From 90a686e08796544d5f43bf35e58b97ca6fa4f51a Mon Sep 17 00:00:00 2001 From: "Redhuan D. Oon" Date: Tue, 23 Dec 2008 06:09:21 +0000 Subject: [PATCH] organize imports --- .../org/adempiere/server/JAXPParserMaker.java | 14 +++++--- .../server/SimpleMessageToTopic.java | 8 ++--- .../server/rpl/imp/FileImportProcessor.java | 4 +-- .../server/rpl/imp/TopicImportProcessor.java | 4 +-- .../server/rpl/imp/TopicListener.java | 3 +- .../compiere/ldap/LdapConnectionHandler.java | 25 +++++++------- .../server/org/compiere/ldap/LdapMessage.java | 9 ++--- .../org/compiere/ldap/LdapProcessor.java | 19 ++++++----- .../server/org/compiere/ldap/LdapResult.java | 11 ++++--- .../org/compiere/server/AcctProcessor.java | 18 +++++++--- .../org/compiere/server/AdempiereServer.java | 28 +++++++++++----- .../compiere/server/AdempiereServerGroup.java | 2 +- .../compiere/server/AdempiereServerMgr.java | 24 +++++++++----- .../org/compiere/server/EMailProcessor.java | 28 ++++++++++++---- .../compiere/server/ReplicationProcessor.java | 2 +- .../org/compiere/server/RequestProcessor.java | 24 +++++++++++--- .../server/org/compiere/server/Scheduler.java | 33 ++++++++++++++----- .../compiere/server/WorkflowProcessor.java | 30 ++++++++++++----- 18 files changed, 194 insertions(+), 92 deletions(-) diff --git a/serverRoot/src/main/server/org/adempiere/server/JAXPParserMaker.java b/serverRoot/src/main/server/org/adempiere/server/JAXPParserMaker.java index 2a92a36d4b..ed2c9e8f96 100644 --- a/serverRoot/src/main/server/org/adempiere/server/JAXPParserMaker.java +++ b/serverRoot/src/main/server/org/adempiere/server/JAXPParserMaker.java @@ -28,10 +28,16 @@ ***********************************************************************/ package org.adempiere.server; -import javax.xml.parsers.*; -import org.w3c.dom.*; -import org.xml.sax.*; -import java.io.*; +import java.io.IOException; +import java.io.StringReader; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import org.w3c.dom.Document; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; /** * diff --git a/serverRoot/src/main/server/org/adempiere/server/SimpleMessageToTopic.java b/serverRoot/src/main/server/org/adempiere/server/SimpleMessageToTopic.java index b43b19f7d4..b34e2dd119 100644 --- a/serverRoot/src/main/server/org/adempiere/server/SimpleMessageToTopic.java +++ b/serverRoot/src/main/server/org/adempiere/server/SimpleMessageToTopic.java @@ -28,15 +28,15 @@ **********************************************************************/ package org.adempiere.server; -import org.apache.activemq.ActiveMQConnectionFactory; - import javax.jms.Connection; -import javax.jms.Session; +import javax.jms.DeliveryMode; import javax.jms.Destination; import javax.jms.MessageProducer; -import javax.jms.DeliveryMode; +import javax.jms.Session; import javax.jms.TextMessage; +import org.apache.activemq.ActiveMQConnectionFactory; + public class SimpleMessageToTopic { private static final String TOPIC_NAME = "ExampleTopic"; diff --git a/serverRoot/src/main/server/org/adempiere/server/rpl/imp/FileImportProcessor.java b/serverRoot/src/main/server/org/adempiere/server/rpl/imp/FileImportProcessor.java index 39daeeebe6..557bf3464b 100644 --- a/serverRoot/src/main/server/org/adempiere/server/rpl/imp/FileImportProcessor.java +++ b/serverRoot/src/main/server/org/adempiere/server/rpl/imp/FileImportProcessor.java @@ -32,10 +32,10 @@ import java.util.Properties; import org.adempiere.server.rpl.IImportProcessor; import org.adempiere.server.rpl.XMLHelper; -import org.eevolution.model.MIMPProcessor; -import org.eevolution.model.X_IMP_ProcessorParameter; import org.compiere.server.ReplicationProcessor; import org.compiere.util.CLogger; +import org.eevolution.model.MIMPProcessor; +import org.eevolution.model.X_IMP_ProcessorParameter; import org.w3c.dom.Document; /** diff --git a/serverRoot/src/main/server/org/adempiere/server/rpl/imp/TopicImportProcessor.java b/serverRoot/src/main/server/org/adempiere/server/rpl/imp/TopicImportProcessor.java index e3ac6c0916..39718ded48 100644 --- a/serverRoot/src/main/server/org/adempiere/server/rpl/imp/TopicImportProcessor.java +++ b/serverRoot/src/main/server/org/adempiere/server/rpl/imp/TopicImportProcessor.java @@ -31,10 +31,10 @@ package org.adempiere.server.rpl.imp; import java.util.Properties; import org.adempiere.server.rpl.IImportProcessor; -import org.eevolution.model.MIMPProcessor; -import org.eevolution.model.X_IMP_ProcessorParameter; import org.compiere.server.ReplicationProcessor; import org.compiere.util.CLogger; +import org.eevolution.model.MIMPProcessor; +import org.eevolution.model.X_IMP_ProcessorParameter; /** * Aim of this class is to import records from JMS Server. diff --git a/serverRoot/src/main/server/org/adempiere/server/rpl/imp/TopicListener.java b/serverRoot/src/main/server/org/adempiere/server/rpl/imp/TopicListener.java index 7cced6f634..79e35f822b 100644 --- a/serverRoot/src/main/server/org/adempiere/server/rpl/imp/TopicListener.java +++ b/serverRoot/src/main/server/org/adempiere/server/rpl/imp/TopicListener.java @@ -33,7 +33,6 @@ package org.adempiere.server.rpl.imp; import java.util.Properties; import javax.jms.Connection; -import javax.jms.InvalidClientIDException; import javax.jms.JMSException; import javax.jms.Message; import javax.jms.MessageConsumer; @@ -44,9 +43,9 @@ import javax.jms.Topic; import org.adempiere.server.rpl.XMLHelper; import org.apache.activemq.ActiveMQConnectionFactory; -import org.eevolution.model.MIMPProcessorLog; import org.compiere.server.ReplicationProcessor; import org.compiere.util.CLogger; +import org.eevolution.model.MIMPProcessorLog; import org.w3c.dom.Document; /** diff --git a/serverRoot/src/main/server/org/compiere/ldap/LdapConnectionHandler.java b/serverRoot/src/main/server/org/compiere/ldap/LdapConnectionHandler.java index 94525a0aa8..cef11cef3a 100644 --- a/serverRoot/src/main/server/org/compiere/ldap/LdapConnectionHandler.java +++ b/serverRoot/src/main/server/org/compiere/ldap/LdapConnectionHandler.java @@ -15,17 +15,20 @@ *****************************************************************************/ package org.compiere.ldap; -import java.io.*; -import java.net.*; -import java.util.Hashtable; -import java.util.logging.*; - -import javax.naming.AuthenticationException; -import javax.naming.Context; -import javax.naming.ldap.InitialLdapContext; - -import org.compiere.model.*; -import org.compiere.util.*; +import java.io.BufferedOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.Socket; +import java.util.Hashtable; +import java.util.logging.Level; + +import javax.naming.AuthenticationException; +import javax.naming.Context; +import javax.naming.ldap.InitialLdapContext; + +import org.compiere.model.MLdapProcessor; +import org.compiere.model.MLdapUser; +import org.compiere.util.CLogger; /** * LDAP Connection Handler diff --git a/serverRoot/src/main/server/org/compiere/ldap/LdapMessage.java b/serverRoot/src/main/server/org/compiere/ldap/LdapMessage.java index c2003a0715..ff0d77129d 100644 --- a/serverRoot/src/main/server/org/compiere/ldap/LdapMessage.java +++ b/serverRoot/src/main/server/org/compiere/ldap/LdapMessage.java @@ -15,10 +15,11 @@ *****************************************************************************/ package org.compiere.ldap; -import java.util.logging.*; - -import org.compiere.util.*; -import com.sun.jndi.ldap.*; +import java.util.logging.Level; + +import org.compiere.util.CLogger; + +import com.sun.jndi.ldap.BerDecoder; /** * Ldap Message diff --git a/serverRoot/src/main/server/org/compiere/ldap/LdapProcessor.java b/serverRoot/src/main/server/org/compiere/ldap/LdapProcessor.java index ebe1bcf518..86a99f6d8b 100644 --- a/serverRoot/src/main/server/org/compiere/ldap/LdapProcessor.java +++ b/serverRoot/src/main/server/org/compiere/ldap/LdapProcessor.java @@ -15,14 +15,17 @@ *****************************************************************************/ package org.compiere.ldap; -import java.net.*; -import java.sql.*; -import java.util.*; -import java.util.logging.*; -import org.compiere.*; -import org.compiere.model.*; -import org.compiere.server.*; -import org.compiere.util.*; +import java.net.ServerSocket; +import java.net.Socket; +import java.sql.Timestamp; +import java.util.Properties; +import java.util.logging.Level; + +import org.compiere.Adempiere; +import org.compiere.model.MLdapProcessor; +import org.compiere.model.MLdapProcessorLog; +import org.compiere.server.AdempiereServer; +import org.compiere.util.TimeUtil; /** * LDAP Server diff --git a/serverRoot/src/main/server/org/compiere/ldap/LdapResult.java b/serverRoot/src/main/server/org/compiere/ldap/LdapResult.java index 00b3be5000..43b30b30cf 100644 --- a/serverRoot/src/main/server/org/compiere/ldap/LdapResult.java +++ b/serverRoot/src/main/server/org/compiere/ldap/LdapResult.java @@ -15,10 +15,13 @@ *****************************************************************************/ package org.compiere.ldap; -import java.util.logging.*; -import org.compiere.model.*; -import org.compiere.util.*; -import com.sun.jndi.ldap.BerEncoder; +import java.util.logging.Level; + +import org.compiere.model.MLdapProcessor; +import org.compiere.model.MLdapUser; +import org.compiere.util.CLogger; + +import com.sun.jndi.ldap.BerEncoder; /** * Ldap Wire Response diff --git a/serverRoot/src/main/server/org/compiere/server/AcctProcessor.java b/serverRoot/src/main/server/org/compiere/server/AcctProcessor.java index 34dcf63a6e..fc41c39cda 100644 --- a/serverRoot/src/main/server/org/compiere/server/AcctProcessor.java +++ b/serverRoot/src/main/server/org/compiere/server/AcctProcessor.java @@ -16,11 +16,19 @@ *****************************************************************************/ package org.compiere.server; -import java.sql.*; -import java.util.logging.*; -import org.compiere.acct.*; -import org.compiere.model.*; -import org.compiere.util.*; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.Timestamp; +import java.util.logging.Level; + +import org.compiere.acct.Doc; +import org.compiere.model.MAcctProcessor; +import org.compiere.model.MAcctProcessorLog; +import org.compiere.model.MAcctSchema; +import org.compiere.model.MClient; +import org.compiere.model.MCost; +import org.compiere.util.DB; +import org.compiere.util.TimeUtil; /** diff --git a/serverRoot/src/main/server/org/compiere/server/AdempiereServer.java b/serverRoot/src/main/server/org/compiere/server/AdempiereServer.java index 4347d099d5..34462dc705 100644 --- a/serverRoot/src/main/server/org/compiere/server/AdempiereServer.java +++ b/serverRoot/src/main/server/org/compiere/server/AdempiereServer.java @@ -16,14 +16,26 @@ *****************************************************************************/ package org.compiere.server; -import java.sql.*; -import java.util.*; -import java.util.logging.*; -import org.compiere.ldap.*; -import org.compiere.model.*; -import org.compiere.util.*; -import org.compiere.wf.*; -import org.eevolution.model.*; +import java.sql.Timestamp; +import java.util.Properties; +import java.util.logging.Level; + +import org.compiere.ldap.LdapProcessor; +import org.compiere.model.AdempiereProcessor; +import org.compiere.model.AdempiereProcessorLog; +import org.compiere.model.MAcctProcessor; +import org.compiere.model.MAlertProcessor; +import org.compiere.model.MClient; +import org.compiere.model.MLdapProcessor; +import org.compiere.model.MRequestProcessor; +import org.compiere.model.MScheduler; +import org.compiere.model.MSystem; +import org.compiere.model.X_R_RequestProcessor; +import org.compiere.util.CLogger; +import org.compiere.util.Env; +import org.compiere.util.TimeUtil; +import org.compiere.wf.MWorkflowProcessor; +import org.eevolution.model.MIMPProcessor; /** * Adempiere Server Base diff --git a/serverRoot/src/main/server/org/compiere/server/AdempiereServerGroup.java b/serverRoot/src/main/server/org/compiere/server/AdempiereServerGroup.java index d2a14d6358..067c1b5b21 100644 --- a/serverRoot/src/main/server/org/compiere/server/AdempiereServerGroup.java +++ b/serverRoot/src/main/server/org/compiere/server/AdempiereServerGroup.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.server; -import org.compiere.util.*; +import org.compiere.util.CLogger; /** * Adempiere Server Group diff --git a/serverRoot/src/main/server/org/compiere/server/AdempiereServerMgr.java b/serverRoot/src/main/server/org/compiere/server/AdempiereServerMgr.java index ef5ade24e0..d9a7fd9702 100644 --- a/serverRoot/src/main/server/org/compiere/server/AdempiereServerMgr.java +++ b/serverRoot/src/main/server/org/compiere/server/AdempiereServerMgr.java @@ -16,14 +16,22 @@ *****************************************************************************/ package org.compiere.server; -import java.sql.*; -import java.util.*; -import java.util.logging.*; -import org.compiere.*; -import org.compiere.model.*; -import org.compiere.util.*; -import org.compiere.wf.*; -import org.eevolution.model.*; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Properties; +import java.util.logging.Level; + +import org.compiere.Adempiere; +import org.compiere.model.MAcctProcessor; +import org.compiere.model.MAlertProcessor; +import org.compiere.model.MLdapProcessor; +import org.compiere.model.MRequestProcessor; +import org.compiere.model.MScheduler; +import org.compiere.model.MSession; +import org.compiere.util.CLogger; +import org.compiere.util.Env; +import org.compiere.wf.MWorkflowProcessor; +import org.eevolution.model.MIMPProcessor; /** * Adempiere Server Manager diff --git a/serverRoot/src/main/server/org/compiere/server/EMailProcessor.java b/serverRoot/src/main/server/org/compiere/server/EMailProcessor.java index fc67c99254..4eb962c1aa 100644 --- a/serverRoot/src/main/server/org/compiere/server/EMailProcessor.java +++ b/serverRoot/src/main/server/org/compiere/server/EMailProcessor.java @@ -16,13 +16,27 @@ *****************************************************************************/ package org.compiere.server; -import java.io.*; -import java.util.*; -import java.util.logging.*; -import javax.mail.*; -import org.compiere.*; -import org.compiere.model.*; -import org.compiere.util.*; +import java.io.InputStream; +import java.util.Enumeration; +import java.util.Properties; +import java.util.logging.Level; + +import javax.mail.Address; +import javax.mail.Flags; +import javax.mail.Folder; +import javax.mail.Header; +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.Multipart; +import javax.mail.Part; +import javax.mail.Session; +import javax.mail.Store; + +import org.compiere.Adempiere; +import org.compiere.model.MClient; +import org.compiere.util.CLogMgt; +import org.compiere.util.CLogger; +import org.compiere.util.EMailAuthenticator; /** * Request Mail Processor diff --git a/serverRoot/src/main/server/org/compiere/server/ReplicationProcessor.java b/serverRoot/src/main/server/org/compiere/server/ReplicationProcessor.java index ed05b69289..b4309d9d94 100644 --- a/serverRoot/src/main/server/org/compiere/server/ReplicationProcessor.java +++ b/serverRoot/src/main/server/org/compiere/server/ReplicationProcessor.java @@ -32,10 +32,10 @@ import java.sql.Timestamp; import org.adempiere.server.rpl.IImportProcessor; import org.compiere.model.MClient; +import org.compiere.util.TimeUtil; import org.eevolution.model.MIMPProcessor; import org.eevolution.model.MIMPProcessorLog; import org.eevolution.model.X_IMP_Processor_Type; -import org.compiere.util.TimeUtil; /** * diff --git a/serverRoot/src/main/server/org/compiere/server/RequestProcessor.java b/serverRoot/src/main/server/org/compiere/server/RequestProcessor.java index 0ce6844427..939a04e82c 100644 --- a/serverRoot/src/main/server/org/compiere/server/RequestProcessor.java +++ b/serverRoot/src/main/server/org/compiere/server/RequestProcessor.java @@ -16,12 +16,26 @@ *****************************************************************************/ package org.compiere.server; -import java.sql.*; -import java.util.*; -import java.util.logging.*; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Timestamp; +import java.util.Properties; +import java.util.StringTokenizer; +import java.util.logging.Level; -import org.compiere.model.*; -import org.compiere.util.*; +import org.compiere.model.MChangeRequest; +import org.compiere.model.MClient; +import org.compiere.model.MGroup; +import org.compiere.model.MRequest; +import org.compiere.model.MRequestProcessor; +import org.compiere.model.MRequestProcessorLog; +import org.compiere.model.MRequestProcessorRoute; +import org.compiere.model.MStatus; +import org.compiere.model.MUser; +import org.compiere.util.DB; +import org.compiere.util.Msg; +import org.compiere.util.TimeUtil; /** * Request Processor diff --git a/serverRoot/src/main/server/org/compiere/server/Scheduler.java b/serverRoot/src/main/server/org/compiere/server/Scheduler.java index f4e35dffd0..e82ee7597a 100644 --- a/serverRoot/src/main/server/org/compiere/server/Scheduler.java +++ b/serverRoot/src/main/server/org/compiere/server/Scheduler.java @@ -16,14 +16,31 @@ *****************************************************************************/ package org.compiere.server; -import java.io.*; -import java.math.*; -import java.sql.*; -import java.util.logging.*; -import org.compiere.model.*; -import org.compiere.print.*; -import org.compiere.process.*; -import org.compiere.util.*; +import java.io.File; +import java.math.BigDecimal; +import java.sql.Timestamp; +import java.util.logging.Level; + +import org.compiere.model.MAttachment; +import org.compiere.model.MClient; +import org.compiere.model.MNote; +import org.compiere.model.MPInstance; +import org.compiere.model.MPInstancePara; +import org.compiere.model.MProcess; +import org.compiere.model.MScheduler; +import org.compiere.model.MSchedulerLog; +import org.compiere.model.MSchedulerPara; +import org.compiere.model.MUser; +import org.compiere.model.X_AD_Note; +import org.compiere.model.X_AD_PInstance; +import org.compiere.model.X_AD_User; +import org.compiere.print.ReportEngine; +import org.compiere.process.ProcessInfo; +import org.compiere.process.ProcessInfoUtil; +import org.compiere.util.DisplayType; +import org.compiere.util.Env; +import org.compiere.util.TimeUtil; +import org.compiere.util.Trx; /** diff --git a/serverRoot/src/main/server/org/compiere/server/WorkflowProcessor.java b/serverRoot/src/main/server/org/compiere/server/WorkflowProcessor.java index dd1d0d1d2f..031ac78f40 100644 --- a/serverRoot/src/main/server/org/compiere/server/WorkflowProcessor.java +++ b/serverRoot/src/main/server/org/compiere/server/WorkflowProcessor.java @@ -16,15 +16,29 @@ *****************************************************************************/ package org.compiere.server; -import java.sql.*; -import java.util.*; -import java.io.*; +import java.io.File; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.logging.Level; -import java.util.logging.*; -import org.compiere.util.*; -import org.compiere.wf.*; -import org.compiere.model.*; -import org.compiere.process.*; +import org.compiere.model.MClient; +import org.compiere.model.MOrgInfo; +import org.compiere.model.MUserRoles; +import org.compiere.model.PO; +import org.compiere.process.DocAction; +import org.compiere.process.StateEngine; +import org.compiere.util.DB; +import org.compiere.util.Msg; +import org.compiere.util.TimeUtil; +import org.compiere.wf.MWFActivity; +import org.compiere.wf.MWFNode; +import org.compiere.wf.MWFProcess; +import org.compiere.wf.MWFResponsible; +import org.compiere.wf.MWorkflowProcessor; +import org.compiere.wf.MWorkflowProcessorLog; /**