Entity now freemarker compliant, freemarker lib update, deprecation of HTMLTemplatePr...

[mir.git] / source / mircoders / entity / EntityComment.java

diff --git a/source/mircoders/entity/EntityComment.java b/source/mircoders/entity/EntityComment.java
index 1bbe80b..e599d8e 100755 (executable)
--- a/source/mircoders/entity/EntityComment.java
+++ b/source/mircoders/entity/EntityComment.java
@@ -19,7 +19,7 @@ import mir.storage.*;
  */
 
 
-public class EntityComment extends AbstractEntity implements Entity
+public class EntityComment extends Entity
 {
   private static int instances;
 
@@ -34,13 +34,6 @@ public class EntityComment extends AbstractEntity implements Entity
     setStorage(theStorage);
   }
 
-  public HashMap getValues() {
-    HashMap returnHash = super.getValues();
-    String create = (String)returnHash.get("webdb_create");
-    returnHash.put("date",StringUtil.dateToReadableDate(create));
-
-    return returnHash;
-  }
 
   /**
    * overridden method setValues to patch creator_main_url
@@ -48,14 +41,19 @@ public class EntityComment extends AbstractEntity implements Entity
   public void setValues(HashMap theStringValues)
   {
     if (theStringValues != null) {
-      if (!theStringValues.containsKey("is_published"))
+      if (!theStringValues.containsKey("is_published")) {
        theStringValues.put("is_published","0");
-      if (theStringValues.containsKey("main_url"))
-        if (((String)theStringValues.get("main_url")).equalsIgnoreCase("http://")) {
-          theStringValues.remove("main_url");
-        } else if (!((String)theStringValues.get("main_url")).startsWith("http://")){
-          theStringValues.put("main_url","http://"+((String)theStringValues.get("main_url")));
-        }
+                       }
+
+                       if (theStringValues.containsKey("main_url")){
+                               if (((String)theStringValues.get("main_url")).equalsIgnoreCase("http://")) {
+                                       theStringValues.remove("main_url");
+                               } else if ((!((String)theStringValues.get("main_url")).startsWith("http://"))
+                                                                       && ((String)theStringValues.get("main_url")).length()>0){
+                                       theStringValues.put("main_url","http://"+((String)theStringValues.get("main_url")));
+                               }
+                       }
+
     }
     super.setValues(theStringValues);
   }