fixed / clean ups

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

diff --git a/source/mircoders/storage/DatabaseLanguage.java b/source/mircoders/storage/DatabaseLanguage.java
index 5f3f1cd..61f9958 100755 (executable)
--- a/source/mircoders/storage/DatabaseLanguage.java
+++ b/source/mircoders/storage/DatabaseLanguage.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,15 +18,14 @@
  * 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;
@@ -40,50 +39,55 @@ package mircoders.storage;
  * @version 1.0
  */
 
-import java.lang.*;
-import java.sql.*;
-import java.io.*;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
 
-import freemarker.template.*;
-
-import mir.storage.*;
-import mir.entity.*;
-import mir.misc.*;
+import mir.entity.Entity;
+import mir.entity.EntityBrowser;
+import mir.log.LoggerWrapper;
+import mir.storage.Database;
+import mir.storage.StorageObject;
+import mir.storage.StorageObjectFailure;
 
 
 public class DatabaseLanguage extends Database implements StorageObject{
+  private static DatabaseLanguage instance;
 
-       private static DatabaseLanguage instance;
-       private static SimpleList languagePopupData;
+  // 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 DatabaseLanguage getInstance() throws
+      StorageObjectFailure {
+    if (instance == null) {
+      instance = new DatabaseLanguage();
+    }
+    return 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 DatabaseLanguage getInstance() 
-         throws StorageObjectException
-       {
-               if (instance == null) {
-                       instance = new DatabaseLanguage();
-                       instance.myselfDatabase = instance;
-               }
-               return instance;
-       }
+  private DatabaseLanguage() throws StorageObjectFailure {
+    super();
+    logger = new LoggerWrapper("Database.Language");
 
-       private DatabaseLanguage() throws StorageObjectException
-       {
-               super();
-               this.hasTimestamp = false;
-               this.theTable="language";
-       }
+    this.hasTimestamp = false;
+    this.mainTable = "language";
+  }
 
-       public SimpleList getPopupData() throws StorageObjectException { 
-      SimpleList pData = null;
-      try {
-      pData = getPopupData("name",false);
-      } catch (StorageObjectException e) {System.err.println("FF");}
-      return pData;
-    }
+  public List getPopupData() throws StorageObjectFailure {
+    List result = new Vector();
+    Iterator i = new EntityBrowser(this, "", "name", 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("name"));
+
+      result.add(entry);
+    }
 
+    return result;
+  }
 }