Some small things like, reorganizing imports, accessing static variables

in a static way.
(thanks to eclipse)

diff --git a/source/Mir.java b/source/Mir.java
index be2b77e..ed6825c 100755 (executable)
--- a/source/Mir.java
+++ b/source/Mir.java
@@ -58,6 +58,7 @@ import freemarker.template.TemplateModel;
 \r
 import mir.config.MirPropertiesConfiguration;\r
 import mir.generator.FreemarkerGenerator;\r
+import mir.log.LoggerWrapper;\r
 import mir.misc.HTMLTemplateProcessor;\r
 import mir.misc.StringUtil;\r
 import mir.servlet.AbstractServlet;\r
@@ -80,8 +81,8 @@ import mircoders.storage.DatabaseUsers;
 /**\r
  * Mir.java - main servlet, that dispatches to servletmodules\r
  *\r
- * @author $Author: zapata $\r
- * @version $Id: Mir.java,v 1.29 2003/02/23 05:00:10 zapata Exp $\r
+ * @author $Author: idfx $\r
+ * @version $Id: Mir.java,v 1.30 2003/02/28 18:27:07 idfx Exp $\r
  *\r
  */\r
 public class Mir extends AbstractServlet {\r
@@ -376,7 +377,7 @@ public class Mir extends AbstractServlet {
     }\r
     catch (Exception e) {\r
       logger.error("Error in ErrorTemplate: " + e.getMessage());\r
-      e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));\r
+      e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
     }\r
   }\r
 \r
@@ -465,7 +466,7 @@ public class Mir extends AbstractServlet {
         getLocale(req));\r
     }\r
     catch (Exception e) {\r
-      e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));\r
+      e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
       handleError(req, res, out, "error while trying to send startpage. " + e.getMessage());\r
     }\r
   }\r

diff --git a/source/mir/entity/Entity.java b/source/mir/entity/Entity.java
index 72e5420..0ea0386 100755 (executable)
--- a/source/mir/entity/Entity.java
+++ b/source/mir/entity/Entity.java
@@ -59,7 +59,7 @@ import mir.storage.StorageObjectFailure;
  * Base Class of Entities\r
  * Interfacing TemplateHashModel and TemplateModelRoot to be freemarker compliant\r
  *\r
- * @version $Id: Entity.java,v 1.15 2003/02/23 05:00:11 zapata Exp $\r
+ * @version $Id: Entity.java,v 1.16 2003/02/28 18:27:07 idfx Exp $\r
  * @author rk\r
  *\r
  */\r
@@ -288,7 +288,7 @@ public class Entity implements TemplateHashModel, TemplateModelRoot
   protected void throwStorageObjectFailure(Throwable e, String wo) throws\r
       StorageObjectFailure {\r
     logger.error(e.toString() + " function: " + wo);\r
-    e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));\r
+    e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
 \r
     throw new StorageObjectFailure("Storage Object Exception in entity", e);\r
   }\r

diff --git a/source/mir/generator/GeneratorLibraryRepository.java b/source/mir/generator/GeneratorLibraryRepository.java
index bed9216..1ac0669 100755 (executable)
--- a/source/mir/generator/GeneratorLibraryRepository.java
+++ b/source/mir/generator/GeneratorLibraryRepository.java
@@ -65,7 +65,7 @@ public class GeneratorLibraryRepository {
       }
     }
     catch (Exception e) {
-      e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));
+      e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));
       throw new GeneratorFailure("Failed to construct generator library: " + e.getMessage(), e);
     }
 

diff --git a/source/mir/misc/WebdbImage.java b/source/mir/misc/WebdbImage.java
index 05d2c35..bb9c8e7 100755 (executable)
--- a/source/mir/misc/WebdbImage.java
+++ b/source/mir/misc/WebdbImage.java
@@ -35,8 +35,8 @@ package mir.misc;
  * Title:\r
  * Description:\r
  * Copyright:    Copyright (c) 2002 Mir-coders\r
