From c1442585c17418ee8c6d96635a180c0a3c55ef07 Mon Sep 17 00:00:00 2001 From: idfx Date: Fri, 28 Feb 2003 18:27:07 +0000 Subject: [PATCH] Some small things like, reorganizing imports, accessing static variables in a static way. (thanks to eclipse) --- source/Mir.java | 9 ++++--- source/mir/entity/Entity.java | 4 +-- .../mir/generator/GeneratorLibraryRepository.java | 2 +- source/mir/misc/WebdbImage.java | 5 ++-- .../mir/producer/reader/ProducerConfigReader.java | 9 ++----- source/mir/servlet/ServletModule.java | 4 +-- source/mir/storage/store/ObjectStore.java | 1 - source/mir/util/SQLQueryBuilder.java | 2 -- source/mircoders/entity/EntityImages.java | 10 ++++---- source/mircoders/entity/EntityUploadedMedia.java | 3 +-- .../localizer/basic/MirBasicProducerLocalizer.java | 1 - source/mircoders/media/MediaHandlerImages.java | 4 +-- .../mircoders/media/MediaHandlerImagesExtern.java | 2 +- source/mircoders/media/MediaRequest.java | 3 +-- source/mircoders/servlet/ServletModuleContent.java | 30 +++++++--------------- .../mircoders/servlet/ServletModuleOpenIndy.java | 4 +-- .../mircoders/servlet/ServletModuleProducer.java | 2 +- source/mircoders/storage/DatabaseMessages.java | 1 - .../mircoders/storage/DatabaseUploadedMedia.java | 1 - 19 files changed, 35 insertions(+), 62 deletions(-) diff --git a/source/Mir.java b/source/Mir.java index be2b77e3..ed6825c3 100755 --- a/source/Mir.java +++ b/source/Mir.java @@ -58,6 +58,7 @@ import freemarker.template.TemplateModel; import mir.config.MirPropertiesConfiguration; import mir.generator.FreemarkerGenerator; +import mir.log.LoggerWrapper; import mir.misc.HTMLTemplateProcessor; import mir.misc.StringUtil; import mir.servlet.AbstractServlet; @@ -80,8 +81,8 @@ import mircoders.storage.DatabaseUsers; /** * Mir.java - main servlet, that dispatches to servletmodules * - * @author $Author: zapata $ - * @version $Id: Mir.java,v 1.29 2003/02/23 05:00:10 zapata Exp $ + * @author $Author: idfx $ + * @version $Id: Mir.java,v 1.30 2003/02/28 18:27:07 idfx Exp $ * */ public class Mir extends AbstractServlet { @@ -376,7 +377,7 @@ public class Mir extends AbstractServlet { } catch (Exception e) { logger.error("Error in ErrorTemplate: " + e.getMessage()); - e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE)); + e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE)); } } @@ -465,7 +466,7 @@ public class Mir extends AbstractServlet { getLocale(req)); } catch (Exception e) { - e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE)); + e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE)); handleError(req, res, out, "error while trying to send startpage. " + e.getMessage()); } } diff --git a/source/mir/entity/Entity.java b/source/mir/entity/Entity.java index 72e54204..0ea03865 100755 --- a/source/mir/entity/Entity.java +++ b/source/mir/entity/Entity.java @@ -59,7 +59,7 @@ import mir.storage.StorageObjectFailure; * Base Class of Entities * Interfacing TemplateHashModel and TemplateModelRoot to be freemarker compliant * - * @version $Id: Entity.java,v 1.15 2003/02/23 05:00:11 zapata Exp $ + * @version $Id: Entity.java,v 1.16 2003/02/28 18:27:07 idfx Exp $ * @author rk * */ @@ -288,7 +288,7 @@ public class Entity implements TemplateHashModel, TemplateModelRoot protected void throwStorageObjectFailure(Throwable e, String wo) throws StorageObjectFailure { logger.error(e.toString() + " function: " + wo); - e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE)); + e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE)); throw new StorageObjectFailure("Storage Object Exception in entity", e); } diff --git a/source/mir/generator/GeneratorLibraryRepository.java b/source/mir/generator/GeneratorLibraryRepository.java index bed92165..1ac0669c 100755 --- 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 05d2c35b..bb9c8e79 100755 --- a/source/mir/misc/WebdbImage.java +++ b/source/mir/misc/WebdbImage.java @@ -35,8 +35,8 @@ package mir.misc; * Title: * Description: * Copyright: Copyright (c) 2002 Mir-coders - * @author $Author: zapata $ - * @version $Id: WebdbImage.java,v 1.10 2003/02/21 05:37:59 zapata Exp $ + * @author $Author: idfx $ + * @version $Id: WebdbImage.java,v 1.11 2003/02/28 18:27:07 idfx Exp $ */ import java.io.File; @@ -52,7 +52,6 @@ import javax.media.jai.PlanarImage; import com.sun.media.jai.codec.FileSeekableStream; import mir.config.MirPropertiesConfiguration; -import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; public class WebdbImage { diff --git a/source/mir/producer/reader/ProducerConfigReader.java b/source/mir/producer/reader/ProducerConfigReader.java index c1688368..5e2d1249 100755 --- a/source/mir/producer/reader/ProducerConfigReader.java +++ b/source/mir/producer/reader/ProducerConfigReader.java @@ -31,25 +31,20 @@ package mir.producer.reader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.Stack; import java.util.Vector; import mir.producer.CompositeProducerNode; import mir.producer.ProducerFactory; import mir.producer.ProducerNode; import mir.producer.SimpleProducerVerb; - -import mir.util.*; +import mir.util.XMLReader; +import mir.util.XMLReaderTool; public class ProducerConfigReader { private ProducerNodeBuilderLibrary builderLibrary; diff --git a/source/mir/servlet/ServletModule.java b/source/mir/servlet/ServletModule.java index 407ff507..eb95f617 100755 --- a/source/mir/servlet/ServletModule.java +++ b/source/mir/servlet/ServletModule.java @@ -54,8 +54,6 @@ import mir.misc.LineFilterWriter; import mir.module.AbstractModule; import mir.module.ModuleException; import mir.storage.StorageObject; -import mir.storage.StorageObjectFailure; - import mir.util.*; @@ -488,7 +486,7 @@ public abstract class ServletModule { return withValues; } catch (Throwable e) { - e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE)); + e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE)); throw new ServletModuleException( "ServletModule.getIntersectingValues: " + e.getMessage()); } diff --git a/source/mir/storage/store/ObjectStore.java b/source/mir/storage/store/ObjectStore.java index 73aea10b..b50f0a88 100755 --- 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; import mir.config.MirPropertiesConfiguration; -import mir.config.MirPropertiesConfiguration.PropertiesConfigExc; import mir.log.LoggerWrapper; public class ObjectStore { diff --git a/source/mir/util/SQLQueryBuilder.java b/source/mir/util/SQLQueryBuilder.java index 99a0bc3b..eef1844b 100755 --- 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 60a39805..c139b340 100755 --- 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 * * @author RK, mh, mir-coders - * @version $Id: EntityImages.java,v 1.15 2003/02/23 05:00:13 zapata Exp $ + * @version $Id: EntityImages.java,v 1.16 2003/02/28 18:27:08 idfx Exp $ */ @@ -104,13 +104,13 @@ public class EntityImages extends EntityUploadedMedia } catch (Exception e) { logger.error("EntityImages.getImage failed: "+e.toString()); - e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE)); + e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE)); try { con.setAutoCommit(true); } catch (Exception e2) { logger.error("EntityImages.getImage reseting transaction mode failed: " + e2.toString()); - e2.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE)); + e2.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE)); } try { @@ -221,13 +221,13 @@ public class EntityImages extends EntityUploadedMedia } catch (Throwable e) { logger.error("EntityImages.getIcon failed: "+e.toString()); - e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE)); + e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE)); try { con.setAutoCommit(true); } catch (Throwable e2) { logger.error("EntityImages.getIcon reseting transaction mode failed: " + e2.toString()); - e2.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE)); + e2.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE)); } try { diff --git a/source/mircoders/entity/EntityUploadedMedia.java b/source/mircoders/entity/EntityUploadedMedia.java index 6b335789..35da22b1 100755 --- 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 a31fadd3..018eb2d8 100755 --- 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 f4f9bc77..7db22a20 100755 --- 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 3432e54e..ab8c4737 100755 --- a/source/mircoders/media/MediaHandlerImagesExtern.java +++ b/source/mircoders/media/MediaHandlerImagesExtern.java @@ -101,7 +101,7 @@ public class MediaHandlerImagesExtern extends MediaHandlerGeneric } catch(Throwable t) { logger.error("MediaHandlerImagesExtern.produce: " + t.getMessage()); - t.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE)); + t.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE)); throw new MirMediaException(t.getMessage()); } } diff --git a/source/mircoders/media/MediaRequest.java b/source/mircoders/media/MediaRequest.java index afd5fc69..2ae108b1 100755 --- 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 f37ccf3a..cc317f84 100755 --- a/source/mircoders/servlet/ServletModuleContent.java +++ b/source/mircoders/servlet/ServletModuleContent.java @@ -31,16 +31,17 @@ package mircoders.servlet; -import java.io.PrintWriter; import java.io.IOException; -import java.util.*; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import mir.entity.EntityList; -import mir.entity.adapter.EntityAdapter; import mir.entity.adapter.EntityAdapterModel; import mir.entity.adapter.EntityIteratorAdapter; import mir.log.LoggerWrapper; @@ -50,41 +51,28 @@ import mir.servlet.ServletModule; import mir.servlet.ServletModuleException; import mir.storage.StorageObjectFailure; import mir.util.CachingRewindableIterator; -import mir.util.HTMLRoutines; -import mir.util.JDBCStringRoutines; import mir.util.HTTPRequestParser; -import mir.util.URLBuilder; +import mir.util.JDBCStringRoutines; import mir.util.SQLQueryBuilder; -import mir.log.*; - +import mir.util.URLBuilder; import mircoders.entity.EntityContent; import mircoders.entity.EntityUsers; import mircoders.global.MirGlobal; import mircoders.module.ModuleContent; -import mircoders.module.ModuleImages; -import mircoders.module.ModuleSchwerpunkt; -import mircoders.module.ModuleTopics; import mircoders.search.IndexUtil; -import mircoders.storage.DatabaseArticleType; import mircoders.storage.DatabaseComment; import mircoders.storage.DatabaseContent; import mircoders.storage.DatabaseContentToTopics; -import mircoders.storage.DatabaseFeature; -import mircoders.storage.DatabaseImages; -import mircoders.storage.DatabaseLanguage; -import mircoders.storage.DatabaseTopics; import org.apache.lucene.index.IndexReader; import freemarker.template.SimpleHash; -import freemarker.template.SimpleScalar; -import freemarker.template.TemplateModelRoot; /* * ServletModuleContent - * deliver html for the article admin form. * - * @version $Id: ServletModuleContent.java,v 1.34 2003/02/21 05:37:59 zapata Exp $ + * @version $Id: ServletModuleContent.java,v 1.35 2003/02/28 18:27:08 idfx Exp $ * @author rk, mir-coders * */ @@ -556,7 +544,7 @@ public class ServletModuleContent extends ServletModule article.update(); } catch(Throwable e) { - e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE)); + e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE)); logger.error("ServletModuleContent.clearparent: " + e.getMessage()); throw new ServletModuleException("ServletModuleContent.clearparent: " + e.getMessage()); diff --git a/source/mircoders/servlet/ServletModuleOpenIndy.java b/source/mircoders/servlet/ServletModuleOpenIndy.java index b9927692..0828b22b 100755 --- 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 * * @author mir-coders group - * @version $Id: ServletModuleOpenIndy.java,v 1.59 2003/02/23 05:00:15 zapata Exp $ + * @version $Id: ServletModuleOpenIndy.java,v 1.60 2003/02/28 18:27:08 idfx Exp $ * */ @@ -465,7 +465,7 @@ public class ServletModuleOpenIndy extends ServletModule } } catch (FileHandlerException e) { - e.printStackTrace(logger.asPrintWriter(logger.DEBUG_MESSAGE)); + e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE)); throw new ServletModuleException("MediaException: "+ e.getMessage()); } catch (IOException e) { throw new ServletModuleException("IOException: "+ e.getMessage());} diff --git a/source/mircoders/servlet/ServletModuleProducer.java b/source/mircoders/servlet/ServletModuleProducer.java index 7119e1af..cdebe680 100755 --- 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 8461ac73..7a9848b5 100755 --- 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 1fd6eee5..5730c927 100755 --- 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; /** -- 2.11.0