get rid of deprecated makeSimpleList and makeSimpleHash usage. this should be it...

[mir.git] / source / mircoders / servlet / ServletModuleImages.java

diff --git a/source/mircoders/servlet/ServletModuleImages.java b/source/mircoders/servlet/ServletModuleImages.java
index 75cf200..ed22077 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleImages.java
+++ b/source/mircoders/servlet/ServletModuleImages.java
@@ -36,12 +36,7 @@ import mircoders.producer.*;
 public class ServletModuleImages extends mir.servlet.ServletModule
 {
 
-  private static ModuleMediafolder mediafolderModule;
-  private static DatabaseRights dbRights;
-  private static DatabaseImageFormat dbImageFormat;
-  private static DatabaseImageType dbImageType;
-  private static DatabaseImageColor dbImageColor;
-  private static DatabaseImageLayout dbImageLayout;
+  //private static DatabaseRights dbRights;
 
   // Singelton / Kontruktor
   private static ServletModuleImages instance = new ServletModuleImages();
@@ -55,12 +50,7 @@ public class ServletModuleImages extends mir.servlet.ServletModule
     templateConfirmString = MirConfig.getProp("ServletModule.Bilder.ConfirmTemplate");
     try {
       mainModule = new ModuleImages(DatabaseImages.getInstance());
-      mediafolderModule = new ModuleMediafolder(DatabaseMediafolder.getInstance());
-      dbRights = DatabaseRights.getInstance();
-      dbImageFormat = DatabaseImageFormat.getInstance();
-      dbImageColor = DatabaseImageColor.getInstance();
-      dbImageType = DatabaseImageType.getInstance();
-      dbImageLayout = DatabaseImageLayout.getInstance();
+      //dbRights = DatabaseRights.getInstance();
     }
     catch (StorageObjectException e) {
       theLog.printDebugInfo("servletmodulebilder konnte nicht initialisiert werden");
@@ -264,12 +254,10 @@ public class ServletModuleImages extends mir.servlet.ServletModule
 
       // fetch und ausliefern
       try {
-        mergeData.put("mediafolderPopupData", mediafolderModule.getPopupData());
-        mergeData.put("mediafolderHashdata", mediafolderModule.getHashData());
         if (query_text!=null || query_is_published!=null || query_media_folder!=null) {
           EntityList theList = mainModule.getByWhereClause(whereClause, order, (new Integer(offset)).intValue(),10);
           if (theList != null) {
-            mergeData.put("contentlist",HTMLTemplateProcessor.makeSimpleList(theList));
+            mergeData.put("contentlist",theList);
             if(theList.getOrder()!=null) {
               mergeData.put("order", theList.getOrder());
               mergeData.put("order_encoded", URLEncoder.encode(theList.getOrder()));
@@ -299,7 +287,6 @@ public class ServletModuleImages extends mir.servlet.ServletModule
     try {
       SimpleHash mergeData = new SimpleHash();
       mergeData.put("new", "1");
-      mergeData.put("mediafolderPopupData", mediafolderModule.getPopupData());
       deliver(req, res, mergeData, templateObjektString);
     }
     catch (Exception e) { throw new ServletModuleException(e.toString());}
@@ -314,14 +301,8 @@ public class ServletModuleImages extends mir.servlet.ServletModule
   private void _edit(String idParam, HttpServletRequest req, HttpServletResponse res) throws ServletModuleException {
     if (idParam!=null && !idParam.equals("")) {
       try {
-        SimpleHash mergeData =  HTMLTemplateProcessor.makeSimpleHash(mainModule.getById(idParam));
-        mergeData.put("mediafolderPopupData", mediafolderModule.getPopupData());
-        mergeData.put("rightsHashdata", dbRights.getHashData());
-        mergeData.put("imgformatHashdata", dbImageFormat.getHashData());
-        mergeData.put("imgcolorHashdata", dbImageColor.getHashData());
-        mergeData.put("imgtypeHashdata", dbImageType.getHashData());
-        mergeData.put("imglayoutHashdata", dbImageLayout.getHashData());
-        deliver(req, res, mergeData, templateObjektString);
+        //mergeData.put("rightsHashdata", dbRights.getHashData());
+        deliver(req, res, mainModule.getById(idParam), templateObjektString);
       }
       catch (ModuleException e) { throw new ServletModuleException(e.toString());}
     }