- * @author $Author: zapata $\r
- * @version $Id: WebdbImage.java,v 1.10 2003/02/21 05:37:59 zapata Exp $\r
+ * @author $Author: idfx $\r
+ * @version $Id: WebdbImage.java,v 1.11 2003/02/28 18:27:07 idfx Exp $\r
  */\r
 \r
 import java.io.File;\r
@@ -52,7 +52,6 @@ import javax.media.jai.PlanarImage;
 import com.sun.media.jai.codec.FileSeekableStream;\r
 \r
 import mir.config.MirPropertiesConfiguration;\r
-import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;\r
 \r
 public class WebdbImage\r
 {\r

diff --git a/source/mir/producer/reader/ProducerConfigReader.java b/source/mir/producer/reader/ProducerConfigReader.java
index c168836..5e2d124 100755 (executable)
--- a/source/mir/producer/reader/ProducerConfigReader.java
+++ b/source/mir/producer/reader/ProducerConfigReader.java
@@ -31,25 +31,20 @@
 \r
 package  mir.producer.reader;\r
 \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.HashSet;\r
 import java.util.Iterator;\r
 import java.util.List;\r
 import java.util.Map;\r
 import java.util.Set;\r
-import java.util.Stack;\r
 import java.util.Vector;\r
 \r
 import mir.producer.CompositeProducerNode;\r
 import mir.producer.ProducerFactory;\r
 import mir.producer.ProducerNode;\r
 import mir.producer.SimpleProducerVerb;\r
-\r
-import mir.util.*;\r
+import mir.util.XMLReader;\r
+import mir.util.XMLReaderTool;\r
 \r
 public class ProducerConfigReader {\r
   private ProducerNodeBuilderLibrary builderLibrary;\r

diff --git a/source/mir/servlet/ServletModule.java b/source/mir/servlet/ServletModule.java
index 407ff50..eb95f61 100755 (executable)
--- a/source/mir/servlet/ServletModule.java
+++ b/source/mir/servlet/ServletModule.java
@@ -54,8 +54,6 @@ import mir.misc.LineFilterWriter;
 import mir.module.AbstractModule;\r
 import mir.module.ModuleException;\r
 import mir.storage.StorageObject;\r
-import mir.storage.StorageObjectFailure;\r
-\r
 import mir.util.*;\r
 \r
 \r
@@ -488,7 +486,7 @@ public abstract class ServletModule {
       return withValues;\r
     }\r
     catch (Throwable e) {\r
-      e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));\r
+      e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
       throw new ServletModuleException(\r
           "ServletModule.getIntersectingValues: " + e.getMessage());\r
     }\r

diff --git a/source/mir/storage/store/ObjectStore.java b/source/mir/storage/store/ObjectStore.java
index 73aea10..b50f0a8 100755 (executable)
--- a/source/mir/storage/store/ObjectStore.java
+++ b/source/mir/storage/store/ObjectStore.java
@@ -71,7 +71,6 @@ import java.util.Properties;
 import javax.servlet.http.HttpServletRequest;\r
 \r
 import mir.config.MirPropertiesConfiguration;\r
