From 2f1d17a81f0a1e83856121504a3ff161e4d1fe04 Mon Sep 17 00:00:00 2001
From: "Redhuan D. Oon" <red1@red1.org>
Date: Mon, 22 Dec 2008 14:10:23 +0000
Subject: [PATCH] organize imports

---
 .../compiere/model/MAlertProcessorLog.java    |  4 +--
 .../org/compiere/model/MAlertRecipient.java   |  4 +--
 .../org/compiere/model/MAllocationLine.java   | 14 ++++++----
 .../org/compiere/model/MAssetDelivery.java    | 11 +++++---
 base/src/org/compiere/model/MAssetGroup.java  |  7 ++---
 .../org/compiere/model/MAssignmentSlot.java   | 13 +++++++---
 base/src/org/compiere/model/MAttachment.java  | 26 ++++++++++++++-----
 .../org/compiere/model/MAttachmentEntry.java  | 14 +++++++---
 .../org/compiere/model/MAttachmentNote.java   |  7 ++---
 base/src/org/compiere/model/MAttribute.java   | 16 ++++++++----
 .../compiere/model/MAttributeInstance.java    |  6 ++---
 .../src/org/compiere/model/MAttributeSet.java | 13 +++++++---
 .../compiere/model/MAttributeSetInstance.java | 18 +++++++++----
 .../src/org/compiere/model/MAttributeUse.java |  7 ++---
 .../org/compiere/model/MAttributeValue.java   |  4 +--
 base/src/org/compiere/model/MElement.java     |  7 ++---
 base/src/org/compiere/model/MEntityType.java  | 13 +++++++---
 base/src/org/compiere/model/MExpenseType.java |  4 +--
 base/src/org/compiere/model/MSLACriteria.java | 14 ++++++----
 base/src/org/compiere/model/MSLAGoal.java     | 12 ++++++---
 base/src/org/compiere/model/MSLAMeasure.java  | 10 ++++---
 base/src/org/compiere/model/MSalesRegion.java |  7 ++---
 base/src/org/compiere/model/MScheduler.java   | 13 +++++++---
 .../src/org/compiere/model/MSchedulerLog.java |  4 +--
 .../org/compiere/model/MSchedulerPara.java    |  4 +--
 .../compiere/model/MSchedulerRecipient.java   |  4 +--
 base/src/org/compiere/model/MSequence.java    |  3 ---
 base/src/org/compiere/model/MStatus.java      | 15 ++++++++---
 .../org/compiere/model/MStatusCategory.java   | 14 +++++++---
 base/src/org/compiere/model/MStore.java       | 22 +++++++++++-----
 .../org/compiere/model/MUOMConversion.java    | 24 ++++++++++++-----
 base/src/org/compiere/model/MUserMail.java    |  6 ++---
 .../org/compiere/model/MUserOrgAccess.java    | 13 +++++++---
 base/src/org/compiere/model/MUserQuery.java   | 13 +++++++---
 base/src/org/compiere/model/MUserRoles.java   | 11 +++++---
 .../org/compiere/model/MWarehousePrice.java   | 12 ++++++---
 base/src/org/compiere/model/MWebMenu.java     |  2 --
 base/src/org/compiere/model/MWebProject.java  |  7 ++---
 .../org/compiere/model/MWebProjectDomain.java |  6 +++--
 .../org/compiere/model/MWebProperties.java    |  2 --
 .../src/org/compiere/model/MWindowAccess.java |  4 +--
 base/src/org/compiere/model/MWithholding.java |  4 +--
 base/src/org/compiere/model/MYear.java        | 20 +++++++++-----
 base/src/org/compiere/model/MultiMap.java     | 11 +++++---
 .../org/compiere/model/NaturalAccountMap.java | 18 ++++++++++---
 45 files changed, 305 insertions(+), 158 deletions(-)

