organizing imports

diff --git a/source/Mir.java b/source/Mir.java
index b61308b..dc7cca0 100755 (executable)
--- a/source/Mir.java
+++ b/source/Mir.java
@@ -31,9 +31,7 @@
 \r
 import java.io.IOException;\r
 import java.io.PrintWriter;\r
-\r
 import java.lang.reflect.Method;\r
-\r
 import java.util.GregorianCalendar;\r
 import java.util.HashMap;\r
 import java.util.Iterator;\r
@@ -48,14 +46,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;\r
 import javax.servlet.http.HttpSession;\r
 \r
-import org.apache.struts.util.MessageResources;\r
-\r
-\r
-import freemarker.template.SimpleHash;\r
-import freemarker.template.SimpleList;\r
-import freemarker.template.SimpleScalar;\r
-import freemarker.template.TemplateModel;\r
-\r
 import mir.config.MirPropertiesConfiguration;\r
 import mir.generator.FreemarkerGenerator;\r
 import mir.log.LoggerWrapper;\r
@@ -67,7 +57,6 @@ import mir.servlet.ServletModuleDispatch;
 import mir.servlet.ServletModuleException;\r
 import mir.servlet.ServletModuleUserException;\r
 import mir.util.StringRoutines;\r
-\r
 import mircoders.entity.EntityUsers;\r
 import mircoders.global.MirGlobal;\r
 import mircoders.module.ModuleMessage;\r
@@ -76,13 +65,20 @@ import mircoders.storage.DatabaseArticleType;
 import mircoders.storage.DatabaseMessages;\r
 import mircoders.storage.DatabaseUsers;\r
 \r