-import mir.config.MirPropertiesConfiguration.PropertiesConfigExc;\r
 import mir.log.LoggerWrapper;\r
 \r
 public class ObjectStore {\r

diff --git a/source/mir/util/SQLQueryBuilder.java b/source/mir/util/SQLQueryBuilder.java
index 99a0bc3..eef1844 100755 (executable)
--- a/source/mir/util/SQLQueryBuilder.java
+++ b/source/mir/util/SQLQueryBuilder.java
@@ -1,7 +1,5 @@
 package mir.util;
 
-import java.util.*;
-
 public class SQLQueryBuilder {
   private StringBuffer whereClause;
   private StringBuffer orderByClause;

diff --git a/source/mircoders/entity/EntityImages.java b/source/mircoders/entity/EntityImages.java
index 60a3980..c139b34 100755 (executable)
--- a/source/mircoders/entity/EntityImages.java
+++ b/source/mircoders/entity/EntityImages.java
@@ -53,7 +53,7 @@ import mir.storage.StorageObjectFailure;
  * Diese Klasse enth?lt die Daten eines MetaObjekts\r
  *\r
  * @author RK, mh, mir-coders\r
- * @version $Id: EntityImages.java,v 1.15 2003/02/23 05:00:13 zapata Exp $\r
+ * @version $Id: EntityImages.java,v 1.16 2003/02/28 18:27:08 idfx Exp $\r
  */\r
 \r
 \r
@@ -104,13 +104,13 @@ public class EntityImages extends EntityUploadedMedia
     }\r
     catch (Exception e) {\r
       logger.error("EntityImages.getImage failed: "+e.toString());\r
-      e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));\r
+      e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
       try {\r
         con.setAutoCommit(true);\r
       }\r
       catch (Exception e2) {\r
         logger.error("EntityImages.getImage reseting transaction mode failed: " + e2.toString());\r
-        e2.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));\r
+        e2.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
       }\r
 \r
       try {\r
@@ -221,13 +221,13 @@ public class EntityImages extends EntityUploadedMedia
     }\r
     catch (Throwable e) {\r
       logger.error("EntityImages.getIcon failed: "+e.toString());\r
-      e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));\r
+      e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
       try {\r
         con.setAutoCommit(true);\r
       }\r
       catch (Throwable e2) {\r
         logger.error("EntityImages.getIcon reseting transaction mode failed: " + e2.toString());\r
-        e2.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));\r
+        e2.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
       }\r
 \r
       try {\r

diff --git a/source/mircoders/entity/EntityUploadedMedia.java b/source/mircoders/entity/EntityUploadedMedia.java
index 6b33578..35da22b 100755 (executable)
--- a/source/mircoders/entity/EntityUploadedMedia.java
+++ b/source/mircoders/entity/EntityUploadedMedia.java
@@ -44,7 +44,6 @@ import mir.media.MediaHelper;
 import mir.media.MirMedia;
 import mir.misc.NumberUtils;
 import mir.storage.StorageObject;
-import mir.storage.StorageObjectExc;
 import mir.storage.StorageObjectFailure;
 import mir.log.LoggerWrapper;
 
@@ -54,7 +53,7 @@ import mircoders.storage.DatabaseUploadedMedia;
 /**
  *
  * @author mh, mir-coders group
- * @version $Id: EntityUploadedMedia.java,v 1.19 2003/02/23 05:00:13 zapata Exp $
+ * @version $Id: EntityUploadedMedia.java,v 1.20 2003/02/28 18:27:08 idfx Exp $
  */
 
 

diff --git a/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java b/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java
index a31fadd..018eb2d 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java
@@ -42,7 +42,6 @@ import mir.entity.adapter.EntityAdapterModel;
 import mir.generator.Generator;
 import mir.generator.WriterEngine;
 import mir.log.LoggerWrapper;
-import mir.producer.CompositeProducerNode;
 import mir.producer.ProducerFactory;
 import mir.producer.reader.DefaultProducerNodeBuilders;
 import mir.producer.reader.ProducerConfigReader;

diff --git a/source/mircoders/media/MediaHandlerImages.java b/source/mircoders/media/MediaHandlerImages.java
index f4f9bc7..7db22a2 100755 (executable)
--- a/source/mircoders/media/MediaHandlerImages.java
+++ b/source/mircoders/media/MediaHandlerImages.java
@@ -63,7 +63,7 @@ import mircoders.entity.EntityImages;
  *
  * @see mir.media.MirMedia
  * @author mh
- * @version $Id: MediaHandlerImages.java,v 1.17 2003/02/23 05:00:14 zapata Exp $
+ * @version $Id: MediaHandlerImages.java,v 1.18 2003/02/28 18:27:08 idfx Exp $
  */
 
 
@@ -113,7 +113,7 @@ public abstract class MediaHandlerImages implements MirMedia
     }
     catch ( StorageObjectFailure e) {
       logger.error("MediaHandlerImages.set: "+e.getMessage());
-      e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));
+      e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));
       throw new MirMediaException(e.getMessage());
     }
   }

