1.1 restoration

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

diff --git a/source/mircoders/servlet/ServletModuleMediafolder.java b/source/mircoders/servlet/ServletModuleMediafolder.java
index 022e6be..4ca4ae6 100755 (executable)
--- a/source/mircoders/servlet/ServletModuleMediafolder.java
+++ b/source/mircoders/servlet/ServletModuleMediafolder.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,41 +18,31 @@
  * 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;
 
-/**
- * Title:        Mir
- * Description:
- * @author       rk
- * @version      02
- */
-
-import java.util.GregorianCalendar;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import mir.log.LoggerWrapper;
 import mir.misc.StringUtil;
 import mir.servlet.ServletModule;
-import mir.storage.StorageObjectFailure;
 import mircoders.module.ModuleMediafolder;
 import mircoders.storage.DatabaseMediafolder;
-import freemarker.template.SimpleHash;
-import freemarker.template.SimpleScalar;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.GregorianCalendar;
+import java.util.Map;
 
+/**
+ *
+ */
 public class ServletModuleMediafolder extends ServletModule
 {
   public static ServletModule getInstance() { return instance; }
@@ -62,26 +52,16 @@ public class ServletModuleMediafolder extends ServletModule
     super();
     logger = new LoggerWrapper("ServletModule.Mediafolder");
 
-    templateListString = configuration.getString("ServletModule.Mediafolder.ListTemplate");
-    templateObjektString = configuration.getString("ServletModule.Mediafolder.ObjektTemplate");
-    templateConfirmString = configuration.getString("ServletModule.Mediafolder.ConfirmTemplate");
-
     try {
-      mainModule = new ModuleMediafolder(DatabaseMediafolder.getInstance());
+      definition = "mediaFolder";
+      mainModule = new ModuleMediafolder();
     }
-    catch (StorageObjectFailure e) {
-      logger.error("Failed to initialize ServletModuleMediafolder: " + e.getMessage());
+    catch (Throwable t) {
+      logger.error("Failed to initialize ServletModuleMediafolder: " + t.toString());
     }
   }
 
-  public void add(HttpServletRequest req, HttpServletResponse res)
-  {
-    SimpleHash mergeData = new SimpleHash();
-    mergeData.put("new", "1");
-    String now = StringUtil.date2webdbDate(new GregorianCalendar());
-// date auf now
-    mergeData.put("date", new SimpleScalar(now));
-    deliver(req, res, mergeData, templateObjektString);
+  protected void initializeNewObject(Map aNewObject, HttpServletRequest aRequest, HttpServletResponse aResponse) {
+    aNewObject.put("date", StringUtil.date2webdbDate(new GregorianCalendar()));
   }
-
 }
\ No newline at end of file