From 18936bb1b3e399458d73dbb37e3ad37696e01cda Mon Sep 17 00:00:00 2001 From: "Redhuan D. Oon" Date: Mon, 22 Dec 2008 13:42:21 +0000 Subject: [PATCH] --- .../org/compiere/model/MPriceListVersion.java | 13 ++++++++---- .../org/compiere/model/MPrivateAccess.java | 10 +++++---- base/src/org/compiere/model/MProcess.java | 17 ++++++++------- .../org/compiere/model/MProcessAccess.java | 4 ++-- base/src/org/compiere/model/MProcessPara.java | 11 ++++++---- base/src/org/compiere/model/MProductBOM.java | 13 ++++++++---- .../org/compiere/model/MProductCategory.java | 16 ++++++++++---- .../org/compiere/model/MProductCosting.java | 10 +++++---- .../org/compiere/model/MProductDownload.java | 16 ++++++++------ .../src/org/compiere/model/MProductPrice.java | 14 ++++++++----- .../org/compiere/model/MProductPricing.java | 14 +++++++++---- base/src/org/compiere/model/MProject.java | 14 +++++++++---- .../src/org/compiere/model/MProjectIssue.java | 13 +++++++----- base/src/org/compiere/model/MProjectLine.java | 12 ++++++----- .../src/org/compiere/model/MProjectPhase.java | 12 +++++++---- base/src/org/compiere/model/MProjectTask.java | 7 ++++--- base/src/org/compiere/model/MProjectType.java | 13 ++++++++---- .../org/compiere/model/MProjectTypePhase.java | 12 +++++++---- .../org/compiere/model/MProjectTypeTask.java | 7 ++++--- base/src/org/compiere/model/MRMA.java | 20 +++++++++++------- base/src/org/compiere/model/MRMALine.java | 10 +++++---- .../src/org/compiere/model/MRecordAccess.java | 10 +++++---- base/src/org/compiere/model/MRecurring.java | 10 ++++++--- .../src/org/compiere/model/MRecurringRun.java | 4 ++-- base/src/org/compiere/model/MRefTable.java | 4 ++-- base/src/org/compiere/model/MRegion.java | 21 +++++++++++++------ .../src/org/compiere/model/MRegistration.java | 15 ++++++++----- .../model/MRegistrationAttribute.java | 13 ++++++++---- base/src/org/compiere/model/MReplenish.java | 7 ++++--- base/src/org/compiere/model/MReplication.java | 4 ++-- .../org/compiere/model/MReplicationLog.java | 2 +- .../org/compiere/model/MReplicationRun.java | 4 ++-- .../org/compiere/model/MRequestAction.java | 2 +- .../org/compiere/model/MRequestCategory.java | 6 +++--- .../org/compiere/model/MRequestProcessor.java | 14 +++++++++---- .../compiere/model/MRequestProcessorLog.java | 4 ++-- .../model/MRequestProcessorRoute.java | 4 ++-- base/src/org/compiere/model/MRequestType.java | 15 +++++++++---- .../org/compiere/model/MRequestUpdate.java | 4 ++-- base/src/org/compiere/model/MRequisition.java | 21 ++++++++++++------- base/src/org/compiere/model/MResolution.java | 6 +++--- .../compiere/model/MResourceAssignment.java | 7 ++++--- .../compiere/model/MRevenueRecognition.java | 4 ++-- .../model/MRevenueRecognitionPlan.java | 7 ++++--- base/src/org/compiere/model/MRfQLine.java | 12 +++++++---- base/src/org/compiere/model/MRfQLineQty.java | 12 +++++++---- base/src/org/compiere/model/MRfQResponse.java | 20 +++++++++++------- .../org/compiere/model/MRfQResponseLine.java | 11 ++++++---- .../compiere/model/MRfQResponseLineQty.java | 10 +++++---- base/src/org/compiere/model/MRfQTopic.java | 10 +++++---- .../compiere/model/MRfQTopicSubscriber.java | 10 +++++---- .../model/MRfQTopicSubscriberOnly.java | 4 ++-- base/src/org/compiere/model/MRoleMenu.java | 2 -- .../org/compiere/model/MRoleOrgAccess.java | 13 ++++++++---- base/src/org/compiere/model/MRoleTest.java | 5 +++-- base/src/org/compiere/model/MRule.java | 16 ++++++++++---- 56 files changed, 365 insertions(+), 206 deletions(-) diff --git a/base/src/org/compiere/model/MPriceListVersion.java b/base/src/org/compiere/model/MPriceListVersion.java index b9957da01e..1ae537f139 100644 --- a/base/src/org/compiere/model/MPriceListVersion.java +++ b/base/src/org/compiere/model/MPriceListVersion.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.DB; +import org.compiere.util.DisplayType; +import org.compiere.util.TimeUtil; /** * Price List Version Model diff --git a/base/src/org/compiere/model/MPrivateAccess.java b/base/src/org/compiere/model/MPrivateAccess.java index 45d34e78e2..111f9d849b 100644 --- a/base/src/org/compiere/model/MPrivateAccess.java +++ b/base/src/org/compiere/model/MPrivateAccess.java @@ -16,11 +16,13 @@ *****************************************************************************/ 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 java.util.logging.*; -import org.compiere.util.*; +import org.compiere.util.CLogger; +import org.compiere.util.DB; /** * Private Access diff --git a/base/src/org/compiere/model/MProcess.java b/base/src/org/compiere/model/MProcess.java index 75b12123b2..2a6cd0263b 100644 --- a/base/src/org/compiere/model/MProcess.java +++ b/base/src/org/compiere/model/MProcess.java @@ -16,15 +16,18 @@ *****************************************************************************/ 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.adempiere.util.ProcessUtil; -import org.compiere.db.CConnection; -import org.compiere.interfaces.Server; -import org.compiere.process.*; -import org.compiere.util.*; +import org.compiere.process.ProcessInfo; +import org.compiere.util.CCache; +import org.compiere.util.CLogger; +import org.compiere.util.DB; +import org.compiere.util.Trx; /** * Process Model diff --git a/base/src/org/compiere/model/MProcessAccess.java b/base/src/org/compiere/model/MProcessAccess.java index 0d10324042..3ad7d86301 100644 --- a/base/src/org/compiere/model/MProcessAccess.java +++ b/base/src/org/compiere/model/MProcessAccess.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/MProcessPara.java b/base/src/org/compiere/model/MProcessPara.java index df2dd13eb6..5514d8dc04 100644 --- a/base/src/org/compiere/model/MProcessPara.java +++ b/base/src/org/compiere/model/MProcessPara.java @@ -16,10 +16,13 @@ *****************************************************************************/ package org.compiere.model; -import java.sql.*; -import java.util.*; -import java.util.logging.*; -import org.compiere.util.*; +import java.sql.ResultSet; +import java.util.Properties; +import java.util.logging.Level; + +import org.compiere.util.CCache; +import org.compiere.util.DisplayType; +import org.compiere.util.Env; /** diff --git a/base/src/org/compiere/model/MProductBOM.java b/base/src/org/compiere/model/MProductBOM.java index e1819b6431..0c44a0b767 100644 --- a/base/src/org/compiere/model/MProductBOM.java +++ b/base/src/org/compiere/model/MProductBOM.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.Env; /** * Product BOM Model (old). diff --git a/base/src/org/compiere/model/MProductCategory.java b/base/src/org/compiere/model/MProductCategory.java index 9cf70e9b13..b159c39e9a 100644 --- a/base/src/org/compiere/model/MProductCategory.java +++ b/base/src/org/compiere/model/MProductCategory.java @@ -16,11 +16,19 @@ *****************************************************************************/ package org.compiere.model; -import java.sql.*; -import java.util.*; -import java.util.logging.*; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Iterator; +import java.util.Properties; +import java.util.Vector; +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; /** * Product Category Model diff --git a/base/src/org/compiere/model/MProductCosting.java b/base/src/org/compiere/model/MProductCosting.java index 777f9311d5..89fff3bcc5 100644 --- a/base/src/org/compiere/model/MProductCosting.java +++ b/base/src/org/compiere/model/MProductCosting.java @@ -16,10 +16,12 @@ *****************************************************************************/ package org.compiere.model; -import java.sql.*; -import java.util.*; -import java.util.logging.*; -import org.compiere.util.*; +import java.sql.ResultSet; +import java.util.List; +import java.util.Properties; + +import org.compiere.util.CLogger; +import org.compiere.util.Env; /** * Product Costing Model (old). diff --git a/base/src/org/compiere/model/MProductDownload.java b/base/src/org/compiere/model/MProductDownload.java index b66e38b15d..4db3b4469f 100644 --- a/base/src/org/compiere/model/MProductDownload.java +++ b/base/src/org/compiere/model/MProductDownload.java @@ -16,13 +16,17 @@ *****************************************************************************/ package org.compiere.model; -import java.io.*; -import java.net.*; -import java.sql.*; -import java.util.*; -import java.util.logging.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.net.URL; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.util.Properties; +import java.util.logging.Level; -import org.compiere.util.*; +import org.compiere.util.CLogger; +import org.compiere.util.DB; /** diff --git a/base/src/org/compiere/model/MProductPrice.java b/base/src/org/compiere/model/MProductPrice.java index d6ec7edf1d..ac34e1846f 100644 --- a/base/src/org/compiere/model/MProductPrice.java +++ b/base/src/org/compiere/model/MProductPrice.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.PreparedStatement; +import java.sql.ResultSet; +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 Price diff --git a/base/src/org/compiere/model/MProductPricing.java b/base/src/org/compiere/model/MProductPricing.java index dfe34df708..961335ff90 100644 --- a/base/src/org/compiere/model/MProductPricing.java +++ b/base/src/org/compiere/model/MProductPricing.java @@ -16,10 +16,16 @@ *****************************************************************************/ package org.compiere.model; -import java.math.*; -import java.sql.*; -import java.util.logging.*; -import org.compiere.util.*; +import java.math.BigDecimal; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.Timestamp; +import java.util.logging.Level; + +import org.compiere.util.CLogger; +import org.compiere.util.DB; +import org.compiere.util.Env; +import org.compiere.util.Trace; /** * Product Price Calculations diff --git a/base/src/org/compiere/model/MProject.java b/base/src/org/compiere/model/MProject.java index 713b7f092e..b59a1ecda8 100644 --- a/base/src/org/compiere/model/MProject.java +++ b/base/src/org/compiere/model/MProject.java @@ -16,10 +16,16 @@ *****************************************************************************/ 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.sql.Timestamp; +import java.util.ArrayList; +import java.util.Properties; +import java.util.logging.Level; + +import org.compiere.util.DB; +import org.compiere.util.Env; /** * Project Model diff --git a/base/src/org/compiere/model/MProjectIssue.java b/base/src/org/compiere/model/MProjectIssue.java index 800ddf8e85..3954740840 100644 --- a/base/src/org/compiere/model/MProjectIssue.java +++ b/base/src/org/compiere/model/MProjectIssue.java @@ -16,11 +16,14 @@ *****************************************************************************/ 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.DB; +import org.compiere.util.Env; /** * Project Issue Model diff --git a/base/src/org/compiere/model/MProjectLine.java b/base/src/org/compiere/model/MProjectLine.java index a5c4dd82a8..190d62bf9e 100644 --- a/base/src/org/compiere/model/MProjectLine.java +++ b/base/src/org/compiere/model/MProjectLine.java @@ -16,11 +16,13 @@ *****************************************************************************/ 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.util.Properties; +import java.util.logging.Level; + +import org.compiere.util.DB; +import org.compiere.util.Env; /** * Project Line Model diff --git a/base/src/org/compiere/model/MProjectPhase.java b/base/src/org/compiere/model/MProjectPhase.java index 8e8036bf1d..5f34d6106e 100644 --- a/base/src/org/compiere/model/MProjectPhase.java +++ b/base/src/org/compiere/model/MProjectPhase.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.SQLException; +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; /** * Project Phase Model diff --git a/base/src/org/compiere/model/MProjectTask.java b/base/src/org/compiere/model/MProjectTask.java index 1a61a8ade6..c0afe4db7d 100644 --- a/base/src/org/compiere/model/MProjectTask.java +++ b/base/src/org/compiere/model/MProjectTask.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; /** * Project Phase Task Model diff --git a/base/src/org/compiere/model/MProjectType.java b/base/src/org/compiere/model/MProjectType.java index 7b968d6965..fc3ceb357e 100644 --- a/base/src/org/compiere/model/MProjectType.java +++ b/base/src/org/compiere/model/MProjectType.java @@ -16,11 +16,16 @@ *****************************************************************************/ package org.compiere.model; -import java.sql.*; -import java.util.*; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +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.CCache; +import org.compiere.util.DB; /** * Project Type Model diff --git a/base/src/org/compiere/model/MProjectTypePhase.java b/base/src/org/compiere/model/MProjectTypePhase.java index 13eab5f53b..fa2004e3bd 100644 --- a/base/src/org/compiere/model/MProjectTypePhase.java +++ b/base/src/org/compiere/model/MProjectTypePhase.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.SQLException; +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; /** * Project Type Phase Model diff --git a/base/src/org/compiere/model/MProjectTypeTask.java b/base/src/org/compiere/model/MProjectTypeTask.java index 37645acc7d..ddbdffac51 100644 --- a/base/src/org/compiere/model/MProjectTypeTask.java +++ b/base/src/org/compiere/model/MProjectTypeTask.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; /** * Project Type Phase Task Model diff --git a/base/src/org/compiere/model/MRMA.java b/base/src/org/compiere/model/MRMA.java index f9ea3e4326..2003d7e480 100644 --- a/base/src/org/compiere/model/MRMA.java +++ b/base/src/org/compiere/model/MRMA.java @@ -16,13 +16,19 @@ *****************************************************************************/ package org.compiere.model; -import java.io.*; -import java.math.*; -import java.sql.*; -import java.util.*; -import java.util.logging.*; -import org.compiere.process.*; -import org.compiere.util.*; +import java.io.File; +import java.math.BigDecimal; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.util.ArrayList; +import java.util.Properties; +import java.util.logging.Level; + +import org.compiere.process.DocAction; +import org.compiere.process.DocumentEngine; +import org.compiere.util.DB; +import org.compiere.util.Env; +import org.compiere.util.Msg; /** * RMA Model diff --git a/base/src/org/compiere/model/MRMALine.java b/base/src/org/compiere/model/MRMALine.java index 32a33a4c6b..935da66ba2 100644 --- a/base/src/org/compiere/model/MRMALine.java +++ b/base/src/org/compiere/model/MRMALine.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.util.Properties; + +import org.compiere.util.DB; +import org.compiere.util.Env; /** diff --git a/base/src/org/compiere/model/MRecordAccess.java b/base/src/org/compiere/model/MRecordAccess.java index e6b4f2d1db..539a38d7a2 100644 --- a/base/src/org/compiere/model/MRecordAccess.java +++ b/base/src/org/compiere/model/MRecordAccess.java @@ -16,11 +16,13 @@ *****************************************************************************/ 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 java.util.logging.*; -import org.compiere.util.*; +import org.compiere.util.DB; +import org.compiere.util.Msg; /** * Record Access Model diff --git a/base/src/org/compiere/model/MRecurring.java b/base/src/org/compiere/model/MRecurring.java index 482f1c9936..773c7bed17 100644 --- a/base/src/org/compiere/model/MRecurring.java +++ b/base/src/org/compiere/model/MRecurring.java @@ -16,9 +16,13 @@ *****************************************************************************/ package org.compiere.model; -import java.sql.*; -import java.util.*; -import org.compiere.util.*; +import java.sql.ResultSet; +import java.sql.Timestamp; +import java.util.Calendar; +import java.util.Properties; + +import org.compiere.util.DB; +import org.compiere.util.Msg; /** * Recurring Model diff --git a/base/src/org/compiere/model/MRecurringRun.java b/base/src/org/compiere/model/MRecurringRun.java index 75d67a3df3..c51f9e5c72 100644 --- a/base/src/org/compiere/model/MRecurringRun.java +++ b/base/src/org/compiere/model/MRecurringRun.java @@ -16,8 +16,8 @@ *****************************************************************************/ package org.compiere.model; -import java.sql.*; -import java.util.*; +import java.sql.ResultSet; +import java.util.Properties; /** * Recurring Run Model diff --git a/base/src/org/compiere/model/MRefTable.java b/base/src/org/compiere/model/MRefTable.java index 207ad46eb0..b06310cd16 100644 --- a/base/src/org/compiere/model/MRefTable.java +++ b/base/src/org/compiere/model/MRefTable.java @@ -16,8 +16,8 @@ *****************************************************************************/ package org.compiere.model; -import java.sql.*; -import java.util.*; +import java.sql.ResultSet; +import java.util.Properties; public class MRefTable extends X_AD_Ref_Table diff --git a/base/src/org/compiere/model/MRegion.java b/base/src/org/compiere/model/MRegion.java index 9da53fa425..9ab8519b22 100644 --- a/base/src/org/compiere/model/MRegion.java +++ b/base/src/org/compiere/model/MRegion.java @@ -16,13 +16,22 @@ *****************************************************************************/ package org.compiere.model; -import java.io.*; -import java.sql.*; -import java.util.*; +import java.io.Serializable; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.Iterator; +import java.util.Properties; +import java.util.logging.Level; -import java.util.logging.*; -import org.compiere.*; -import org.compiere.util.*; +import org.compiere.Adempiere; +import org.compiere.util.CCache; +import org.compiere.util.CLogger; +import org.compiere.util.DB; +import org.compiere.util.Env; /** * Localtion Region Model (Value Object) diff --git a/base/src/org/compiere/model/MRegistration.java b/base/src/org/compiere/model/MRegistration.java index 12ad633401..af2089f6b9 100644 --- a/base/src/org/compiere/model/MRegistration.java +++ b/base/src/org/compiere/model/MRegistration.java @@ -16,13 +16,18 @@ *****************************************************************************/ 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.Arrays; +import java.util.Properties; +import java.util.logging.Level; -import javax.servlet.http.*; +import javax.servlet.http.HttpServletRequest; -import java.util.logging.*; -import org.compiere.util.*; +import org.compiere.util.DB; +import org.compiere.util.WebUtil; /** * Asset Registration Model diff --git a/base/src/org/compiere/model/MRegistrationAttribute.java b/base/src/org/compiere/model/MRegistrationAttribute.java index be659d2d2e..918cddae27 100644 --- a/base/src/org/compiere/model/MRegistrationAttribute.java +++ b/base/src/org/compiere/model/MRegistrationAttribute.java @@ -16,11 +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 java.util.logging.*; -import org.compiere.util.*; +import org.compiere.util.CCache; +import org.compiere.util.CLogger; +import org.compiere.util.DB; +import org.compiere.util.Env; /** * Asset Registration Attribute diff --git a/base/src/org/compiere/model/MReplenish.java b/base/src/org/compiere/model/MReplenish.java index d5e9ac76f2..d4cf237d8d 100644 --- a/base/src/org/compiere/model/MReplenish.java +++ b/base/src/org/compiere/model/MReplenish.java @@ -31,10 +31,11 @@ package org.compiere.model; -import java.util.*; +import java.sql.ResultSet; +import java.util.List; +import java.util.Properties; -import org.compiere.util.*; -import java.sql.*; +import org.compiere.util.Env; /** * diff --git a/base/src/org/compiere/model/MReplication.java b/base/src/org/compiere/model/MReplication.java index 0ee170fba7..eb3f2aa75f 100644 --- a/base/src/org/compiere/model/MReplication.java +++ b/base/src/org/compiere/model/MReplication.java @@ -16,8 +16,8 @@ *****************************************************************************/ package org.compiere.model; -import java.util.*; -import java.sql.*; +import java.sql.Timestamp; +import java.util.Properties; /** * Replication Model diff --git a/base/src/org/compiere/model/MReplicationLog.java b/base/src/org/compiere/model/MReplicationLog.java index 9dfca15a0d..913f78e0d5 100644 --- a/base/src/org/compiere/model/MReplicationLog.java +++ b/base/src/org/compiere/model/MReplicationLog.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.model; -import java.util.*; +import java.util.Properties; /** * Replication Log Model diff --git a/base/src/org/compiere/model/MReplicationRun.java b/base/src/org/compiere/model/MReplicationRun.java index 786094e29c..0afdb189ad 100644 --- a/base/src/org/compiere/model/MReplicationRun.java +++ b/base/src/org/compiere/model/MReplicationRun.java @@ -16,8 +16,8 @@ *****************************************************************************/ package org.compiere.model; -import java.util.*; -import java.sql.*; +import java.sql.Timestamp; +import java.util.Properties; /** * Replication Run Model diff --git a/base/src/org/compiere/model/MRequestAction.java b/base/src/org/compiere/model/MRequestAction.java index 6f231d0950..a13be66e80 100644 --- a/base/src/org/compiere/model/MRequestAction.java +++ b/base/src/org/compiere/model/MRequestAction.java @@ -19,7 +19,7 @@ package org.compiere.model; import java.sql.ResultSet; import java.util.Properties; -import org.compiere.util.*; +import org.compiere.util.Msg; /** * Request History Model diff --git a/base/src/org/compiere/model/MRequestCategory.java b/base/src/org/compiere/model/MRequestCategory.java index 8552c43128..a09ed98748 100644 --- a/base/src/org/compiere/model/MRequestCategory.java +++ b/base/src/org/compiere/model/MRequestCategory.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.CCache; /** * Request Category Model diff --git a/base/src/org/compiere/model/MRequestProcessor.java b/base/src/org/compiere/model/MRequestProcessor.java index 81c6c37013..44ba82236a 100644 --- a/base/src/org/compiere/model/MRequestProcessor.java +++ b/base/src/org/compiere/model/MRequestProcessor.java @@ -16,10 +16,16 @@ *****************************************************************************/ 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; +import org.compiere.util.Msg; /** * Request Processor Model diff --git a/base/src/org/compiere/model/MRequestProcessorLog.java b/base/src/org/compiere/model/MRequestProcessorLog.java index cc6f267da0..74b2ea991b 100644 --- a/base/src/org/compiere/model/MRequestProcessorLog.java +++ b/base/src/org/compiere/model/MRequestProcessorLog.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/MRequestProcessorRoute.java b/base/src/org/compiere/model/MRequestProcessorRoute.java index a9f52f19de..9cd345fa52 100644 --- a/base/src/org/compiere/model/MRequestProcessorRoute.java +++ b/base/src/org/compiere/model/MRequestProcessorRoute.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/MRequestType.java b/base/src/org/compiere/model/MRequestType.java index d58510897f..88148d8e55 100644 --- a/base/src/org/compiere/model/MRequestType.java +++ b/base/src/org/compiere/model/MRequestType.java @@ -16,11 +16,18 @@ *****************************************************************************/ package org.compiere.model; -import java.sql.*; -import java.util.*; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +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.CCache; +import org.compiere.util.CLogger; +import org.compiere.util.DB; +import org.compiere.util.Env; /** * Request Type Model diff --git a/base/src/org/compiere/model/MRequestUpdate.java b/base/src/org/compiere/model/MRequestUpdate.java index 5c07c7f17c..f471b14845 100644 --- a/base/src/org/compiere/model/MRequestUpdate.java +++ b/base/src/org/compiere/model/MRequestUpdate.java @@ -16,8 +16,8 @@ *****************************************************************************/ package org.compiere.model; -import java.sql.*; -import java.util.*; +import java.sql.ResultSet; +import java.util.Properties; /** * Request Update Model diff --git a/base/src/org/compiere/model/MRequisition.java b/base/src/org/compiere/model/MRequisition.java index 3e8a2e1cf6..6e9d9a3d5b 100644 --- a/base/src/org/compiere/model/MRequisition.java +++ b/base/src/org/compiere/model/MRequisition.java @@ -16,13 +16,20 @@ *****************************************************************************/ package org.compiere.model; -import java.io.*; -import java.math.*; -import java.sql.*; -import java.util.*; -import java.util.logging.*; -import org.compiere.process.*; -import org.compiere.util.*; +import java.io.File; +import java.math.BigDecimal; +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.process.DocAction; +import org.compiere.process.DocumentEngine; +import org.compiere.util.DB; +import org.compiere.util.Env; +import org.compiere.util.Msg; /** * Requisition Model diff --git a/base/src/org/compiere/model/MResolution.java b/base/src/org/compiere/model/MResolution.java index e365cc0964..6b3fa5e39e 100644 --- a/base/src/org/compiere/model/MResolution.java +++ b/base/src/org/compiere/model/MResolution.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.CCache; /** * Request Resolution Model diff --git a/base/src/org/compiere/model/MResourceAssignment.java b/base/src/org/compiere/model/MResourceAssignment.java index d9fe861114..abc2540edb 100644 --- a/base/src/org/compiere/model/MResourceAssignment.java +++ b/base/src/org/compiere/model/MResourceAssignment.java @@ -16,9 +16,10 @@ *****************************************************************************/ package org.compiere.model; -import java.math.*; -import java.sql.*; -import java.util.*; +import java.math.BigDecimal; +import java.sql.ResultSet; +import java.sql.Timestamp; +import java.util.Properties; /** diff --git a/base/src/org/compiere/model/MRevenueRecognition.java b/base/src/org/compiere/model/MRevenueRecognition.java index 6456f21b9b..5544e8764b 100644 --- a/base/src/org/compiere/model/MRevenueRecognition.java +++ b/base/src/org/compiere/model/MRevenueRecognition.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/MRevenueRecognitionPlan.java b/base/src/org/compiere/model/MRevenueRecognitionPlan.java index 55554288cf..b925e64e2d 100644 --- a/base/src/org/compiere/model/MRevenueRecognitionPlan.java +++ b/base/src/org/compiere/model/MRevenueRecognitionPlan.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; /** * Revenue Recognition Plan diff --git a/base/src/org/compiere/model/MRfQLine.java b/base/src/org/compiere/model/MRfQLine.java index c891361b98..ddcce70ce8 100644 --- a/base/src/org/compiere/model/MRfQLine.java +++ b/base/src/org/compiere/model/MRfQLine.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.util.ArrayList; +import java.util.Properties; +import java.util.logging.Level; -import java.util.logging.*; -import org.compiere.util.*; +import org.compiere.util.CCache; +import org.compiere.util.DB; +import org.compiere.util.TimeUtil; /** * RfQ Line diff --git a/base/src/org/compiere/model/MRfQLineQty.java b/base/src/org/compiere/model/MRfQLineQty.java index e1976a5d22..22c456e3f1 100644 --- a/base/src/org/compiere/model/MRfQLineQty.java +++ b/base/src/org/compiere/model/MRfQLineQty.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.util.ArrayList; +import java.util.Properties; +import java.util.logging.Level; -import java.util.logging.*; -import org.compiere.util.*; +import org.compiere.util.CCache; +import org.compiere.util.DB; +import org.compiere.util.Env; /** * RfQ Line Qty Model diff --git a/base/src/org/compiere/model/MRfQResponse.java b/base/src/org/compiere/model/MRfQResponse.java index 6a29fb56cc..e6ee5a24d0 100644 --- a/base/src/org/compiere/model/MRfQResponse.java +++ b/base/src/org/compiere/model/MRfQResponse.java @@ -16,14 +16,20 @@ *****************************************************************************/ package org.compiere.model; -import java.io.*; -import java.math.*; -import java.sql.*; -import java.util.*; +import java.io.File; +import java.math.BigDecimal; +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.print.*; -import java.util.logging.*; -import org.compiere.util.*; +import org.compiere.print.ReportEngine; +import org.compiere.util.DB; +import org.compiere.util.EMail; +import org.compiere.util.Env; +import org.compiere.util.TimeUtil; /** * RfQ Response Model diff --git a/base/src/org/compiere/model/MRfQResponseLine.java b/base/src/org/compiere/model/MRfQResponseLine.java index 87c4eed471..dc4b4594dc 100644 --- a/base/src/org/compiere/model/MRfQResponseLine.java +++ b/base/src/org/compiere/model/MRfQResponseLine.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.DB; +import org.compiere.util.TimeUtil; /** * RfQ Response Line Model diff --git a/base/src/org/compiere/model/MRfQResponseLineQty.java b/base/src/org/compiere/model/MRfQResponseLineQty.java index 496b0e0443..bed038be0e 100644 --- a/base/src/org/compiere/model/MRfQResponseLineQty.java +++ b/base/src/org/compiere/model/MRfQResponseLineQty.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.util.Comparator; +import java.util.Properties; + +import org.compiere.util.Env; /** * RfQ Response Line Qty diff --git a/base/src/org/compiere/model/MRfQTopic.java b/base/src/org/compiere/model/MRfQTopic.java index aaf1fbd895..a174ae2865 100644 --- a/base/src/org/compiere/model/MRfQTopic.java +++ b/base/src/org/compiere/model/MRfQTopic.java @@ -16,11 +16,13 @@ *****************************************************************************/ 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.DB; /** diff --git a/base/src/org/compiere/model/MRfQTopicSubscriber.java b/base/src/org/compiere/model/MRfQTopicSubscriber.java index 950f6f22c6..26af89c7a9 100644 --- a/base/src/org/compiere/model/MRfQTopicSubscriber.java +++ b/base/src/org/compiere/model/MRfQTopicSubscriber.java @@ -16,11 +16,13 @@ *****************************************************************************/ 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.DB; /** diff --git a/base/src/org/compiere/model/MRfQTopicSubscriberOnly.java b/base/src/org/compiere/model/MRfQTopicSubscriberOnly.java index 70e0005994..64cc1636fc 100644 --- a/base/src/org/compiere/model/MRfQTopicSubscriberOnly.java +++ b/base/src/org/compiere/model/MRfQTopicSubscriberOnly.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/MRoleMenu.java b/base/src/org/compiere/model/MRoleMenu.java index 8ccdae54a9..a147ca90e5 100644 --- a/base/src/org/compiere/model/MRoleMenu.java +++ b/base/src/org/compiere/model/MRoleMenu.java @@ -24,8 +24,6 @@ package org.compiere.model; import java.sql.ResultSet; import java.util.Properties; -import org.compiere.model.X_U_RoleMenu; - public class MRoleMenu extends X_U_RoleMenu { diff --git a/base/src/org/compiere/model/MRoleOrgAccess.java b/base/src/org/compiere/model/MRoleOrgAccess.java index 4817f2992b..21682d6fc3 100644 --- a/base/src/org/compiere/model/MRoleOrgAccess.java +++ b/base/src/org/compiere/model/MRoleOrgAccess.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; /** * Role Org Access Model diff --git a/base/src/org/compiere/model/MRoleTest.java b/base/src/org/compiere/model/MRoleTest.java index a0537d263c..8175a3f963 100644 --- a/base/src/org/compiere/model/MRoleTest.java +++ b/base/src/org/compiere/model/MRoleTest.java @@ -16,8 +16,9 @@ *****************************************************************************/ package org.compiere.model; -import junit.framework.*; -import org.compiere.util.*; +import junit.framework.TestCase; + +import org.compiere.util.Env; /** * The class MRoleTest contains tests for the class MRole diff --git a/base/src/org/compiere/model/MRule.java b/base/src/org/compiere/model/MRule.java index ad2bd59245..93896f494f 100644 --- a/base/src/org/compiere/model/MRule.java +++ b/base/src/org/compiere/model/MRule.java @@ -17,14 +17,22 @@ *****************************************************************************/ 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.Enumeration; +import java.util.Iterator; +import java.util.Properties; +import java.util.logging.Level; import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; -import org.compiere.util.*; +import org.compiere.util.CCache; +import org.compiere.util.CLogger; +import org.compiere.util.DB; +import org.compiere.util.Msg; +import org.compiere.util.Util; /** * Persistent Rule Model