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

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

diff --git a/source/mircoders/servlet/ServletModuleLinksImcs.java b/source/mircoders/servlet/ServletModuleLinksImcs.java
index f100489..8e7b36d 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleLinksImcs.java
+++ b/source/mircoders/servlet/ServletModuleLinksImcs.java
@@ -62,8 +62,8 @@ public class ServletModuleLinksImcs extends ServletModule
       theLanguageList = languageModule.getByWhereClause(null, "name", 0);
 
       modelRoot.put("new", "1");
-      modelRoot.put("parentlist",HTMLTemplateProcessor.makeSimpleList(theParentList));
-      modelRoot.put("languagelist",HTMLTemplateProcessor.makeSimpleList(theLanguageList));
+      modelRoot.put("parentlist",theParentList);
+      modelRoot.put("languagelist",theLanguageList);
 
       if (theParentList == null || theParentList.getCount() == 0 || theParentList.getCount()>1){
         HTMLTemplateProcessor.process(res,getLanguage(req)+"/"+templateObjektString,
@@ -78,8 +78,6 @@ public class ServletModuleLinksImcs extends ServletModule
       throw new ServletModuleException(e.toString());
     } catch (IOException e) {
       throw new ServletModuleException(e.toString());
-    } catch(StorageObjectException e) {
-      throw new ServletModuleException(e.toString());
     }
   }
 
@@ -141,9 +139,9 @@ public class ServletModuleLinksImcs extends ServletModule
       theImcsList = mainModule.getByWhereClause(whereClause, "title", (new Integer(offset)).intValue());
       theLanguageList = languageModule.getByWhereClause(null, "name", 0);
 
-      modelRoot.put("parentlist",HTMLTemplateProcessor.makeSimpleList(theParentList));
-      modelRoot.put("imcslist",HTMLTemplateProcessor.makeSimpleList(theImcsList));
-      modelRoot.put("languagelist",HTMLTemplateProcessor.makeSimpleList(theLanguageList));
+      modelRoot.put("parentlist",theParentList);
+      modelRoot.put("imcslist",theImcsList);
+      modelRoot.put("languagelist",theLanguageList);
       modelRoot.put("count", (new Integer(theImcsList.getCount())).toString());
                        modelRoot.put("from", (new Integer(theImcsList.getFrom())).toString());
                        modelRoot.put("to", (new Integer(theImcsList.getTo())).toString());
@@ -174,15 +172,13 @@ public class ServletModuleLinksImcs extends ServletModule
       parentList = mainModule.getByWhereClause("to_parent_id=NULL", "title", offset, 1000);
       theLanguageList = languageModule.getByWhereClause(null, "name", 0);
 
-      modelRoot.put("parentlist",HTMLTemplateProcessor.makeSimpleList(parentList));
-      modelRoot.put("languagelist",HTMLTemplateProcessor.makeSimpleList(theLanguageList));
+      modelRoot.put("parentlist",parentList);
+      modelRoot.put("languagelist",theLanguageList);
       modelRoot.put("entity", mainModule.getById(idParam));
       deliver(req, res, modelRoot, templateObjektString);
 
     } catch(ModuleException e) {
       throw new ServletModuleException(e.toString());
-    } catch(StorageObjectException e) {
-      throw new ServletModuleException(e.toString());
     }
   }