diff --git a/source/mircoders/media/MediaHandlerImagesExtern.java b/source/mircoders/media/MediaHandlerImagesExtern.java
index 3432e54..ab8c473 100755 (executable)
--- a/source/mircoders/media/MediaHandlerImagesExtern.java
+++ b/source/mircoders/media/MediaHandlerImagesExtern.java
@@ -101,7 +101,7 @@ public class MediaHandlerImagesExtern extends MediaHandlerGeneric
     }\r
     catch(Throwable t) {\r
       logger.error("MediaHandlerImagesExtern.produce: " + t.getMessage());\r
-      t.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));\r
+      t.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
       throw new MirMediaException(t.getMessage());\r
     }\r
   }\r

diff --git a/source/mircoders/media/MediaRequest.java b/source/mircoders/media/MediaRequest.java
index afd5fc6..2ae108b 100755 (executable)
--- a/source/mircoders/media/MediaRequest.java
+++ b/source/mircoders/media/MediaRequest.java
@@ -50,7 +50,6 @@ import mir.misc.FileHandler;
 import mir.misc.FileHandlerException;
 import mir.misc.FileHandlerUserException;
 import mir.misc.StringUtil;
-import mir.module.ModuleException;
 import mir.storage.Database;
 import mir.storage.StorageObjectExc;
 import mir.storage.StorageObjectFailure;
@@ -65,7 +64,7 @@ import mircoders.storage.DatabaseMediaType;
  *    appropriate media objects are set.
  *
  * @author mh
- * @version $Id: MediaRequest.java,v 1.13 2003/02/23 05:00:14 zapata Exp $
+ * @version $Id: MediaRequest.java,v 1.14 2003/02/28 18:27:08 idfx Exp $
  *
  */
 

diff --git a/source/mircoders/servlet/ServletModuleContent.java b/source/mircoders/servlet/ServletModuleContent.java
index f37ccf3..cc317f8 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleContent.java
+++ b/source/mircoders/servlet/ServletModuleContent.java
@@ -31,16 +31,17 @@
 \r
 package mircoders.servlet;\r
 \r
-import java.io.PrintWriter;\r
 import java.io.IOException;\r
-import java.util.*;\r
+import java.util.GregorianCalendar;\r
+import java.util.HashMap;\r
+import java.util.Iterator;\r
+import java.util.List;\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 mir.entity.EntityList;\r
-import mir.entity.adapter.EntityAdapter;\r
 import mir.entity.adapter.EntityAdapterModel;\r
 import mir.entity.adapter.EntityIteratorAdapter;\r
 import mir.log.LoggerWrapper;\r
@@ -50,41 +51,28 @@ import mir.servlet.ServletModule;
 import mir.servlet.ServletModuleException;\r
 import mir.storage.StorageObjectFailure;\r
 import mir.util.CachingRewindableIterator;\r
-import mir.util.HTMLRoutines;\r
-import mir.util.JDBCStringRoutines;\r
 import mir.util.HTTPRequestParser;\r
-import mir.util.URLBuilder;\r
+import mir.util.JDBCStringRoutines;\r
 import mir.util.SQLQueryBuilder;\r
-import mir.log.*;\r
-\r
+import mir.util.URLBuilder;\r
 import mircoders.entity.EntityContent;\r
 import mircoders.entity.EntityUsers;\r
 import mircoders.global.MirGlobal;\r
 import mircoders.module.ModuleContent;\r
-import mircoders.module.ModuleImages;\r
-import mircoders.module.ModuleSchwerpunkt;\r
-import mircoders.module.ModuleTopics;\r
 import mircoders.search.IndexUtil;\r
-import mircoders.storage.DatabaseArticleType;\r
 import mircoders.storage.DatabaseComment;\r
 import mircoders.storage.DatabaseContent;\r
 import mircoders.storage.DatabaseContentToTopics;\r
