first cut of merge of STABLE-pre1_0 into HEAD. I won't even guarantee that it

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

diff --git a/source/mircoders/module/ModuleUsers.java b/source/mircoders/module/ModuleUsers.java
index 779dc2c..13c07c5 100755 (executable)
--- a/source/mircoders/module/ModuleUsers.java
+++ b/source/mircoders/module/ModuleUsers.java
@@ -35,7 +35,7 @@ public class ModuleUsers extends AbstractModule
        public ModuleUsers(StorageObject theStorage)
        {
 
-               if (theLog == null) theLog = Logfile.getInstance(this.getClass().getName());
+               if (theLog == null) theLog = Logfile.getInstance(MirConfig.getProp("Home") + MirConfig.getProp("Module.Users.Logfile"));
                if (theStorage == null) theLog.printWarning("StorageObject was null!");
                this.theStorage = theStorage;
 
@@ -67,9 +67,13 @@ public class ModuleUsers extends AbstractModule
                }
        }
 
-       public SimpleList getUsersAsSimpleList() {
+       public SimpleList getUsersAsSimpleList() throws ModuleException {
                //  String sql = "select id, name from Users order by name";
-               return ((DatabaseUsers)theStorage).getPopupData();
+    try {
+                 return ((DatabaseUsers)theStorage).getPopupData();
+    } catch(StorageObjectException e) {
+      throw new ModuleException(e.toString());
+    }
        }
 
 }