From 2e48792949123874c2bea46ed3075d8bf1c2547f Mon Sep 17 00:00:00 2001 From: "Redhuan D. Oon" Date: Mon, 22 Dec 2008 10:06:48 +0000 Subject: [PATCH] organize imports --- base/src/org/compiere/util/ASyncProcess.java | 2 +- base/src/org/compiere/util/ASyncWorker.java | 8 ++- base/src/org/compiere/util/AmtInWords_HU.java | 2 - .../compiere/util/ByteArrayDataSource.java | 12 +++- base/src/org/compiere/util/CCache.java | 8 ++- base/src/org/compiere/util/CCachedRowSet.java | 23 ++++--- base/src/org/compiere/util/CLogConsole.java | 11 +++- .../org/compiere/util/CLogErrorBuffer.java | 14 +++-- base/src/org/compiere/util/CLogFile.java | 10 +++- base/src/org/compiere/util/CLogFilter.java | 4 +- base/src/org/compiere/util/CLogFormatter.java | 12 ++-- base/src/org/compiere/util/CLogMgt.java | 30 +++++++--- base/src/org/compiere/util/CLogMgtLog4J.java | 4 +- base/src/org/compiere/util/CLogger.java | 5 +- base/src/org/compiere/util/CMemoryUsage.java | 4 +- base/src/org/compiere/util/CStatement.java | 5 +- base/src/org/compiere/util/CacheMgt.java | 6 +- base/src/org/compiere/util/ConnectTest.java | 11 ++-- base/src/org/compiere/util/DisplayType.java | 7 ++- base/src/org/compiere/util/EMail.java | 38 +++++++++--- .../org/compiere/util/EMailAuthenticator.java | 6 +- base/src/org/compiere/util/EMailTest.java | 5 +- base/src/org/compiere/util/EnvLoader.java | 5 +- base/src/org/compiere/util/Evaluator.java | 7 ++- .../compiere/util/ExtensionFileFilter.java | 3 +- base/src/org/compiere/util/FileUpload.java | 15 +++-- base/src/org/compiere/util/HtmlCode.java | 4 +- base/src/org/compiere/util/IniDialog.java | 24 +++++--- base/src/org/compiere/util/Language.java | 17 ++++-- base/src/org/compiere/util/Login.java | 28 ++++++--- base/src/org/compiere/util/Msg.java | 12 ++-- base/src/org/compiere/util/NullParameter.java | 2 +- base/src/org/compiere/util/Queue.java | 3 +- .../org/compiere/util/ReplenishInterface.java | 6 +- base/src/org/compiere/util/Secure.java | 14 +++-- base/src/org/compiere/util/SecureEngine.java | 4 +- .../org/compiere/util/SecureInterface.java | 4 +- base/src/org/compiere/util/Splash.java | 19 +++++- base/src/org/compiere/util/Task.java | 6 +- base/src/org/compiere/util/TimeUtil.java | 6 +- base/src/org/compiere/util/Trace.java | 4 +- base/src/org/compiere/util/Util.java | 23 ++++--- base/src/org/compiere/util/WebDoc.java | 23 ++++++- base/src/org/compiere/util/WebEnv.java | 37 +++++++++--- base/src/org/compiere/util/WebLogin.java | 16 +++-- base/src/org/compiere/util/WebSessionCtx.java | 18 ++++-- base/src/org/compiere/util/WebUtil.java | 60 +++++++++++++++---- base/src/org/compiere/util/ZipUtil.java | 17 ++++-- 48 files changed, 422 insertions(+), 182 deletions(-) diff --git a/base/src/org/compiere/util/ASyncProcess.java b/base/src/org/compiere/util/ASyncProcess.java index 0c623985ba..79331eefab 100644 --- a/base/src/org/compiere/util/ASyncProcess.java +++ b/base/src/org/compiere/util/ASyncProcess.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.util; -import org.compiere.process.*; +import org.compiere.process.ProcessInfo; /** * Async Process Interface. diff --git a/base/src/org/compiere/util/ASyncWorker.java b/base/src/org/compiere/util/ASyncWorker.java index 4760d36112..ca9a733219 100644 --- a/base/src/org/compiere/util/ASyncWorker.java +++ b/base/src/org/compiere/util/ASyncWorker.java @@ -16,9 +16,11 @@ *****************************************************************************/ package org.compiere.util; -import java.util.logging.*; -import javax.swing.*; -import org.compiere.process.*; +import java.util.logging.Level; + +import javax.swing.SwingUtilities; + +import org.compiere.process.ProcessInfo; /** * ASync Worker for starting methods in classes implementing ASyncProcess diff --git a/base/src/org/compiere/util/AmtInWords_HU.java b/base/src/org/compiere/util/AmtInWords_HU.java index 69b9917dcf..8308ab3e8a 100644 --- a/base/src/org/compiere/util/AmtInWords_HU.java +++ b/base/src/org/compiere/util/AmtInWords_HU.java @@ -5,8 +5,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.compiere.util.AmtInWords; - public class AmtInWords_HU implements AmtInWords { static String thousandseparator=","; diff --git a/base/src/org/compiere/util/ByteArrayDataSource.java b/base/src/org/compiere/util/ByteArrayDataSource.java index 00aa6f1d3a..06dfb75078 100644 --- a/base/src/org/compiere/util/ByteArrayDataSource.java +++ b/base/src/org/compiere/util/ByteArrayDataSource.java @@ -16,9 +16,15 @@ *****************************************************************************/ package org.compiere.util; -import java.io.*; -import java.util.logging.*; -import javax.activation.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import java.util.logging.Level; + +import javax.activation.DataSource; /** * A DataSource based on the Java Mail Example. diff --git a/base/src/org/compiere/util/CCache.java b/base/src/org/compiere/util/CCache.java index 27f70efa6c..1a95786be5 100644 --- a/base/src/org/compiere/util/CCache.java +++ b/base/src/org/compiere/util/CCache.java @@ -16,8 +16,12 @@ *****************************************************************************/ package org.compiere.util; -import java.beans.*; -import java.util.*; +import java.beans.VetoableChangeListener; +import java.beans.VetoableChangeSupport; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; /** * Adempiere Cache. diff --git a/base/src/org/compiere/util/CCachedRowSet.java b/base/src/org/compiere/util/CCachedRowSet.java index 844c8beaab..c29d912182 100644 --- a/base/src/org/compiere/util/CCachedRowSet.java +++ b/base/src/org/compiere/util/CCachedRowSet.java @@ -16,13 +16,22 @@ *****************************************************************************/ package org.compiere.util; -import java.sql.*; -import java.util.*; -import javax.sql.*; -import javax.sql.rowset.*; -import org.compiere.db.*; -import oracle.jdbc.rowset.*; -import com.sun.rowset.*; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Collection; +import java.util.Locale; + +import javax.sql.RowSet; +import javax.sql.rowset.CachedRowSet; + +import oracle.jdbc.rowset.OracleCachedRowSet; + +import org.compiere.db.AdempiereDatabase; +import org.compiere.db.Database; + +import com.sun.rowset.CachedRowSetImpl; /** diff --git a/base/src/org/compiere/util/CLogConsole.java b/base/src/org/compiere/util/CLogConsole.java index eb5b7df5b3..5105aa0d65 100644 --- a/base/src/org/compiere/util/CLogConsole.java +++ b/base/src/org/compiere/util/CLogConsole.java @@ -16,9 +16,14 @@ *****************************************************************************/ package org.compiere.util; -import java.io.*; -import java.sql.*; -import java.util.logging.*; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.io.UnsupportedEncodingException; +import java.sql.DriverManager; +import java.util.logging.ErrorManager; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogRecord; /** * Adempiere Console Logger diff --git a/base/src/org/compiere/util/CLogErrorBuffer.java b/base/src/org/compiere/util/CLogErrorBuffer.java index 94cca8d668..3084b1df9f 100644 --- a/base/src/org/compiere/util/CLogErrorBuffer.java +++ b/base/src/org/compiere/util/CLogErrorBuffer.java @@ -16,11 +16,17 @@ *****************************************************************************/ package org.compiere.util; -import java.sql.*; -import java.util.*; -import java.util.logging.*; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.Properties; +import java.util.Vector; +import java.util.logging.ErrorManager; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogRecord; -import org.compiere.model.*; +import org.compiere.model.MIssue; /** * Client Error Buffer diff --git a/base/src/org/compiere/util/CLogFile.java b/base/src/org/compiere/util/CLogFile.java index 200436d180..1f3011d3ce 100644 --- a/base/src/org/compiere/util/CLogFile.java +++ b/base/src/org/compiere/util/CLogFile.java @@ -16,9 +16,13 @@ *****************************************************************************/ package org.compiere.util; -import java.io.*; -import java.sql.*; -import java.util.logging.*; +import java.io.File; +import java.io.FileWriter; +import java.sql.Timestamp; +import java.util.logging.ErrorManager; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogRecord; /** diff --git a/base/src/org/compiere/util/CLogFilter.java b/base/src/org/compiere/util/CLogFilter.java index bf062d4cb9..092f4a5474 100644 --- a/base/src/org/compiere/util/CLogFilter.java +++ b/base/src/org/compiere/util/CLogFilter.java @@ -16,7 +16,9 @@ *****************************************************************************/ package org.compiere.util; -import java.util.logging.*; +import java.util.logging.Filter; +import java.util.logging.Level; +import java.util.logging.LogRecord; /** diff --git a/base/src/org/compiere/util/CLogFormatter.java b/base/src/org/compiere/util/CLogFormatter.java index 8b3ac30b58..c3b5755e84 100644 --- a/base/src/org/compiere/util/CLogFormatter.java +++ b/base/src/org/compiere/util/CLogFormatter.java @@ -16,10 +16,14 @@ *****************************************************************************/ package org.compiere.util; -import java.awt.*; -import java.rmi.*; -import java.sql.*; -import java.util.logging.*; +import java.awt.Toolkit; +import java.rmi.ServerException; +import java.sql.SQLException; +import java.sql.Timestamp; +import java.util.logging.Formatter; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogRecord; /** diff --git a/base/src/org/compiere/util/CLogMgt.java b/base/src/org/compiere/util/CLogMgt.java index b6d1499b8c..bd8c00dc1e 100644 --- a/base/src/org/compiere/util/CLogMgt.java +++ b/base/src/org/compiere/util/CLogMgt.java @@ -16,15 +16,27 @@ *****************************************************************************/ package org.compiere.util; -import java.io.*; -import java.net.*; -import java.sql.*; -import java.util.*; -import java.util.jar.*; -import java.util.logging.*; -import org.compiere.*; -import org.compiere.db.*; -import org.compiere.model.*; +import java.io.BufferedInputStream; +import java.io.InputStream; +import java.io.PrintWriter; +import java.net.InetAddress; +import java.sql.DriverManager; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.Properties; +import java.util.jar.Attributes; +import java.util.jar.Manifest; +import java.util.logging.Filter; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogManager; +import java.util.logging.Logger; + +import org.compiere.Adempiere; +import org.compiere.db.CConnection; +import org.compiere.model.MClient; /** diff --git a/base/src/org/compiere/util/CLogMgtLog4J.java b/base/src/org/compiere/util/CLogMgtLog4J.java index 88ddc10185..63c6c311a4 100644 --- a/base/src/org/compiere/util/CLogMgtLog4J.java +++ b/base/src/org/compiere/util/CLogMgtLog4J.java @@ -16,7 +16,9 @@ *****************************************************************************/ package org.compiere.util; -import org.apache.log4j.*; +import org.apache.log4j.Level; +import org.apache.log4j.LogManager; +import org.apache.log4j.Logger; /** * Log4J Utilities. diff --git a/base/src/org/compiere/util/CLogger.java b/base/src/org/compiere/util/CLogger.java index 22e7af471f..677b733777 100644 --- a/base/src/org/compiere/util/CLogger.java +++ b/base/src/org/compiere/util/CLogger.java @@ -16,8 +16,9 @@ *****************************************************************************/ package org.compiere.util; -import java.io.*; -import java.util.logging.*; +import java.io.Serializable; +import java.util.logging.LogManager; +import java.util.logging.Logger; /** diff --git a/base/src/org/compiere/util/CMemoryUsage.java b/base/src/org/compiere/util/CMemoryUsage.java index 7ceb57bb04..632739adad 100644 --- a/base/src/org/compiere/util/CMemoryUsage.java +++ b/base/src/org/compiere/util/CMemoryUsage.java @@ -16,8 +16,8 @@ *****************************************************************************/ package org.compiere.util; -import java.lang.management.*; -import java.text.*; +import java.lang.management.MemoryUsage; +import java.text.DecimalFormat; /** * Memory Usage Info diff --git a/base/src/org/compiere/util/CStatement.java b/base/src/org/compiere/util/CStatement.java index 32c261e61e..24a1cf3dcc 100644 --- a/base/src/org/compiere/util/CStatement.java +++ b/base/src/org/compiere/util/CStatement.java @@ -16,9 +16,10 @@ *****************************************************************************/ package org.compiere.util; -import java.sql.*; +import java.sql.SQLException; +import java.sql.Statement; -import javax.sql.*; +import javax.sql.RowSet; /** * Interface to wrap and extend Statement diff --git a/base/src/org/compiere/util/CacheMgt.java b/base/src/org/compiere/util/CacheMgt.java index 5bfb3a8fd3..719852b454 100644 --- a/base/src/org/compiere/util/CacheMgt.java +++ b/base/src/org/compiere/util/CacheMgt.java @@ -16,11 +16,7 @@ *****************************************************************************/ package org.compiere.util; -import java.rmi.*; -import java.util.*; -import java.util.logging.*; -import org.compiere.db.*; -import org.compiere.interfaces.*; +import java.util.ArrayList; /** * Adempiere Cache Manangement diff --git a/base/src/org/compiere/util/ConnectTest.java b/base/src/org/compiere/util/ConnectTest.java index 153bba07e7..64888f9598 100644 --- a/base/src/org/compiere/util/ConnectTest.java +++ b/base/src/org/compiere/util/ConnectTest.java @@ -16,11 +16,14 @@ *****************************************************************************/ package org.compiere.util; -import java.net.*; -import java.util.*; -import javax.naming.*; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.Hashtable; -import org.compiere.interfaces.*; +import javax.naming.InitialContext; +import javax.naming.NamingEnumeration; + +import org.compiere.interfaces.Status; /** * Apps Server Connection Test diff --git a/base/src/org/compiere/util/DisplayType.java b/base/src/org/compiere/util/DisplayType.java index 083cb54c15..cea3610b39 100644 --- a/base/src/org/compiere/util/DisplayType.java +++ b/base/src/org/compiere/util/DisplayType.java @@ -16,8 +16,11 @@ *****************************************************************************/ package org.compiere.util; -import java.text.*; -import java.util.*; +import java.text.DateFormat; +import java.text.DecimalFormat; +import java.text.NumberFormat; +import java.text.SimpleDateFormat; +import java.util.Locale; import java.util.logging.Level; /** diff --git a/base/src/org/compiere/util/EMail.java b/base/src/org/compiere/util/EMail.java index d2abb00576..fc7db6038b 100644 --- a/base/src/org/compiere/util/EMail.java +++ b/base/src/org/compiere/util/EMail.java @@ -16,16 +16,36 @@ *****************************************************************************/ package org.compiere.util; -import java.io.*; -import java.net.*; -import java.util.*; -import java.util.logging.*; -import javax.activation.*; -import javax.mail.*; -import javax.mail.internet.*; -import com.sun.mail.smtp.*; +import java.io.File; +import java.io.IOException; +import java.io.Serializable; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Enumeration; +import java.util.Properties; +import java.util.logging.Level; -import org.compiere.model.*; +import javax.activation.DataHandler; +import javax.activation.DataSource; +import javax.activation.FileDataSource; +import javax.activation.URLDataSource; +import javax.mail.Address; +import javax.mail.AuthenticationFailedException; +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.Multipart; +import javax.mail.SendFailedException; +import javax.mail.Session; +import javax.mail.Transport; +import javax.mail.internet.InternetAddress; +import javax.mail.internet.MimeBodyPart; +import javax.mail.internet.MimeMessage; +import javax.mail.internet.MimeMultipart; + +import org.compiere.model.MClient; + +import com.sun.mail.smtp.SMTPMessage; /** * EMail Object. diff --git a/base/src/org/compiere/util/EMailAuthenticator.java b/base/src/org/compiere/util/EMailAuthenticator.java index 9b777f25e4..e005714aa4 100644 --- a/base/src/org/compiere/util/EMailAuthenticator.java +++ b/base/src/org/compiere/util/EMailAuthenticator.java @@ -16,8 +16,10 @@ *****************************************************************************/ package org.compiere.util; -import java.util.logging.*; -import javax.mail.*; +import java.util.logging.Level; + +import javax.mail.Authenticator; +import javax.mail.PasswordAuthentication; /** * Email User Authentification diff --git a/base/src/org/compiere/util/EMailTest.java b/base/src/org/compiere/util/EMailTest.java index 568b948413..b0d62e5110 100644 --- a/base/src/org/compiere/util/EMailTest.java +++ b/base/src/org/compiere/util/EMailTest.java @@ -16,8 +16,9 @@ *****************************************************************************/ package org.compiere.util; -import java.io.*; -import junit.framework.*; +import java.io.File; + +import junit.framework.TestCase; /** * The class EMailTest contains tests for the class diff --git a/base/src/org/compiere/util/EnvLoader.java b/base/src/org/compiere/util/EnvLoader.java index ab95eaab45..255a452f4a 100644 --- a/base/src/org/compiere/util/EnvLoader.java +++ b/base/src/org/compiere/util/EnvLoader.java @@ -16,8 +16,9 @@ *****************************************************************************/ package org.compiere.util; -import java.io.*; -import java.util.*; +import java.io.InputStream; +import java.util.Properties; +import java.util.StringTokenizer; /** * Environment Loader - loads system environment variables int System.properties diff --git a/base/src/org/compiere/util/Evaluator.java b/base/src/org/compiere/util/Evaluator.java index d79a364abb..51f8013827 100644 --- a/base/src/org/compiere/util/Evaluator.java +++ b/base/src/org/compiere/util/Evaluator.java @@ -16,9 +16,10 @@ *****************************************************************************/ package org.compiere.util; -import java.math.*; -import java.util.*; -import java.util.logging.*; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.StringTokenizer; +import java.util.logging.Level; /** diff --git a/base/src/org/compiere/util/ExtensionFileFilter.java b/base/src/org/compiere/util/ExtensionFileFilter.java index e53b079848..c62a2050bc 100644 --- a/base/src/org/compiere/util/ExtensionFileFilter.java +++ b/base/src/org/compiere/util/ExtensionFileFilter.java @@ -16,10 +16,11 @@ *****************************************************************************/ package org.compiere.util; -import javax.swing.filechooser.*; import java.io.File; import java.io.Serializable; +import javax.swing.filechooser.FileFilter; + /** * Extension File Chooser diff --git a/base/src/org/compiere/util/FileUpload.java b/base/src/org/compiere/util/FileUpload.java index 7c7b37a174..8cc23955f7 100644 --- a/base/src/org/compiere/util/FileUpload.java +++ b/base/src/org/compiere/util/FileUpload.java @@ -16,11 +16,16 @@ *****************************************************************************/ package org.compiere.util; -import java.io.*; -import java.util.logging.*; -import javax.servlet.*; -import javax.servlet.http.*; -import org.apache.ecs.xhtml.*; +import java.io.DataInputStream; +import java.io.IOException; +import java.util.logging.Level; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; + +import org.apache.ecs.xhtml.form; +import org.apache.ecs.xhtml.input; +import org.apache.ecs.xhtml.label; /** * Web File Upload utility. diff --git a/base/src/org/compiere/util/HtmlCode.java b/base/src/org/compiere/util/HtmlCode.java index c4d88dbde4..ea98486882 100644 --- a/base/src/org/compiere/util/HtmlCode.java +++ b/base/src/org/compiere/util/HtmlCode.java @@ -16,7 +16,9 @@ *****************************************************************************/ package org.compiere.util; -import org.apache.ecs.*; +import org.apache.ecs.Element; +import org.apache.ecs.MultiPartElement; +import org.apache.ecs.Printable; /** * ECS Component Collection. diff --git a/base/src/org/compiere/util/IniDialog.java b/base/src/org/compiere/util/IniDialog.java index 3d2c8eebfc..817b93b77f 100644 --- a/base/src/org/compiere/util/IniDialog.java +++ b/base/src/org/compiere/util/IniDialog.java @@ -16,15 +16,25 @@ *****************************************************************************/ package org.compiere.util; -import java.awt.*; -import java.awt.event.*; -import java.net.*; -import java.util.*; -import java.util.logging.*; -import javax.swing.*; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.net.URL; +import java.util.ResourceBundle; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JEditorPane; +import javax.swing.JLabel; +import javax.swing.JScrollPane; import org.adempiere.plaf.AdempierePLAF; -import org.compiere.swing.*; +import org.compiere.swing.CPanel; /** * Init Dialog diff --git a/base/src/org/compiere/util/Language.java b/base/src/org/compiere/util/Language.java index 1ce62137ac..445a442388 100644 --- a/base/src/org/compiere/util/Language.java +++ b/base/src/org/compiere/util/Language.java @@ -16,12 +16,17 @@ *****************************************************************************/ package org.compiere.util; -import java.awt.*; -import java.io.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import javax.print.attribute.standard.*; +import java.awt.ComponentOrientation; +import java.io.Serializable; +import java.text.DateFormat; +import java.text.DecimalFormatSymbols; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Locale; +import java.util.logging.Logger; + +import javax.print.attribute.standard.MediaSize; /** * Language Management. diff --git a/base/src/org/compiere/util/Login.java b/base/src/org/compiere/util/Login.java index 97a4049562..e4a60b67a2 100644 --- a/base/src/org/compiere/util/Login.java +++ b/base/src/org/compiere/util/Login.java @@ -16,15 +16,25 @@ *****************************************************************************/ package org.compiere.util; -import java.security.*; -import java.sql.*; -import java.util.*; -import java.util.logging.*; -import javax.swing.*; -// -import org.compiere.*; -import org.compiere.db.*; -import org.compiere.model.*; +import java.security.Principal; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Locale; +import java.util.Properties; +import java.util.logging.Level; + +import javax.swing.JOptionPane; + +import org.compiere.Adempiere; +import org.compiere.db.CConnection; +import org.compiere.model.MCountry; +import org.compiere.model.MRole; +import org.compiere.model.MSystem; +import org.compiere.model.MTree_Base; +import org.compiere.model.ModelValidationEngine; /** diff --git a/base/src/org/compiere/util/Msg.java b/base/src/org/compiere/util/Msg.java index 5223f251d5..8913d81d32 100644 --- a/base/src/org/compiere/util/Msg.java +++ b/base/src/org/compiere/util/Msg.java @@ -16,16 +16,16 @@ *****************************************************************************/ package org.compiere.util; -import java.io.File; +import java.io.File; import java.sql.PreparedStatement; -import java.sql.ResultSet; +import java.sql.ResultSet; import java.sql.SQLException; -import java.text.MessageFormat; -import java.util.Iterator; +import java.text.MessageFormat; +import java.util.Iterator; import java.util.Properties; -import java.util.logging.Level; +import java.util.logging.Level; -import org.compiere.Adempiere; +import org.compiere.Adempiere; /** * Reads all Messages and stores them in a HashMap diff --git a/base/src/org/compiere/util/NullParameter.java b/base/src/org/compiere/util/NullParameter.java index 86e2e722fc..518a5ab534 100644 --- a/base/src/org/compiere/util/NullParameter.java +++ b/base/src/org/compiere/util/NullParameter.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.util; -import java.io.*; +import java.io.Serializable; /** * Null Parameter for CPreparedStatement diff --git a/base/src/org/compiere/util/Queue.java b/base/src/org/compiere/util/Queue.java index d9429247f8..c31b142c5f 100644 --- a/base/src/org/compiere/util/Queue.java +++ b/base/src/org/compiere/util/Queue.java @@ -16,8 +16,7 @@ *****************************************************************************/ package org.compiere.util; -import java.io.*; -//import oracle.AQ.*; +import java.io.Serializable; //import org.compiere.db.CConnection; diff --git a/base/src/org/compiere/util/ReplenishInterface.java b/base/src/org/compiere/util/ReplenishInterface.java index e675bf8c3a..916503c576 100644 --- a/base/src/org/compiere/util/ReplenishInterface.java +++ b/base/src/org/compiere/util/ReplenishInterface.java @@ -16,8 +16,10 @@ *****************************************************************************/ package org.compiere.util; -import java.math.*; -import org.compiere.model.*; +import java.math.BigDecimal; + +import org.compiere.model.MWarehouse; +import org.compiere.model.X_T_Replenish; /** * Custom Replenishment Interface diff --git a/base/src/org/compiere/util/Secure.java b/base/src/org/compiere/util/Secure.java index 545a787afd..52e07bc1ca 100644 --- a/base/src/org/compiere/util/Secure.java +++ b/base/src/org/compiere/util/Secure.java @@ -16,11 +16,17 @@ *****************************************************************************/ package org.compiere.util; -import java.math.*; -import java.security.*; +import java.math.BigDecimal; +import java.security.AlgorithmParameters; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import java.sql.Timestamp; -import java.util.logging.*; -import javax.crypto.*; +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.crypto.Cipher; +import javax.crypto.KeyGenerator; +import javax.crypto.SecretKey; /** * Security Services. diff --git a/base/src/org/compiere/util/SecureEngine.java b/base/src/org/compiere/util/SecureEngine.java index 2388a89835..daec7b5146 100644 --- a/base/src/org/compiere/util/SecureEngine.java +++ b/base/src/org/compiere/util/SecureEngine.java @@ -16,8 +16,8 @@ *****************************************************************************/ package org.compiere.util; -import java.util.*; -import java.util.logging.*; +import java.util.Properties; +import java.util.logging.Logger; /** * Security Engine diff --git a/base/src/org/compiere/util/SecureInterface.java b/base/src/org/compiere/util/SecureInterface.java index fefc882f87..978ff13882 100644 --- a/base/src/org/compiere/util/SecureInterface.java +++ b/base/src/org/compiere/util/SecureInterface.java @@ -16,8 +16,8 @@ *****************************************************************************/ package org.compiere.util; -import java.math.*; -import java.sql.*; +import java.math.BigDecimal; +import java.sql.Timestamp; /** * Adempiere Security Interface. diff --git a/base/src/org/compiere/util/Splash.java b/base/src/org/compiere/util/Splash.java index f1d31076e3..0371825a5e 100644 --- a/base/src/org/compiere/util/Splash.java +++ b/base/src/org/compiere/util/Splash.java @@ -16,8 +16,23 @@ *****************************************************************************/ package org.compiere.util; -import java.awt.*; -import java.net.*; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.Graphics; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Image; +import java.awt.Insets; +import java.awt.Label; +import java.awt.MediaTracker; +import java.awt.Panel; +import java.awt.Rectangle; +import java.awt.SystemColor; +import java.awt.Toolkit; +import java.net.URL; import java.util.Locale; import org.compiere.Adempiere; diff --git a/base/src/org/compiere/util/Task.java b/base/src/org/compiere/util/Task.java index 86485fd769..83ea7eac72 100644 --- a/base/src/org/compiere/util/Task.java +++ b/base/src/org/compiere/util/Task.java @@ -16,8 +16,10 @@ *****************************************************************************/ package org.compiere.util; -import java.io.*; -import java.util.logging.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.logging.Level; /** * Execute OS Task diff --git a/base/src/org/compiere/util/TimeUtil.java b/base/src/org/compiere/util/TimeUtil.java index 5d024570d6..e339b161d9 100644 --- a/base/src/org/compiere/util/TimeUtil.java +++ b/base/src/org/compiere/util/TimeUtil.java @@ -16,8 +16,10 @@ *****************************************************************************/ package org.compiere.util; -import java.sql.*; -import java.util.*; +import java.sql.Timestamp; +import java.util.BitSet; +import java.util.Calendar; +import java.util.GregorianCalendar; /** diff --git a/base/src/org/compiere/util/Trace.java b/base/src/org/compiere/util/Trace.java index db01bffb93..c3cae5dcd8 100644 --- a/base/src/org/compiere/util/Trace.java +++ b/base/src/org/compiere/util/Trace.java @@ -16,8 +16,8 @@ *****************************************************************************/ package org.compiere.util; -import java.util.*; -import java.util.logging.*; +import java.util.ArrayList; +import java.util.logging.Logger; /** * Trace Information diff --git a/base/src/org/compiere/util/Util.java b/base/src/org/compiere/util/Util.java index 43f38c769f..da5deb5b11 100644 --- a/base/src/org/compiere/util/Util.java +++ b/base/src/org/compiere/util/Util.java @@ -16,14 +16,23 @@ *****************************************************************************/ package org.compiere.util; -import java.awt.*; -import java.awt.font.*; -import java.io.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; +import java.awt.Color; +import java.awt.font.TextAttribute; +import java.io.UnsupportedEncodingException; +import java.text.AttributedCharacterIterator; +import java.text.AttributedString; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; -import javax.swing.*; +import javax.swing.Action; +import javax.swing.ActionMap; +import javax.swing.InputMap; +import javax.swing.JComponent; +import javax.swing.KeyStroke; /** * General Utilities diff --git a/base/src/org/compiere/util/WebDoc.java b/base/src/org/compiere/util/WebDoc.java index de4108f6cd..c2b20b96d3 100644 --- a/base/src/org/compiere/util/WebDoc.java +++ b/base/src/org/compiere/util/WebDoc.java @@ -16,11 +16,28 @@ *****************************************************************************/ package org.compiere.util; -import java.io.*; +import java.io.OutputStream; +import java.io.PrintWriter; import java.util.Properties; -import org.apache.ecs.*; -import org.apache.ecs.xhtml.*; +import org.apache.ecs.AlignType; +import org.apache.ecs.Element; +import org.apache.ecs.xhtml.a; +import org.apache.ecs.xhtml.b; +import org.apache.ecs.xhtml.body; +import org.apache.ecs.xhtml.form; +import org.apache.ecs.xhtml.h1; +import org.apache.ecs.xhtml.head; +import org.apache.ecs.xhtml.html; +import org.apache.ecs.xhtml.img; +import org.apache.ecs.xhtml.input; +import org.apache.ecs.xhtml.link; +import org.apache.ecs.xhtml.meta; +import org.apache.ecs.xhtml.script; +import org.apache.ecs.xhtml.table; +import org.apache.ecs.xhtml.td; +import org.apache.ecs.xhtml.title; +import org.apache.ecs.xhtml.tr; /** diff --git a/base/src/org/compiere/util/WebEnv.java b/base/src/org/compiere/util/WebEnv.java index bc7eea9784..00de876d7d 100644 --- a/base/src/org/compiere/util/WebEnv.java +++ b/base/src/org/compiere/util/WebEnv.java @@ -16,16 +16,35 @@ *****************************************************************************/ package org.compiere.util; -import java.sql.*; -import java.util.*; -import java.util.logging.*; -import javax.servlet.*; -import javax.servlet.http.*; -import org.apache.ecs.*; -import org.apache.ecs.xhtml.*; +import java.sql.Timestamp; +import java.util.Enumeration; +import java.util.Properties; +import java.util.logging.Level; -import org.compiere.*; -import org.compiere.model.*; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import org.apache.ecs.AlignType; +import org.apache.ecs.xhtml.a; +import org.apache.ecs.xhtml.body; +import org.apache.ecs.xhtml.br; +import org.apache.ecs.xhtml.comment; +import org.apache.ecs.xhtml.h3; +import org.apache.ecs.xhtml.hr; +import org.apache.ecs.xhtml.img; +import org.apache.ecs.xhtml.p; +import org.apache.ecs.xhtml.script; +import org.apache.ecs.xhtml.table; +import org.apache.ecs.xhtml.td; +import org.apache.ecs.xhtml.tr; +import org.compiere.Adempiere; +import org.compiere.model.MClient; +import org.compiere.model.MSystem; /** * Web Environment and debugging diff --git a/base/src/org/compiere/util/WebLogin.java b/base/src/org/compiere/util/WebLogin.java index eb241a3849..af315fa5bd 100644 --- a/base/src/org/compiere/util/WebLogin.java +++ b/base/src/org/compiere/util/WebLogin.java @@ -16,11 +16,17 @@ package org.compiere.util; import java.io.IOException; -import java.util.*; -import javax.servlet.http.*; -import javax.servlet.*; -import org.compiere.model.*; -import java.util.logging.*; +import java.util.Properties; +import java.util.logging.Level; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import org.compiere.model.MBPBankAccount; +import org.compiere.model.MMailMsg; +import org.compiere.model.MSession; /** diff --git a/base/src/org/compiere/util/WebSessionCtx.java b/base/src/org/compiere/util/WebSessionCtx.java index d57fb922be..a9623f186b 100644 --- a/base/src/org/compiere/util/WebSessionCtx.java +++ b/base/src/org/compiere/util/WebSessionCtx.java @@ -16,13 +16,19 @@ *****************************************************************************/ package org.compiere.util; -import java.io.*; -import java.text.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; +import java.io.Serializable; +import java.text.DecimalFormat; +import java.text.SimpleDateFormat; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Properties; -import org.compiere.model.*; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.compiere.model.MClient; +import org.compiere.model.MStore; /** diff --git a/base/src/org/compiere/util/WebUtil.java b/base/src/org/compiere/util/WebUtil.java index 38d472d18a..12185e744b 100644 --- a/base/src/org/compiere/util/WebUtil.java +++ b/base/src/org/compiere/util/WebUtil.java @@ -16,19 +16,53 @@ *****************************************************************************/ package org.compiere.util; -import java.io.*; -import java.math.*; -import java.net.*; -import java.sql.*; -import java.text.*; -import java.util.*; -import java.util.logging.*; -import javax.mail.internet.*; -import javax.servlet.*; -import javax.servlet.http.*; -import org.apache.ecs.*; -import org.apache.ecs.xhtml.*; -import org.compiere.model.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import java.net.URLDecoder; +import java.net.URLEncoder; +import java.sql.Timestamp; +import java.text.DateFormat; +import java.text.DecimalFormat; +import java.text.SimpleDateFormat; +import java.util.Properties; +import java.util.logging.Level; + +import javax.mail.internet.AddressException; +import javax.mail.internet.InternetAddress; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import org.apache.ecs.AlignType; +import org.apache.ecs.xhtml.a; +import org.apache.ecs.xhtml.body; +import org.apache.ecs.xhtml.br; +import org.apache.ecs.xhtml.hr; +import org.apache.ecs.xhtml.input; +import org.apache.ecs.xhtml.label; +import org.apache.ecs.xhtml.option; +import org.apache.ecs.xhtml.p; +import org.apache.ecs.xhtml.script; +import org.apache.ecs.xhtml.small; +import org.apache.ecs.xhtml.td; +import org.apache.ecs.xhtml.tr; +import org.compiere.model.MAttachment; +import org.compiere.model.MAttachmentEntry; +import org.compiere.model.MMailMsg; +import org.compiere.model.MRequest; +import org.compiere.model.MStore; +import org.compiere.model.MUserMail; /** * Servlet Utilities diff --git a/base/src/org/compiere/util/ZipUtil.java b/base/src/org/compiere/util/ZipUtil.java index 3e5158399a..ce7d8f9633 100644 --- a/base/src/org/compiere/util/ZipUtil.java +++ b/base/src/org/compiere/util/ZipUtil.java @@ -16,11 +16,18 @@ *****************************************************************************/ package org.compiere.util; -import java.util.*; -import java.util.zip.*; -import java.util.jar.*; -import java.io.*; -import java.sql.*; +import java.io.File; +import java.io.IOException; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Enumeration; +import java.util.jar.Attributes; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import java.util.jar.Manifest; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; /** * Zip/Jar File Utilities