tiny fixes here and there

diff --git a/source/mir/config/MirPropertiesConfiguration.java b/source/mir/config/MirPropertiesConfiguration.java
index 79c19de..125dff0 100755 (executable)
--- a/source/mir/config/MirPropertiesConfiguration.java
+++ b/source/mir/config/MirPropertiesConfiguration.java
@@ -26,19 +26,17 @@
  */
 package mir.config;
 
  */
 package mir.config;
 

+import multex.Exc;
+import multex.Failure;
+import org.apache.commons.collections.ExtendedProperties;
+
+import javax.servlet.ServletContext;

 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
 import java.io.File;
 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.collections.ExtendedProperties;
-

 /**
  * @author idefix
  */
 /**
  * @author idefix
  */

diff --git a/source/mir/misc/StringUtil.java b/source/mir/misc/StringUtil.java
index 3464faa..fc9b84a 100755 (executable)
--- a/source/mir/misc/StringUtil.java
+++ b/source/mir/misc/StringUtil.java
@@ -39,6 +39,7 @@ import java.util.TimeZone;
  */
 public final class StringUtil {
 
  */
 public final class StringUtil {
 

+  private static TimeZone UTC = TimeZone.getTimeZone("UTC");

   private static RE   re_newline2br, re_brbr2p, re_mail, re_url, re_tags,
                       re_tables, re_forbiddenTags;
 
   private static RE   re_newline2br, re_brbr2p, re_mail, re_url, re_tags,
                       re_tables, re_forbiddenTags;
 


@@ -384,10 +385,11 @@ public final class StringUtil {
     seconds = Integer.parseInt(anInternalDate.substring(17,19));
 
     timezoneOffset = Integer.parseInt(anInternalDate.substring(20,22));
     seconds = Integer.parseInt(anInternalDate.substring(17,19));
 
     timezoneOffset = Integer.parseInt(anInternalDate.substring(20,22));

-    if (anInternalDate.charAt(19) == '-')
+    if (anInternalDate.charAt(19) == '-') {

       timezoneOffset = -timezoneOffset;
       timezoneOffset = -timezoneOffset;

+    }

 
 

-    calendar.setTimeZone(TimeZone.getTimeZone("UTC"));
+    calendar.setTimeZone(UTC);

     calendar.set(year, month-1, day, hours, minutes, seconds);
     calendar.add(Calendar.HOUR, -timezoneOffset);
 
     calendar.set(year, month-1, day, hours, minutes, seconds);
     calendar.add(Calendar.HOUR, -timezoneOffset);
 

diff --git a/source/mircoders/abuse/RegularExpressionFilterType.java b/source/mircoders/abuse/RegularExpressionFilterType.java
index f6b57b6..c19b3f8 100755 (executable)
--- a/source/mircoders/abuse/RegularExpressionFilterType.java
+++ b/source/mircoders/abuse/RegularExpressionFilterType.java
@@ -31,14 +31,13 @@
 package mircoders.abuse;
 
 import gnu.regexp.RE;
 package mircoders.abuse;
 
 import gnu.regexp.RE;

+import mir.entity.Entity;
+import mir.session.Request;

 
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
 
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 

-import mir.entity.Entity;
-import mir.session.Request;
-

 
 /**
   * A description of a regular expression filter.
 
 /**
   * A description of a regular expression filter.

diff --git a/source/mircoders/global/Abuse.java b/source/mircoders/global/Abuse.java
index 329aeff..dd54988 100755 (executable)
--- a/source/mircoders/global/Abuse.java
+++ b/source/mircoders/global/Abuse.java
@@ -30,22 +30,6 @@
 
 package mircoders.global;
 
 
 package mircoders.global;
 

-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-

 import mir.config.MirPropertiesConfiguration;
 import mir.entity.Entity;
 import mir.entity.adapter.EntityAdapterModel;
 import mir.config.MirPropertiesConfiguration;
 import mir.entity.Entity;
 import mir.entity.adapter.EntityAdapterModel;


@@ -59,11 +43,25 @@ import mircoders.abuse.FilterEngine;
 import mircoders.entity.EntityComment;
 import mircoders.entity.EntityContent;
 import mircoders.localizer.MirAdminInterfaceLocalizer;
 import mircoders.entity.EntityComment;
 import mircoders.entity.EntityContent;
 import mircoders.localizer.MirAdminInterfaceLocalizer;

-import mircoders.module.ModuleContent;

 import mircoders.module.ModuleComment;
 import mircoders.module.ModuleComment;

-
+import mircoders.module.ModuleContent;

 import org.apache.commons.collections.ExtendedProperties;
 
 import org.apache.commons.collections.ExtendedProperties;
 

+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+

 /**
  *  This class manages abuse (spam, offending material, etc.). This
  *  is done by using a set of filters managed by the FilterEngine class.
 /**
  *  This class manages abuse (spam, offending material, etc.). This
  *  is done by using a set of filters managed by the FilterEngine class.

diff --git a/source/mircoders/localizer/basic/MirBasicArticlePostingHandler.java b/source/mircoders/localizer/basic/MirBasicArticlePostingHandler.java
index d9fb68a..c3f42e4 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicArticlePostingHandler.java
+++ b/source/mircoders/localizer/basic/MirBasicArticlePostingHandler.java
@@ -30,12 +30,6 @@
 
 package mircoders.localizer.basic;
 
 
 package mircoders.localizer.basic;
 

-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-

 import mir.entity.Entity;
 import mir.misc.StringUtil;
 import mir.session.Request;
 import mir.entity.Entity;
 import mir.misc.StringUtil;
 import mir.session.Request;


@@ -54,6 +48,12 @@ import mircoders.storage.DatabaseContent;
 import mircoders.storage.DatabaseContentToMedia;
 import mircoders.storage.DatabaseContentToTopics;
 
 import mircoders.storage.DatabaseContentToMedia;
 import mircoders.storage.DatabaseContentToTopics;
 

+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+

 /**
  * Extensible handler for open article postings
  */
 /**
  * Extensible handler for open article postings
  */

diff --git a/source/mircoders/producer/MediaGeneratingProducerNode.java b/source/mircoders/producer/MediaGeneratingProducerNode.java
index 584cbeb..192ca2b 100755 (executable)
--- a/source/mircoders/producer/MediaGeneratingProducerNode.java
+++ b/source/mircoders/producer/MediaGeneratingProducerNode.java
@@ -61,12 +61,15 @@ public class MediaGeneratingProducerNode extends AbstractProducerNode {
       data = ParameterExpander.findValueForKey( aValueMap, mediaEntityKey );
 
       if (!(data instanceof EntityAdapter)) {
       data = ParameterExpander.findValueForKey( aValueMap, mediaEntityKey );
 
       if (!(data instanceof EntityAdapter)) {

-        throw new ProducerExc("MediaGeneratingProducerNode: value of '"+mediaEntityKey+"' is not an EntityAdapter, but an " + data.getClass().getName());
+        throw new ProducerExc("MediaGeneratingProducerNode: value of '" +
+            mediaEntityKey + "' is not an EntityAdapter, but an " + data.getClass().getName());

       }
 
       entity = ((EntityAdapter) data).getEntity();
       }
 
       entity = ((EntityAdapter) data).getEntity();

-      if (! (entity instanceof EntityUploadedMedia)) {
-        throw new ProducerExc("MediaGeneratingProducerNode: value of '"+mediaEntityKey+"' is not an uploaded media EntityAdapter, but a " + entity.getClass().getName() + " adapter");
+      if (!(entity instanceof EntityUploadedMedia)) {
+        throw new ProducerExc("MediaGeneratingProducerNode: value of '" +
+            mediaEntityKey + "' is not an uploaded media EntityAdapter, but a " +
+            entity.getClass().getName() + " adapter");

       }
 
       uploadedMediaEntity = (EntityUploadedMedia) entity;
       }
 
       uploadedMediaEntity = (EntityUploadedMedia) entity;


@@ -80,7 +83,8 @@ public class MediaGeneratingProducerNode extends AbstractProducerNode {
       entity.setFieldValue("is_produced", "1");
       entity.update();
 
       entity.setFieldValue("is_produced", "1");
       entity.update();
 

-      aLogger.info("media with id "+uploadedMediaEntity.getFieldValue("id") + ", mediaType " + mediaType.getFieldValue("name") + " successfully produced");
+      aLogger.info("media with id " + uploadedMediaEntity.getFieldValue("id") +
+          ", mediaType " + mediaType.getFieldValue("name") + " successfully produced");

     }
     catch (Throwable t) {
       String message = "Error while generating media";
     }
     catch (Throwable t) {
       String message = "Error while generating media";