problem with ghost fragments appearing after generated files has been fixed

[mir.git] / source / mircoders / storage / DatabaseTopics.java

diff --git a/source/mircoders/storage/DatabaseTopics.java b/source/mircoders/storage/DatabaseTopics.java
index 51deeb7..bb13cd3 100755 (executable)
--- a/source/mircoders/storage/DatabaseTopics.java
+++ b/source/mircoders/storage/DatabaseTopics.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,71 +18,62 @@
  * 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.storage;
 
-import java.lang.*;
-import java.sql.*;
-import java.io.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
-import freemarker.template.*;
-
-import mir.storage.*;
-import mir.entity.*;
-import mir.misc.*;
-
-/**
- * <b>Diese Klasse implementiert die Datenbankverbindung zur MetaObjekt-Tabelle
- *
- *
- */
-
-public class DatabaseTopics extends Database implements StorageObject{
+import mir.entity.Entity;
+import mir.entity.EntityBrowser;
+import mir.log.LoggerWrapper;
+import mir.storage.Database;
+import mir.storage.DatabaseFailure;
 
+public class DatabaseTopics extends Database {
   private static DatabaseTopics instance;
 
-  // the following *has* to be sychronized cause this static method
-  // could get preemted and we could end up with 2 instances of DatabaseFoo..
-  // see the "Singletons with needles and thread" article at JavaWorld -mh
-  public synchronized static DatabaseTopics getInstance() 
-    throws StorageObjectException {
-      if (instance == null) {
-    instance = new DatabaseTopics();
-    instance.myselfDatabase = instance;
-      }
+  public synchronized static DatabaseTopics getInstance() {
+    if (instance == null) {
+      instance = new DatabaseTopics();
+    }
     return instance;
   }
 
-  private DatabaseTopics() throws StorageObjectException
-  {
-          super();
-      //this.cache = new DatabaseCache(20);
-      this.hasTimestamp = false;
-      this.theTable="topic";
-      try {
-    this.theEntityClass = Class.forName("mircoders.entity.EntityTopics");
-      }
-      catch (Exception e) {
-    throw new StorageObjectException(e.toString());
-      }
+  private DatabaseTopics() throws DatabaseFailure {
+    super();
 
-  }
+    logger = new LoggerWrapper("Database.Topics");
 
-  public SimpleList getPopupData() throws StorageObjectException {
-    return getPopupData("title",true);
+    mainTable = "topic";
+    entityClass = mircoders.entity.EntityTopics.class;
   }
 
+  public List getPopupData() throws DatabaseFailure {
+    List result = new ArrayList();
+    Iterator i = new EntityBrowser(this, "", "title", 100, -1, 0);
 
+    while (i.hasNext()) {
+      Entity e = (Entity) i.next();
+      Map entry = new HashMap();
+      entry.put("key", e.getId());
+      entry.put("value", e.getFieldValue("title"));
 
+      result.add(entry);
+    }
+
+    return result;
+  }
 }