+import org.apache.struts.util.MessageResources;\r
+\r
+import freemarker.template.SimpleHash;\r
+import freemarker.template.SimpleList;\r
+import freemarker.template.SimpleScalar;\r
+import freemarker.template.TemplateModel;\r
+\r
 \r
 \r
 /**\r
  * Mir.java - main servlet, that dispatches to servletmodules\r
  *\r
- * @author $Author: zapata $\r
- * @version $Id: Mir.java,v 1.31 2003/03/04 22:00:51 zapata Exp $\r
+ * @author $Author: idfx $\r
+ * @version $Id: Mir.java,v 1.32 2003/03/05 19:23:14 idfx Exp $\r
  *\r
  */\r
 public class Mir extends AbstractServlet {\r

diff --git a/source/OpenMir.java b/source/OpenMir.java
index 32289d3..8235d74 100755 (executable)
--- 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 2d618e0..4d2775b 100755 (executable)
--- 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 85ae712..84e87b5 100755 (executable)
--- a/source/mir/entity/Entity.java
+++ b/source/mir/entity/Entity.java
@@ -36,17 +36,9 @@
 \r
 package  mir.entity;\r
 \r
+import java.util.HashMap;\r
 import java.util.List;\r
 import java.util.Map;\r
-import java.util.HashMap;\r
-import java.util.Iterator;\r
-import java.util.Set;\r
-\r
-import freemarker.template.SimpleScalar;\r
-import freemarker.template.TemplateHashModel;\r
-import freemarker.template.TemplateModel;\r
-import freemarker.template.TemplateModelException;\r
-import freemarker.template.TemplateModelRoot;\r
 \r
 import mir.config.MirPropertiesConfiguration;\r
 import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;\r
@@ -55,12 +47,17 @@ import mir.misc.StringUtil;
 import mir.storage.StorageObject;\r
 import mir.storage.StorageObjectExc;\r
 import mir.storage.StorageObjectFailure;\r
+import freemarker.template.SimpleScalar;\r
+import freemarker.template.TemplateHashModel;\r
+import freemarker.template.TemplateModel;\r
+import freemarker.template.TemplateModelException;\r
+import freemarker.template.TemplateModelRoot;\r
 \r
 /**\r
  * Base Class of Entities\r
  * Interfacing TemplateHashModel and TemplateModelRoot to be freemarker compliant\r
  *\r
- * @version $Id: Entity.java,v 1.17 2003/03/04 22:00:51 zapata Exp $\r
+ * @version $Id: Entity.java,v 1.18 2003/03/05 19:23:14 idfx Exp $\r
  * @author rk\r
  *\r
  */\r

diff --git a/source/mir/entity/EntityList.java b/source/mir/entity/EntityList.java
index b2fc95b..14170d0 100755 (executable)
--- 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 eef3d71..9de4648 100755 (executable)
--- a/source/mir/generator/FreemarkerGenerator.java
+++ b/source/mir/generator/FreemarkerGenerator.java
@@ -38,6 +38,9 @@ import java.util.List;
 import java.util.Map;\r
 import java.util.Vector;\r
 \r
+import mir.misc.MessageMethodModel;\r
+import mir.util.RewindableIterator;\r
+\r
 import org.apache.struts.util.MessageResources;\r
 \r
 import freemarker.template.FileTemplateCache;\r
@@ -51,9 +54,6 @@ import freemarker.template.TemplateModelException;
 import freemarker.template.TemplateModelRoot;\r
 import freemarker.template.TemplateScalarModel;\r
 \r
-import mir.misc.MessageMethodModel;\r
-import mir.util.RewindableIterator;\r
-\r
 public class FreemarkerGenerator implements Generator {\r
   private Template template;\r
 \r

diff --git a/source/mir/generator/GeneratorLibraryRepository.java b/source/mir/generator/GeneratorLibraryRepository.java
index 1ac0669..06dde95 100755 (executable)
--- 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 2b97f93..bf396ce 100755 (executable)
--- 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 3d8adfb..3470bff 100755 (executable)
--- a/source/mir/log/log4j/LoggerImpl.java
+++ b/source/mir/log/log4j/LoggerImpl.java
@@ -1,13 +1,13 @@
 package mir.log.log4j;\r
 \r
+import java.util.HashMap;\r
+import java.util.Map;\r
+\r
 import mir.config.MirPropertiesConfiguration;\r
 import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;\r
 \r
-import org.apache.log4j.PropertyConfigurator;\r
 import org.apache.log4j.Logger;\r
-\r
-import java.util.Map;\r
-import java.util.HashMap;\r
+import org.apache.log4j.PropertyConfigurator;\r
 \r
 \r
 public class LoggerImpl implements mir.log.Logger {\r

diff --git a/source/mir/misc/HTMLTemplateProcessor.java b/source/mir/misc/HTMLTemplateProcessor.java
index 46775f2..04d9d40 100755 (executable)
--- a/source/mir/misc/HTMLTemplateProcessor.java
+++ b/source/mir/misc/HTMLTemplateProcessor.java
@@ -33,22 +33,32 @@ package mir.misc;
 \r
 import java.io.PrintWriter;\r
 import java.net.URLEncoder;\r
-import java.util.*;\r
+import java.util.GregorianCalendar;\r
+import java.util.Iterator;\r
+import java.util.Locale;\r
+import java.util.Map;\r
+import java.util.Set;\r
 \r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import org.apache.struts.util.MessageResources;\r
-\r
-import freemarker.template.*;\r
-\r
-import mir.log.LoggerWrapper;\r
-import mir.util.*;\r
-import mir.generator.*;\r
 import mir.config.MirPropertiesConfiguration;\r
 import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;\r
 import mir.entity.Entity;\r
 import mir.entity.EntityList;\r
+import mir.generator.FreemarkerGenerator;\r
+import mir.log.LoggerWrapper;\r
 import mir.storage.StorageObjectFailure;\r
+import mir.util.GeneratorHTMLFunctions;\r
+import mir.util.GeneratorIntegerFunctions;\r
+\r
+import org.apache.struts.util.MessageResources;\r
+\r
+import freemarker.template.FileTemplateCache;\r
+import freemarker.template.SimpleHash;\r
+import freemarker.template.SimpleList;\r
+import freemarker.template.SimpleScalar;\r
+import freemarker.template.Template;\r
+import freemarker.template.TemplateModelRoot;\r
 \r
 /**\r
  * Hilfsklasse zum Mergen von Template und Daten\r

diff --git a/source/mir/misc/WebdbImage.java b/source/mir/misc/WebdbImage.java
index bb9c8e7..136acb1 100755 (executable)
--- a/source/mir/misc/WebdbImage.java
+++ b/source/mir/misc/WebdbImage.java
@@ -36,7 +36,7 @@ package mir.misc;
  * Description:\r
  * Copyright:    Copyright (c) 2002 Mir-coders\r
  * @author $Author: idfx $\r
- * @version $Id: WebdbImage.java,v 1.11 2003/02/28 18:27:07 idfx Exp $\r
+ * @version $Id: WebdbImage.java,v 1.12 2003/03/05 19:23:14 idfx Exp $\r
  */\r
 \r
 import java.io.File;\r
@@ -49,10 +49,10 @@ import javax.media.jai.JAI;
 import javax.media.jai.ParameterBlockJAI;\r
 import javax.media.jai.PlanarImage;\r
 \r
-import com.sun.media.jai.codec.FileSeekableStream;\r
-\r
 import mir.config.MirPropertiesConfiguration;\r
 \r
+import com.sun.media.jai.codec.FileSeekableStream;\r
+\r
 public class WebdbImage\r
 {\r
 \r

diff --git a/source/mir/misc/WebdbMultipartRequest.java b/source/mir/misc/WebdbMultipartRequest.java
index d421d12..4735fd1 100755 (executable)
--- 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 0a70fca..718925d 100755 (executable)
--- 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 a551e28..fcfc3b3 100755 (executable)
--- 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 5cb16fc..0fd85d6 100755 (executable)
--- 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 265fb97..1e9185d 100755 (executable)
--- a/source/mir/servlet/ServletModule.java
+++ b/source/mir/servlet/ServletModule.java
@@ -33,18 +33,15 @@ package mir.servlet;
 \r
 import java.io.IOException;\r
 import java.io.PrintWriter;\r
-import java.util.List;\r
-import java.util.Map;\r
 import java.util.HashMap;\r
+import java.util.List;\r
 import java.util.Locale;\r
+import java.util.Map;\r
 \r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 import javax.servlet.http.HttpSession;\r
 \r
-import freemarker.template.SimpleHash;\r
-import freemarker.template.TemplateModelRoot;\r
-\r
 import mir.config.MirPropertiesConfiguration;\r
 import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;\r
 import mir.entity.EntityList;\r
@@ -55,7 +52,9 @@ import mir.misc.LineFilterWriter;
 import mir.module.AbstractModule;\r
 import mir.module.ModuleException;\r
 import mir.storage.StorageObject;\r
-import mir.util.*;\r
+import mir.util.HTTPRequestParser;\r
+import freemarker.template.SimpleHash;\r
+import freemarker.template.TemplateModelRoot;\r
 \r
 \r
 \r

diff --git a/source/mir/storage/Database.java b/source/mir/storage/Database.java
index 2482ba1..6621191 100755 (executable)
--- a/source/mir/storage/Database.java
+++ b/source/mir/storage/Database.java
@@ -32,7 +32,6 @@ package mir.storage;
 \r
 import java.io.IOException;\r
 import java.io.InputStreamReader;\r
-\r
 import java.sql.Connection;\r
 import java.sql.PreparedStatement;\r
 import java.sql.ResultSet;\r
@@ -40,43 +39,35 @@ import java.sql.ResultSetMetaData;
 import java.sql.SQLException;\r
 import java.sql.Statement;\r
 import java.sql.Timestamp;\r
-\r
 import java.text.ParseException;\r
 import java.text.SimpleDateFormat;\r
-\r
 import java.util.ArrayList;\r
-import java.util.List;\r
 import java.util.Calendar;\r
 import java.util.GregorianCalendar;\r
 import java.util.HashMap;\r
+import java.util.List;\r
 import java.util.Map;\r
 \r
-import com.codestudio.util.SQLManager;\r
-\r
-import freemarker.template.SimpleHash;\r
-import freemarker.template.SimpleList;\r
-\r
 import mir.config.MirPropertiesConfiguration;\r
-\r
 import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;\r
-\r
 import mir.entity.Entity;\r
 import mir.entity.EntityList;\r
 import mir.entity.StorableObjectEntity;\r
-\r
 import mir.log.LoggerWrapper;\r
-\r
 import mir.misc.HTMLTemplateProcessor;\r
 import mir.misc.StringUtil;\r
-\r
 import mir.storage.store.ObjectStore;\r
 import mir.storage.store.StorableObject;\r
 import mir.storage.store.StoreContainerType;\r
 import mir.storage.store.StoreIdentifier;\r
 import mir.storage.store.StoreUtil;\r
-\r
 import mir.util.JDBCStringRoutines;\r
 \r
+import com.codestudio.util.SQLManager;\r
+\r
+import freemarker.template.SimpleHash;\r
+import freemarker.template.SimpleList;\r
+\r
 \r
 /**\r
  * Diese Klasse implementiert die Zugriffsschicht auf die Datenbank.\r
@@ -86,7 +77,7 @@ import mir.util.JDBCStringRoutines;
  * Treiber, Host, User und Passwort, ueber den der Zugriff auf die\r
  * Datenbank erfolgt.\r
  *\r
- * @version $Id: Database.java,v 1.35 2003/03/04 22:00:52 zapata Exp $\r
+ * @version $Id: Database.java,v 1.36 2003/03/05 19:23:15 idfx Exp $\r
  * @author rk\r
  *\r
  */\r

diff --git a/source/mir/storage/DatabaseAdaptor.java b/source/mir/storage/DatabaseAdaptor.java
index c70030f..614c2a5 100755 (executable)
--- 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 <RK>
  *
- * @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 1e6c903..21f94cd 100755 (executable)
--- 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;
-
 
 /**
  * <b>Diese Klasse implementiert die abstrakte Klasse DatabaseAdaptor

diff --git a/source/mir/storage/DatabaseAdaptorOracle.java b/source/mir/storage/DatabaseAdaptorOracle.java
index e18a98a..fc20498 100755 (executable)
--- 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 841ff6f..8713074 100755 (executable)
--- 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;
-
 
 /**
  * <b>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 a55a1e3..3e7b058 100755 (executable)
--- 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 ac85d05..99e4c43 100755 (executable)
--- 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 e117bcf..de9803a 100755 (executable)
--- a/source/mir/storage/store/ObjectStore.java
+++ b/source/mir/storage/store/ObjectStore.java
@@ -63,9 +63,9 @@ package mir.storage.store;
 \r
 import java.io.BufferedInputStream;\r
 import java.io.FileInputStream;\r
-import java.util.Map;\r
 import java.util.HashMap;\r
 import java.util.Iterator;\r
+import java.util.Map;\r
 import java.util.MissingResourceException;\r
 import java.util.Properties;\r
 \r

diff --git a/source/mir/util/XMLReader.java b/source/mir/util/XMLReader.java
index 0a814f2..6f77dca 100755 (executable)
--- a/source/mir/util/XMLReader.java
+++ b/source/mir/util/XMLReader.java
@@ -31,13 +31,22 @@
 \r
 package mir.util;\r
 \r
-import java.io.*;\r
-import java.util.*;\r
+import java.io.File;\r
+import java.io.FileInputStream;\r
+import java.io.FileNotFoundException;\r
+import java.io.IOException;\r
+import java.util.HashMap;\r
+import java.util.List;\r
+import java.util.Map;\r
+import java.util.Stack;\r
 \r
 import javax.xml.parsers.ParserConfigurationException;\r
 import javax.xml.parsers.SAXParser;\r
 import javax.xml.parsers.SAXParserFactory;\r
 \r
+import multex.Exc;\r
+import multex.Failure;\r
+\r
 import org.xml.sax.Attributes;\r
 import org.xml.sax.InputSource;\r
 import org.xml.sax.Locator;\r
@@ -45,9 +54,6 @@ import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;\r
 import org.xml.sax.helpers.DefaultHandler;\r
 \r
-import multex.Failure;\r
-import multex.Exc;\r
-\r
 public class XMLReader {\r
   private Locator locator;\r
   private String filename;\r

diff --git a/source/mircoders/entity/EntityContent.java b/source/mircoders/entity/EntityContent.java
index 5c4f6da..3e6bbb3 100755 (executable)
--- 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 0ef98fb..9f90ca3 100755 (executable)
--- 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 97cb75a..01c63ee 100755 (executable)
--- a/source/mircoders/entity/EntityVideo.java
+++ b/source/mircoders/entity/EntityVideo.java
@@ -34,9 +34,9 @@ package mircoders.entity;
 import java.sql.SQLException;\r
 import java.util.Map;\r
 \r
+import mir.log.LoggerWrapper;\r
 import mir.storage.StorageObject;\r
 import mir.storage.StorageObjectFailure;\r
-import mir.log.LoggerWrapper;\r
 \r
 /**\r
  * Diese Klasse enth?lt die Daten eines MetaObjekts\r

diff --git a/source/mircoders/global/MirGlobal.java b/source/mircoders/global/MirGlobal.java
index 8bd4711..6641b1d 100755 (executable)
--- 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 1d87158..9d7831d 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicAdminInterfaceLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicAdminInterfaceLocalizer.java
@@ -40,8 +40,8 @@ import java.util.Vector;
 \r
 import mir.entity.Entity;\r
 import mir.entity.adapter.EntityAdapter;\r
-import mir.storage.StorageObjectFailure;\r
 import mir.misc.StringUtil;\r
+import mir.storage.StorageObjectFailure;\r
 import mir.util.StringRoutines;\r
 import mircoders.entity.EntityComment;\r
 import mircoders.entity.EntityContent;\r

diff --git a/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java b/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java
index fe7b59e..e5229ba 100755 (executable)
--- 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;\r
 import mir.entity.adapter.EntityAdapterDefinition;\r
 import mir.entity.adapter.EntityAdapterModel;\r
+import mir.log.LoggerWrapper;\r
 import mir.media.MediaHelper;\r
 import mir.media.MirMedia;\r
 import mir.util.RewindableIterator;\r
-import mir.log.LoggerWrapper;\r
 import mircoders.entity.EntityUploadedMedia;\r
 import mircoders.global.MirGlobal;\r
 import mircoders.localizer.MirAdminInterfaceLocalizer;\r

diff --git a/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java b/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java
index 5beb8b2..f6f6710 100755 (executable)
--- 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 a759cda..6518e61 100755 (executable)
--- a/source/mircoders/media/MediaHandlerGeneric.java
+++ b/source/mircoders/media/MediaHandlerGeneric.java
@@ -36,17 +36,15 @@ import java.io.FileInputStream;
 import java.io.IOException;\r
 import java.io.InputStream;\r
 \r
-import freemarker.template.SimpleList;\r
-\r
-import mir.log.LoggerWrapper;\r
-\r
 import mir.config.MirPropertiesConfiguration;\r
 import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;\r
 import mir.entity.Entity;\r
+import mir.log.LoggerWrapper;\r
 import mir.media.MirMedia;\r
 import mir.media.MirMediaException;\r
 import mir.misc.FileUtil;\r
 import mir.misc.StringUtil;\r
+import freemarker.template.SimpleList;\r
 \r
 \r
 /**\r
@@ -66,7 +64,7 @@ import mir.misc.StringUtil;
  *\r
  * @see mir.media.MirMedia\r
  * @author mh <mh@nadir.org>\r
- * @version $Id: MediaHandlerGeneric.java,v 1.14 2003/02/23 05:00:14 zapata Exp $\r
+ * @version $Id: MediaHandlerGeneric.java,v 1.15 2003/03/05 19:23:16 idfx Exp $\r
  */\r
 \r
 public class MediaHandlerGeneric implements MirMedia\r

diff --git a/source/mircoders/media/MediaHandlerImages.java b/source/mircoders/media/MediaHandlerImages.java
index 7db22a2..68073e3 100755 (executable)
--- 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 ab8c473..3b8de9e 100755 (executable)
--- a/source/mircoders/media/MediaHandlerImagesExtern.java
+++ b/source/mircoders/media/MediaHandlerImagesExtern.java
@@ -36,12 +36,11 @@ import java.io.File;
 import java.io.FileInputStream;\r
 import java.io.InputStream;\r
 \r
-import mir.log.LoggerWrapper;\r
 import mir.config.MirPropertiesConfiguration;\r
 import mir.entity.Entity;\r
+import mir.log.LoggerWrapper;\r
 import mir.media.MirMediaException;\r
 import mir.misc.StringUtil;\r
-\r
 import mircoders.storage.DatabaseUploadedMedia;\r
 \r
 \r

diff --git a/source/mircoders/media/MediaHandlerMp3.java b/source/mircoders/media/MediaHandlerMp3.java
index eae9c88..582556a 100755 (executable)
--- a/source/mircoders/media/MediaHandlerMp3.java
+++ b/source/mircoders/media/MediaHandlerMp3.java
@@ -33,15 +33,14 @@ package  mircoders.media;
 \r
 import java.io.StringReader;\r
 \r
-import freemarker.template.SimpleHash;\r
-import freemarker.template.SimpleList;\r
-\r
 import mir.entity.Entity;\r
+import mir.log.LoggerWrapper;\r
 import mir.media.MirMedia;\r
 import mir.media.MirMediaException;\r
 import mir.misc.FileUtil;\r
 import mir.misc.StringUtil;\r
-import mir.log.LoggerWrapper;\r
+import freemarker.template.SimpleHash;\r
+import freemarker.template.SimpleList;\r
 \r
 /**\r
  * Please note: this media handler produces\r
@@ -67,7 +66,7 @@ import mir.log.LoggerWrapper;
  *\r
  * @see mir.media.MirMedia\r
  * @author mh <mh@nadir.org>\r
- * @version $Id: MediaHandlerMp3.java,v 1.11 2003/02/23 05:00:14 zapata Exp $\r
+ * @version $Id: MediaHandlerMp3.java,v 1.12 2003/03/05 19:23:16 idfx Exp $\r
  */\r
 \r
 public class MediaHandlerMp3 extends MediaHandlerAudio implements MirMedia\r

diff --git a/source/mircoders/media/MediaHandlerRealAudio.java b/source/mircoders/media/MediaHandlerRealAudio.java
index e0bfb58..9d1cf60 100755 (executable)
--- 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 <john@manifestor.org>, mh <heckmann@hbe.ca>
- * @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 8149a73..65fec96 100755 (executable)
--- 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 <john@manifestor.org>, mh <mh@nadir.org>
- * @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 3142ca0..829e8d9 100755 (executable)
--- 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 9c14525..8274fa3 100755 (executable)
--- 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 2f30f64..901dde5 100755 (executable)
--- 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 4310dc9..53fe122 100755 (executable)
--- a/source/mircoders/module/ModuleUsers.java
+++ b/source/mircoders/module/ModuleUsers.java
@@ -31,22 +31,17 @@
 \r
 package mircoders.module;\r
 \r
-import java.util.Map;\r
 import java.util.HashMap;\r
+import java.util.Map;\r
 \r
 import mir.entity.EntityList;\r
 import mir.log.LoggerWrapper;\r
 import mir.module.AbstractModule;\r
 import mir.module.ModuleException;\r
 import mir.storage.StorageObject;\r
-import mir.storage.StorageObjectFailure;\r
 import mir.util.JDBCStringRoutines;\r
-\r
 import mircoders.entity.EntityUsers;\r
-import mircoders.storage.DatabaseUsers;\r
 import mircoders.global.MirGlobal;\r
-import mircoders.localizer.MirAdminInterfaceLocalizer;\r
-import mircoders.localizer.MirLocalizer;\r
 \r
 \r
 /*\r

diff --git a/source/mircoders/producer/IndexingProducerNode.java b/source/mircoders/producer/IndexingProducerNode.java
index e8039ec..f647533 100755 (executable)
--- 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 3004000..2999595 100755 (executable)
--- 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 b1e0c10..fc9d76c 100755 (executable)
--- 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 7f43dc4..416a1c6 100755 (executable)
--- 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 478376a..f22923f 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleContent.java
+++ b/source/mircoders/servlet/ServletModuleContent.java
@@ -33,7 +33,6 @@ package mircoders.servlet;
 \r
 import java.io.IOException;\r
 import java.util.GregorianCalendar;\r
-import java.util.Map;\r
 import java.util.HashMap;\r
 import java.util.Iterator;\r
 import java.util.List;\r
@@ -73,7 +72,7 @@ import freemarker.template.SimpleHash;
  *  ServletModuleContent -\r
  *  deliver html for the article admin form.\r
  *\r
- * @version $Id: ServletModuleContent.java,v 1.38 2003/03/04 22:00:54 zapata Exp $\r
+ * @version $Id: ServletModuleContent.java,v 1.39 2003/03/05 19:23:16 idfx Exp $\r
  * @author rk, mir-coders\r
  *\r
  */\r

diff --git a/source/mircoders/servlet/ServletModuleOpenIndy.java b/source/mircoders/servlet/ServletModuleOpenIndy.java
index e720bb9..55def12 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleOpenIndy.java
+++ b/source/mircoders/servlet/ServletModuleOpenIndy.java
@@ -42,11 +42,11 @@ import java.util.ArrayList;
 import java.util.Collections;\r
 import java.util.Enumeration;\r
 import java.util.GregorianCalendar;\r
-import java.util.Map;\r
 import java.util.HashMap;\r
 import java.util.Iterator;\r
 import java.util.ListIterator;\r
 import java.util.Locale;\r
+import java.util.Map;\r
 import java.util.Random;\r
 import java.util.Set;\r
 \r
@@ -121,7 +121,7 @@ import freemarker.template.TemplateModelRoot;
  *    open-postings to the newswire\r
  *\r
  * @author mir-coders group\r
- * @version $Id: ServletModuleOpenIndy.java,v 1.61 2003/03/04 22:00:54 zapata Exp $\r
+ * @version $Id: ServletModuleOpenIndy.java,v 1.62 2003/03/05 19:23:16 idfx Exp $\r
  *\r
  */\r
 \r

diff --git a/source/mircoders/servlet/ServletModuleUploadedMedia.java b/source/mircoders/servlet/ServletModuleUploadedMedia.java
index 7d20647..6e0275b 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleUploadedMedia.java
+++ b/source/mircoders/servlet/ServletModuleUploadedMedia.java
@@ -58,12 +58,12 @@ import mir.servlet.ServletModule;
 import mir.servlet.ServletModuleException;\r
 import mir.servlet.ServletModuleUserException;\r
 import mir.storage.StorageObjectFailure;\r
+import mircoders.entity.EntityContent;\r
 import mircoders.entity.EntityUploadedMedia;\r
 import mircoders.entity.EntityUsers;\r
-import mircoders.entity.EntityContent;\r
 import mircoders.media.MediaRequest;\r
-import mircoders.storage.DatabaseMediafolder;\r
 import mircoders.storage.DatabaseContent;\r
+import mircoders.storage.DatabaseMediafolder;\r
 import freemarker.template.SimpleHash;\r
 import freemarker.template.SimpleList;\r
 \r
@@ -71,7 +71,7 @@ import freemarker.template.SimpleList;
  *  ServletModuleBilder -\r
  *  liefert HTML fuer Bilder\r
  *\r
- * @version $Id: ServletModuleUploadedMedia.java,v 1.17 2003/03/04 22:00:54 zapata Exp $\r
+ * @version $Id: ServletModuleUploadedMedia.java,v 1.18 2003/03/05 19:23:17 idfx Exp $\r
  * @author RK, the mir-coders group\r
  */\r
 \r

diff --git a/source/mircoders/servlet/ServletModuleUsers.java b/source/mircoders/servlet/ServletModuleUsers.java
index b7506df..5955b05 100755 (executable)
--- 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;\r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import freemarker.template.SimpleHash;\r
-\r
 import mir.log.LoggerWrapper;\r
 import mir.module.ModuleException;\r
 import mir.servlet.ServletModule;\r
@@ -45,9 +43,9 @@ import mir.servlet.ServletModuleException;
 import mir.servlet.ServletModuleUserException;\r
 import mir.storage.StorageObjectFailure;\r
 import mir.util.HTTPRequestParser;\r
-\r
 import mircoders.module.ModuleUsers;\r
 import mircoders.storage.DatabaseUsers;\r
+import freemarker.template.SimpleHash;\r
 \r
 /*\r
  *  ServletModuleUsers -\r

diff --git a/source/mircoders/storage/DatabaseAudio.java b/source/mircoders/storage/DatabaseAudio.java
index 6d698b0..fa98493 100755 (executable)
--- a/source/mircoders/storage/DatabaseAudio.java
+++ b/source/mircoders/storage/DatabaseAudio.java
@@ -33,8 +33,8 @@ package mircoders.storage;
 \r
 import java.util.GregorianCalendar;\r
 \r
-import mir.log.LoggerWrapper;\r
 import mir.entity.Entity;\r
+import mir.log.LoggerWrapper;\r
 import mir.misc.StringUtil;\r
 import mir.storage.Database;\r
 import mir.storage.StorageObject;\r

diff --git a/source/mircoders/storage/DatabaseContent.java b/source/mircoders/storage/DatabaseContent.java
index fc5116a..357530e 100755 (executable)
--- 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 bcb8ced..5c32f72 100755 (executable)
--- a/source/mircoders/storage/DatabaseContentToMedia.java
+++ b/source/mircoders/storage/DatabaseContentToMedia.java
@@ -35,13 +35,12 @@ import java.sql.Connection;
 import java.sql.ResultSet;\r
 import java.sql.Statement;\r
 \r
-import mir.log.LoggerWrapper;\r
 import mir.entity.EntityList;\r
+import mir.log.LoggerWrapper;\r
 import mir.storage.Database;\r
 import mir.storage.StorageObject;\r
 import mir.storage.StorageObjectExc;\r
 import mir.storage.StorageObjectFailure;\r
-\r
 import mircoders.entity.EntityContent;\r
 import mircoders.entity.EntityUploadedMedia;\r
 \r
@@ -49,7 +48,7 @@ import mircoders.entity.EntityUploadedMedia;
  * <b>implements abstract DB connection to the content_x_media SQL table\r
  *\r
  * @author RK, mir-coders group\r
- * @version $Id: DatabaseContentToMedia.java,v 1.13 2003/02/20 16:05:35 zapata Exp $\r
+ * @version $Id: DatabaseContentToMedia.java,v 1.14 2003/03/05 19:23:17 idfx Exp $\r
  *\r
  */\r
 \r

diff --git a/source/mircoders/storage/DatabaseContentToTopics.java b/source/mircoders/storage/DatabaseContentToTopics.java
index 9d3b0c4..d01861c 100755 (executable)
--- 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 0334127..4efeb22 100755 (executable)
--- a/source/mircoders/storage/DatabaseFeature.java
+++ b/source/mircoders/storage/DatabaseFeature.java
@@ -31,11 +31,11 @@
 \r
 package mircoders.storage;\r
 \r
-import freemarker.template.SimpleList;\r
 import mir.log.LoggerWrapper;\r
 import mir.storage.Database;\r
 import mir.storage.StorageObject;\r
 import mir.storage.StorageObjectFailure;\r
+import freemarker.template.SimpleList;\r
 \r
 /**\r
  * <b>Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle\r

diff --git a/source/mircoders/storage/DatabaseImageColor.java b/source/mircoders/storage/DatabaseImageColor.java
index 4dce646..c611dfc 100755 (executable)
--- a/source/mircoders/storage/DatabaseImageColor.java
+++ b/source/mircoders/storage/DatabaseImageColor.java
@@ -31,11 +31,11 @@
 \r
 package mircoders.storage;\r
 \r
-import freemarker.template.SimpleList;\r
 import mir.log.LoggerWrapper;\r
 import mir.storage.Database;\r
 import mir.storage.StorageObject;\r
 import mir.storage.StorageObjectFailure;\r
+import freemarker.template.SimpleList;\r
 \r
 /**\r
  * <b>Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle\r

diff --git a/source/mircoders/storage/DatabaseImageFormat.java b/source/mircoders/storage/DatabaseImageFormat.java
index 67a3e7d..217d4c7 100755 (executable)
--- a/source/mircoders/storage/DatabaseImageFormat.java
+++ b/source/mircoders/storage/DatabaseImageFormat.java
@@ -31,11 +31,11 @@
 \r
 package mircoders.storage;\r
 \r
-import freemarker.template.SimpleList;\r
 import mir.log.LoggerWrapper;\r
 import mir.storage.Database;\r
 import mir.storage.StorageObject;\r
 import mir.storage.StorageObjectFailure;\r
+import freemarker.template.SimpleList;\r
 \r
 /**\r
  * <b>Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle\r

diff --git a/source/mircoders/storage/DatabaseImageLayout.java b/source/mircoders/storage/DatabaseImageLayout.java
index 10a2b70..c3bf576 100755 (executable)
--- a/source/mircoders/storage/DatabaseImageLayout.java
+++ b/source/mircoders/storage/DatabaseImageLayout.java
@@ -31,11 +31,11 @@
 \r
 package mircoders.storage;\r
 \r
-import freemarker.template.SimpleList;\r
 import mir.log.LoggerWrapper;\r
 import mir.storage.Database;\r
 import mir.storage.StorageObject;\r
 import mir.storage.StorageObjectFailure;\r
+import freemarker.template.SimpleList;\r
 \r
 /**\r
  * <b>Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle\r

diff --git a/source/mircoders/storage/DatabaseImageType.java b/source/mircoders/storage/DatabaseImageType.java
index 6f4dd7f..e3754fe 100755 (executable)
--- a/source/mircoders/storage/DatabaseImageType.java
+++ b/source/mircoders/storage/DatabaseImageType.java
@@ -31,12 +31,11 @@
 \r
 package mircoders.storage;\r
 \r
-import freemarker.template.SimpleList;\r
-\r
 import mir.log.LoggerWrapper;\r
 import mir.storage.Database;\r
 import mir.storage.StorageObject;\r
 import mir.storage.StorageObjectFailure;\r
+import freemarker.template.SimpleList;\r
 \r
 /**\r
  * <b>Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle\r

diff --git a/source/mircoders/storage/DatabaseImages.java b/source/mircoders/storage/DatabaseImages.java
index 9a30c4f..e44eb28 100755 (executable)
--- a/source/mircoders/storage/DatabaseImages.java
+++ b/source/mircoders/storage/DatabaseImages.java
@@ -33,14 +33,13 @@ package mircoders.storage;
 \r
 import java.util.GregorianCalendar;\r
 \r
-import freemarker.template.SimpleList;\r
-\r
-import mir.log.LoggerWrapper;\r
 import mir.entity.Entity;\r
+import mir.log.LoggerWrapper;\r
 import mir.misc.StringUtil;\r
 import mir.storage.Database;\r
 import mir.storage.StorageObject;\r
 import mir.storage.StorageObjectFailure;\r
+import freemarker.template.SimpleList;\r
 \r
 /**\r
  * <b>Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle\r

diff --git a/source/mircoders/storage/DatabaseLanguage.java b/source/mircoders/storage/DatabaseLanguage.java
index 86142c8..0d2b585 100755 (executable)
--- a/source/mircoders/storage/DatabaseLanguage.java
+++ b/source/mircoders/storage/DatabaseLanguage.java
@@ -40,12 +40,11 @@ package mircoders.storage;
  * @version 1.0\r
  */\r
 \r
-import freemarker.template.SimpleList;\r
-\r
 import mir.log.LoggerWrapper;\r
 import mir.storage.Database;\r
 import mir.storage.StorageObject;\r
 import mir.storage.StorageObjectFailure;\r
+import freemarker.template.SimpleList;\r
 \r
 \r
 public class DatabaseLanguage extends Database implements StorageObject{\r

diff --git a/source/mircoders/storage/DatabaseLinksImcs.java b/source/mircoders/storage/DatabaseLinksImcs.java
index cf4a810..0499acb 100755 (executable)
--- a/source/mircoders/storage/DatabaseLinksImcs.java
+++ b/source/mircoders/storage/DatabaseLinksImcs.java
@@ -38,8 +38,8 @@ import java.sql.SQLException;
 import java.util.List;\r
 import java.util.Map;\r
 \r
-import mir.log.LoggerWrapper;\r
 import mir.entity.Entity;\r
+import mir.log.LoggerWrapper;\r
 import mir.storage.Database;\r
 import mir.storage.StorageObject;\r
 import mir.storage.StorageObjectFailure;\r

diff --git a/source/mircoders/storage/DatabaseMedia.java b/source/mircoders/storage/DatabaseMedia.java
index 97b25f9..9da7e10 100755 (executable)
--- 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 15061d6..fce632d 100755 (executable)
--- a/source/mircoders/storage/DatabaseOther.java
+++ b/source/mircoders/storage/DatabaseOther.java
@@ -34,8 +34,8 @@ package mircoders.storage;
 \r
 import java.util.GregorianCalendar;\r
 \r
-import mir.log.LoggerWrapper;\r
 import mir.entity.Entity;\r
+import mir.log.LoggerWrapper;\r
 import mir.misc.StringUtil;\r
 import mir.storage.Database;\r
 import mir.storage.StorageObject;\r

diff --git a/source/mircoders/storage/DatabaseUploadedMedia.java b/source/mircoders/storage/DatabaseUploadedMedia.java
index 5730c92..81fdd65 100755 (executable)
--- 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 d251c60..e1cdf4e 100755 (executable)
--- a/source/mircoders/storage/DatabaseVideo.java
+++ b/source/mircoders/storage/DatabaseVideo.java
@@ -33,8 +33,8 @@ package mircoders.storage;
 \r
 import java.util.GregorianCalendar;\r
 \r
-import mir.log.LoggerWrapper;\r
 import mir.entity.Entity;\r
+import mir.log.LoggerWrapper;\r
 import mir.misc.StringUtil;\r
 import mir.storage.Database;\r
 import mir.storage.StorageObject;\r