From: mh Date: Mon, 18 Mar 2002 10:51:05 +0000 (+0000) Subject: get rid of deprecated makeSimpleList and makeSimpleHash usage. this should be it... X-Git-Tag: prexmlproducerconfig~268 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=4d55a2881c862bff5ad73c5272273904ab0d11f3;p=mir.git get rid of deprecated makeSimpleList and makeSimpleHash usage. this should be it for makeSimpleList. there is still one none obvious use of makeSimpleHash in ServletModuleContent that needs to be taken # care of. --- diff --git a/doc/TODO.txt b/doc/TODO.txt index 1bc5261c..aae4f9f3 100755 --- a/doc/TODO.txt +++ b/doc/TODO.txt @@ -40,7 +40,7 @@ m) re-tweak media infrastructure (underway, -mh) bytes n) CVS id, author stamps o) make Entity implement freemarke TemplateModel (done, rk) -p) don't use deprecated methods. specifically the SimpleList stuff +p) don't use deprecated methods. specifically the SimpleList stuff (done, mh, rk) New Features: @@ -51,7 +51,7 @@ something to do with this event can be seen on this page. (nn) e) It should be possible to choose between direct and indirect open posting. (09/14/2001, done, idfx). g) "Upcoming Events"-include-file (ha) -h) indymedia-links (fh) +h) indymedia-links (done, fh) i) objectStore (underway, -rk) diff --git a/source/mircoders/producer/ProducerAll.java b/source/mircoders/producer/ProducerAll.java index 88f324f6..c07463fb 100755 --- a/source/mircoders/producer/ProducerAll.java +++ b/source/mircoders/producer/ProducerAll.java @@ -97,7 +97,6 @@ public class ProducerAll extends Producer{ long sessionConnectTime = 0; long startTime = (new java.util.Date()).getTime(); EntityContent currentContent; - HashMap currentContentValues; //get all new unproduced content-entities String whereClause="is_produced='0' && to_article_type>0"; @@ -108,7 +107,6 @@ public class ProducerAll extends Producer{ while (entityList != null) { for(int i=0;i=1) { - SimpleList mediaList = HTMLTemplateProcessor.makeSimpleList(currentMedia); - mergeData.put("to_media", mediaList); + mergeData.put("to_media", currentMedia); } @@ -462,8 +461,6 @@ public class ServletModuleContent extends ServletModule String tinyIcon; String iconAlt; - opList = HTMLTemplateProcessor.makeSimpleList(theList); - for (int i=0; i < theList.size();i++) { currentContent = (EntityContent)theList.elementAt(i); //fetching/setting the images @@ -480,15 +477,6 @@ public class ServletModuleContent extends ServletModule //must of had a non-existant to_media_type entry.. //let's save our ass. if (mediaType != null) { - /* - * grrr. why doesn't getId return an int! if It - * did I could just compare the value of getId and - * pick the biggest one. or is there - * another way around this that I am missing? - * can we make getIdasInt() or can we just have - * another getId() that returns an Int and the VM - * will handle it transparantly? -mh - */ try { mediaHandlerName = mediaType.getValue("classname"); mediaHandlerClass = Class.forName("mir.media.MediaHandler"+mediaHandlerName); @@ -526,7 +514,7 @@ public class ServletModuleContent extends ServletModule try{ //mediaList = HTMLTemplateProcessor.makeSimpleList(upMediaEntityList); - contentHash = (SimpleHash)opList.get(i); + contentHash = (SimpleHash)theList.get(i); contentHash.put("tiny_icon", imageRoot+"/"+tinyIcon); contentHash.put("icon_alt", iconAlt); } catch (Exception e){} diff --git a/source/mircoders/servlet/ServletModuleImages.java b/source/mircoders/servlet/ServletModuleImages.java index 75cf2009..ed220773 100755 --- 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());} } diff --git a/source/mircoders/servlet/ServletModuleLinksImcs.java b/source/mircoders/servlet/ServletModuleLinksImcs.java index f100489b..8e7b36d0 100755 --- 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()); } } diff --git a/source/mircoders/servlet/ServletModuleMessage.java b/source/mircoders/servlet/ServletModuleMessage.java index 65da2f1e..4057c08b 100755 --- a/source/mircoders/servlet/ServletModuleMessage.java +++ b/source/mircoders/servlet/ServletModuleMessage.java @@ -54,7 +54,7 @@ public class ServletModuleMessage extends ServletModule if (offset==null || offset.equals("")) offset="0"; mergeData.put("offset",offset); EntityList theList = mainModule.getByWhereClause(null, "webdb_create desc", (new Integer(offset)).intValue()); - 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()));