From: zapata <zapata>
Date: Thu, 1 May 2003 09:19:53 +0000 (+0000)
Subject: small fix
X-Git-Tag: BEFORE_MERGE_1_1~128
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=3042abd3ebed359d7fa37a3f8c11abbd204b4bdd;p=mir.git

small fix
---

diff --git a/source/mircoders/localizer/MirAdminInterfaceLocalizer.java b/source/mircoders/localizer/MirAdminInterfaceLocalizer.java
index 35859353..cc859fd0 100755
--- a/source/mircoders/localizer/MirAdminInterfaceLocalizer.java
+++ b/source/mircoders/localizer/MirAdminInterfaceLocalizer.java
@@ -18,13 +18,13 @@
  * 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  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.  
+ * 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.localizer;
diff --git a/source/mircoders/localizer/MirCachingLocalizerDecorator.java b/source/mircoders/localizer/MirCachingLocalizerDecorator.java
index 340d2bd5..6b2c1019 100755
--- a/source/mircoders/localizer/MirCachingLocalizerDecorator.java
+++ b/source/mircoders/localizer/MirCachingLocalizerDecorator.java
@@ -32,7 +32,7 @@ package mircoders.localizer;
 
 import mir.generator.Generator;
 import mir.generator.WriterEngine;
-
+import mir.entity.adapter.*;
 
 public class MirCachingLocalizerDecorator implements MirLocalizer {
   private MirLocalizer localizer;
@@ -81,7 +81,7 @@ public class MirCachingLocalizerDecorator implements MirLocalizer {
 
   public MirDataModelLocalizer dataModel() throws MirLocalizerFailure, MirLocalizerExc {
     if (dataModelLocalizer==null) {
-      dataModelLocalizer = localizer.dataModel();
+      dataModelLocalizer = new MirCachingDatamodelLocalizer(localizer.dataModel());
     }
 
     return dataModelLocalizer;
@@ -95,6 +95,25 @@ public class MirCachingLocalizerDecorator implements MirLocalizer {
     return adminInterfaceLocalizer;
   };
 
+  private static class MirCachingDatamodelLocalizer implements MirDataModelLocalizer {
+    private MirDataModelLocalizer master;
+    private EntityAdapterModel adapterModel;
+
+    public MirCachingDatamodelLocalizer(MirDataModelLocalizer aMaster) {
+      master = aMaster;
+      adapterModel = null;
+    }
+
+    public EntityAdapterModel makeAdapterModel() throws MirLocalizerExc, MirLocalizerFailure {
+      if (adapterModel==null) {
+        adapterModel = master.makeAdapterModel();
+      }
+
+      return adapterModel;
+    };
+
+  }
+
   private static class MirCachingGeneratorLocalizer implements MirGeneratorLocalizer {
     private MirGeneratorLocalizer master;
     private WriterEngine writerEngine;
diff --git a/source/mircoders/localizer/MirDataModelLocalizer.java b/source/mircoders/localizer/MirDataModelLocalizer.java
index 3b72b409..4c3d0d3b 100755
--- a/source/mircoders/localizer/MirDataModelLocalizer.java
+++ b/source/mircoders/localizer/MirDataModelLocalizer.java
@@ -18,13 +18,13 @@
  * 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  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.  
+ * 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.
  */
 
@@ -33,5 +33,5 @@ package mircoders.localizer;
 import mir.entity.adapter.EntityAdapterModel;
 
 public interface MirDataModelLocalizer {
-  public EntityAdapterModel adapterModel() throws MirLocalizerExc, MirLocalizerFailure;
+  public EntityAdapterModel makeAdapterModel() throws MirLocalizerExc, MirLocalizerFailure;
 }
\ No newline at end of file
diff --git a/source/mircoders/localizer/basic/MirBasicCommentPostingHandler.java b/source/mircoders/localizer/basic/MirBasicCommentPostingHandler.java
index 61edd556..6b05ddb3 100755
--- a/source/mircoders/localizer/basic/MirBasicCommentPostingHandler.java
+++ b/source/mircoders/localizer/basic/MirBasicCommentPostingHandler.java
@@ -72,8 +72,8 @@ public class MirBasicCommentPostingHandler extends MirBasicPostingSessionHandler
     setResponseGenerators(
       configuration.getString("Localizer.OpenSession.comment.EditTemplate"),
       configuration.getString("Localizer.OpenSession.comment.DupeTemplate"),
-      configuration.getString("Localizer.OpenSession.comment.DoneTemplate"),
-      configuration.getString("Localizer.OpenSession.comment.UnsupportedMediaTemplate"));
+      configuration.getString("Localizer.OpenSession.comment.UnsupportedMediaTemplate"),
+      configuration.getString("Localizer.OpenSession.comment.DoneTemplate"));
   }
 
   protected void initializeResponseData(Request aRequest, Session aSession, Response aResponse) throws SessionExc, SessionFailure {
diff --git a/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java b/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java
index 9c738893..94407e7e 100755
--- a/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicDataModelLocalizer.java
@@ -71,12 +71,10 @@ import mircoders.storage.DatabaseUsers;
 import mircoders.storage.DatabaseVideo;
 
 public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
-  private EntityAdapterModel model;
   protected LoggerWrapper logger;
   protected MirPropertiesConfiguration configuration;
 
   public MirBasicDataModelLocalizer() throws MirLocalizerFailure, MirLocalizerExc {
-    model=null;
     logger = new LoggerWrapper("Localizer.DataModel");
 
     try {
@@ -87,13 +85,6 @@ public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
     }
   }
 
-  public EntityAdapterModel adapterModel() throws MirLocalizerFailure {
-    if (model==null)
-      model = buildModel();
-
-    return model;
-  };
-
   protected void constructContentAdapterDefinition(EntityAdapterDefinition anEntityAdapterDefinition) throws MirLocalizerFailure {
     try {
       anEntityAdapterDefinition.addDBDateField("creationdate", "webdb_create");
@@ -164,7 +155,7 @@ public class MirBasicDataModelLocalizer implements MirDataModelLocalizer {
     }
   }
 
-  protected EntityAdapterModel buildModel() throws MirLocalizerFailure {
+  public EntityAdapterModel makeAdapterModel() throws MirLocalizerFailure, MirLocalizerExc {
     EntityAdapterModel result = new EntityAdapterModel();
 
     try {