diff --git a/base/src/org/compiere/model/MAlertProcessorLog.java b/base/src/org/compiere/model/MAlertProcessorLog.java
index 61e26ccc8c..a02e01d19e 100644
--- a/base/src/org/compiere/model/MAlertProcessorLog.java
+++ b/base/src/org/compiere/model/MAlertProcessorLog.java
@@ -16,8 +16,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 
 /**
diff --git a/base/src/org/compiere/model/MAlertRecipient.java b/base/src/org/compiere/model/MAlertRecipient.java
index eaee08a750..efbae6f6cf 100644
--- a/base/src/org/compiere/model/MAlertRecipient.java
+++ b/base/src/org/compiere/model/MAlertRecipient.java
@@ -16,8 +16,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 
 /**
diff --git a/base/src/org/compiere/model/MAllocationLine.java b/base/src/org/compiere/model/MAllocationLine.java
index 4b0a8c8973..df95c0bb7d 100644
--- a/base/src/org/compiere/model/MAllocationLine.java
+++ b/base/src/org/compiere/model/MAllocationLine.java
@@ -16,11 +16,15 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 
 /**
diff --git a/base/src/org/compiere/model/MAssetDelivery.java b/base/src/org/compiere/model/MAssetDelivery.java
index 7ae982ee43..399446bef1 100644
--- a/base/src/org/compiere/model/MAssetDelivery.java
+++ b/base/src/org/compiere/model/MAssetDelivery.java
@@ -16,10 +16,13 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import javax.servlet.http.*;
-import org.compiere.util.*;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.Properties;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.compiere.util.EMail;
 
 /**
  *  Asset Delivery Model
diff --git a/base/src/org/compiere/model/MAssetGroup.java b/base/src/org/compiere/model/MAssetGroup.java
index 4e740f9119..10784491c1 100644
--- a/base/src/org/compiere/model/MAssetGroup.java
+++ b/base/src/org/compiere/model/MAssetGroup.java
@@ -16,9 +16,10 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import org.compiere.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+import org.compiere.util.CCache;
 
 /**
  * 	Asset Group Model
diff --git a/base/src/org/compiere/model/MAssignmentSlot.java b/base/src/org/compiere/model/MAssignmentSlot.java
index 029c463c14..c3ff5767ee 100644
--- a/base/src/org/compiere/model/MAssignmentSlot.java
+++ b/base/src/org/compiere/model/MAssignmentSlot.java
@@ -16,10 +16,15 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.awt.*;
-import java.sql.*;
-import java.util.*;
-import org.compiere.util.*;
+import java.awt.Color;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.util.Calendar;
+import java.util.Comparator;
+import java.util.GregorianCalendar;
+
+import org.compiere.util.Language;
+import org.compiere.util.TimeUtil;
 
 /**
  *	Assignment Slot.
diff --git a/base/src/org/compiere/model/MAttachment.java b/base/src/org/compiere/model/MAttachment.java
index ab38c30172..0c0970e38f 100644
--- a/base/src/org/compiere/model/MAttachment.java
+++ b/base/src/org/compiere/model/MAttachment.java
@@ -16,12 +16,23 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.nio.channels.FileChannel;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import java.util.zip.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.zip.Deflater;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -33,7 +44,10 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.compiere.util.*;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.MimeType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
diff --git a/base/src/org/compiere/model/MAttachmentEntry.java b/base/src/org/compiere/model/MAttachmentEntry.java
index 2f2d8f0d11..7a53b4121a 100644
--- a/base/src/org/compiere/model/MAttachmentEntry.java
+++ b/base/src/org/compiere/model/MAttachmentEntry.java
@@ -16,10 +16,16 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.io.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Random;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.MimeType;
 
 
 /**
diff --git a/base/src/org/compiere/model/MAttachmentNote.java b/base/src/org/compiere/model/MAttachmentNote.java
index 3b9c5d6dd6..65045c551e 100644
--- a/base/src/org/compiere/model/MAttachmentNote.java
+++ b/base/src/org/compiere/model/MAttachmentNote.java
@@ -16,9 +16,10 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import org.compiere.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+import org.compiere.util.Env;
 
 /**
  *	Attachment Note
diff --git a/base/src/org/compiere/model/MAttribute.java b/base/src/org/compiere/model/MAttribute.java
index 2b1a4a2504..f5ed33b646 100644
--- a/base/src/org/compiere/model/MAttribute.java
+++ b/base/src/org/compiere/model/MAttribute.java
@@ -16,11 +16,17 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *  Product Attribute
diff --git a/base/src/org/compiere/model/MAttributeInstance.java b/base/src/org/compiere/model/MAttributeInstance.java
index 889b5e8757..e17418198b 100644
--- a/base/src/org/compiere/model/MAttributeInstance.java
+++ b/base/src/org/compiere/model/MAttributeInstance.java
@@ -16,9 +16,9 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 /**
  *  Product Attribute Set
diff --git a/base/src/org/compiere/model/MAttributeSet.java b/base/src/org/compiere/model/MAttributeSet.java
index 9365f04064..e80eee1cb7 100644
--- a/base/src/org/compiere/model/MAttributeSet.java
+++ b/base/src/org/compiere/model/MAttributeSet.java
@@ -16,10 +16,15 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CCache;
+import org.compiere.util.DB;
 
 /**
  *  Product Attribute Set
diff --git a/base/src/org/compiere/model/MAttributeSetInstance.java b/base/src/org/compiere/model/MAttributeSetInstance.java
index 8f8abec07f..e5b42d567d 100644
--- a/base/src/org/compiere/model/MAttributeSetInstance.java
+++ b/base/src/org/compiere/model/MAttributeSetInstance.java
@@ -16,11 +16,19 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.text.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.DisplayType;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.TimeUtil;
 
 /**
  *  Product Attribute Set Instance
diff --git a/base/src/org/compiere/model/MAttributeUse.java b/base/src/org/compiere/model/MAttributeUse.java
index f95280c46c..edc7cfbc15 100644
--- a/base/src/org/compiere/model/MAttributeUse.java
+++ b/base/src/org/compiere/model/MAttributeUse.java
@@ -16,9 +16,10 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import org.compiere.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+import org.compiere.util.DB;
 
 
 /**
diff --git a/base/src/org/compiere/model/MAttributeValue.java b/base/src/org/compiere/model/MAttributeValue.java
index 460d784d82..44092cca62 100644
--- a/base/src/org/compiere/model/MAttributeValue.java
+++ b/base/src/org/compiere/model/MAttributeValue.java
@@ -16,8 +16,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.util.*;
-import java.sql.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 /**
  *  Product Attribute Value
diff --git a/base/src/org/compiere/model/MElement.java b/base/src/org/compiere/model/MElement.java
index 25e4015eb6..394753c17d 100644
--- a/base/src/org/compiere/model/MElement.java
+++ b/base/src/org/compiere/model/MElement.java
@@ -16,9 +16,10 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import org.compiere.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+import org.compiere.util.Msg;
 
 /**
  *	Accounting Element Model.
diff --git a/base/src/org/compiere/model/MEntityType.java b/base/src/org/compiere/model/MEntityType.java
index 4b2b99b5c6..800929f334 100644
--- a/base/src/org/compiere/model/MEntityType.java
+++ b/base/src/org/compiere/model/MEntityType.java
@@ -16,10 +16,15 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
 
 /**
  * 	Enitity Type Model
diff --git a/base/src/org/compiere/model/MExpenseType.java b/base/src/org/compiere/model/MExpenseType.java
index 9affca48ab..01232c9bee 100644
--- a/base/src/org/compiere/model/MExpenseType.java
+++ b/base/src/org/compiere/model/MExpenseType.java
@@ -16,8 +16,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 
 /**
diff --git a/base/src/org/compiere/model/MSLACriteria.java b/base/src/org/compiere/model/MSLACriteria.java
index ec9c3a464f..5392ad2a4f 100644
--- a/base/src/org/compiere/model/MSLACriteria.java
+++ b/base/src/org/compiere/model/MSLACriteria.java
@@ -16,12 +16,16 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import org.compiere.sla.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import org.compiere.sla.SLACriteria;
+import org.compiere.util.AdempiereSystemError;
+import org.compiere.util.CCache;
+import org.compiere.util.DB;
 
 /**
  *	Service Level Agreement Criteria Model
diff --git a/base/src/org/compiere/model/MSLAGoal.java b/base/src/org/compiere/model/MSLAGoal.java
index d772085570..4ac5db4b14 100644
--- a/base/src/org/compiere/model/MSLAGoal.java
+++ b/base/src/org/compiere/model/MSLAGoal.java
@@ -16,11 +16,15 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import java.util.logging.*;
-import org.compiere.util.*;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  *	Service Level Agreement Goals
diff --git a/base/src/org/compiere/model/MSLAMeasure.java b/base/src/org/compiere/model/MSLAMeasure.java
index a2d46ba810..2ccf8bf007 100644
--- a/base/src/org/compiere/model/MSLAMeasure.java
+++ b/base/src/org/compiere/model/MSLAMeasure.java
@@ -16,10 +16,12 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import org.compiere.util.*;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.Properties;
+
+import org.compiere.util.Env;
 
 /**
  *	Service Level Agreement Measure
diff --git a/base/src/org/compiere/model/MSalesRegion.java b/base/src/org/compiere/model/MSalesRegion.java
index 2d95cea682..bb7ba8c8c8 100644
--- a/base/src/org/compiere/model/MSalesRegion.java
+++ b/base/src/org/compiere/model/MSalesRegion.java
@@ -16,9 +16,10 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import org.compiere.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+import org.compiere.util.CCache;
 
 
 /**
diff --git a/base/src/org/compiere/model/MScheduler.java b/base/src/org/compiere/model/MScheduler.java
index 848c4aa74a..a8ca8a31eb 100644
--- a/base/src/org/compiere/model/MScheduler.java
+++ b/base/src/org/compiere/model/MScheduler.java
@@ -16,10 +16,15 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
 
 
 /**
diff --git a/base/src/org/compiere/model/MSchedulerLog.java b/base/src/org/compiere/model/MSchedulerLog.java
index bf35df39cc..7e72fc25e5 100644
--- a/base/src/org/compiere/model/MSchedulerLog.java
+++ b/base/src/org/compiere/model/MSchedulerLog.java
@@ -16,8 +16,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 
 /**
diff --git a/base/src/org/compiere/model/MSchedulerPara.java b/base/src/org/compiere/model/MSchedulerPara.java
index bf39801390..cc7ecf10b1 100644
--- a/base/src/org/compiere/model/MSchedulerPara.java
+++ b/base/src/org/compiere/model/MSchedulerPara.java
@@ -16,8 +16,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 /**
  * 	Scheduler Parameter Model
diff --git a/base/src/org/compiere/model/MSchedulerRecipient.java b/base/src/org/compiere/model/MSchedulerRecipient.java
index 125c3c65e3..c037d55852 100644
--- a/base/src/org/compiere/model/MSchedulerRecipient.java
+++ b/base/src/org/compiere/model/MSchedulerRecipient.java
@@ -16,8 +16,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 /**
  * 	Scheduler Recipient Model
diff --git a/base/src/org/compiere/model/MSequence.java b/base/src/org/compiere/model/MSequence.java
index 6dc32ab663..5880d5fc2c 100644
--- a/base/src/org/compiere/model/MSequence.java
+++ b/base/src/org/compiere/model/MSequence.java
@@ -22,7 +22,6 @@ import java.io.PrintWriter;
 import java.net.Socket;
 import java.net.URL;
 import java.net.URLEncoder;
-import java.rmi.RemoteException;
 import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -37,9 +36,7 @@ import java.util.Properties;
 import java.util.Vector;
 import java.util.logging.Level;
 
-import org.adempiere.exceptions.DBException;
 import org.compiere.db.CConnection;
-import org.compiere.interfaces.Server;
 import org.compiere.util.CLogMgt;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
diff --git a/base/src/org/compiere/model/MStatus.java b/base/src/org/compiere/model/MStatus.java
index 6ecd1ba74d..3237184c30 100644
--- a/base/src/org/compiere/model/MStatus.java
+++ b/base/src/org/compiere/model/MStatus.java
@@ -16,10 +16,17 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 /**
  * 	Request Status Model
diff --git a/base/src/org/compiere/model/MStatusCategory.java b/base/src/org/compiere/model/MStatusCategory.java
index f1fc2117ee..d79019eb9e 100644
--- a/base/src/org/compiere/model/MStatusCategory.java
+++ b/base/src/org/compiere/model/MStatusCategory.java
@@ -16,11 +16,17 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import org.compiere.util.*;
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Msg;
 
 /**
  * 	Request Status Category Model
diff --git a/base/src/org/compiere/model/MStore.java b/base/src/org/compiere/model/MStore.java
index b771324920..8c64c8b913 100644
--- a/base/src/org/compiere/model/MStore.java
+++ b/base/src/org/compiere/model/MStore.java
@@ -16,13 +16,23 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import org.compiere.db.*;
-import org.compiere.interfaces.*;
-import org.compiere.util.*;
+import org.compiere.db.CConnection;
+import org.compiere.interfaces.Server;
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.EMail;
+import org.compiere.util.Env;
+import org.compiere.util.Ini;
+import org.compiere.util.Msg;
 
 /**
  * 	Web Store
diff --git a/base/src/org/compiere/model/MUOMConversion.java b/base/src/org/compiere/model/MUOMConversion.java
index 7854686626..fc2b8969e0 100644
--- a/base/src/org/compiere/model/MUOMConversion.java
+++ b/base/src/org/compiere/model/MUOMConversion.java
@@ -16,12 +16,24 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.awt.*;
-import java.math.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.awt.Point;
+import java.math.BigDecimal;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
+import org.compiere.util.Ini;
+import org.compiere.util.Msg;
 
 /**
  *	Unit of Measure Conversion Model
diff --git a/base/src/org/compiere/model/MUserMail.java b/base/src/org/compiere/model/MUserMail.java
index f66caefefe..ed887a3395 100644
--- a/base/src/org/compiere/model/MUserMail.java
+++ b/base/src/org/compiere/model/MUserMail.java
@@ -16,10 +16,10 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
-import org.compiere.util.*;
+import org.compiere.util.EMail;
 
 /**
  * 	User Mail Model
diff --git a/base/src/org/compiere/model/MUserOrgAccess.java b/base/src/org/compiere/model/MUserOrgAccess.java
index ba518d9d82..177615cd57 100644
--- a/base/src/org/compiere/model/MUserOrgAccess.java
+++ b/base/src/org/compiere/model/MUserOrgAccess.java
@@ -16,10 +16,15 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Msg;
 
 
 /**
diff --git a/base/src/org/compiere/model/MUserQuery.java b/base/src/org/compiere/model/MUserQuery.java
index 49d53844db..e7cc4d18e8 100644
--- a/base/src/org/compiere/model/MUserQuery.java
+++ b/base/src/org/compiere/model/MUserQuery.java
@@ -15,10 +15,15 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
+
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
+import org.compiere.util.Env;
 
 
 /**
diff --git a/base/src/org/compiere/model/MUserRoles.java b/base/src/org/compiere/model/MUserRoles.java
index eb05772d87..6f2946e1c8 100644
--- a/base/src/org/compiere/model/MUserRoles.java
+++ b/base/src/org/compiere/model/MUserRoles.java
@@ -16,11 +16,14 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import java.util.logging.*;
-import org.compiere.util.*;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
 
 /**
  *	User Roles Model
diff --git a/base/src/org/compiere/model/MWarehousePrice.java b/base/src/org/compiere/model/MWarehousePrice.java
index 18d078111c..874e624e1d 100644
--- a/base/src/org/compiere/model/MWarehousePrice.java
+++ b/base/src/org/compiere/model/MWarehousePrice.java
@@ -16,11 +16,15 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.logging.Level;
 
-import java.util.logging.*;
-import org.compiere.util.*;
+import org.compiere.util.CLogger;
+import org.compiere.util.DB;
 
 /**
  *	Product Warehouse Availability and Price Model.
diff --git a/base/src/org/compiere/model/MWebMenu.java b/base/src/org/compiere/model/MWebMenu.java
index 3baf132c1a..e760e7bc79 100644
--- a/base/src/org/compiere/model/MWebMenu.java
+++ b/base/src/org/compiere/model/MWebMenu.java
@@ -22,8 +22,6 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.util.Properties;
 
-import org.compiere.model.X_U_WebMenu;
-
 
 public class MWebMenu extends X_U_WebMenu
 {
diff --git a/base/src/org/compiere/model/MWebProject.java b/base/src/org/compiere/model/MWebProject.java
index fd2cf718d3..58c45bd1d6 100644
--- a/base/src/org/compiere/model/MWebProject.java
+++ b/base/src/org/compiere/model/MWebProject.java
@@ -16,9 +16,10 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
-import org.compiere.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
+
+import org.compiere.util.CCache;
 
 /**
  * 	Web Project Model
diff --git a/base/src/org/compiere/model/MWebProjectDomain.java b/base/src/org/compiere/model/MWebProjectDomain.java
index 38474bb0bc..001c113eb4 100644
--- a/base/src/org/compiere/model/MWebProjectDomain.java
+++ b/base/src/org/compiere/model/MWebProjectDomain.java
@@ -16,9 +16,11 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Properties;
 import java.util.logging.Level;
+
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
 
diff --git a/base/src/org/compiere/model/MWebProperties.java b/base/src/org/compiere/model/MWebProperties.java
index 46f093d29e..c301f75f20 100644
--- a/base/src/org/compiere/model/MWebProperties.java
+++ b/base/src/org/compiere/model/MWebProperties.java
@@ -26,8 +26,6 @@ package org.compiere.model;
 import java.sql.ResultSet;
 import java.util.Properties;
 
-import org.compiere.model.X_U_Web_Properties;
-
 
 public class MWebProperties extends X_U_Web_Properties
 {
diff --git a/base/src/org/compiere/model/MWindowAccess.java b/base/src/org/compiere/model/MWindowAccess.java
index aa10340505..5871db0980 100644
--- a/base/src/org/compiere/model/MWindowAccess.java
+++ b/base/src/org/compiere/model/MWindowAccess.java
@@ -16,8 +16,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 
 /**
diff --git a/base/src/org/compiere/model/MWithholding.java b/base/src/org/compiere/model/MWithholding.java
index 8e335651fe..069069e268 100644
--- a/base/src/org/compiere/model/MWithholding.java
+++ b/base/src/org/compiere/model/MWithholding.java
@@ -16,8 +16,8 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.util.*;
+import java.sql.ResultSet;
+import java.util.Properties;
 
 
 /**
diff --git a/base/src/org/compiere/model/MYear.java b/base/src/org/compiere/model/MYear.java
index aaca4c5e06..a42cb07d4b 100644
--- a/base/src/org/compiere/model/MYear.java
+++ b/base/src/org/compiere/model/MYear.java
@@ -16,13 +16,21 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.sql.*;
-import java.text.*;
-import java.util.*;
-import java.util.logging.*;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.text.DateFormatSymbols;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.logging.Level;
 
-import org.compiere.process.*;
-import org.compiere.util.*;
+import org.compiere.process.DocumentTypeVerify;
+import org.compiere.process.SvrProcess;
+import org.compiere.util.Env;
+import org.compiere.util.Language;
+import org.compiere.util.Msg;
 
 
 /**
diff --git a/base/src/org/compiere/model/MultiMap.java b/base/src/org/compiere/model/MultiMap.java
index df8a4e9000..329b098a6f 100644
--- a/base/src/org/compiere/model/MultiMap.java
+++ b/base/src/org/compiere/model/MultiMap.java
@@ -16,9 +16,14 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.io.*;
-import java.util.*;
-import org.compiere.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.compiere.util.CLogger;
 
 /**
  *  MultiMap allows multiple keys with their values.
diff --git a/base/src/org/compiere/model/NaturalAccountMap.java b/base/src/org/compiere/model/NaturalAccountMap.java
index 0f117a41c4..a79aabb180 100644
--- a/base/src/org/compiere/model/NaturalAccountMap.java
+++ b/base/src/org/compiere/model/NaturalAccountMap.java
@@ -16,10 +16,20 @@
  *****************************************************************************/
 package org.compiere.model;
 
-import java.io.*;
-import java.util.*;
-import java.util.logging.*;
-import org.compiere.util.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.logging.Level;
+
+import org.compiere.util.CCache;
+import org.compiere.util.CLogger;
+import org.compiere.util.Ini;
+import org.compiere.util.Util;
 
 /**
  *  Natural Account (HashMap) Management.