From 1ba06c565ec314b8e189a25e7aead8b3a4ce3ad5 Mon Sep 17 00:00:00 2001 From: idfx Date: Wed, 5 Mar 2003 19:23:14 +0000 Subject: [PATCH] organizing imports --- source/Mir.java | 22 ++++++++---------- source/OpenMir.java | 7 +++--- source/mir/config/MirPropertiesConfiguration.java | 11 +++++---- source/mir/entity/Entity.java | 17 ++++++-------- source/mir/entity/EntityList.java | 7 +++--- source/mir/generator/FreemarkerGenerator.java | 6 ++--- .../mir/generator/GeneratorLibraryRepository.java | 2 +- source/mir/log/LoggerWrapper.java | 2 +- source/mir/log/log4j/LoggerImpl.java | 8 +++---- source/mir/misc/HTMLTemplateProcessor.java | 26 +++++++++++++++------- source/mir/misc/WebdbImage.java | 6 ++--- source/mir/misc/WebdbMultipartRequest.java | 2 +- source/mir/module/AbstractModule.java | 3 +-- .../reader/DefaultProducerNodeBuilders.java | 3 ++- .../mir/producer/reader/ProducerNodeBuilder.java | 2 +- source/mir/servlet/ServletModule.java | 11 +++++---- source/mir/storage/Database.java | 23 ++++++------------- source/mir/storage/DatabaseAdaptor.java | 6 ++--- source/mir/storage/DatabaseAdaptorMySQL.java | 5 ++--- source/mir/storage/DatabaseAdaptorOracle.java | 5 ++--- source/mir/storage/DatabaseAdaptorPostgresql.java | 5 ++--- source/mir/storage/DatabaseAdaptorSybase.java | 5 ++--- source/mir/storage/StorageObject.java | 12 +++++----- source/mir/storage/store/ObjectStore.java | 2 +- source/mir/util/XMLReader.java | 16 ++++++++----- source/mircoders/entity/EntityContent.java | 13 +++++------ source/mircoders/entity/EntityUploadedMedia.java | 14 +++++------- source/mircoders/entity/EntityVideo.java | 2 +- source/mircoders/global/MirGlobal.java | 5 +++-- .../basic/MirBasicAdminInterfaceLocalizer.java | 2 +- .../basic/MirBasicDataModelLocalizer.java | 2 +- .../basic/MirBasicGeneratorLocalizer.java | 1 - source/mircoders/media/MediaHandlerGeneric.java | 8 +++---- source/mircoders/media/MediaHandlerImages.java | 8 +++---- .../mircoders/media/MediaHandlerImagesExtern.java | 3 +-- source/mircoders/media/MediaHandlerMp3.java | 9 ++++---- source/mircoders/media/MediaHandlerRealAudio.java | 9 ++++---- source/mircoders/media/MediaHandlerRealVideo.java | 11 +++++---- source/mircoders/media/MediaRequest.java | 11 +++++---- source/mircoders/module/ModuleContent.java | 4 ++-- source/mircoders/module/ModuleTopics.java | 10 ++------- source/mircoders/module/ModuleUsers.java | 7 +----- .../mircoders/producer/IndexingProducerNode.java | 17 +++----------- .../reader/SupplementalProducerNodeBuilders.java | 4 ++-- source/mircoders/servlet/ServletHelper.java | 4 ++-- source/mircoders/servlet/ServletModuleComment.java | 2 +- source/mircoders/servlet/ServletModuleContent.java | 3 +-- .../mircoders/servlet/ServletModuleOpenIndy.java | 4 ++-- .../servlet/ServletModuleUploadedMedia.java | 6 ++--- source/mircoders/servlet/ServletModuleUsers.java | 4 +--- source/mircoders/storage/DatabaseAudio.java | 2 +- source/mircoders/storage/DatabaseContent.java | 2 +- .../mircoders/storage/DatabaseContentToMedia.java | 5 ++--- .../mircoders/storage/DatabaseContentToTopics.java | 2 +- source/mircoders/storage/DatabaseFeature.java | 2 +- source/mircoders/storage/DatabaseImageColor.java | 2 +- source/mircoders/storage/DatabaseImageFormat.java | 2 +- source/mircoders/storage/DatabaseImageLayout.java | 2 +- source/mircoders/storage/DatabaseImageType.java | 3 +-- source/mircoders/storage/DatabaseImages.java | 5 ++--- source/mircoders/storage/DatabaseLanguage.java | 3 +-- source/mircoders/storage/DatabaseLinksImcs.java | 2 +- source/mircoders/storage/DatabaseMedia.java | 2 +- source/mircoders/storage/DatabaseOther.java | 2 +- .../mircoders/storage/DatabaseUploadedMedia.java | 2 +- source/mircoders/storage/DatabaseVideo.java | 2 +- 66 files changed, 183 insertions(+), 234 deletions(-) diff --git a/source/Mir.java b/source/Mir.java index b61308b6..dc7cca00 100755 --- a/source/Mir.java +++ b/source/Mir.java @@ -31,9 +31,7 @@ import java.io.IOException; import java.io.PrintWriter; - import java.lang.reflect.Method; - import java.util.GregorianCalendar; import java.util.HashMap; import java.util.Iterator; @@ -48,14 +46,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.struts.util.MessageResources; - - -import freemarker.template.SimpleHash; -import freemarker.template.SimpleList; -import freemarker.template.SimpleScalar; -import freemarker.template.TemplateModel; - import mir.config.MirPropertiesConfiguration; import mir.generator.FreemarkerGenerator; import mir.log.LoggerWrapper; @@ -67,7 +57,6 @@ import mir.servlet.ServletModuleDispatch; import mir.servlet.ServletModuleException; import mir.servlet.ServletModuleUserException; import mir.util.StringRoutines; - import mircoders.entity.EntityUsers; import mircoders.global.MirGlobal; import mircoders.module.ModuleMessage; @@ -76,13 +65,20 @@ import mircoders.storage.DatabaseArticleType; import mircoders.storage.DatabaseMessages; import mircoders.storage.DatabaseUsers; +import org.apache.struts.util.MessageResources; + +import freemarker.template.SimpleHash; +import freemarker.template.SimpleList; +import freemarker.template.SimpleScalar; +import freemarker.template.TemplateModel; + /** * Mir.java - main servlet, that dispatches to servletmodules * - * @author $Author: zapata $ - * @version $Id: Mir.java,v 1.31 2003/03/04 22:00:51 zapata Exp $ + * @author $Author: idfx $ + * @version $Id: Mir.java,v 1.32 2003/03/05 19:23:14 idfx Exp $ * */ public class Mir extends AbstractServlet { diff --git a/source/OpenMir.java b/source/OpenMir.java index 32289d34..8235d74d 100755 --- a/source/OpenMir.java +++ b/source/OpenMir.java @@ -39,9 +39,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import freemarker.template.SimpleHash; -import freemarker.template.SimpleScalar; - import mir.config.MirPropertiesConfiguration; import mir.misc.HTMLTemplateProcessor; import mir.misc.StringUtil; @@ -50,12 +47,14 @@ import mir.servlet.ServletModuleDispatch; import mir.servlet.ServletModuleException; import mir.servlet.ServletModuleUserException; import mircoders.servlet.ServletModuleOpenIndy; +import freemarker.template.SimpleHash; +import freemarker.template.SimpleScalar; /** * OpenMir.java - main servlet for open posting and comment feature to articles * * @author RK 1999-2001, the mir-coders group - * @version $Id: OpenMir.java,v 1.20 2003/02/23 05:00:10 zapata Exp $ + * @version $Id: OpenMir.java,v 1.21 2003/03/05 19:23:14 idfx Exp $ * */ diff --git a/source/mir/config/MirPropertiesConfiguration.java b/source/mir/config/MirPropertiesConfiguration.java index 2d618e0e..4d2775bb 100755 --- a/source/mir/config/MirPropertiesConfiguration.java +++ b/source/mir/config/MirPropertiesConfiguration.java @@ -30,21 +30,20 @@ */ package mir.config; -import multex.Exc; -import multex.Failure; - -import org.apache.commons.configuration.PropertiesConfiguration; - import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; - import java.util.HashMap; import java.util.Iterator; import java.util.Map; import javax.servlet.ServletContext; +import multex.Exc; +import multex.Failure; + +import org.apache.commons.configuration.PropertiesConfiguration; + /** * @author idefix diff --git a/source/mir/entity/Entity.java b/source/mir/entity/Entity.java index 85ae7121..84e87b5a 100755 --- a/source/mir/entity/Entity.java +++ b/source/mir/entity/Entity.java @@ -36,17 +36,9 @@ package mir.entity; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Set; - -import freemarker.template.SimpleScalar; -import freemarker.template.TemplateHashModel; -import freemarker.template.TemplateModel; -import freemarker.template.TemplateModelException; -import freemarker.template.TemplateModelRoot; import mir.config.MirPropertiesConfiguration; import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; @@ -55,12 +47,17 @@ import mir.misc.StringUtil; import mir.storage.StorageObject; import mir.storage.StorageObjectExc; import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleScalar; +import freemarker.template.TemplateHashModel; +import freemarker.template.TemplateModel; +import freemarker.template.TemplateModelException; +import freemarker.template.TemplateModelRoot; /** * Base Class of Entities * Interfacing TemplateHashModel and TemplateModelRoot to be freemarker compliant * - * @version $Id: Entity.java,v 1.17 2003/03/04 22:00:51 zapata Exp $ + * @version $Id: Entity.java,v 1.18 2003/03/05 19:23:14 idfx Exp $ * @author rk * */ diff --git a/source/mir/entity/EntityList.java b/source/mir/entity/EntityList.java index b2fc95ba..14170d0f 100755 --- a/source/mir/entity/EntityList.java +++ b/source/mir/entity/EntityList.java @@ -34,17 +34,16 @@ package mir.entity; import java.util.ArrayList; import java.util.Set; -import freemarker.template.TemplateListModel; -import freemarker.template.TemplateModel; - -import mir.log.LoggerWrapper; import mir.config.MirPropertiesConfiguration; import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; +import mir.log.LoggerWrapper; import mir.storage.StorageObject; import mir.storage.store.StorableObject; import mir.storage.store.StoreContainerType; import mir.storage.store.StoreIdentifier; import mir.storage.store.StoreUtil; +import freemarker.template.TemplateListModel; +import freemarker.template.TemplateModel; /** * diff --git a/source/mir/generator/FreemarkerGenerator.java b/source/mir/generator/FreemarkerGenerator.java index eef3d71f..9de46480 100755 --- a/source/mir/generator/FreemarkerGenerator.java +++ b/source/mir/generator/FreemarkerGenerator.java @@ -38,6 +38,9 @@ import java.util.List; import java.util.Map; import java.util.Vector; +import mir.misc.MessageMethodModel; +import mir.util.RewindableIterator; + import org.apache.struts.util.MessageResources; import freemarker.template.FileTemplateCache; @@ -51,9 +54,6 @@ import freemarker.template.TemplateModelException; import freemarker.template.TemplateModelRoot; import freemarker.template.TemplateScalarModel; -import mir.misc.MessageMethodModel; -import mir.util.RewindableIterator; - public class FreemarkerGenerator implements Generator { private Template template; diff --git a/source/mir/generator/GeneratorLibraryRepository.java b/source/mir/generator/GeneratorLibraryRepository.java index 1ac0669c..06dde953 100755 --- a/source/mir/generator/GeneratorLibraryRepository.java +++ b/source/mir/generator/GeneratorLibraryRepository.java @@ -3,8 +3,8 @@ package mir.generator; import java.util.HashMap; import java.util.Map; -import mir.util.SimpleParser; import mir.log.LoggerWrapper; +import mir.util.SimpleParser; public class GeneratorLibraryRepository { private Map factories; diff --git a/source/mir/log/LoggerWrapper.java b/source/mir/log/LoggerWrapper.java index 2b97f93d..bf396ce4 100755 --- a/source/mir/log/LoggerWrapper.java +++ b/source/mir/log/LoggerWrapper.java @@ -1,6 +1,6 @@ package mir.log; -import java.io.*; +import java.io.PrintWriter; public class LoggerWrapper { private Object object; diff --git a/source/mir/log/log4j/LoggerImpl.java b/source/mir/log/log4j/LoggerImpl.java index 3d8adfbb..3470bff8 100755 --- a/source/mir/log/log4j/LoggerImpl.java +++ b/source/mir/log/log4j/LoggerImpl.java @@ -1,13 +1,13 @@ package mir.log.log4j; +import java.util.HashMap; +import java.util.Map; + import mir.config.MirPropertiesConfiguration; import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; -import org.apache.log4j.PropertyConfigurator; import org.apache.log4j.Logger; - -import java.util.Map; -import java.util.HashMap; +import org.apache.log4j.PropertyConfigurator; public class LoggerImpl implements mir.log.Logger { diff --git a/source/mir/misc/HTMLTemplateProcessor.java b/source/mir/misc/HTMLTemplateProcessor.java index 46775f27..04d9d406 100755 --- a/source/mir/misc/HTMLTemplateProcessor.java +++ b/source/mir/misc/HTMLTemplateProcessor.java @@ -33,22 +33,32 @@ package mir.misc; import java.io.PrintWriter; import java.net.URLEncoder; -import java.util.*; +import java.util.GregorianCalendar; +import java.util.Iterator; +import java.util.Locale; +import java.util.Map; +import java.util.Set; import javax.servlet.http.HttpServletResponse; -import org.apache.struts.util.MessageResources; - -import freemarker.template.*; - -import mir.log.LoggerWrapper; -import mir.util.*; -import mir.generator.*; import mir.config.MirPropertiesConfiguration; import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; import mir.entity.Entity; import mir.entity.EntityList; +import mir.generator.FreemarkerGenerator; +import mir.log.LoggerWrapper; import mir.storage.StorageObjectFailure; +import mir.util.GeneratorHTMLFunctions; +import mir.util.GeneratorIntegerFunctions; + +import org.apache.struts.util.MessageResources; + +import freemarker.template.FileTemplateCache; +import freemarker.template.SimpleHash; +import freemarker.template.SimpleList; +import freemarker.template.SimpleScalar; +import freemarker.template.Template; +import freemarker.template.TemplateModelRoot; /** * Hilfsklasse zum Mergen von Template und Daten diff --git a/source/mir/misc/WebdbImage.java b/source/mir/misc/WebdbImage.java index bb9c8e79..136acb15 100755 --- a/source/mir/misc/WebdbImage.java +++ b/source/mir/misc/WebdbImage.java @@ -36,7 +36,7 @@ package mir.misc; * Description: * Copyright: Copyright (c) 2002 Mir-coders * @author $Author: idfx $ - * @version $Id: WebdbImage.java,v 1.11 2003/02/28 18:27:07 idfx Exp $ + * @version $Id: WebdbImage.java,v 1.12 2003/03/05 19:23:14 idfx Exp $ */ import java.io.File; @@ -49,10 +49,10 @@ import javax.media.jai.JAI; import javax.media.jai.ParameterBlockJAI; import javax.media.jai.PlanarImage; -import com.sun.media.jai.codec.FileSeekableStream; - import mir.config.MirPropertiesConfiguration; +import com.sun.media.jai.codec.FileSeekableStream; + public class WebdbImage { diff --git a/source/mir/misc/WebdbMultipartRequest.java b/source/mir/misc/WebdbMultipartRequest.java index d421d12d..4735fd12 100755 --- a/source/mir/misc/WebdbMultipartRequest.java +++ b/source/mir/misc/WebdbMultipartRequest.java @@ -34,8 +34,8 @@ package mir.misc; import java.io.IOException; import java.util.Enumeration; import java.util.HashMap; -import java.util.Map; import java.util.Hashtable; +import java.util.Map; import java.util.Vector; import javax.servlet.http.HttpServletRequest; diff --git a/source/mir/module/AbstractModule.java b/source/mir/module/AbstractModule.java index 0a70fca2..718925dc 100755 --- a/source/mir/module/AbstractModule.java +++ b/source/mir/module/AbstractModule.java @@ -34,13 +34,12 @@ package mir.module; import java.sql.SQLException; import java.util.Map; -import freemarker.template.SimpleHash; - import mir.entity.Entity; import mir.entity.EntityList; import mir.storage.StorageObject; import mir.storage.StorageObjectExc; import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleHash; /** diff --git a/source/mir/producer/reader/DefaultProducerNodeBuilders.java b/source/mir/producer/reader/DefaultProducerNodeBuilders.java index a551e28e..fcfc3b3a 100755 --- a/source/mir/producer/reader/DefaultProducerNodeBuilders.java +++ b/source/mir/producer/reader/DefaultProducerNodeBuilders.java @@ -57,7 +57,8 @@ import mir.producer.LoopProducerNode; import mir.producer.ProducerNode; import mir.producer.ResourceBundleProducerNode; import mir.producer.ScriptCallingProducerNode; -import mir.util.*; +import mir.util.XMLReader; +import mir.util.XMLReaderTool; public class DefaultProducerNodeBuilders { diff --git a/source/mir/producer/reader/ProducerNodeBuilder.java b/source/mir/producer/reader/ProducerNodeBuilder.java index 5cb16fcb..0fd85d63 100755 --- a/source/mir/producer/reader/ProducerNodeBuilder.java +++ b/source/mir/producer/reader/ProducerNodeBuilder.java @@ -35,7 +35,7 @@ import java.util.Map; import java.util.Set; import mir.producer.ProducerNode; -import mir.util.*; +import mir.util.XMLReader; public interface ProducerNodeBuilder { public void setAttributes(Map anAttributes) throws ProducerConfigExc, XMLReader.XMLReaderExc; diff --git a/source/mir/servlet/ServletModule.java b/source/mir/servlet/ServletModule.java index 265fb974..1e9185da 100755 --- a/source/mir/servlet/ServletModule.java +++ b/source/mir/servlet/ServletModule.java @@ -33,18 +33,15 @@ package mir.servlet; import java.io.IOException; import java.io.PrintWriter; -import java.util.List; -import java.util.Map; import java.util.HashMap; +import java.util.List; import java.util.Locale; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import freemarker.template.SimpleHash; -import freemarker.template.TemplateModelRoot; - import mir.config.MirPropertiesConfiguration; import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; import mir.entity.EntityList; @@ -55,7 +52,9 @@ import mir.misc.LineFilterWriter; import mir.module.AbstractModule; import mir.module.ModuleException; import mir.storage.StorageObject; -import mir.util.*; +import mir.util.HTTPRequestParser; +import freemarker.template.SimpleHash; +import freemarker.template.TemplateModelRoot; diff --git a/source/mir/storage/Database.java b/source/mir/storage/Database.java index 2482ba1c..66211910 100755 --- a/source/mir/storage/Database.java +++ b/source/mir/storage/Database.java @@ -32,7 +32,6 @@ package mir.storage; import java.io.IOException; import java.io.InputStreamReader; - import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -40,43 +39,35 @@ import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.sql.Statement; import java.sql.Timestamp; - import java.text.ParseException; import java.text.SimpleDateFormat; - import java.util.ArrayList; -import java.util.List; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.HashMap; +import java.util.List; import java.util.Map; -import com.codestudio.util.SQLManager; - -import freemarker.template.SimpleHash; -import freemarker.template.SimpleList; - import mir.config.MirPropertiesConfiguration; - import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; - import mir.entity.Entity; import mir.entity.EntityList; import mir.entity.StorableObjectEntity; - import mir.log.LoggerWrapper; - import mir.misc.HTMLTemplateProcessor; import mir.misc.StringUtil; - import mir.storage.store.ObjectStore; import mir.storage.store.StorableObject; import mir.storage.store.StoreContainerType; import mir.storage.store.StoreIdentifier; import mir.storage.store.StoreUtil; - import mir.util.JDBCStringRoutines; +import com.codestudio.util.SQLManager; + +import freemarker.template.SimpleHash; +import freemarker.template.SimpleList; + /** * Diese Klasse implementiert die Zugriffsschicht auf die Datenbank. @@ -86,7 +77,7 @@ import mir.util.JDBCStringRoutines; * Treiber, Host, User und Passwort, ueber den der Zugriff auf die * Datenbank erfolgt. * - * @version $Id: Database.java,v 1.35 2003/03/04 22:00:52 zapata Exp $ + * @version $Id: Database.java,v 1.36 2003/03/05 19:23:15 idfx Exp $ * @author rk * */ diff --git a/source/mir/storage/DatabaseAdaptor.java b/source/mir/storage/DatabaseAdaptor.java index c70030fb..614c2a52 100755 --- a/source/mir/storage/DatabaseAdaptor.java +++ b/source/mir/storage/DatabaseAdaptor.java @@ -30,10 +30,10 @@ */ package mir.storage; -import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; - import java.util.Properties; +import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; + /** * Interfacedefinition f?r Datenbank-Adpatoren. Die Adaptoren legen @@ -42,7 +42,7 @@ import java.util.Properties; * * @author * - * @version $Id: DatabaseAdaptor.java,v 1.5 2003/01/28 21:48:30 idfx Exp $ + * @version $Id: DatabaseAdaptor.java,v 1.6 2003/03/05 19:23:15 idfx Exp $ */ public interface DatabaseAdaptor { /* Liefert den Namen der Adaptorklasse diff --git a/source/mir/storage/DatabaseAdaptorMySQL.java b/source/mir/storage/DatabaseAdaptorMySQL.java index 1e6c9038..21f94cd6 100755 --- a/source/mir/storage/DatabaseAdaptorMySQL.java +++ b/source/mir/storage/DatabaseAdaptorMySQL.java @@ -30,12 +30,11 @@ */ package mir.storage; -import mir.config.MirPropertiesConfiguration; +import java.util.Properties; +import mir.config.MirPropertiesConfiguration; import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; -import java.util.Properties; - /** * Diese Klasse implementiert die abstrakte Klasse DatabaseAdaptor diff --git a/source/mir/storage/DatabaseAdaptorOracle.java b/source/mir/storage/DatabaseAdaptorOracle.java index e18a98a6..fc20498d 100755 --- a/source/mir/storage/DatabaseAdaptorOracle.java +++ b/source/mir/storage/DatabaseAdaptorOracle.java @@ -33,12 +33,11 @@ */ package mir.storage; -import mir.config.MirPropertiesConfiguration; +import java.util.Properties; +import mir.config.MirPropertiesConfiguration; import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; -import java.util.Properties; - /** * Diese Klasse implementiert Interface DatabaseAdaptor fuer Oracle diff --git a/source/mir/storage/DatabaseAdaptorPostgresql.java b/source/mir/storage/DatabaseAdaptorPostgresql.java index 841ff6f4..87130746 100755 --- a/source/mir/storage/DatabaseAdaptorPostgresql.java +++ b/source/mir/storage/DatabaseAdaptorPostgresql.java @@ -30,12 +30,11 @@ */ package mir.storage; -import mir.config.MirPropertiesConfiguration; +import java.util.Properties; +import mir.config.MirPropertiesConfiguration; import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; -import java.util.Properties; - /** * Diese Klasse implementiert die abstrakte Klasse DatabaseAdaptor f?r Postgresql-Datenbanken diff --git a/source/mir/storage/DatabaseAdaptorSybase.java b/source/mir/storage/DatabaseAdaptorSybase.java index a55a1e38..3e7b0583 100755 --- a/source/mir/storage/DatabaseAdaptorSybase.java +++ b/source/mir/storage/DatabaseAdaptorSybase.java @@ -33,12 +33,11 @@ */ package mir.storage; -import mir.config.MirPropertiesConfiguration; +import java.util.Properties; +import mir.config.MirPropertiesConfiguration; import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; -import java.util.Properties; - /** * Diese Klasse implementiert Interface DatabaseAdaptor fuer Sybase diff --git a/source/mir/storage/StorageObject.java b/source/mir/storage/StorageObject.java index ac85d056..99e4c431 100755 --- a/source/mir/storage/StorageObject.java +++ b/source/mir/storage/StorageObject.java @@ -35,19 +35,17 @@ */ package mir.storage; -import freemarker.template.SimpleHash; -import freemarker.template.SimpleList; - -import mir.entity.Entity; -import mir.entity.EntityList; - import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; - import java.util.List; +import mir.entity.Entity; +import mir.entity.EntityList; +import freemarker.template.SimpleHash; +import freemarker.template.SimpleList; + /** * Implementiert Interface f?r die Speicherschicht. diff --git a/source/mir/storage/store/ObjectStore.java b/source/mir/storage/store/ObjectStore.java index e117bcf5..de9803a1 100755 --- a/source/mir/storage/store/ObjectStore.java +++ b/source/mir/storage/store/ObjectStore.java @@ -63,9 +63,9 @@ package mir.storage.store; import java.io.BufferedInputStream; import java.io.FileInputStream; -import java.util.Map; import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import java.util.MissingResourceException; import java.util.Properties; diff --git a/source/mir/util/XMLReader.java b/source/mir/util/XMLReader.java index 0a814f23..6f77dcae 100755 --- a/source/mir/util/XMLReader.java +++ b/source/mir/util/XMLReader.java @@ -31,13 +31,22 @@ package mir.util; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Stack; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; +import multex.Exc; +import multex.Failure; + import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.Locator; @@ -45,9 +54,6 @@ import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import org.xml.sax.helpers.DefaultHandler; -import multex.Failure; -import multex.Exc; - public class XMLReader { private Locator locator; private String filename; diff --git a/source/mircoders/entity/EntityContent.java b/source/mircoders/entity/EntityContent.java index 5c4f6da4..3e6bbb30 100755 --- a/source/mircoders/entity/EntityContent.java +++ b/source/mircoders/entity/EntityContent.java @@ -34,28 +34,27 @@ package mircoders.entity; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; -import java.util.Map; import java.util.HashMap; +import java.util.Map; -import freemarker.template.SimpleScalar; -import freemarker.template.TemplateModel; -import freemarker.template.TemplateModelException; - -import mir.log.LoggerWrapper; import mir.entity.Entity; import mir.entity.EntityList; +import mir.log.LoggerWrapper; import mir.storage.StorageObject; import mir.storage.StorageObjectExc; import mir.storage.StorageObjectFailure; import mircoders.storage.DatabaseContent; import mircoders.storage.DatabaseContentToMedia; import mircoders.storage.DatabaseContentToTopics; +import freemarker.template.SimpleScalar; +import freemarker.template.TemplateModel; +import freemarker.template.TemplateModelException; /** * this class implements mapping of one line of the database table content * to a java object * - * @version $Id: EntityContent.java,v 1.16 2003/03/04 22:00:53 zapata Exp $ + * @version $Id: EntityContent.java,v 1.17 2003/03/05 19:23:15 idfx Exp $ * @author mir-coders group * */ diff --git a/source/mircoders/entity/EntityUploadedMedia.java b/source/mircoders/entity/EntityUploadedMedia.java index 0ef98fb5..9f90ca35 100755 --- a/source/mircoders/entity/EntityUploadedMedia.java +++ b/source/mircoders/entity/EntityUploadedMedia.java @@ -33,27 +33,25 @@ package mircoders.entity; import java.util.Map; -import freemarker.template.SimpleList; -import freemarker.template.SimpleScalar; -import freemarker.template.TemplateModel; -import freemarker.template.TemplateModelException; - import mir.entity.Entity; import mir.entity.EntityList; +import mir.log.LoggerWrapper; import mir.media.MediaHelper; import mir.media.MirMedia; import mir.misc.NumberUtils; import mir.storage.StorageObject; import mir.storage.StorageObjectFailure; -import mir.log.LoggerWrapper; - import mircoders.storage.DatabaseContentToMedia; import mircoders.storage.DatabaseUploadedMedia; +import freemarker.template.SimpleList; +import freemarker.template.SimpleScalar; +import freemarker.template.TemplateModel; +import freemarker.template.TemplateModelException; /** * * @author mh, mir-coders group - * @version $Id: EntityUploadedMedia.java,v 1.21 2003/03/04 22:00:53 zapata Exp $ + * @version $Id: EntityUploadedMedia.java,v 1.22 2003/03/05 19:23:15 idfx Exp $ */ diff --git a/source/mircoders/entity/EntityVideo.java b/source/mircoders/entity/EntityVideo.java index 97cb75ae..01c63eef 100755 --- a/source/mircoders/entity/EntityVideo.java +++ b/source/mircoders/entity/EntityVideo.java @@ -34,9 +34,9 @@ package mircoders.entity; import java.sql.SQLException; import java.util.Map; +import mir.log.LoggerWrapper; import mir.storage.StorageObject; import mir.storage.StorageObjectFailure; -import mir.log.LoggerWrapper; /** * Diese Klasse enth?lt die Daten eines MetaObjekts diff --git a/source/mircoders/global/MirGlobal.java b/source/mircoders/global/MirGlobal.java index 8bd47117..6641b1d6 100755 --- a/source/mircoders/global/MirGlobal.java +++ b/source/mircoders/global/MirGlobal.java @@ -33,8 +33,9 @@ package mircoders.global; import mir.config.MirPropertiesConfiguration; import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; -import mir.misc.*; -import mircoders.localizer.*; +import mir.misc.ConfigException; +import mircoders.localizer.MirCachingLocalizerDecorator; +import mircoders.localizer.MirLocalizer; public class MirGlobal { static private MirPropertiesConfiguration configuration; diff --git a/source/mircoders/localizer/basic/MirBasicAdminInterfaceLocalizer.java b/source/mircoders/localizer/basic/MirBasicAdminInterfaceLocalizer.java index 1d871589..9d7831da 100755 --- a/source/mircoders/localizer/basic/MirBasicAdminInterfaceLocalizer.java +++ b/source/mircoders/localizer/basic/MirBasicAdminInterfaceLocalizer.java @@ -40,8 +40,8 @@ import java.util.Vector; import mir.entity.Entity; import mir.entity.adapter.EntityAdapter; -import mir.storage.StorageObjectFailure; import mir.misc.StringUtil; +import mir.storage.StorageObjectFailure; import mir.util.StringRoutines; import mircoders.entity.EntityComment; import mircoders.entity.EntityContent; diff --git a/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java b/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java index fe7b59e0..e5229ba6 100755 --- a/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java +++ b/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java @@ -41,10 +41,10 @@ import mir.entity.Entity; import mir.entity.adapter.EntityAdapter; import mir.entity.adapter.EntityAdapterDefinition; import mir.entity.adapter.EntityAdapterModel; +import mir.log.LoggerWrapper; import mir.media.MediaHelper; import mir.media.MirMedia; import mir.util.RewindableIterator; -import mir.log.LoggerWrapper; import mircoders.entity.EntityUploadedMedia; import mircoders.global.MirGlobal; import mircoders.localizer.MirAdminInterfaceLocalizer; diff --git a/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java b/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java index 5beb8b2a..f6f67102 100755 --- a/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java +++ b/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java @@ -36,7 +36,6 @@ import mir.generator.Generator; import mir.generator.GeneratorLibraryRepository; import mir.generator.WriterEngine; import mir.log.LoggerWrapper; - import mircoders.global.MirGlobal; import mircoders.localizer.MirGeneratorLocalizer; import mircoders.localizer.MirLocalizerExc; diff --git a/source/mircoders/media/MediaHandlerGeneric.java b/source/mircoders/media/MediaHandlerGeneric.java index a759cda8..6518e61c 100755 --- a/source/mircoders/media/MediaHandlerGeneric.java +++ b/source/mircoders/media/MediaHandlerGeneric.java @@ -36,17 +36,15 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import freemarker.template.SimpleList; - -import mir.log.LoggerWrapper; - import mir.config.MirPropertiesConfiguration; import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; import mir.entity.Entity; +import mir.log.LoggerWrapper; import mir.media.MirMedia; import mir.media.MirMediaException; import mir.misc.FileUtil; import mir.misc.StringUtil; +import freemarker.template.SimpleList; /** @@ -66,7 +64,7 @@ import mir.misc.StringUtil; * * @see mir.media.MirMedia * @author mh - * @version $Id: MediaHandlerGeneric.java,v 1.14 2003/02/23 05:00:14 zapata Exp $ + * @version $Id: MediaHandlerGeneric.java,v 1.15 2003/03/05 19:23:16 idfx Exp $ */ public class MediaHandlerGeneric implements MirMedia diff --git a/source/mircoders/media/MediaHandlerImages.java b/source/mircoders/media/MediaHandlerImages.java index 7db22a20..68073e30 100755 --- a/source/mircoders/media/MediaHandlerImages.java +++ b/source/mircoders/media/MediaHandlerImages.java @@ -35,19 +35,17 @@ package mircoders.media; import java.io.File; import java.io.InputStream; -import freemarker.template.SimpleList; - import mir.config.MirPropertiesConfiguration; import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; import mir.entity.Entity; +import mir.log.LoggerWrapper; import mir.media.MirMedia; import mir.media.MirMediaException; import mir.misc.FileUtil; import mir.misc.StringUtil; import mir.storage.StorageObjectFailure; -import mir.log.LoggerWrapper; - import mircoders.entity.EntityImages; +import freemarker.template.SimpleList; /** * This class handles saving, fetching creating representations @@ -63,7 +61,7 @@ import mircoders.entity.EntityImages; * * @see mir.media.MirMedia * @author mh - * @version $Id: MediaHandlerImages.java,v 1.18 2003/02/28 18:27:08 idfx Exp $ + * @version $Id: MediaHandlerImages.java,v 1.19 2003/03/05 19:23:16 idfx Exp $ */ diff --git a/source/mircoders/media/MediaHandlerImagesExtern.java b/source/mircoders/media/MediaHandlerImagesExtern.java index ab8c4737..3b8de9e1 100755 --- a/source/mircoders/media/MediaHandlerImagesExtern.java +++ b/source/mircoders/media/MediaHandlerImagesExtern.java @@ -36,12 +36,11 @@ import java.io.File; import java.io.FileInputStream; import java.io.InputStream; -import mir.log.LoggerWrapper; import mir.config.MirPropertiesConfiguration; import mir.entity.Entity; +import mir.log.LoggerWrapper; import mir.media.MirMediaException; import mir.misc.StringUtil; - import mircoders.storage.DatabaseUploadedMedia; diff --git a/source/mircoders/media/MediaHandlerMp3.java b/source/mircoders/media/MediaHandlerMp3.java index eae9c883..582556af 100755 --- a/source/mircoders/media/MediaHandlerMp3.java +++ b/source/mircoders/media/MediaHandlerMp3.java @@ -33,15 +33,14 @@ package mircoders.media; import java.io.StringReader; -import freemarker.template.SimpleHash; -import freemarker.template.SimpleList; - import mir.entity.Entity; +import mir.log.LoggerWrapper; import mir.media.MirMedia; import mir.media.MirMediaException; import mir.misc.FileUtil; import mir.misc.StringUtil; -import mir.log.LoggerWrapper; +import freemarker.template.SimpleHash; +import freemarker.template.SimpleList; /** * Please note: this media handler produces @@ -67,7 +66,7 @@ import mir.log.LoggerWrapper; * * @see mir.media.MirMedia * @author mh - * @version $Id: MediaHandlerMp3.java,v 1.11 2003/02/23 05:00:14 zapata Exp $ + * @version $Id: MediaHandlerMp3.java,v 1.12 2003/03/05 19:23:16 idfx Exp $ */ public class MediaHandlerMp3 extends MediaHandlerAudio implements MirMedia diff --git a/source/mircoders/media/MediaHandlerRealAudio.java b/source/mircoders/media/MediaHandlerRealAudio.java index e0bfb580..9d1cf606 100755 --- a/source/mircoders/media/MediaHandlerRealAudio.java +++ b/source/mircoders/media/MediaHandlerRealAudio.java @@ -33,15 +33,14 @@ package mircoders.media; import java.io.StringReader; -import freemarker.template.SimpleHash; -import freemarker.template.SimpleList; - -import mir.log.LoggerWrapper; import mir.entity.Entity; +import mir.log.LoggerWrapper; import mir.media.MirMedia; import mir.media.MirMediaException; import mir.misc.FileUtil; import mir.misc.StringUtil; +import freemarker.template.SimpleHash; +import freemarker.template.SimpleList; @@ -53,7 +52,7 @@ import mir.misc.StringUtil; * @see mir.media.MediaHandlerGeneric * @see mir.media.MirMedia * @author john , mh - * @version $Id: MediaHandlerRealAudio.java,v 1.15 2003/02/23 05:00:14 zapata Exp $ + * @version $Id: MediaHandlerRealAudio.java,v 1.16 2003/03/05 19:23:16 idfx Exp $ */ diff --git a/source/mircoders/media/MediaHandlerRealVideo.java b/source/mircoders/media/MediaHandlerRealVideo.java index 8149a730..65fec96c 100755 --- a/source/mircoders/media/MediaHandlerRealVideo.java +++ b/source/mircoders/media/MediaHandlerRealVideo.java @@ -31,18 +31,17 @@ package mircoders.media; -import java.io.StringReader; import java.io.File; +import java.io.StringReader; -import freemarker.template.SimpleHash; -import freemarker.template.SimpleList; - -import mir.log.LoggerWrapper; import mir.entity.Entity; +import mir.log.LoggerWrapper; import mir.media.MirMedia; import mir.media.MirMediaException; import mir.misc.FileUtil; import mir.misc.StringUtil; +import freemarker.template.SimpleHash; +import freemarker.template.SimpleList; @@ -54,7 +53,7 @@ import mir.misc.StringUtil; * @see mir.media.MediaHandlerGeneric * @see mir.media.MirMedia * @author john , mh - * @version $Id: MediaHandlerRealVideo.java,v 1.15 2003/02/23 05:00:14 zapata Exp $ + * @version $Id: MediaHandlerRealVideo.java,v 1.16 2003/03/05 19:23:16 idfx Exp $ */ diff --git a/source/mircoders/media/MediaRequest.java b/source/mircoders/media/MediaRequest.java index 3142ca0a..829e8d9f 100755 --- a/source/mircoders/media/MediaRequest.java +++ b/source/mircoders/media/MediaRequest.java @@ -32,17 +32,15 @@ package mircoders.media; import java.util.GregorianCalendar; -import java.util.Map; import java.util.Iterator; +import java.util.Map; import javax.servlet.ServletContext; -import com.oreilly.servlet.multipart.FilePart; - -import mir.log.LoggerWrapper; import mir.config.MirPropertiesConfiguration; import mir.entity.Entity; import mir.entity.EntityList; +import mir.log.LoggerWrapper; import mir.media.MediaHelper; import mir.media.MirMedia; import mir.media.MirMediaException; @@ -53,9 +51,10 @@ import mir.misc.StringUtil; import mir.storage.Database; import mir.storage.StorageObjectExc; import mir.storage.StorageObjectFailure; - import mircoders.storage.DatabaseMediaType; +import com.oreilly.servlet.multipart.FilePart; + /* * MediaRequest.java - @@ -64,7 +63,7 @@ import mircoders.storage.DatabaseMediaType; * appropriate media objects are set. * * @author mh - * @version $Id: MediaRequest.java,v 1.15 2003/03/04 22:00:53 zapata Exp $ + * @version $Id: MediaRequest.java,v 1.16 2003/03/05 19:23:16 idfx Exp $ * */ diff --git a/source/mircoders/module/ModuleContent.java b/source/mircoders/module/ModuleContent.java index 9c145256..8274fa37 100755 --- a/source/mircoders/module/ModuleContent.java +++ b/source/mircoders/module/ModuleContent.java @@ -31,8 +31,8 @@ package mircoders.module; -import java.util.Map; import java.util.Iterator; +import java.util.Map; import java.util.Set; import java.util.StringTokenizer; @@ -49,7 +49,7 @@ import mircoders.storage.DatabaseContentToMedia; /* * ContentObjekt - * - * @version $Id: ModuleContent.java,v 1.15 2003/03/04 22:00:53 zapata Exp $ + * @version $Id: ModuleContent.java,v 1.16 2003/03/05 19:23:16 idfx Exp $ * * @author RK, mir-coders * diff --git a/source/mircoders/module/ModuleTopics.java b/source/mircoders/module/ModuleTopics.java index 2f30f64a..901dde5b 100755 --- a/source/mircoders/module/ModuleTopics.java +++ b/source/mircoders/module/ModuleTopics.java @@ -33,22 +33,16 @@ package mircoders.module; import java.util.Map; -import freemarker.template.SimpleList; - import mir.entity.Entity; import mir.entity.EntityList; +import mir.log.LoggerWrapper; import mir.module.AbstractModule; import mir.module.ModuleException; import mir.storage.StorageObject; import mir.storage.StorageObjectExc; import mir.storage.StorageObjectFailure; -import mir.log.*; - -import mircoders.entity.EntityContent; -import mircoders.entity.EntityTopics; -import mircoders.storage.DatabaseContent; -import mircoders.storage.DatabaseContentToTopics; import mircoders.storage.DatabaseTopics; +import freemarker.template.SimpleList; /* * ThemenModule - diff --git a/source/mircoders/module/ModuleUsers.java b/source/mircoders/module/ModuleUsers.java index 4310dc9d..53fe122d 100755 --- a/source/mircoders/module/ModuleUsers.java +++ b/source/mircoders/module/ModuleUsers.java @@ -31,22 +31,17 @@ package mircoders.module; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import mir.entity.EntityList; import mir.log.LoggerWrapper; import mir.module.AbstractModule; import mir.module.ModuleException; import mir.storage.StorageObject; -import mir.storage.StorageObjectFailure; import mir.util.JDBCStringRoutines; - import mircoders.entity.EntityUsers; -import mircoders.storage.DatabaseUsers; import mircoders.global.MirGlobal; -import mircoders.localizer.MirAdminInterfaceLocalizer; -import mircoders.localizer.MirLocalizer; /* diff --git a/source/mircoders/producer/IndexingProducerNode.java b/source/mircoders/producer/IndexingProducerNode.java index e8039ec7..f647533a 100755 --- a/source/mircoders/producer/IndexingProducerNode.java +++ b/source/mircoders/producer/IndexingProducerNode.java @@ -29,22 +29,18 @@ */ package mircoders.producer; -import mir.entity.Entity; +import java.io.PrintWriter; +import java.util.Map; +import mir.entity.Entity; import mir.entity.adapter.EntityAdapter; - import mir.log.LoggerToWriterAdapter; import mir.log.LoggerWrapper; - import mir.misc.StringUtil; - import mir.producer.ProducerFailure; import mir.producer.ProducerNode; - import mir.util.ParameterExpander; - import mircoders.entity.EntityContent; - import mircoders.search.AudioSearchTerm; import mircoders.search.ContentSearchTerm; import mircoders.search.ImagesSearchTerm; @@ -56,18 +52,11 @@ import mircoders.search.UnIndexedSearchTerm; import mircoders.search.VideoSearchTerm; import org.apache.lucene.analysis.standard.StandardAnalyzer; - import org.apache.lucene.document.Document; - import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; - import org.apache.lucene.store.FSDirectory; -import java.io.PrintWriter; - -import java.util.Map; - public class IndexingProducerNode implements ProducerNode { private String contentKey; diff --git a/source/mircoders/producer/reader/SupplementalProducerNodeBuilders.java b/source/mircoders/producer/reader/SupplementalProducerNodeBuilders.java index 3004000a..29995953 100755 --- a/source/mircoders/producer/reader/SupplementalProducerNodeBuilders.java +++ b/source/mircoders/producer/reader/SupplementalProducerNodeBuilders.java @@ -38,8 +38,8 @@ import mir.producer.ProducerNode; import mir.producer.reader.DefaultProducerNodeBuilders; import mir.producer.reader.ProducerConfigExc; import mir.producer.reader.ProducerNodeBuilderLibrary; -import mir.util.*; - +import mir.util.XMLReader; +import mir.util.XMLReaderTool; import mircoders.producer.ContentMarkingProducerNode; import mircoders.producer.ContentModifyingProducerNode; import mircoders.producer.IndexingProducerNode; diff --git a/source/mircoders/servlet/ServletHelper.java b/source/mircoders/servlet/ServletHelper.java index b1e0c10e..fc9d76cf 100755 --- a/source/mircoders/servlet/ServletHelper.java +++ b/source/mircoders/servlet/ServletHelper.java @@ -5,12 +5,12 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; +import mir.entity.adapter.EntityIteratorAdapter; import mir.generator.Generator; import mir.servlet.ServletModuleException; +import mir.util.CachingRewindableIterator; import mir.util.NullWriter; import mir.util.ResourceBundleGeneratorFunction; -import mir.entity.adapter.*; -import mir.util.*; import mircoders.global.MirGlobal; import org.apache.struts.util.MessageResources; diff --git a/source/mircoders/servlet/ServletModuleComment.java b/source/mircoders/servlet/ServletModuleComment.java index 7f43dc45..416a1c66 100755 --- a/source/mircoders/servlet/ServletModuleComment.java +++ b/source/mircoders/servlet/ServletModuleComment.java @@ -47,8 +47,8 @@ import mir.servlet.ServletModuleException; import mir.util.CachingRewindableIterator; import mir.util.HTTPRequestParser; import mir.util.JDBCStringRoutines; -import mir.util.URLBuilder; import mir.util.SQLQueryBuilder; +import mir.util.URLBuilder; import mircoders.global.MirGlobal; import mircoders.module.ModuleComment; import mircoders.module.ModuleContent; diff --git a/source/mircoders/servlet/ServletModuleContent.java b/source/mircoders/servlet/ServletModuleContent.java index 478376af..f22923f0 100755 --- a/source/mircoders/servlet/ServletModuleContent.java +++ b/source/mircoders/servlet/ServletModuleContent.java @@ -33,7 +33,6 @@ package mircoders.servlet; import java.io.IOException; import java.util.GregorianCalendar; -import java.util.Map; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -73,7 +72,7 @@ import freemarker.template.SimpleHash; * ServletModuleContent - * deliver html for the article admin form. * - * @version $Id: ServletModuleContent.java,v 1.38 2003/03/04 22:00:54 zapata Exp $ + * @version $Id: ServletModuleContent.java,v 1.39 2003/03/05 19:23:16 idfx Exp $ * @author rk, mir-coders * */ diff --git a/source/mircoders/servlet/ServletModuleOpenIndy.java b/source/mircoders/servlet/ServletModuleOpenIndy.java index e720bb90..55def123 100755 --- a/source/mircoders/servlet/ServletModuleOpenIndy.java +++ b/source/mircoders/servlet/ServletModuleOpenIndy.java @@ -42,11 +42,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; import java.util.GregorianCalendar; -import java.util.Map; import java.util.HashMap; import java.util.Iterator; import java.util.ListIterator; import java.util.Locale; +import java.util.Map; import java.util.Random; import java.util.Set; @@ -121,7 +121,7 @@ import freemarker.template.TemplateModelRoot; * open-postings to the newswire * * @author mir-coders group - * @version $Id: ServletModuleOpenIndy.java,v 1.61 2003/03/04 22:00:54 zapata Exp $ + * @version $Id: ServletModuleOpenIndy.java,v 1.62 2003/03/05 19:23:16 idfx Exp $ * */ diff --git a/source/mircoders/servlet/ServletModuleUploadedMedia.java b/source/mircoders/servlet/ServletModuleUploadedMedia.java index 7d206473..6e0275b0 100755 --- a/source/mircoders/servlet/ServletModuleUploadedMedia.java +++ b/source/mircoders/servlet/ServletModuleUploadedMedia.java @@ -58,12 +58,12 @@ import mir.servlet.ServletModule; import mir.servlet.ServletModuleException; import mir.servlet.ServletModuleUserException; import mir.storage.StorageObjectFailure; +import mircoders.entity.EntityContent; import mircoders.entity.EntityUploadedMedia; import mircoders.entity.EntityUsers; -import mircoders.entity.EntityContent; import mircoders.media.MediaRequest; -import mircoders.storage.DatabaseMediafolder; import mircoders.storage.DatabaseContent; +import mircoders.storage.DatabaseMediafolder; import freemarker.template.SimpleHash; import freemarker.template.SimpleList; @@ -71,7 +71,7 @@ import freemarker.template.SimpleList; * ServletModuleBilder - * liefert HTML fuer Bilder * - * @version $Id: ServletModuleUploadedMedia.java,v 1.17 2003/03/04 22:00:54 zapata Exp $ + * @version $Id: ServletModuleUploadedMedia.java,v 1.18 2003/03/05 19:23:17 idfx Exp $ * @author RK, the mir-coders group */ diff --git a/source/mircoders/servlet/ServletModuleUsers.java b/source/mircoders/servlet/ServletModuleUsers.java index b7506df1..5955b05c 100755 --- a/source/mircoders/servlet/ServletModuleUsers.java +++ b/source/mircoders/servlet/ServletModuleUsers.java @@ -36,8 +36,6 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import freemarker.template.SimpleHash; - import mir.log.LoggerWrapper; import mir.module.ModuleException; import mir.servlet.ServletModule; @@ -45,9 +43,9 @@ import mir.servlet.ServletModuleException; import mir.servlet.ServletModuleUserException; import mir.storage.StorageObjectFailure; import mir.util.HTTPRequestParser; - import mircoders.module.ModuleUsers; import mircoders.storage.DatabaseUsers; +import freemarker.template.SimpleHash; /* * ServletModuleUsers - diff --git a/source/mircoders/storage/DatabaseAudio.java b/source/mircoders/storage/DatabaseAudio.java index 6d698b0a..fa98493d 100755 --- a/source/mircoders/storage/DatabaseAudio.java +++ b/source/mircoders/storage/DatabaseAudio.java @@ -33,8 +33,8 @@ package mircoders.storage; import java.util.GregorianCalendar; -import mir.log.LoggerWrapper; import mir.entity.Entity; +import mir.log.LoggerWrapper; import mir.misc.StringUtil; import mir.storage.Database; import mir.storage.StorageObject; diff --git a/source/mircoders/storage/DatabaseContent.java b/source/mircoders/storage/DatabaseContent.java index fc5116aa..357530ed 100755 --- a/source/mircoders/storage/DatabaseContent.java +++ b/source/mircoders/storage/DatabaseContent.java @@ -34,9 +34,9 @@ package mircoders.storage; import java.sql.Connection; import java.sql.Statement; -import mir.log.LoggerWrapper; import mir.entity.EntityList; import mir.entity.EntityRelation; +import mir.log.LoggerWrapper; import mir.storage.Database; import mir.storage.StorageObject; import mir.storage.StorageObjectFailure; diff --git a/source/mircoders/storage/DatabaseContentToMedia.java b/source/mircoders/storage/DatabaseContentToMedia.java index bcb8cedf..5c32f72b 100755 --- a/source/mircoders/storage/DatabaseContentToMedia.java +++ b/source/mircoders/storage/DatabaseContentToMedia.java @@ -35,13 +35,12 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; -import mir.log.LoggerWrapper; import mir.entity.EntityList; +import mir.log.LoggerWrapper; import mir.storage.Database; import mir.storage.StorageObject; import mir.storage.StorageObjectExc; import mir.storage.StorageObjectFailure; - import mircoders.entity.EntityContent; import mircoders.entity.EntityUploadedMedia; @@ -49,7 +48,7 @@ import mircoders.entity.EntityUploadedMedia; * implements abstract DB connection to the content_x_media SQL table * * @author RK, mir-coders group - * @version $Id: DatabaseContentToMedia.java,v 1.13 2003/02/20 16:05:35 zapata Exp $ + * @version $Id: DatabaseContentToMedia.java,v 1.14 2003/03/05 19:23:17 idfx Exp $ * */ diff --git a/source/mircoders/storage/DatabaseContentToTopics.java b/source/mircoders/storage/DatabaseContentToTopics.java index 9d3b0c41..d01861ca 100755 --- a/source/mircoders/storage/DatabaseContentToTopics.java +++ b/source/mircoders/storage/DatabaseContentToTopics.java @@ -38,8 +38,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import mir.log.LoggerWrapper; import mir.entity.EntityList; +import mir.log.LoggerWrapper; import mir.storage.Database; import mir.storage.StorageObject; import mir.storage.StorageObjectFailure; diff --git a/source/mircoders/storage/DatabaseFeature.java b/source/mircoders/storage/DatabaseFeature.java index 03341276..4efeb22c 100755 --- a/source/mircoders/storage/DatabaseFeature.java +++ b/source/mircoders/storage/DatabaseFeature.java @@ -31,11 +31,11 @@ package mircoders.storage; -import freemarker.template.SimpleList; import mir.log.LoggerWrapper; import mir.storage.Database; import mir.storage.StorageObject; import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle diff --git a/source/mircoders/storage/DatabaseImageColor.java b/source/mircoders/storage/DatabaseImageColor.java index 4dce6468..c611dfc0 100755 --- a/source/mircoders/storage/DatabaseImageColor.java +++ b/source/mircoders/storage/DatabaseImageColor.java @@ -31,11 +31,11 @@ package mircoders.storage; -import freemarker.template.SimpleList; import mir.log.LoggerWrapper; import mir.storage.Database; import mir.storage.StorageObject; import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle diff --git a/source/mircoders/storage/DatabaseImageFormat.java b/source/mircoders/storage/DatabaseImageFormat.java index 67a3e7d3..217d4c7d 100755 --- a/source/mircoders/storage/DatabaseImageFormat.java +++ b/source/mircoders/storage/DatabaseImageFormat.java @@ -31,11 +31,11 @@ package mircoders.storage; -import freemarker.template.SimpleList; import mir.log.LoggerWrapper; import mir.storage.Database; import mir.storage.StorageObject; import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle diff --git a/source/mircoders/storage/DatabaseImageLayout.java b/source/mircoders/storage/DatabaseImageLayout.java index 10a2b70f..c3bf5765 100755 --- a/source/mircoders/storage/DatabaseImageLayout.java +++ b/source/mircoders/storage/DatabaseImageLayout.java @@ -31,11 +31,11 @@ package mircoders.storage; -import freemarker.template.SimpleList; import mir.log.LoggerWrapper; import mir.storage.Database; import mir.storage.StorageObject; import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle diff --git a/source/mircoders/storage/DatabaseImageType.java b/source/mircoders/storage/DatabaseImageType.java index 6f4dd7fc..e3754fe4 100755 --- a/source/mircoders/storage/DatabaseImageType.java +++ b/source/mircoders/storage/DatabaseImageType.java @@ -31,12 +31,11 @@ package mircoders.storage; -import freemarker.template.SimpleList; - import mir.log.LoggerWrapper; import mir.storage.Database; import mir.storage.StorageObject; import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle diff --git a/source/mircoders/storage/DatabaseImages.java b/source/mircoders/storage/DatabaseImages.java index 9a30c4fb..e44eb288 100755 --- a/source/mircoders/storage/DatabaseImages.java +++ b/source/mircoders/storage/DatabaseImages.java @@ -33,14 +33,13 @@ package mircoders.storage; import java.util.GregorianCalendar; -import freemarker.template.SimpleList; - -import mir.log.LoggerWrapper; import mir.entity.Entity; +import mir.log.LoggerWrapper; import mir.misc.StringUtil; import mir.storage.Database; import mir.storage.StorageObject; import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; /** * Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle diff --git a/source/mircoders/storage/DatabaseLanguage.java b/source/mircoders/storage/DatabaseLanguage.java index 86142c8c..0d2b5859 100755 --- a/source/mircoders/storage/DatabaseLanguage.java +++ b/source/mircoders/storage/DatabaseLanguage.java @@ -40,12 +40,11 @@ package mircoders.storage; * @version 1.0 */ -import freemarker.template.SimpleList; - import mir.log.LoggerWrapper; import mir.storage.Database; import mir.storage.StorageObject; import mir.storage.StorageObjectFailure; +import freemarker.template.SimpleList; public class DatabaseLanguage extends Database implements StorageObject{ diff --git a/source/mircoders/storage/DatabaseLinksImcs.java b/source/mircoders/storage/DatabaseLinksImcs.java index cf4a8109..0499acba 100755 --- a/source/mircoders/storage/DatabaseLinksImcs.java +++ b/source/mircoders/storage/DatabaseLinksImcs.java @@ -38,8 +38,8 @@ import java.sql.SQLException; import java.util.List; import java.util.Map; -import mir.log.LoggerWrapper; import mir.entity.Entity; +import mir.log.LoggerWrapper; import mir.storage.Database; import mir.storage.StorageObject; import mir.storage.StorageObjectFailure; diff --git a/source/mircoders/storage/DatabaseMedia.java b/source/mircoders/storage/DatabaseMedia.java index 97b25f91..9da7e10d 100755 --- a/source/mircoders/storage/DatabaseMedia.java +++ b/source/mircoders/storage/DatabaseMedia.java @@ -31,9 +31,9 @@ package mircoders.storage; -import mir.log.LoggerWrapper; import mir.entity.Entity; import mir.entity.EntityRelation; +import mir.log.LoggerWrapper; import mir.storage.Database; import mir.storage.StorageObject; import mir.storage.StorageObjectExc; diff --git a/source/mircoders/storage/DatabaseOther.java b/source/mircoders/storage/DatabaseOther.java index 15061d61..fce632d0 100755 --- a/source/mircoders/storage/DatabaseOther.java +++ b/source/mircoders/storage/DatabaseOther.java @@ -34,8 +34,8 @@ package mircoders.storage; import java.util.GregorianCalendar; -import mir.log.LoggerWrapper; import mir.entity.Entity; +import mir.log.LoggerWrapper; import mir.misc.StringUtil; import mir.storage.Database; import mir.storage.StorageObject; diff --git a/source/mircoders/storage/DatabaseUploadedMedia.java b/source/mircoders/storage/DatabaseUploadedMedia.java index 5730c927..81fdd650 100755 --- a/source/mircoders/storage/DatabaseUploadedMedia.java +++ b/source/mircoders/storage/DatabaseUploadedMedia.java @@ -31,9 +31,9 @@ package mircoders.storage; -import mir.log.LoggerWrapper; import mir.entity.Entity; import mir.entity.EntityRelation; +import mir.log.LoggerWrapper; import mir.storage.Database; import mir.storage.StorageObject; import mir.storage.StorageObjectFailure; diff --git a/source/mircoders/storage/DatabaseVideo.java b/source/mircoders/storage/DatabaseVideo.java index d251c600..e1cdf4e2 100755 --- a/source/mircoders/storage/DatabaseVideo.java +++ b/source/mircoders/storage/DatabaseVideo.java @@ -33,8 +33,8 @@ package mircoders.storage; import java.util.GregorianCalendar; -import mir.log.LoggerWrapper; import mir.entity.Entity; +import mir.log.LoggerWrapper; import mir.misc.StringUtil; import mir.storage.Database; import mir.storage.StorageObject; -- 2.11.0