-import mircoders.storage.DatabaseFeature;\r
-import mircoders.storage.DatabaseImages;\r
-import mircoders.storage.DatabaseLanguage;\r
-import mircoders.storage.DatabaseTopics;\r
 \r
 import org.apache.lucene.index.IndexReader;\r
 \r
 import freemarker.template.SimpleHash;\r
-import freemarker.template.SimpleScalar;\r
-import freemarker.template.TemplateModelRoot;\r
 \r
 /*\r
  *  ServletModuleContent -\r
  *  deliver html for the article admin form.\r
  *\r
- * @version $Id: ServletModuleContent.java,v 1.34 2003/02/21 05:37:59 zapata Exp $\r
+ * @version $Id: ServletModuleContent.java,v 1.35 2003/02/28 18:27:08 idfx Exp $\r
  * @author rk, mir-coders\r
  *\r
  */\r
@@ -556,7 +544,7 @@ public class ServletModuleContent extends ServletModule
       article.update();\r
     }\r
     catch(Throwable e) {\r
-      e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));\r
+      e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
       logger.error("ServletModuleContent.clearparent: " + e.getMessage());\r
 \r
       throw new ServletModuleException("ServletModuleContent.clearparent: " + e.getMessage());\r

diff --git a/source/mircoders/servlet/ServletModuleOpenIndy.java b/source/mircoders/servlet/ServletModuleOpenIndy.java
index b992769..0828b22 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleOpenIndy.java
+++ b/source/mircoders/servlet/ServletModuleOpenIndy.java
@@ -120,7 +120,7 @@ import freemarker.template.TemplateModelRoot;
  *    open-postings to the newswire\r
  *\r
  * @author mir-coders group\r
- * @version $Id: ServletModuleOpenIndy.java,v 1.59 2003/02/23 05:00:15 zapata Exp $\r
+ * @version $Id: ServletModuleOpenIndy.java,v 1.60 2003/02/28 18:27:08 idfx Exp $\r
  *\r
  */\r
 \r
@@ -465,7 +465,7 @@ public class ServletModuleOpenIndy extends ServletModule
       }\r
     }\r
     catch (FileHandlerException e) {\r
-      e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));\r
+      e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));\r
       throw new ServletModuleException("MediaException: "+ e.getMessage());\r
     }\r
     catch (IOException e) { throw new ServletModuleException("IOException: "+ e.getMessage());}\r

diff --git a/source/mircoders/servlet/ServletModuleProducer.java b/source/mircoders/servlet/ServletModuleProducer.java
index 7119e1a..cdebe68 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleProducer.java
+++ b/source/mircoders/servlet/ServletModuleProducer.java
@@ -138,7 +138,7 @@ public class ServletModuleProducer extends ServletModule
       generator.generate(aResponse.getWriter(), generationData, new PrintWriter(new NullWriter()));
     }
     catch (Throwable t) {
-      t.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE));
+      t.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));
       throw new ServletModuleException(t.getMessage());
     }
   }

diff --git a/source/mircoders/storage/DatabaseMessages.java b/source/mircoders/storage/DatabaseMessages.java
index 8461ac7..7a9848b 100755 (executable)
--- a/source/mircoders/storage/DatabaseMessages.java
+++ b/source/mircoders/storage/DatabaseMessages.java
@@ -34,7 +34,6 @@ package mircoders.storage;
 import mir.log.LoggerWrapper;
 import mir.storage.Database;
 import mir.storage.StorageObject;
-import mir.storage.StorageObjectFailure;
 
 
 /**

diff --git a/source/mircoders/storage/DatabaseUploadedMedia.java b/source/mircoders/storage/DatabaseUploadedMedia.java
index 1fd6eee..5730c92 100755 (executable)
--- a/source/mircoders/storage/DatabaseUploadedMedia.java
+++ b/source/mircoders/storage/DatabaseUploadedMedia.java
@@ -36,7 +36,6 @@ import mir.entity.Entity;
 import mir.entity.EntityRelation;
 import mir.storage.Database;
 import mir.storage.StorageObject;
-import mir.storage.StorageObjectExc;
 import mir.storage.StorageObjectFailure;
 
 /**