rebuilding head

[mir.git] / source / mircoders / module / ModuleTopics.java

diff --git a/source/mircoders/module/ModuleTopics.java b/source/mircoders/module/ModuleTopics.java
index 6cdce27..9cc517c 100755 (executable)
--- a/source/mircoders/module/ModuleTopics.java
+++ b/source/mircoders/module/ModuleTopics.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,93 +18,26 @@
  * 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.module;
 
-import java.util.Map;
-
-import mir.entity.Entity;
-import mir.entity.EntityList;
 import mir.log.LoggerWrapper;
 import mir.module.AbstractModule;
-import mir.module.ModuleExc;
-import mir.module.ModuleFailure;
-import mir.storage.StorageObject;
 import mircoders.storage.DatabaseTopics;
-import freemarker.template.SimpleList;
-
-/*
- *  ThemenModule -
- *
- *
- * @author RK
- */
 
 public class ModuleTopics extends AbstractModule {
 
   static LoggerWrapper logger = new LoggerWrapper("Module.Topics");
 
-  public ModuleTopics(StorageObject theStorage) {
-    this.theStorage = theStorage;
-  }
-
-  public SimpleList getTopicsAsSimpleList() throws ModuleExc, ModuleFailure {
-    try {
-      return ((DatabaseTopics) theStorage).getPopupData();
-    }
-    catch (Throwable e) {
-      throw new ModuleFailure(e);
-    }
-  }
-
-  /**
-   *  Method getTopicList
-   *
-   *  @return SimpleList of all Topics sorted by title
-   *
-   */
-  public EntityList getTopicsList() throws ModuleExc, ModuleFailure {
-    try {
-      return getByWhereClause("", "title", -1);
-    }
-    catch (Throwable e) {
-      logger.error("ModuleTopics.getTopicsList: topics could not be fetched: " + e.getMessage());
-
-      throw new ModuleFailure("ModuleTopics.getTopicsList: topics could not be fetched: " + e.getMessage(), e);
-    }
+  public ModuleTopics() {
+    super (DatabaseTopics.getInstance());
   }
-
-  /**
-   * Overrides the AbstractModule.set(),
-   * All dependent ContentEntities are set unproduced.
-   * @param theValues Hash mit Spalte/Wert-Paaren
-   * @return Id des eingef?gten Objekts
-   * @exception ModuleException
-   */
-  public String set(Map theValues) throws ModuleExc, ModuleFailure {
-    try {
-      Entity theEntity = theStorage.selectById((String) theValues.get("id"));
-      if (theEntity == null) {
-        throw new ModuleExc("No topic with id  " + theValues.get("id") + " found");
-      }
-      theEntity.setValues(theValues);
-      theEntity.update();
-
-      return theEntity.getId();
-    }
-    catch (Throwable e) {
-      throw new ModuleFailure(e);
-    }
-  }
-
 }