jlint debugging...

diff --git a/source/mir/entity/Entity.java b/source/mir/entity/Entity.java
index d10fb93..6530eb3 100755 (executable)
--- a/source/mir/entity/Entity.java
+++ b/source/mir/entity/Entity.java
@@ -68,15 +68,18 @@ public class Entity implements TemplateHashModel, TemplateModelRoot
   public void setValues(HashMap theStringValues)
   {
     /** @todo should be synchronized */
-    theValuesHash = new HashMap();
-    String aKey;
-    Set set = theStringValues.keySet();
-    Iterator it = set.iterator();
-    int size = set.size();
-    for (int i = 0; i < size; i++) {
-      aKey = (String)it.next();
-      theValuesHash.put(aKey, (String)theStringValues.get(aKey));
+    if (theStringValues!=null) {
+      theValuesHash = new HashMap();
+      String aKey;
+      Set set = theStringValues.keySet();
+      Iterator it = set.iterator();
+      int size = set.size();
+      for (int i = 0; i < size; i++) {
+        aKey = (String)it.next();
+        theValuesHash.put(aKey, (String)theStringValues.get(aKey));
+      }
     }
+    else theLog.printWarning("Entity.setValues called with null HashMap");
  }
 
   /**

diff --git a/source/mir/servlet/ServletModuleDispatch.java b/source/mir/servlet/ServletModuleDispatch.java
index 472b48e..76570e0 100755 (executable)
--- a/source/mir/servlet/ServletModuleDispatch.java
+++ b/source/mir/servlet/ServletModuleDispatch.java
@@ -67,7 +67,7 @@ public final class ServletModuleDispatch {
       catch ( NoSuchMethodException e) { throw new ServletModuleException("no such method!" + e.toString());}
       catch ( SecurityException e) { throw new ServletModuleException("method not allowed!" + e.toString());}
       catch ( InvocationTargetException e) {
-        if (e.getTargetException().getClass().getName() == "mir.servlet.ServletModuleUserException") {
+        if (e.getTargetException().getClass().getName().equals("mir.servlet.ServletModuleUserException")) {
             throw new ServletModuleUserException(((ServletModuleUserException)e.getTargetException()).getMsg());
         } else {
             e.printStackTrace();

diff --git a/source/mir/storage/Database.java b/source/mir/storage/Database.java
index 5b37923..893aa92 100755 (executable)
--- a/source/mir/storage/Database.java
+++ b/source/mir/storage/Database.java
@@ -47,7 +47,6 @@ public class Database implements StorageObject {
   private int                         defaultLimit;
   protected DatabaseAdaptor             theAdaptor;
   protected Logfile                   theLog;
-  //protected Connection                con;
 
   /**
    * Kontruktor bekommt den Filenamen des Konfigurationsfiles übergeben.

diff --git a/source/mircoders/entity/EntityBreaking.java b/source/mircoders/entity/EntityBreaking.java
index 216d3e9..4b430d8 100755 (executable)
--- a/source/mircoders/entity/EntityBreaking.java
+++ b/source/mircoders/entity/EntityBreaking.java
@@ -14,20 +14,13 @@ import java.io.*;
 import java.util.*;
 import java.sql.*;
 
-import freemarker.template.*;
-
 import mir.entity.*;
 import mir.misc.*;
 import mir.storage.*;
 
 public class EntityBreaking extends Entity
 {
-       private static int instances;
-
-       public EntityBreaking() {       super(); instances++;   }
+       public EntityBreaking() {       super();        }
        public EntityBreaking(StorageObject theStorage) {       this(); setStorage(theStorage); }
-       public void finalize() {
-    instances--;
-    super.finalize();
-  }
+
 }

diff --git a/source/mircoders/entity/EntityComment.java b/source/mircoders/entity/EntityComment.java
index e599d8e..7b535be 100755 (executable)
--- a/source/mircoders/entity/EntityComment.java
+++ b/source/mircoders/entity/EntityComment.java
@@ -21,12 +21,10 @@ import mir.storage.*;
 
 public class EntityComment extends Entity
 {
-  private static int instances;
 
   public EntityComment()
   {
     super();
-    instances++;
   }
 
   public EntityComment(StorageObject theStorage) {
@@ -59,8 +57,4 @@ public class EntityComment extends Entity
   }
 
 
-  public void finalize() {
-    instances--;
-    super.finalize();
-  }
 }

diff --git a/source/mircoders/entity/EntityContent.java b/source/mircoders/entity/EntityContent.java
index 39b0428..8eac2db 100755 (executable)
--- a/source/mircoders/entity/EntityContent.java
+++ b/source/mircoders/entity/EntityContent.java
@@ -25,14 +25,11 @@ import mircoders.storage.*;
 public class EntityContent extends Entity
 {
 
-       private static int      instances;
-
        // constructors
 
        public EntityContent()
        {
                super();
-               instances++;
     //content_data is now filed-type "text"
                //streamedInput = new ArrayList();
                //streamedInput.add("content_data");
@@ -43,11 +40,6 @@ public class EntityContent extends Entity
                setStorage(theStorage);
        }
 
-       public void finalize() {
-    instances--;
-    super.finalize();
-  }
-
        //
        // methods
 

diff --git a/source/mircoders/entity/EntityFeature.java b/source/mircoders/entity/EntityFeature.java
index 16d422e..0863559 100755 (executable)
--- a/source/mircoders/entity/EntityFeature.java
+++ b/source/mircoders/entity/EntityFeature.java
@@ -20,18 +20,15 @@ import mircoders.storage.*;
 
 public class EntityFeature extends Entity
 {
-               private static int instances;
-
 
                public EntityFeature()
                {
-       super();
-                               instances++;
+       super();
                }
 
                public EntityFeature(StorageObject theStorage) {
                        this();
-       setStorage(theStorage);
+       setStorage(theStorage);
                }
 
        public void update() throws StorageObjectException{
@@ -40,8 +37,4 @@ public class EntityFeature extends Entity
                dbContent.setUnproduced("to_feature="+getId());
        }
 
-  public void finalize() {
-         instances--;
-    super.finalize();
-  }
 }

diff --git a/source/mircoders/entity/EntityImages.java b/source/mircoders/entity/EntityImages.java
index 7e75b40..cb890dc 100755 (executable)
--- a/source/mircoders/entity/EntityImages.java
+++ b/source/mircoders/entity/EntityImages.java
@@ -19,12 +19,9 @@ import mir.storage.*;
 
 public class EntityImages extends Entity
 {
-       private static int instances;
-
        public EntityImages()
        {
                super();
-               instances++;
        }
 
        public EntityImages(StorageObject theStorage) {
@@ -106,7 +103,7 @@ public class EntityImages extends Entity
                        }
                        catch (Exception e) {throwStorageObjectException(e, "settimage :: setImage gescheitert: ");}
                        finally {
-                               try {con.setAutoCommit(true); } catch (Exception e) {;}
+                               try { if (con!=null) con.setAutoCommit(true); } catch (Exception e) {;}
                                theStorageObject.freeConnection(con,pstmt); }
                }
        }
@@ -154,9 +151,4 @@ public class EntityImages extends Entity
                return img_data;
        }
 
-       public void finalize() {
-    instances--;
-    super.finalize();
-  }
-
 }

diff --git a/source/mircoders/entity/EntityLinksImcs.java b/source/mircoders/entity/EntityLinksImcs.java
index 6b83557..942fd31 100755 (executable)
--- a/source/mircoders/entity/EntityLinksImcs.java
+++ b/source/mircoders/entity/EntityLinksImcs.java
@@ -20,11 +20,9 @@ import mircoders.storage.*;
 
 public class EntityLinksImcs extends Entity
 {
-  private static int instances;
 
   public EntityLinksImcs(){
          super();
-    instances++;
   }
 
   public EntityLinksImcs(StorageObject theStorage)
@@ -33,8 +31,4 @@ public class EntityLinksImcs extends Entity
     setStorage(theStorage);
   }
 
-  public void finalize() {
-    instances--;
-    super.finalize();
-  }
 }

diff --git a/source/mircoders/entity/EntityMedia.java b/source/mircoders/entity/EntityMedia.java
index c4cc9ab..62a9f7b 100755 (executable)
--- a/source/mircoders/entity/EntityMedia.java
+++ b/source/mircoders/entity/EntityMedia.java
@@ -20,11 +20,9 @@ import mircoders.storage.*;
 
 public class EntityMedia extends Entity
 {
-  private static int instances;
 
   public EntityMedia(){
     super();
-    instances++;
   }
 
   public EntityMedia(StorageObject theStorage)
@@ -46,9 +44,4 @@ public class EntityMedia extends Entity
         }
 
        }
-
-  public void finalize() {
-    instances--;
-    super.finalize();
-  }
 }

diff --git a/source/mircoders/entity/EntityTopics.java b/source/mircoders/entity/EntityTopics.java
index 6b985d8..c7fb5cf 100755 (executable)
--- a/source/mircoders/entity/EntityTopics.java
+++ b/source/mircoders/entity/EntityTopics.java
@@ -20,11 +20,8 @@ import mircoders.storage.*;
 
 public class EntityTopics extends Entity
 {
-  private static int instances;
-
   public EntityTopics(){
          super();
-    instances++;
   }
 
   public EntityTopics(StorageObject theStorage)
@@ -40,8 +37,4 @@ public class EntityTopics extends Entity
     dbContent.setUnproduced("to_topic="+getId());
   }
 
-  public void finalize() {
-    instances--;
-    super.finalize();
-  }
 }

diff --git a/source/mircoders/entity/EntityUploadedMedia.java b/source/mircoders/entity/EntityUploadedMedia.java
index d7f0561..a5a4918 100755 (executable)
--- a/source/mircoders/entity/EntityUploadedMedia.java
+++ b/source/mircoders/entity/EntityUploadedMedia.java
@@ -20,11 +20,10 @@ import mircoders.storage.*;
 
 public class EntityUploadedMedia extends Entity
 {
-  private static int instances;
+
 
   public EntityUploadedMedia(){
     super();
-    instances++;
   }
 
   public EntityUploadedMedia(StorageObject theStorage)
@@ -57,10 +56,4 @@ public class EntityUploadedMedia extends Entity
         return ent;
        }
 
-
-
-  public void finalize() {
-    instances--;
-    super.finalize();
-  }
 }

diff --git a/source/mircoders/entity/EntityUsers.java b/source/mircoders/entity/EntityUsers.java
index 56f9912..1fbded3 100755 (executable)
--- a/source/mircoders/entity/EntityUsers.java
+++ b/source/mircoders/entity/EntityUsers.java
@@ -19,12 +19,10 @@ import mir.storage.*;
 
 public class EntityUsers extends Entity
 {
-               private static int instances;
 
                public EntityUsers()
                {
                        super();
-                               instances++;
                }
 
                public EntityUsers(StorageObject theStorage) {
@@ -32,11 +30,6 @@ public class EntityUsers extends Entity
                        setStorage(theStorage);
                }
 
-       public void finalize() {
-    instances--;
-    super.finalize();
-  }
-
        // Methods
 
        public boolean isAdmin()

diff --git a/source/mircoders/entity/EntityVideo.java b/source/mircoders/entity/EntityVideo.java
index fd44a60..a72ab3a 100755 (executable)
--- a/source/mircoders/entity/EntityVideo.java
+++ b/source/mircoders/entity/EntityVideo.java
@@ -19,12 +19,10 @@ import mir.storage.*;
 
 public class EntityVideo extends Entity
 {
-       private static int instances;
 
        public EntityVideo()
        {
                super();
-               instances++;
        }
 
        public EntityVideo(StorageObject theStorage) {
@@ -106,10 +104,4 @@ public class EntityVideo extends Entity
                super.setValues(theStringValues);
        }
 
-
-       public void finalize() {
-               instances--;
-               super.finalize();
-       }
-
 }

diff --git a/source/mircoders/producer/ProducerList.java b/source/mircoders/producer/ProducerList.java
index 5a4195c..99d5950 100755 (executable)
--- a/source/mircoders/producer/ProducerList.java
+++ b/source/mircoders/producer/ProducerList.java
@@ -128,7 +128,7 @@ abstract public class ProducerList extends Producer {
                       //we most likely need further info
                       upMedia = mediaStorage.selectById(upMedia.getId());
                       upMediaSimpleHash.put("url", mediaHandler.getListView(upMedia, mediaType));
-                      if (upMedia.getValue("is_published") == "1") {
+                      if (upMedia.getValue("is_published").equals("1")) {
                           if (mediaHandler.isImage()) {
                             mediaListImages.add(upMediaSimpleHash);
                           } else if (mediaHandler.isAudio()) {
@@ -148,7 +148,7 @@ abstract public class ProducerList extends Producer {
                   contentHash.put("to_media_video", mediaListVideo);
                   contentHash.put("to_media_other", mediaListOther);
                 } //end if currentMediaList != null
-                                                       
+
                                                                //content to html
                                                                if(((SimpleScalar)contentHash.get("is_html")).getAsString().equals("0") ){
                                                                        SimpleScalar tempScalar = (SimpleScalar)contentHash.get("description");

diff --git a/source/mircoders/producer/ProducerMedia.java b/source/mircoders/producer/ProducerMedia.java
index 93eda60..9a3997f 100755 (executable)
--- a/source/mircoders/producer/ProducerMedia.java
+++ b/source/mircoders/producer/ProducerMedia.java
@@ -68,13 +68,13 @@ public class ProducerMedia extends Producer {
                     String mediaHandlerName = currentMediaType.getValue("classname");
                     theLog.printError("HANLDER"+mediaHandlerName);
                     Class mediaHandlerClass = Class.forName("mir.media.MediaHandler"+mediaHandlerName);
-                    MirMedia currentMediaHandler = (MirMedia)mediaHandlerClass.newInstance();       
-                        
+                    MirMedia currentMediaHandler = (MirMedia)mediaHandlerClass.newInstance();
+
                     String date = currentMedia.getValue("date");
                     String datePath = StringUtil.webdbDate2path(date);
 
                     // do icon
-                    if (currentMedia.getValue("icon_is_produced") != "1") {
+                    if (!currentMedia.getValue("icon_is_produced").equals("1")) {
                         iconPath = currentMediaHandler.getIconStoragePath();
                         iconFilename = producerDocRoot+iconPath+datePath+
                             currentMedia.getId()+"."+currentMediaType.getValue("name");
@@ -87,7 +87,7 @@ public class ProducerMedia extends Producer {
                     } else {
                         iconProduced = true;
                     }
-                    
+
                     //now produce the media content
 
                     theLog.printError("ABOUT OT MED"+id2);

diff --git a/source/mircoders/producer/ProducerStartPage.java b/source/mircoders/producer/ProducerStartPage.java
index ba10a4b..3ea6e41 100755 (executable)
--- a/source/mircoders/producer/ProducerStartPage.java
+++ b/source/mircoders/producer/ProducerStartPage.java
@@ -192,7 +192,7 @@ public class ProducerStartPage extends Producer {
                 //we most likely need further info
                 upMedia = mediaStorage.selectById(upMedia.getId());
                 upMediaSimpleHash.put("url", mediaHandler.getListView(upMedia, mediaType));
-                if (upMedia.getValue("is_published") == "1") {
+                if (upMedia.getValue("is_published").equals("1")) {
                   if (mediaHandler.isImage()) {
                     mediaListImages.add(upMediaSimpleHash);
                   } else if (mediaHandler.isAudio()) {
@@ -269,8 +269,8 @@ public class ProducerStartPage extends Producer {
                 //we most likely need further info
                 upMedia = mediaStorage.selectById(upMedia.getId());
                 upMediaSimpleHash.put("url", mediaHandler.getListView(upMedia, mediaType));
-                /** @todo String comparison here should never work .equals()  !!!! */
-                if (upMedia.getValue("is_published") == "1") {
+
+                if (upMedia.getValue("is_published").equals("1")) {
                   if (mediaHandler.isImage()) {
                     mediaListImages.add(upMediaSimpleHash);
                   } else if (mediaHandler.isAudio()) {

diff --git a/source/mircoders/producer/ProducerTopics.java b/source/mircoders/producer/ProducerTopics.java
index e23e970..7fb06c0 100755 (executable)
--- a/source/mircoders/producer/ProducerTopics.java
+++ b/source/mircoders/producer/ProducerTopics.java
@@ -126,7 +126,7 @@ public class ProducerTopics extends ProducerList {
                     //we most likely need further info
                     upMedia = mediaStorage.selectById(upMedia.getId());
                     upMediaSimpleHash.put("url", mediaHandler.getListView(upMedia, mediaType));
-                    if (upMedia.getValue("is_published") == "1") {
+                    if (upMedia.getValue("is_published").equals("1")) {
                       if (mediaHandler.isImage()) {
                         mediaListImages.add(upMediaSimpleHash);
                       } else if (mediaHandler.isAudio()) {
@@ -155,7 +155,7 @@ public class ProducerTopics extends ProducerList {
             logHTML(htmlout,"ProducerTopics: problem with start special: "+currentContent.getId()+" "+e.toString());
           }
         }
-        
+
         //set the list of topics
         setAdditional("topicslist",topicsList);
 

diff --git a/source/mircoders/servlet/ServletModuleImages.java b/source/mircoders/servlet/ServletModuleImages.java
index 970d777..9841466 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleImages.java
+++ b/source/mircoders/servlet/ServletModuleImages.java
@@ -91,10 +91,10 @@ public class ServletModuleImages extends mir.servlet.ServletModule
 
       if (imageData!=null && fileName!=null) {
         String fileType = "-1";
-        
+
        //the where clause to find the media_type entry
         //from the content-type.
-        //we use the media type entry to lookup the 
+        //we use the media type entry to lookup the
         //media Handler/Storage classes
         String wc = " mime_type='"+contentType+"'";
 
@@ -102,7 +102,7 @@ public class ServletModuleImages extends mir.servlet.ServletModule
        String mediaTypeId = null;
         String mediaStorageName = null;
         String mediaHandlerName = null;
- 
+
         //if we found an entry matching the
         //content-type int the table.
         if (mediaTypesList.size() > 0) {
@@ -111,7 +111,7 @@ public class ServletModuleImages extends mir.servlet.ServletModule
           mediaStorageName = mediaTypesList.elementAt(0).getValue("tablename");
           mediaHandlerName = mediaTypesList.elementAt(0).getValue("classname");
           parameters.put("to_media_type",mediaTypeId);
-         
+
           //load the classes via reflection
           String MediaId;
           try {
@@ -131,7 +131,7 @@ public class ServletModuleImages extends mir.servlet.ServletModule
                 //were done with mpReq at this point, dereference it. as it contains
                 //mucho mem. -mh 01.10.2001
                 mpReq=null;
-              
+
               if(mediaId!=null){
                 new ProducerMedia().handle(null, null, false, false, mediaId);
               }
@@ -140,7 +140,7 @@ public class ServletModuleImages extends mir.servlet.ServletModule
           } //end try-catch
 
 
-        if (fileType != "-1")
+        if (!fileType.equals("-1"))
           entImage.setImage(imageData, fileType);
         else
           theLog.printError("Wrong file uploaded!");
@@ -359,7 +359,7 @@ public class ServletModuleImages extends mir.servlet.ServletModule
         String fileType = "-1";
         if (contentType.equals("image/jpeg")) fileType="0";
         if (contentType.equals("image/gif")) fileType="1";
-        if (fileType != "-1") {
+        if (!fileType.equals("-1")) {
           EntityImages entImage = (EntityImages)mainModule.getById(idParam);
           entImage.setImage(imageData, fileType);
         }

diff --git a/source/mircoders/storage/DatabaseContent.java b/source/mircoders/storage/DatabaseContent.java
index 2c750d0..0478cea 100755 (executable)
--- a/source/mircoders/storage/DatabaseContent.java
+++ b/source/mircoders/storage/DatabaseContent.java
@@ -98,8 +98,8 @@ public class DatabaseContent extends Database implements StorageObject {
     return feature;
   }
 
-  public boolean delete(String id)
-    throws StorageObjectException {
+  public boolean delete(String id) throws StorageObjectException
+  {
     DatabaseComment.getInstance().deleteByContentId(id);
     super.delete(id);
     return true;