From ff92324c227f2ef7af287bfc5d036d0fd96b5ca0 Mon Sep 17 00:00:00 2001 From: "Redhuan D. Oon" Date: Tue, 23 Dec 2008 06:01:15 +0000 Subject: [PATCH] organize imports --- install/src/org/compiere/install/Config.java | 9 ++-- .../org/compiere/install/ConfigGlassfish.java | 4 +- .../src/org/compiere/install/ConfigJBoss.java | 4 +- .../org/compiere/install/ConfigOracle.java | 20 +++++---- .../compiere/install/ConfigPostgreSQL.java | 7 ++-- .../src/org/compiere/install/ConfigVMMac.java | 5 ++- .../src/org/compiere/install/ConfigVMSun.java | 5 ++- .../compiere/install/ConfigurationData.java | 41 ++++++++++++++----- .../compiere/install/ConfigurationPanel.java | 38 +++++++++++++---- .../org/compiere/install/KeyStoreDialog.java | 22 +++++++--- .../src/org/compiere/install/KeyStoreMgt.java | 27 ++++++++---- install/src/org/compiere/install/Setup.java | 31 ++++++++++---- .../src/org/compiere/install/SetupRes.java | 2 +- .../src/org/compiere/install/SetupRes_ar.java | 2 +- .../src/org/compiere/install/SetupRes_ca.java | 2 +- .../src/org/compiere/install/SetupRes_da.java | 2 +- .../src/org/compiere/install/SetupRes_es.java | 2 +- .../src/org/compiere/install/SetupRes_fa.java | 2 +- .../src/org/compiere/install/SetupRes_hr.java | 2 +- .../src/org/compiere/install/SetupRes_hu.java | 2 +- .../src/org/compiere/install/SetupRes_in.java | 2 +- .../src/org/compiere/install/SetupRes_ja.java | 2 +- .../src/org/compiere/install/SetupRes_my.java | 2 +- .../src/org/compiere/install/SetupRes_no.java | 2 +- .../src/org/compiere/install/SetupRes_pl.java | 2 +- .../src/org/compiere/install/SetupRes_ro.java | 2 +- .../src/org/compiere/install/SetupRes_ru.java | 2 +- .../src/org/compiere/install/SetupRes_sl.java | 2 +- .../src/org/compiere/install/SetupRes_sr.java | 2 +- .../src/org/compiere/install/SetupRes_sv.java | 2 +- .../src/org/compiere/install/SetupRes_vi.java | 2 +- .../src/org/compiere/install/SetupRes_zh.java | 2 +- .../org/compiere/install/SetupRes_zh_CN.java | 2 +- .../src/org/compiere/install/Setup_Help.java | 26 ++++++++---- 34 files changed, 190 insertions(+), 91 deletions(-) diff --git a/install/src/org/compiere/install/Config.java b/install/src/org/compiere/install/Config.java index ce7cbd3cf5..c4c9e9f2ed 100644 --- a/install/src/org/compiere/install/Config.java +++ b/install/src/org/compiere/install/Config.java @@ -16,10 +16,13 @@ *****************************************************************************/ package org.compiere.install; -import java.sql.*; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Statement; -import org.compiere.swing.*; -import org.compiere.util.*; +import org.compiere.swing.CCheckBox; +import org.compiere.util.CLogger; +import org.compiere.util.DB; /** diff --git a/install/src/org/compiere/install/ConfigGlassfish.java b/install/src/org/compiere/install/ConfigGlassfish.java index 525f1f810a..c7ca3b6c8a 100644 --- a/install/src/org/compiere/install/ConfigGlassfish.java +++ b/install/src/org/compiere/install/ConfigGlassfish.java @@ -29,8 +29,8 @@ package org.compiere.install; -import java.io.*; -import java.net.*; +import java.io.File; +import java.net.InetAddress; /** * GlassFish v2UR1 Apps Server Configuration diff --git a/install/src/org/compiere/install/ConfigJBoss.java b/install/src/org/compiere/install/ConfigJBoss.java index 48acdd029c..e4aed3c171 100644 --- a/install/src/org/compiere/install/ConfigJBoss.java +++ b/install/src/org/compiere/install/ConfigJBoss.java @@ -16,8 +16,8 @@ *****************************************************************************/ package org.compiere.install; -import java.io.*; -import java.net.*; +import java.io.File; +import java.net.InetAddress; /** diff --git a/install/src/org/compiere/install/ConfigOracle.java b/install/src/org/compiere/install/ConfigOracle.java index 688e2bff8d..eeee3c8ed6 100644 --- a/install/src/org/compiere/install/ConfigOracle.java +++ b/install/src/org/compiere/install/ConfigOracle.java @@ -16,13 +16,19 @@ *****************************************************************************/ package org.compiere.install; -import java.io.*; -import java.net.*; -import java.sql.*; -import java.util.*; -import java.util.regex.*; -import org.compiere.db.*; -import oracle.jdbc.*; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStream; +import java.net.InetAddress; +import java.sql.Connection; +import java.sql.DriverManager; +import java.util.ArrayList; +import java.util.regex.Pattern; + +import oracle.jdbc.OracleDriver; + +import org.compiere.db.DB_Oracle; /** diff --git a/install/src/org/compiere/install/ConfigPostgreSQL.java b/install/src/org/compiere/install/ConfigPostgreSQL.java index f7e9c6b04a..ca16c4c084 100755 --- a/install/src/org/compiere/install/ConfigPostgreSQL.java +++ b/install/src/org/compiere/install/ConfigPostgreSQL.java @@ -14,9 +14,10 @@ *****************************************************************************/ package org.compiere.install; -import java.net.*; -import java.sql.*; -import org.compiere.db.*; +import java.net.InetAddress; +import java.sql.Connection; + +import org.compiere.db.DB_PostgreSQL; /** * PostgreSQL Configuration diff --git a/install/src/org/compiere/install/ConfigVMMac.java b/install/src/org/compiere/install/ConfigVMMac.java index 94d70d3623..46c9369ccb 100644 --- a/install/src/org/compiere/install/ConfigVMMac.java +++ b/install/src/org/compiere/install/ConfigVMMac.java @@ -16,8 +16,9 @@ *****************************************************************************/ package org.compiere.install; -import java.io.*; -import org.compiere.util.*; +import java.io.File; + +import org.compiere.util.CLogMgt; /** diff --git a/install/src/org/compiere/install/ConfigVMSun.java b/install/src/org/compiere/install/ConfigVMSun.java index 49908471fa..973c53f317 100644 --- a/install/src/org/compiere/install/ConfigVMSun.java +++ b/install/src/org/compiere/install/ConfigVMSun.java @@ -16,8 +16,9 @@ *****************************************************************************/ package org.compiere.install; -import java.io.*; -import org.compiere.util.*; +import java.io.File; + +import org.compiere.util.CLogMgt; /** diff --git a/install/src/org/compiere/install/ConfigurationData.java b/install/src/org/compiere/install/ConfigurationData.java index 4a9d0b8982..b5e252c2ca 100644 --- a/install/src/org/compiere/install/ConfigurationData.java +++ b/install/src/org/compiere/install/ConfigurationData.java @@ -16,17 +16,38 @@ *****************************************************************************/ package org.compiere.install; -import java.io.*; -import java.net.*; -import java.util.*; -import java.util.logging.*; -import javax.mail.*; -import javax.mail.internet.*; -import javax.swing.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.InetAddress; +import java.net.MalformedURLException; +import java.net.ServerSocket; +import java.net.Socket; +import java.net.URL; +import java.net.URLConnection; +import java.util.Properties; +import java.util.logging.Level; -import org.compiere.*; -import org.compiere.db.*; -import org.compiere.util.*; +import javax.mail.Folder; +import javax.mail.MessagingException; +import javax.mail.NoSuchProviderException; +import javax.mail.Session; +import javax.mail.Store; +import javax.mail.internet.InternetAddress; +import javax.swing.DefaultComboBoxModel; +import javax.swing.JFrame; +import javax.swing.JOptionPane; +import javax.swing.SwingUtilities; + +import org.compiere.Adempiere; +import org.compiere.db.CConnection; +import org.compiere.db.Database; +import org.compiere.util.CLogMgt; +import org.compiere.util.CLogger; +import org.compiere.util.EMail; +import org.compiere.util.EMailAuthenticator; +import org.compiere.util.Ini; /** diff --git a/install/src/org/compiere/install/ConfigurationPanel.java b/install/src/org/compiere/install/ConfigurationPanel.java index 222ae8a2af..2fe9d43317 100644 --- a/install/src/org/compiere/install/ConfigurationPanel.java +++ b/install/src/org/compiere/install/ConfigurationPanel.java @@ -16,16 +16,36 @@ *****************************************************************************/ package org.compiere.install; -import java.awt.*; -import java.awt.event.*; -import java.util.*; -import java.util.logging.*; -import javax.swing.*; +import java.awt.Color; +import java.awt.Cursor; +import java.awt.Font; +import java.awt.Frame; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ResourceBundle; +import java.util.logging.Level; + +import javax.swing.ImageIcon; +import javax.swing.JFileChooser; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JSeparator; +import javax.swing.SwingUtilities; import javax.swing.border.TitledBorder; -import org.apache.tools.ant.*; -import org.compiere.*; -import org.compiere.swing.*; -import org.compiere.util.*; + +import org.apache.tools.ant.Main; +import org.compiere.Adempiere; +import org.compiere.swing.CButton; +import org.compiere.swing.CCheckBox; +import org.compiere.swing.CComboBox; +import org.compiere.swing.CLabel; +import org.compiere.swing.CPanel; +import org.compiere.swing.CPassword; +import org.compiere.swing.CTextField; +import org.compiere.util.CLogger; /** diff --git a/install/src/org/compiere/install/KeyStoreDialog.java b/install/src/org/compiere/install/KeyStoreDialog.java index af3643f26b..66e4ecd4ab 100644 --- a/install/src/org/compiere/install/KeyStoreDialog.java +++ b/install/src/org/compiere/install/KeyStoreDialog.java @@ -16,11 +16,23 @@ *****************************************************************************/ package org.compiere.install; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import org.compiere.apps.*; -import org.compiere.swing.*; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.HeadlessException; +import java.awt.event.ActionEvent; + +import javax.swing.JFrame; + +import org.compiere.apps.AEnv; +import org.compiere.apps.ALayout; +import org.compiere.apps.ALayoutConstraint; +import org.compiere.apps.ConfirmPanel; +import org.compiere.swing.CButton; +import org.compiere.swing.CDialog; +import org.compiere.swing.CLabel; +import org.compiere.swing.CPanel; +import org.compiere.swing.CTextField; /** diff --git a/install/src/org/compiere/install/KeyStoreMgt.java b/install/src/org/compiere/install/KeyStoreMgt.java index 931726e526..ed1bf6f129 100644 --- a/install/src/org/compiere/install/KeyStoreMgt.java +++ b/install/src/org/compiere/install/KeyStoreMgt.java @@ -16,16 +16,25 @@ *****************************************************************************/ package org.compiere.install; -import java.io.*; -import java.net.*; -import java.security.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.net.InetAddress; +import java.security.Key; +import java.security.KeyStore; import java.security.cert.Certificate; -import java.util.*; -import java.util.logging.*; -import javax.swing.*; -import org.compiere.*; -import org.compiere.util.*; -import sun.security.tools.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.StringTokenizer; +import java.util.logging.Level; + +import javax.swing.JFrame; + +import org.compiere.Adempiere; +import org.compiere.util.CLogMgt; +import org.compiere.util.CLogger; + +import sun.security.tools.KeyTool; /** * Class to manage SSL KeyStore diff --git a/install/src/org/compiere/install/Setup.java b/install/src/org/compiere/install/Setup.java index cf31f52108..29f7d96ca3 100644 --- a/install/src/org/compiere/install/Setup.java +++ b/install/src/org/compiere/install/Setup.java @@ -16,16 +16,29 @@ *****************************************************************************/ package org.compiere.install; -import java.awt.*; -import java.awt.event.*; -import java.util.*; -import java.util.logging.*; -import javax.swing.*; -import org.compiere.*; +import java.awt.AWTEvent; +import java.awt.BorderLayout; +import java.awt.Cursor; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ResourceBundle; +import java.util.logging.Handler; +import java.util.logging.Level; -import org.compiere.apps.*; -import org.compiere.swing.*; -import org.compiere.util.*; +import javax.swing.BorderFactory; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JPanel; + +import org.compiere.Adempiere; +import org.compiere.apps.AEnv; +import org.compiere.swing.CFrame; +import org.compiere.swing.CMenuItem; +import org.compiere.util.CLogFile; +import org.compiere.util.CLogMgt; +import org.compiere.util.CLogger; /** * Setup Dialog Frame. diff --git a/install/src/org/compiere/install/SetupRes.java b/install/src/org/compiere/install/SetupRes.java index 2859734981..5b539ed37c 100644 --- a/install/src/org/compiere/install/SetupRes.java +++ b/install/src/org/compiere/install/SetupRes.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Setup Resources diff --git a/install/src/org/compiere/install/SetupRes_ar.java b/install/src/org/compiere/install/SetupRes_ar.java index 30a0cf70c7..f0a88cbe6f 100644 --- a/install/src/org/compiere/install/SetupRes_ar.java +++ b/install/src/org/compiere/install/SetupRes_ar.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Setup Resources diff --git a/install/src/org/compiere/install/SetupRes_ca.java b/install/src/org/compiere/install/SetupRes_ca.java index 37ece982d2..6dc9242a80 100644 --- a/install/src/org/compiere/install/SetupRes_ca.java +++ b/install/src/org/compiere/install/SetupRes_ca.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Setup Resources diff --git a/install/src/org/compiere/install/SetupRes_da.java b/install/src/org/compiere/install/SetupRes_da.java index 5413bff370..c60cea386c 100644 --- a/install/src/org/compiere/install/SetupRes_da.java +++ b/install/src/org/compiere/install/SetupRes_da.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Setup Resources diff --git a/install/src/org/compiere/install/SetupRes_es.java b/install/src/org/compiere/install/SetupRes_es.java index 8f7ae8227e..a141d17cf3 100644 --- a/install/src/org/compiere/install/SetupRes_es.java +++ b/install/src/org/compiere/install/SetupRes_es.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Setup Resources diff --git a/install/src/org/compiere/install/SetupRes_fa.java b/install/src/org/compiere/install/SetupRes_fa.java index 1d7baad84c..eb8bcf3571 100644 --- a/install/src/org/compiere/install/SetupRes_fa.java +++ b/install/src/org/compiere/install/SetupRes_fa.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Setup Resources diff --git a/install/src/org/compiere/install/SetupRes_hr.java b/install/src/org/compiere/install/SetupRes_hr.java index 001e1b9888..19cb2ebb07 100644 --- a/install/src/org/compiere/install/SetupRes_hr.java +++ b/install/src/org/compiere/install/SetupRes_hr.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Setup Resources diff --git a/install/src/org/compiere/install/SetupRes_hu.java b/install/src/org/compiere/install/SetupRes_hu.java index f705281211..cf0eafe0a8 100644 --- a/install/src/org/compiere/install/SetupRes_hu.java +++ b/install/src/org/compiere/install/SetupRes_hu.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Setup Resources diff --git a/install/src/org/compiere/install/SetupRes_in.java b/install/src/org/compiere/install/SetupRes_in.java index 5268a9b13d..761336ffda 100644 --- a/install/src/org/compiere/install/SetupRes_in.java +++ b/install/src/org/compiere/install/SetupRes_in.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Setup Resources diff --git a/install/src/org/compiere/install/SetupRes_ja.java b/install/src/org/compiere/install/SetupRes_ja.java index f4da9765ba..959b8a4fe8 100644 --- a/install/src/org/compiere/install/SetupRes_ja.java +++ b/install/src/org/compiere/install/SetupRes_ja.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Setup Resources diff --git a/install/src/org/compiere/install/SetupRes_my.java b/install/src/org/compiere/install/SetupRes_my.java index 99a5f7e56b..f9a32237f3 100644 --- a/install/src/org/compiere/install/SetupRes_my.java +++ b/install/src/org/compiere/install/SetupRes_my.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Setup Resources diff --git a/install/src/org/compiere/install/SetupRes_no.java b/install/src/org/compiere/install/SetupRes_no.java index 40b0e64663..a2a090af2f 100644 --- a/install/src/org/compiere/install/SetupRes_no.java +++ b/install/src/org/compiere/install/SetupRes_no.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Norwegian Setup Resource Translation diff --git a/install/src/org/compiere/install/SetupRes_pl.java b/install/src/org/compiere/install/SetupRes_pl.java index cb46b989e3..f58d739ede 100644 --- a/install/src/org/compiere/install/SetupRes_pl.java +++ b/install/src/org/compiere/install/SetupRes_pl.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Setup Resources diff --git a/install/src/org/compiere/install/SetupRes_ro.java b/install/src/org/compiere/install/SetupRes_ro.java index ad53c4c8e7..0672ab9ee9 100644 --- a/install/src/org/compiere/install/SetupRes_ro.java +++ b/install/src/org/compiere/install/SetupRes_ro.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Setup Resources diff --git a/install/src/org/compiere/install/SetupRes_ru.java b/install/src/org/compiere/install/SetupRes_ru.java index fec4ca9763..7f3bd85ba4 100644 --- a/install/src/org/compiere/install/SetupRes_ru.java +++ b/install/src/org/compiere/install/SetupRes_ru.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Russian Setup Resource Translation diff --git a/install/src/org/compiere/install/SetupRes_sl.java b/install/src/org/compiere/install/SetupRes_sl.java index 94cad43038..95e67e6534 100644 --- a/install/src/org/compiere/install/SetupRes_sl.java +++ b/install/src/org/compiere/install/SetupRes_sl.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Setup Resources diff --git a/install/src/org/compiere/install/SetupRes_sr.java b/install/src/org/compiere/install/SetupRes_sr.java index 950f614ca9..8859dbf6f9 100644 --- a/install/src/org/compiere/install/SetupRes_sr.java +++ b/install/src/org/compiere/install/SetupRes_sr.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Setup Resources diff --git a/install/src/org/compiere/install/SetupRes_sv.java b/install/src/org/compiere/install/SetupRes_sv.java index 1b53bff684..5af325267f 100644 --- a/install/src/org/compiere/install/SetupRes_sv.java +++ b/install/src/org/compiere/install/SetupRes_sv.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Swedish Setup Resource Translation diff --git a/install/src/org/compiere/install/SetupRes_vi.java b/install/src/org/compiere/install/SetupRes_vi.java index dbf2ad2d90..784ba6c488 100644 --- a/install/src/org/compiere/install/SetupRes_vi.java +++ b/install/src/org/compiere/install/SetupRes_vi.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Vietnamese Setup Resources diff --git a/install/src/org/compiere/install/SetupRes_zh.java b/install/src/org/compiere/install/SetupRes_zh.java index 3f54daa3ea..1669bdab8c 100644 --- a/install/src/org/compiere/install/SetupRes_zh.java +++ b/install/src/org/compiere/install/SetupRes_zh.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Setup Resources diff --git a/install/src/org/compiere/install/SetupRes_zh_CN.java b/install/src/org/compiere/install/SetupRes_zh_CN.java index 1177506c92..7144051608 100644 --- a/install/src/org/compiere/install/SetupRes_zh_CN.java +++ b/install/src/org/compiere/install/SetupRes_zh_CN.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.install; -import java.util.*; +import java.util.ListResourceBundle; /** * Setup Resources diff --git a/install/src/org/compiere/install/Setup_Help.java b/install/src/org/compiere/install/Setup_Help.java index 3c590f328f..a39ab9b351 100644 --- a/install/src/org/compiere/install/Setup_Help.java +++ b/install/src/org/compiere/install/Setup_Help.java @@ -16,14 +16,26 @@ *****************************************************************************/ package org.compiere.install; -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import java.util.*; -import javax.swing.*; +import java.awt.AWTEvent; +import java.awt.BorderLayout; +import java.awt.Dialog; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.Point; +import java.awt.Window; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowEvent; +import java.io.IOException; +import java.util.ResourceBundle; -import org.compiere.apps.*; -import org.compiere.swing.*; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JEditorPane; +import javax.swing.JScrollPane; + +import org.compiere.apps.OnlineHelp; +import org.compiere.swing.CPanel; /** * Setup Online Help