X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fservlet%2FServletModuleMessage.java;h=31c22464867fcf7cad24a752349cfffc810b8439;hb=0d512e810fc3838b6787c2a866864481d79c93ca;hp=fbe12e932031f520db3912022a41c3acc2677cca;hpb=d96e301d3d5b64037f4bd72c12e6ac0f7de69ec7;p=mir.git

diff --git a/source/mircoders/servlet/ServletModuleMessage.java b/source/mircoders/servlet/ServletModuleMessage.java
index fbe12e93..31c22464 100755
--- a/source/mircoders/servlet/ServletModuleMessage.java
+++ b/source/mircoders/servlet/ServletModuleMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002  The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
  *
  * This file is part of Mir.
  *
@@ -18,36 +18,28 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two.  You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries.  If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so.  If you do
- * not wish to do so, delete this exception statement from your version.
+ * the code of this program with  any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two.  You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries.  If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your version.
  */
-
 package mircoders.servlet;
 
-import java.io.IOException;
-import java.net.URLEncoder;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import mir.entity.EntityList;
 import mir.log.LoggerWrapper;
-import mir.misc.HTMLTemplateProcessor;
-import mir.module.ModuleException;
 import mir.servlet.ServletModule;
-import mir.servlet.ServletModuleExc;
 import mir.servlet.ServletModuleFailure;
-import mir.storage.StorageObjectFailure;
+import mircoders.global.MirGlobal;
 import mircoders.module.ModuleMessage;
 import mircoders.storage.DatabaseMessages;
-import freemarker.template.SimpleHash;
 
 /**
  * Title:       ServletModuleMessage
@@ -61,9 +53,6 @@ import freemarker.template.SimpleHash;
 
 public class ServletModuleMessage extends ServletModule
 {
-
-  // Singelton / Kontruktor
-
   private static ServletModuleMessage instance = new ServletModuleMessage();
   public static ServletModule getInstance() { return instance; }
 
@@ -71,49 +60,19 @@ public class ServletModuleMessage extends ServletModule
     super();
     logger = new LoggerWrapper("ServletModule.Messages");
 
-    templateListString = configuration.getString("ServletModule.Messages.ListTemplate");
-    templateObjektString = configuration.getString("ServletModule.Messages.ObjektTemplate");
-    templateConfirmString = configuration.getString("ServletModule.Messages.ConfirmTemplate");
-
     try {
+      model = MirGlobal.localizer().dataModel().adapterModel();
+      definition = "internalMessage";
       mainModule = new ModuleMessage(DatabaseMessages.getInstance());
     }
-    catch (StorageObjectFailure e) {
+    catch (Throwable e) {
       logger.error("initialization of ServletModuleMessage failed!: " + e.getMessage());
 
       throw new ServletModuleFailure(e);
     }
   }
 
-  public void list(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc
-  {
-// fetch and deliver
-    try {
-      SimpleHash mergeData = new SimpleHash();
-      String offset = req.getParameter("offset");
-      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",theList);
-      if(theList.getOrder()!=null) {
-        mergeData.put("order", theList.getOrder());
-        mergeData.put("order_encoded", URLEncoder.encode(theList.getOrder()));
-      }
-      mergeData.put("count", (new Integer(theList.getCount())).toString());
-      mergeData.put("from", (new Integer(theList.getFrom())).toString());
-      mergeData.put("to", (new Integer(theList.getTo())).toString());
-      if (theList.hasNextBatch())
-        mergeData.put("next", (new Integer(theList.getNextBatch())).toString());
-      if (theList.hasPrevBatch())
-        mergeData.put("prev", (new Integer(theList.getPrevBatch())).toString());
-
-      HTMLTemplateProcessor.process(res, templateListString, mergeData, res.getWriter(), getLocale(req));
-
-    }
-    catch (Throwable e) {
-      throw new ServletModuleFailure(e);
-    }
+  protected void initializeNewObject(Map aNewObject, HttpServletRequest aRequest, HttpServletResponse aResponse) {
+    aNewObject.put("creator", ServletHelper.getUserName(aRequest));
   }
-
-
 }