X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fglobal%2FMirGlobal.java;h=e64d14a6e1bce814645fca29a961f4685e772a27;hb=42680c1f9fe3250bcbd0f9ed5d9dee6188333b15;hp=cd486ad11698d4fed55dc44583b998cdbfdfedfb;hpb=e700d303f1487bd12a7e185a79dc877c21fab7e9;p=mir.git

diff --git a/source/mircoders/global/MirGlobal.java b/source/mircoders/global/MirGlobal.java
index cd486ad1..e64d14a6 100755
--- a/source/mircoders/global/MirGlobal.java
+++ b/source/mircoders/global/MirGlobal.java
@@ -43,7 +43,7 @@ import mircoders.entity.EntityComment;
 import mircoders.entity.EntityContent;
 import mircoders.entity.EntityUsers;
 import mircoders.localizer.MirAdminInterfaceLocalizer;
-import mircoders.localizer.MirCachingLocalizerDecorator;
+import mircoders.localizer.LocalizerCache;
 import mircoders.localizer.MirLocalizer;
 import mircoders.localizer.MirLocalizerExc;
 import mircoders.localizer.MirLocalizerFailure;
@@ -66,7 +66,9 @@ public class MirGlobal {
   static private final Map loggedInUserIds = new HashMap();
   static private LoggerWrapper logger = new LoggerWrapper("Global");
   static private LoggerWrapper adminUsageLogger = new LoggerWrapper("AdminUsage");
-//  static private ChangeEngine changeEngine = new ChangeEngine();
+
+  static private ChangeEngine changeEngine = new ChangeEngine();
+
   static private DatabaseEngine databaseEngine;
 
   static private BundleFactory bundleFactory =
@@ -99,7 +101,7 @@ public class MirGlobal {
       }
 
       try {
-        localizer = new MirCachingLocalizerDecorator((MirLocalizer) localizerClass.newInstance());
+        localizer = new LocalizerCache((MirLocalizer) localizerClass.newInstance());
       }
       catch (Throwable t) {
         throw new MirLocalizerFailure("localizer class '" +
@@ -140,9 +142,9 @@ public class MirGlobal {
   /**
    * returns the global change engine (used to track changed files)
    */
-//  public static ChangeEngine getChangeEngine() {
-//    return changeEngine;
-//  }
+  public static ChangeEngine getChangeEngine() {
+    return changeEngine;
+  }
 
   public static MirPropertiesConfiguration config() {
     return MirPropertiesConfiguration.instance();
@@ -182,7 +184,7 @@ public class MirGlobal {
   }
 
   public static void performArticleOperation(EntityUsers aUser, EntityContent  anArticle, String anOperation) {
-    MirAdminInterfaceLocalizer.MirSimpleEntityOperation operation = getArticleOperationForName(anOperation);
+    MirAdminInterfaceLocalizer.EntityOperation operation = getArticleOperationForName(anOperation);
 
     try {
       EntityAdapter user = null;
@@ -202,7 +204,7 @@ public class MirGlobal {
   }
 
   public static void performCommentOperation(EntityUsers aUser, EntityComment  aComment, String anOperation) {
-    MirAdminInterfaceLocalizer.MirSimpleEntityOperation operation = getCommentOperationForName(anOperation);
+    MirAdminInterfaceLocalizer.EntityOperation operation = getCommentOperationForName(anOperation);
 
     try {
       EntityAdapter user = null;
@@ -221,40 +223,40 @@ public class MirGlobal {
     }
   }
 
-  private synchronized static MirAdminInterfaceLocalizer.MirSimpleEntityOperation
+  private synchronized static MirAdminInterfaceLocalizer.EntityOperation
       getArticleOperationForName(String aName) {
     try {
       if (articleOperations == null) {
         articleOperations = new HashMap();
         Iterator i = localizer().adminInterface().simpleArticleOperations().iterator();
         while (i.hasNext()) {
-          MirAdminInterfaceLocalizer.MirSimpleEntityOperation operation =
-              (MirAdminInterfaceLocalizer.MirSimpleEntityOperation) i.next();
+          MirAdminInterfaceLocalizer.EntityOperation operation =
+              (MirAdminInterfaceLocalizer.EntityOperation) i.next();
           articleOperations.put(operation.getName(), operation);
         }
       }
 
-      return (MirAdminInterfaceLocalizer.MirSimpleEntityOperation) articleOperations.get(aName);
+      return (MirAdminInterfaceLocalizer.EntityOperation) articleOperations.get(aName);
     }
     catch (Throwable t) {
       throw new MirGlobalFailure(t.getMessage(), t);
     }
   }
 
-  private synchronized static MirAdminInterfaceLocalizer.MirSimpleEntityOperation
+  private synchronized static MirAdminInterfaceLocalizer.EntityOperation
       getCommentOperationForName(String aName) {
     try {
       if (commentOperations == null) {
         commentOperations = new HashMap();
         Iterator i = localizer().adminInterface().simpleCommentOperations().iterator();
         while (i.hasNext()) {
-          MirAdminInterfaceLocalizer.MirSimpleEntityOperation operation =
-              (MirAdminInterfaceLocalizer.MirSimpleEntityOperation) i.next();
+          MirAdminInterfaceLocalizer.EntityOperation operation =
+              (MirAdminInterfaceLocalizer.EntityOperation) i.next();
           commentOperations.put(operation.getName(), operation);
         }
       }
 
-      return (MirAdminInterfaceLocalizer.MirSimpleEntityOperation) commentOperations.get(aName);
+      return (MirAdminInterfaceLocalizer.EntityOperation) commentOperations.get(aName);
     }
     catch (Throwable t) {
       throw new MirGlobalFailure(t.getMessage(), t);