diff --git a/base/src/org/compiere/db/AdempiereDatabase.java b/base/src/org/compiere/db/AdempiereDatabase.java index 9a7c288d39..1f874819bd 100644 --- a/base/src/org/compiere/db/AdempiereDatabase.java +++ b/base/src/org/compiere/db/AdempiereDatabase.java @@ -16,10 +16,13 @@ *****************************************************************************/ package org.compiere.db; -import java.math.*; -import java.sql.*; +import java.math.BigDecimal; +import java.sql.Connection; +import java.sql.Driver; +import java.sql.SQLException; +import java.sql.Timestamp; -import javax.sql.*; +import javax.sql.DataSource; import org.compiere.dbPort.Convert; diff --git a/base/src/org/compiere/db/CConnection.java b/base/src/org/compiere/db/CConnection.java index 05741340a6..7f5e5567a7 100644 --- a/base/src/org/compiere/db/CConnection.java +++ b/base/src/org/compiere/db/CConnection.java @@ -16,18 +16,29 @@ *****************************************************************************/ package org.compiere.db; -import java.io.*; -import java.sql.*; -import java.util.*; -import java.util.logging.*; -import javax.naming.*; -import javax.sql.*; +import java.io.Serializable; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.SQLException; +import java.util.Hashtable; +import java.util.logging.Level; + +import javax.naming.CommunicationException; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.sql.DataSource; import javax.swing.JOptionPane; import org.adempiere.as.ASFactory; -import org.compiere.*; -import org.compiere.interfaces.*; -import org.compiere.util.*; +import org.compiere.Adempiere; +import org.compiere.interfaces.Server; +import org.compiere.interfaces.Status; +import org.compiere.util.CLogMgt; +import org.compiere.util.CLogger; +import org.compiere.util.Env; +import org.compiere.util.Ini; +import org.compiere.util.ValueNamePair; /** * Adempiere Connection Descriptor diff --git a/base/src/org/compiere/db/CConnectionDialog.java b/base/src/org/compiere/db/CConnectionDialog.java index c1955bda2d..72294c2b5b 100644 --- a/base/src/org/compiere/db/CConnectionDialog.java +++ b/base/src/org/compiere/db/CConnectionDialog.java @@ -16,15 +16,34 @@ *****************************************************************************/ package org.compiere.db; -import java.awt.*; -import java.awt.event.*; -import java.util.*; -import java.util.logging.*; -import javax.swing.*; +import java.awt.BorderLayout; +import java.awt.Cursor; +import java.awt.FlowLayout; +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.Icon; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPasswordField; import org.adempiere.plaf.AdempierePLAF; -import org.compiere.swing.*; -import org.compiere.util.*; +import org.compiere.swing.CButton; +import org.compiere.swing.CCheckBox; +import org.compiere.swing.CComboBox; +import org.compiere.swing.CDialog; +import org.compiere.swing.CLabel; +import org.compiere.swing.CPanel; +import org.compiere.swing.CTextField; +import org.compiere.util.CLogger; +import org.compiere.util.Ini; +import org.compiere.util.ValueNamePair; /** * Connection Dialog. diff --git a/base/src/org/compiere/db/CConnectionEditor.java b/base/src/org/compiere/db/CConnectionEditor.java index a1f107b396..1fceb76a02 100644 --- a/base/src/org/compiere/db/CConnectionEditor.java +++ b/base/src/org/compiere/db/CConnectionEditor.java @@ -16,12 +16,23 @@ *****************************************************************************/ package org.compiere.db; -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Cursor; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + +import javax.swing.ImageIcon; +import javax.swing.JComponent; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JTextField; +import javax.swing.LookAndFeel; import org.adempiere.plaf.AdempierePLAF; -import org.compiere.swing.*; +import org.compiere.swing.CEditor; import org.compiere.util.DB; /** diff --git a/base/src/org/compiere/db/DBRes.java b/base/src/org/compiere/db/DBRes.java index e3814b6656..16fd3cbb9f 100644 --- a/base/src/org/compiere/db/DBRes.java +++ b/base/src/org/compiere/db/DBRes.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_ar.java b/base/src/org/compiere/db/DBRes_ar.java index aa547db217..ce0e93b168 100644 --- a/base/src/org/compiere/db/DBRes_ar.java +++ b/base/src/org/compiere/db/DBRes_ar.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_bg.java b/base/src/org/compiere/db/DBRes_bg.java index c02dfd80a5..022b1da355 100644 --- a/base/src/org/compiere/db/DBRes_bg.java +++ b/base/src/org/compiere/db/DBRes_bg.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_ca.java b/base/src/org/compiere/db/DBRes_ca.java index f83128007c..e8fe468f32 100644 --- a/base/src/org/compiere/db/DBRes_ca.java +++ b/base/src/org/compiere/db/DBRes_ca.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_da.java b/base/src/org/compiere/db/DBRes_da.java index 91c20cb53d..f682b205e6 100644 --- a/base/src/org/compiere/db/DBRes_da.java +++ b/base/src/org/compiere/db/DBRes_da.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_de.java b/base/src/org/compiere/db/DBRes_de.java index bebfa6fb6c..bb7717b661 100644 --- a/base/src/org/compiere/db/DBRes_de.java +++ b/base/src/org/compiere/db/DBRes_de.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings (German) diff --git a/base/src/org/compiere/db/DBRes_es.java b/base/src/org/compiere/db/DBRes_es.java index f1c446567a..7cbbea9dcc 100644 --- a/base/src/org/compiere/db/DBRes_es.java +++ b/base/src/org/compiere/db/DBRes_es.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_fa.java b/base/src/org/compiere/db/DBRes_fa.java index e66572b377..6418e52d0f 100644 --- a/base/src/org/compiere/db/DBRes_fa.java +++ b/base/src/org/compiere/db/DBRes_fa.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_fr.java b/base/src/org/compiere/db/DBRes_fr.java index 86083a075e..33e651277a 100644 --- a/base/src/org/compiere/db/DBRes_fr.java +++ b/base/src/org/compiere/db/DBRes_fr.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings (French) diff --git a/base/src/org/compiere/db/DBRes_hr.java b/base/src/org/compiere/db/DBRes_hr.java index ae21343e9f..8a264de6d5 100644 --- a/base/src/org/compiere/db/DBRes_hr.java +++ b/base/src/org/compiere/db/DBRes_hr.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_hu.java b/base/src/org/compiere/db/DBRes_hu.java index b4cc2d4e91..138ed3e632 100644 --- a/base/src/org/compiere/db/DBRes_hu.java +++ b/base/src/org/compiere/db/DBRes_hu.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_in.java b/base/src/org/compiere/db/DBRes_in.java index 94d58bf8d7..8ce6ac7edb 100644 --- a/base/src/org/compiere/db/DBRes_in.java +++ b/base/src/org/compiere/db/DBRes_in.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_it.java b/base/src/org/compiere/db/DBRes_it.java index a66b279ce7..50ffc1f9e7 100644 --- a/base/src/org/compiere/db/DBRes_it.java +++ b/base/src/org/compiere/db/DBRes_it.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_ja.java b/base/src/org/compiere/db/DBRes_ja.java index 4aa3107404..59f9835a1e 100644 --- a/base/src/org/compiere/db/DBRes_ja.java +++ b/base/src/org/compiere/db/DBRes_ja.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_ms.java b/base/src/org/compiere/db/DBRes_ms.java index 039ac4ef45..4d747531f2 100644 --- a/base/src/org/compiere/db/DBRes_ms.java +++ b/base/src/org/compiere/db/DBRes_ms.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_nl.java b/base/src/org/compiere/db/DBRes_nl.java index ba7ff7e4b6..5f7e117bd3 100644 --- a/base/src/org/compiere/db/DBRes_nl.java +++ b/base/src/org/compiere/db/DBRes_nl.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_no.java b/base/src/org/compiere/db/DBRes_no.java index 385cffdeb5..1296b87b38 100644 --- a/base/src/org/compiere/db/DBRes_no.java +++ b/base/src/org/compiere/db/DBRes_no.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Norwegian Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_pl.java b/base/src/org/compiere/db/DBRes_pl.java index 8116b1150b..cc57deacf5 100644 --- a/base/src/org/compiere/db/DBRes_pl.java +++ b/base/src/org/compiere/db/DBRes_pl.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_pt.java b/base/src/org/compiere/db/DBRes_pt.java index 9657c6cfd2..d9e20beed4 100644 --- a/base/src/org/compiere/db/DBRes_pt.java +++ b/base/src/org/compiere/db/DBRes_pt.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_ro.java b/base/src/org/compiere/db/DBRes_ro.java index 4b10bb1c45..33648c8ff1 100644 --- a/base/src/org/compiere/db/DBRes_ro.java +++ b/base/src/org/compiere/db/DBRes_ro.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_ru.java b/base/src/org/compiere/db/DBRes_ru.java index d59a51dc14..adf002ecfa 100644 --- a/base/src/org/compiere/db/DBRes_ru.java +++ b/base/src/org/compiere/db/DBRes_ru.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_sl.java b/base/src/org/compiere/db/DBRes_sl.java index f5996cfcf7..693eab9fdb 100644 --- a/base/src/org/compiere/db/DBRes_sl.java +++ b/base/src/org/compiere/db/DBRes_sl.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_sr.java b/base/src/org/compiere/db/DBRes_sr.java index 5e6aa24661..33119702ca 100644 --- a/base/src/org/compiere/db/DBRes_sr.java +++ b/base/src/org/compiere/db/DBRes_sr.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_sv.java b/base/src/org/compiere/db/DBRes_sv.java index 6154cac1e1..4b70c7cb19 100644 --- a/base/src/org/compiere/db/DBRes_sv.java +++ b/base/src/org/compiere/db/DBRes_sv.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Swedish Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_th.java b/base/src/org/compiere/db/DBRes_th.java index e48f91c518..a2f5397435 100644 --- a/base/src/org/compiere/db/DBRes_th.java +++ b/base/src/org/compiere/db/DBRes_th.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings (Thai) diff --git a/base/src/org/compiere/db/DBRes_vi.java b/base/src/org/compiere/db/DBRes_vi.java index 9c31fa2b88..75305e6cfd 100644 --- a/base/src/org/compiere/db/DBRes_vi.java +++ b/base/src/org/compiere/db/DBRes_vi.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_zh.java b/base/src/org/compiere/db/DBRes_zh.java index 055b304e0a..c9d1e76bab 100644 --- a/base/src/org/compiere/db/DBRes_zh.java +++ b/base/src/org/compiere/db/DBRes_zh.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/DBRes_zh_CN.java b/base/src/org/compiere/db/DBRes_zh_CN.java index e1803f6ebd..f061638b6f 100644 --- a/base/src/org/compiere/db/DBRes_zh_CN.java +++ b/base/src/org/compiere/db/DBRes_zh_CN.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; +import java.util.ListResourceBundle; /** * Connection Resource Strings diff --git a/base/src/org/compiere/db/JDBCInfo.java b/base/src/org/compiere/db/JDBCInfo.java index ba4cc3fbe2..4156ec59ab 100644 --- a/base/src/org/compiere/db/JDBCInfo.java +++ b/base/src/org/compiere/db/JDBCInfo.java @@ -16,10 +16,17 @@ *****************************************************************************/ package org.compiere.db; -import java.sql.*; -import java.util.logging.*; -import org.compiere.*; -import org.compiere.util.*; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.SQLException; +import java.util.logging.Level; + +import org.compiere.Adempiere; +import org.compiere.util.CLogMgt; +import org.compiere.util.CLogger; +import org.compiere.util.DB; /** * JDBC Meta Info diff --git a/base/src/org/compiere/db/LDAP.java b/base/src/org/compiere/db/LDAP.java index 96a89887fc..6b8a3b2315 100644 --- a/base/src/org/compiere/db/LDAP.java +++ b/base/src/org/compiere/db/LDAP.java @@ -15,14 +15,18 @@ *****************************************************************************/ package org.compiere.db; -import java.util.*; -import java.util.logging.*; +import java.util.Hashtable; +import java.util.logging.Level; -import javax.naming.*; -import javax.naming.ldap.*; -import javax.naming.directory.*; +import javax.naming.AuthenticationException; +import javax.naming.Context; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.directory.Attribute; +import javax.naming.directory.Attributes; +import javax.naming.ldap.InitialLdapContext; -import org.compiere.util.*; +import org.compiere.util.CLogger; /** diff --git a/base/src/org/compiere/db/TestConnection.java b/base/src/org/compiere/db/TestConnection.java index f665577b3f..ed60e2ea06 100644 --- a/base/src/org/compiere/db/TestConnection.java +++ b/base/src/org/compiere/db/TestConnection.java @@ -16,7 +16,12 @@ *****************************************************************************/ package org.compiere.db; -import java.sql.*; +import java.sql.Connection; +import java.sql.Driver; +import java.sql.DriverManager; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; /** * Test Connection (speed) diff --git a/base/src/org/compiere/db/TestEJB.java b/base/src/org/compiere/db/TestEJB.java index 1bbcc0fef9..89fc1111ba 100644 --- a/base/src/org/compiere/db/TestEJB.java +++ b/base/src/org/compiere/db/TestEJB.java @@ -16,8 +16,11 @@ *****************************************************************************/ package org.compiere.db; -import javax.naming.*; -import org.compiere.interfaces.*; +import javax.naming.CommunicationException; +import javax.naming.InitialContext; +import javax.naming.NamingEnumeration; + +import org.compiere.interfaces.Status; /** * Test EJB