misc. fixes/cleanup

[mir.git] / source / mircoders / global / MirGlobal.java

diff --git a/source/mircoders/global/MirGlobal.java b/source/mircoders/global/MirGlobal.java
index 69473bb..cd486ad 100755 (executable)
--- a/source/mircoders/global/MirGlobal.java
+++ b/source/mircoders/global/MirGlobal.java
@@ -30,12 +30,6 @@
 
 package mircoders.global;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
 import mir.bundle.BasicBundleFactory;
 import mir.bundle.BundleFactory;
 import mir.bundle.CascadingBundleFactory;
@@ -44,7 +38,6 @@ import mir.config.MirPropertiesConfiguration;
 import mir.entity.adapter.EntityAdapter;
 import mir.log.LoggerEngine;
 import mir.log.LoggerWrapper;
-import mir.misc.ConfigException;
 import mircoders.accesscontrol.AccessControl;
 import mircoders.entity.EntityComment;
 import mircoders.entity.EntityContent;
@@ -53,6 +46,13 @@ import mircoders.localizer.MirAdminInterfaceLocalizer;
 import mircoders.localizer.MirCachingLocalizerDecorator;
 import mircoders.localizer.MirLocalizer;
 import mircoders.localizer.MirLocalizerExc;
+import mircoders.localizer.MirLocalizerFailure;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 public class MirGlobal {
   static private MirLocalizer localizer;
@@ -75,6 +75,9 @@ public class MirGlobal {
             new PropertiesFileBundleLoader(
                 config().getHome())));
 
+  private MirGlobal() {
+  }
+
   public synchronized static MirLocalizer localizer() {
     String localizerClassName;
     Class localizerClass;
@@ -86,20 +89,21 @@ public class MirGlobal {
         localizerClass = Class.forName(localizerClassName);
       }
       catch (Throwable t) {
-        throw new ConfigException("localizer class '" +
-            localizerClassName + "' not found: " + t.toString());
+        throw new MirLocalizerFailure("localizer class '" +
+            localizerClassName + "' not found: ", t);
       }
 
-      if (!(MirLocalizer.class.isAssignableFrom(localizerClass)))
-        throw new ConfigException("localizer class '" +
+      if (!MirLocalizer.class.isAssignableFrom(localizerClass)) {
+        throw new MirLocalizerFailure("localizer class '" +
             localizerClassName + "' is not assignable from MirLocalizer");
+      }
 
       try {
         localizer = new MirCachingLocalizerDecorator((MirLocalizer) localizerClass.newInstance());
       }
       catch (Throwable t) {
-        throw new ConfigException("localizer class '" +
-            localizerClassName + "' cannot be instantiated: " + t.toString());
+        throw new MirLocalizerFailure("localizer class '" +
+            localizerClassName + "' cannot be instantiated: " + t.getMessage(), t);
       }
     }
 
@@ -120,7 +124,7 @@ public class MirGlobal {
     return result.toString();
   }
 
-  public synchronized static Abuse abuse() {
+  synchronized public static Abuse abuse() {
     if (abuse==null) {
       try {
         abuse = new Abuse(localizer().dataModel().adapterModel());
@@ -144,9 +148,10 @@ public class MirGlobal {
     return MirPropertiesConfiguration.instance();
   }
 
-  public synchronized static DatabaseEngine getDatabaseEngine() {
-    if (databaseEngine==null)
+  synchronized public static DatabaseEngine getDatabaseEngine() {
+    if (databaseEngine==null) {
       databaseEngine = new DatabaseEngine();
+    }
 
     return databaseEngine;
   }
@@ -168,7 +173,7 @@ public class MirGlobal {
     }
   }
 
-  public static synchronized AccessControl accessControl() {
+  synchronized public static AccessControl accessControl() {
     if (accessControl == null) {
       accessControl=new AccessControl();
     }
@@ -181,18 +186,18 @@ public class MirGlobal {
 
     try {
       EntityAdapter user = null;
-      if (aUser!=null)
+      if (aUser!=null) {
           user = localizer().dataModel().adapterModel().makeEntityAdapter("user", aUser);
+      }
 
-      if (operation!=null)
+      if (operation!=null) {
         operation.perform(
             user,
             localizer().dataModel().adapterModel().makeEntityAdapter("content", anArticle));
+      }
     }
     catch (Throwable t) {
-      t.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));
-
-      throw new RuntimeException(t.toString());
+      throw new MirGlobalFailure(t.getMessage(), t);
     }
   }
 
@@ -201,16 +206,18 @@ public class MirGlobal {
 
     try {
       EntityAdapter user = null;
-      if (aUser!=null)
+      if (aUser!=null) {
           user = localizer().dataModel().adapterModel().makeEntityAdapter("user", aUser);
+      }
 
-      if (operation!=null)
+      if (operation!=null) {
         operation.perform(
             user,
             localizer().dataModel().adapterModel().makeEntityAdapter("comment", aComment));
+      }
     }
     catch (Throwable t) {
-      throw new RuntimeException(t.toString());
+      throw new MirGlobalFailure(t.getMessage(), t);
     }
   }
 
@@ -230,7 +237,7 @@ public class MirGlobal {
       return (MirAdminInterfaceLocalizer.MirSimpleEntityOperation) articleOperations.get(aName);
     }
     catch (Throwable t) {
-      throw new RuntimeException(t.toString());
+      throw new MirGlobalFailure(t.getMessage(), t);
     }
   }
 
@@ -250,7 +257,7 @@ public class MirGlobal {
       return (MirAdminInterfaceLocalizer.MirSimpleEntityOperation) commentOperations.get(aName);
     }
     catch (Throwable t) {
-      throw new RuntimeException(t.toString());
+      throw new MirGlobalFailure(t.getMessage(), t);
     }
   }