From a9c12ddd67aaea98e1117b9af717ad4d2d573e9b Mon Sep 17 00:00:00 2001 From: "Redhuan D. Oon" Date: Tue, 23 Dec 2008 06:29:11 +0000 Subject: [PATCH] organize imports --- .../servlet/org/compiere/cm/AdRedirector.java | 11 +++++--- .../servlet/org/compiere/cm/Broadcast.java | 20 ++++++++++----- .../servlet/org/compiere/cm/Community.java | 14 ++++++++--- .../main/servlet/org/compiere/cm/Extend.java | 11 +++++--- .../org/compiere/cm/HttpServletCM.java | 25 ++++++++++++++----- .../org/compiere/cm/MediaBroadcast.java | 24 ++++++++++-------- .../org/compiere/cm/RequestServlet.java | 12 ++++----- .../org/compiere/cm/StageBroadcast.java | 19 +++++++++----- .../servlet/org/compiere/cm/XMLBroadcast.java | 16 ++++++------ .../servlet/org/compiere/cm/cache/CO.java | 7 +++++- .../servlet/org/compiere/cm/cache/Chat.java | 3 ++- .../org/compiere/cm/cache/Container.java | 3 ++- .../compiere/cm/cache/ContainerElement.java | 2 +- .../org/compiere/cm/cache/ContainerTree.java | 2 +- .../servlet/org/compiere/cm/cache/Domain.java | 2 +- .../org/compiere/cm/cache/MediaServer.java | 4 ++- .../org/compiere/cm/cache/Service.java | 2 +- .../org/compiere/cm/cache/WebProject.java | 2 +- .../servlet/org/compiere/cm/cache/XML.java | 5 ++-- .../org/compiere/cm/extend/indexSearch.java | 5 ++-- .../org/compiere/cm/request/Request.java | 22 ++++++++-------- .../org/compiere/cm/utils/AccessLogger.java | 8 +++--- .../org/compiere/cm/utils/Counter.java | 3 ++- .../org/compiere/cm/utils/LocaleHandler.java | 4 ++- .../compiere/cm/utils/RequestAnalyzer.java | 19 +++++++++----- .../org/compiere/cm/xml/XSLTProcessor.java | 16 ++++++++---- 26 files changed, 167 insertions(+), 94 deletions(-) diff --git a/webCM/src/main/servlet/org/compiere/cm/AdRedirector.java b/webCM/src/main/servlet/org/compiere/cm/AdRedirector.java index a3705c5613..9b2f5c4696 100644 --- a/webCM/src/main/servlet/org/compiere/cm/AdRedirector.java +++ b/webCM/src/main/servlet/org/compiere/cm/AdRedirector.java @@ -16,10 +16,13 @@ *****************************************************************************/ package org.compiere.cm; -import java.io.IOException; -import javax.servlet.*; -import javax.servlet.http.*; -import org.compiere.model.*; +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.compiere.model.MAd; /** * AdRedirector will forward the Ad Request to the destination URL and log the request diff --git a/webCM/src/main/servlet/org/compiere/cm/Broadcast.java b/webCM/src/main/servlet/org/compiere/cm/Broadcast.java index e46f652cba..ae37d32648 100644 --- a/webCM/src/main/servlet/org/compiere/cm/Broadcast.java +++ b/webCM/src/main/servlet/org/compiere/cm/Broadcast.java @@ -16,12 +16,20 @@ *****************************************************************************/ package org.compiere.cm; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; -import org.compiere.util.*; -import org.compiere.cm.utils.*; -import org.compiere.cm.xml.*; +import java.io.IOException; +import java.io.PrintWriter; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import org.compiere.cm.utils.AccessLogger; +import org.compiere.cm.utils.LocaleHandler; +import org.compiere.cm.utils.RequestAnalyzer; +import org.compiere.cm.xml.Generator; +import org.compiere.cm.xml.XSLTProcessor; +import org.compiere.util.WebEnv; /** * Broadcast Servlet This servlet normally does Page processing for all pages, diff --git a/webCM/src/main/servlet/org/compiere/cm/Community.java b/webCM/src/main/servlet/org/compiere/cm/Community.java index 57fcc12d67..b6da31787c 100644 --- a/webCM/src/main/servlet/org/compiere/cm/Community.java +++ b/webCM/src/main/servlet/org/compiere/cm/Community.java @@ -17,13 +17,19 @@ package org.compiere.cm; import java.io.IOException; import java.util.Properties; + import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import org.compiere.util.*; -import org.compiere.model.*; -import org.compiere.cm.utils.*; +import javax.servlet.http.HttpSession; + +import org.compiere.cm.utils.RequestAnalyzer; +import org.compiere.model.X_W_Store; +import org.compiere.util.CLogger; +import org.compiere.util.WebEnv; +import org.compiere.util.WebLogin; +import org.compiere.util.WebSessionCtx; +import org.compiere.util.WebUtil; /** * Community Servlet to handle login, BPartner create & Update etc. diff --git a/webCM/src/main/servlet/org/compiere/cm/Extend.java b/webCM/src/main/servlet/org/compiere/cm/Extend.java index 2a12dfa090..f8034334e4 100644 --- a/webCM/src/main/servlet/org/compiere/cm/Extend.java +++ b/webCM/src/main/servlet/org/compiere/cm/Extend.java @@ -15,10 +15,13 @@ *****************************************************************************/ package org.compiere.cm; -import java.io.Serializable; -import org.compiere.util.*; -import java.util.*; -import javax.servlet.http.*; +import java.io.Serializable; +import java.util.Properties; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.compiere.util.WebInfo; /** * diff --git a/webCM/src/main/servlet/org/compiere/cm/HttpServletCM.java b/webCM/src/main/servlet/org/compiere/cm/HttpServletCM.java index c67adc9197..4633bac9fc 100644 --- a/webCM/src/main/servlet/org/compiere/cm/HttpServletCM.java +++ b/webCM/src/main/servlet/org/compiere/cm/HttpServletCM.java @@ -16,12 +16,25 @@ *****************************************************************************/ package org.compiere.cm; -import java.util.*; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.*; -import org.compiere.cm.cache.*; -import org.compiere.util.*; +import java.util.Properties; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; + +import org.compiere.cm.cache.Chat; +import org.compiere.cm.cache.Container; +import org.compiere.cm.cache.ContainerElement; +import org.compiere.cm.cache.ContainerTree; +import org.compiere.cm.cache.Domain; +import org.compiere.cm.cache.MediaServer; +import org.compiere.cm.cache.Template; +import org.compiere.cm.cache.WebProject; +import org.compiere.cm.cache.XML; +import org.compiere.util.CLogger; +import org.compiere.util.DB; +import org.compiere.util.WebEnv; /** * HttpServletCM we extended the normal HttpServlet to store some global diff --git a/webCM/src/main/servlet/org/compiere/cm/MediaBroadcast.java b/webCM/src/main/servlet/org/compiere/cm/MediaBroadcast.java index 11bfcc7763..018ecd51e8 100644 --- a/webCM/src/main/servlet/org/compiere/cm/MediaBroadcast.java +++ b/webCM/src/main/servlet/org/compiere/cm/MediaBroadcast.java @@ -16,17 +16,19 @@ *****************************************************************************/ package org.compiere.cm; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import org.compiere.model.MImage; -import org.compiere.model.MMedia; -import org.compiere.util.WebEnv; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintWriter; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import org.compiere.model.MImage; +import org.compiere.model.MMedia; +import org.compiere.util.WebEnv; /** * Broadcast Servlet diff --git a/webCM/src/main/servlet/org/compiere/cm/RequestServlet.java b/webCM/src/main/servlet/org/compiere/cm/RequestServlet.java index b35702efc4..7bea6ccbea 100644 --- a/webCM/src/main/servlet/org/compiere/cm/RequestServlet.java +++ b/webCM/src/main/servlet/org/compiere/cm/RequestServlet.java @@ -15,12 +15,12 @@ *****************************************************************************/ package org.compiere.cm; -import java.io.IOException; -import java.util.Properties; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Properties; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.compiere.cm.request.Request; diff --git a/webCM/src/main/servlet/org/compiere/cm/StageBroadcast.java b/webCM/src/main/servlet/org/compiere/cm/StageBroadcast.java index df8b721ef1..441c74004b 100644 --- a/webCM/src/main/servlet/org/compiere/cm/StageBroadcast.java +++ b/webCM/src/main/servlet/org/compiere/cm/StageBroadcast.java @@ -16,12 +16,19 @@ *****************************************************************************/ package org.compiere.cm; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; -import org.compiere.util.*; -import org.compiere.cm.utils.*; -import org.compiere.cm.xml.*; +import java.io.IOException; +import java.io.PrintWriter; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import org.compiere.cm.utils.LocaleHandler; +import org.compiere.cm.utils.RequestAnalyzer; +import org.compiere.cm.xml.Generator; +import org.compiere.cm.xml.XSLTProcessor; +import org.compiere.util.WebEnv; /** * Broadcast Servlet diff --git a/webCM/src/main/servlet/org/compiere/cm/XMLBroadcast.java b/webCM/src/main/servlet/org/compiere/cm/XMLBroadcast.java index 83a55e08dc..5b5a1ac217 100644 --- a/webCM/src/main/servlet/org/compiere/cm/XMLBroadcast.java +++ b/webCM/src/main/servlet/org/compiere/cm/XMLBroadcast.java @@ -16,13 +16,15 @@ *****************************************************************************/ package org.compiere.cm; -import java.io.IOException; -import java.io.PrintWriter; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.compiere.cm.utils.RequestAnalyzer; -import org.compiere.cm.xml.Generator; +import java.io.IOException; +import java.io.PrintWriter; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.compiere.cm.utils.RequestAnalyzer; +import org.compiere.cm.xml.Generator; /** * @author YS diff --git a/webCM/src/main/servlet/org/compiere/cm/cache/CO.java b/webCM/src/main/servlet/org/compiere/cm/cache/CO.java index e4d7d93a5b..cbacf62995 100644 --- a/webCM/src/main/servlet/org/compiere/cm/cache/CO.java +++ b/webCM/src/main/servlet/org/compiere/cm/cache/CO.java @@ -16,7 +16,12 @@ *****************************************************************************/ package org.compiere.cm.cache; -import java.util.*; +import java.util.Collections; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Properties; +import java.util.Vector; import org.compiere.util.CLogger; diff --git a/webCM/src/main/servlet/org/compiere/cm/cache/Chat.java b/webCM/src/main/servlet/org/compiere/cm/cache/Chat.java index 23c10cf95c..1bd6faa896 100644 --- a/webCM/src/main/servlet/org/compiere/cm/cache/Chat.java +++ b/webCM/src/main/servlet/org/compiere/cm/cache/Chat.java @@ -16,7 +16,8 @@ *****************************************************************************/ package org.compiere.cm.cache; -import java.util.*; +import java.util.Hashtable; + import org.compiere.model.MChat; /** diff --git a/webCM/src/main/servlet/org/compiere/cm/cache/Container.java b/webCM/src/main/servlet/org/compiere/cm/cache/Container.java index d6afa87e23..83525bccd0 100644 --- a/webCM/src/main/servlet/org/compiere/cm/cache/Container.java +++ b/webCM/src/main/servlet/org/compiere/cm/cache/Container.java @@ -16,7 +16,8 @@ *****************************************************************************/ package org.compiere.cm.cache; -import java.util.*; +import java.util.Hashtable; + import org.compiere.model.MContainer; /** diff --git a/webCM/src/main/servlet/org/compiere/cm/cache/ContainerElement.java b/webCM/src/main/servlet/org/compiere/cm/cache/ContainerElement.java index 24814a93a9..73dfcfbea9 100644 --- a/webCM/src/main/servlet/org/compiere/cm/cache/ContainerElement.java +++ b/webCM/src/main/servlet/org/compiere/cm/cache/ContainerElement.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.cm.cache; -import org.compiere.model.MContainerElement; +import org.compiere.model.MContainerElement; /** * Container Element Cache diff --git a/webCM/src/main/servlet/org/compiere/cm/cache/ContainerTree.java b/webCM/src/main/servlet/org/compiere/cm/cache/ContainerTree.java index 903385268b..8c431b4cde 100644 --- a/webCM/src/main/servlet/org/compiere/cm/cache/ContainerTree.java +++ b/webCM/src/main/servlet/org/compiere/cm/cache/ContainerTree.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.cm.cache; -import java.util.*; +import java.util.Hashtable; import org.compiere.cm.utils.TreeXML; import org.compiere.model.MWebProject; diff --git a/webCM/src/main/servlet/org/compiere/cm/cache/Domain.java b/webCM/src/main/servlet/org/compiere/cm/cache/Domain.java index 2ba1a03ebc..3cb4283589 100644 --- a/webCM/src/main/servlet/org/compiere/cm/cache/Domain.java +++ b/webCM/src/main/servlet/org/compiere/cm/cache/Domain.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.cm.cache; -import org.compiere.model.*; +import org.compiere.model.MWebProjectDomain; /** * @author Yves Sandfort diff --git a/webCM/src/main/servlet/org/compiere/cm/cache/MediaServer.java b/webCM/src/main/servlet/org/compiere/cm/cache/MediaServer.java index bf81777e30..d3d1ea1690 100644 --- a/webCM/src/main/servlet/org/compiere/cm/cache/MediaServer.java +++ b/webCM/src/main/servlet/org/compiere/cm/cache/MediaServer.java @@ -16,7 +16,9 @@ *****************************************************************************/ package org.compiere.cm.cache; -import java.util.*; +import java.util.Hashtable; +import java.util.Properties; + import org.compiere.model.MMediaServer; /** diff --git a/webCM/src/main/servlet/org/compiere/cm/cache/Service.java b/webCM/src/main/servlet/org/compiere/cm/cache/Service.java index d7ce3339c8..aeff511bcd 100644 --- a/webCM/src/main/servlet/org/compiere/cm/cache/Service.java +++ b/webCM/src/main/servlet/org/compiere/cm/cache/Service.java @@ -23,7 +23,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.compiere.cm.*; +import org.compiere.cm.HttpServletCM; /** * Cache Object Service classes diff --git a/webCM/src/main/servlet/org/compiere/cm/cache/WebProject.java b/webCM/src/main/servlet/org/compiere/cm/cache/WebProject.java index e9bbb2843c..f25cb4a9ae 100644 --- a/webCM/src/main/servlet/org/compiere/cm/cache/WebProject.java +++ b/webCM/src/main/servlet/org/compiere/cm/cache/WebProject.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.cm.cache; -import org.compiere.model.*; +import org.compiere.model.MWebProject; /** * Web Project Cache diff --git a/webCM/src/main/servlet/org/compiere/cm/cache/XML.java b/webCM/src/main/servlet/org/compiere/cm/cache/XML.java index 07938f8bdf..198e406915 100644 --- a/webCM/src/main/servlet/org/compiere/cm/cache/XML.java +++ b/webCM/src/main/servlet/org/compiere/cm/cache/XML.java @@ -16,8 +16,9 @@ *****************************************************************************/ package org.compiere.cm.cache; -import java.util.*; -import org.compiere.model.*; +import java.util.Hashtable; + +import org.compiere.model.MCountry; public class XML extends CO { diff --git a/webCM/src/main/servlet/org/compiere/cm/extend/indexSearch.java b/webCM/src/main/servlet/org/compiere/cm/extend/indexSearch.java index 8f458793ca..3e38e63745 100644 --- a/webCM/src/main/servlet/org/compiere/cm/extend/indexSearch.java +++ b/webCM/src/main/servlet/org/compiere/cm/extend/indexSearch.java @@ -15,8 +15,9 @@ *****************************************************************************/ package org.compiere.cm.extend; -import javax.servlet.http.*; -import java.util.*; +import java.util.Properties; + +import javax.servlet.http.HttpServletRequest; /** * Search the index for results diff --git a/webCM/src/main/servlet/org/compiere/cm/request/Request.java b/webCM/src/main/servlet/org/compiere/cm/request/Request.java index 231e33e096..a3b1b36fe6 100644 --- a/webCM/src/main/servlet/org/compiere/cm/request/Request.java +++ b/webCM/src/main/servlet/org/compiere/cm/request/Request.java @@ -15,17 +15,17 @@ *****************************************************************************/ package org.compiere.cm.request; -import java.math.BigDecimal; -import java.sql.Timestamp; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Properties; - -import javax.servlet.http.HttpServletRequest; - -import org.compiere.model.MRequest; -import org.compiere.util.DB; +import java.math.BigDecimal; +import java.sql.Timestamp; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Properties; + +import javax.servlet.http.HttpServletRequest; + +import org.compiere.model.MRequest; +import org.compiere.util.DB; /** * Request Class to create or update Requests. diff --git a/webCM/src/main/servlet/org/compiere/cm/utils/AccessLogger.java b/webCM/src/main/servlet/org/compiere/cm/utils/AccessLogger.java index e345043789..794009d106 100644 --- a/webCM/src/main/servlet/org/compiere/cm/utils/AccessLogger.java +++ b/webCM/src/main/servlet/org/compiere/cm/utils/AccessLogger.java @@ -16,11 +16,13 @@ *****************************************************************************/ package org.compiere.cm.utils; -import javax.servlet.http.*; import java.math.BigDecimal; import java.util.Properties; -import org.compiere.cm.*; -import org.compiere.model.*; + +import javax.servlet.http.HttpServletRequest; + +import org.compiere.cm.HttpServletCM; +import org.compiere.model.X_CM_WebAccessLog; import org.compiere.util.Env; diff --git a/webCM/src/main/servlet/org/compiere/cm/utils/Counter.java b/webCM/src/main/servlet/org/compiere/cm/utils/Counter.java index 57cc7e1190..6eab567d4d 100644 --- a/webCM/src/main/servlet/org/compiere/cm/utils/Counter.java +++ b/webCM/src/main/servlet/org/compiere/cm/utils/Counter.java @@ -16,7 +16,8 @@ *****************************************************************************/ package org.compiere.cm.utils; -import javax.servlet.http.*; +import javax.servlet.http.HttpSessionEvent; +import javax.servlet.http.HttpSessionListener; /** * @author YS diff --git a/webCM/src/main/servlet/org/compiere/cm/utils/LocaleHandler.java b/webCM/src/main/servlet/org/compiere/cm/utils/LocaleHandler.java index 08e4bfee60..986bb7f7f5 100644 --- a/webCM/src/main/servlet/org/compiere/cm/utils/LocaleHandler.java +++ b/webCM/src/main/servlet/org/compiere/cm/utils/LocaleHandler.java @@ -16,7 +16,9 @@ *****************************************************************************/ package org.compiere.cm.utils; -import java.util.*; +import java.util.Hashtable; +import java.util.Locale; +import java.util.StringTokenizer; /** * @author YS diff --git a/webCM/src/main/servlet/org/compiere/cm/utils/RequestAnalyzer.java b/webCM/src/main/servlet/org/compiere/cm/utils/RequestAnalyzer.java index b93dc6b7b9..18730e6ffe 100644 --- a/webCM/src/main/servlet/org/compiere/cm/utils/RequestAnalyzer.java +++ b/webCM/src/main/servlet/org/compiere/cm/utils/RequestAnalyzer.java @@ -16,16 +16,23 @@ *****************************************************************************/ package org.compiere.cm.utils; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import java.lang.reflect.Constructor; import java.net.MalformedURLException; import java.net.URL; import java.util.Properties; -import org.compiere.model.*; -import org.compiere.cm.cache.*; -import org.compiere.cm.*; -import org.compiere.util.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.compiere.cm.Extend; +import org.compiere.cm.HttpServletCM; +import org.compiere.cm.cache.Container; +import org.compiere.cm.cache.Domain; +import org.compiere.cm.cache.WebProject; +import org.compiere.model.MContainer; +import org.compiere.model.MWebProject; +import org.compiere.model.MWebProjectDomain; +import org.compiere.util.CLogger; /** * RequestAnalyzer diff --git a/webCM/src/main/servlet/org/compiere/cm/xml/XSLTProcessor.java b/webCM/src/main/servlet/org/compiere/cm/xml/XSLTProcessor.java index 54e47a0237..491b44da95 100644 --- a/webCM/src/main/servlet/org/compiere/cm/xml/XSLTProcessor.java +++ b/webCM/src/main/servlet/org/compiere/cm/xml/XSLTProcessor.java @@ -16,11 +16,17 @@ *****************************************************************************/ package org.compiere.cm.xml; -import java.io.*; -import java.util.*; -import javax.servlet.http.*; -import javax.xml.transform.*; -import javax.xml.transform.stream.*; +import java.io.ByteArrayOutputStream; +import java.io.OutputStream; +import java.io.StringReader; +import java.util.Calendar; +import java.util.Enumeration; + +import javax.servlet.http.HttpServletRequest; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; /** * @author YS