Changeset 1595

Timestamp:

06/05/07 15:01:00 (18 months ago)

Author:

jmoore

Message:

[MERGING] #728 fix into source:branches/3.0-Beta2

Location:

branches/3.0-Beta2/components/server/src/ome

Files:

• logic/AbstractLevel1Service.java (modified) (3 diffs)
• logic/AbstractLevel2Service.java (modified) (2 diffs)
• logic/AdminImpl.java (modified) (7 diffs)
• logic/ConfigImpl.java (modified) (1 diff)
• logic/PixelsImpl.java (modified) (1 diff)
• logic/PojosImpl.java (modified) (1 diff)
• logic/RepositoryInfoImpl.java (modified) (3 diffs)
• logic/UpdateImpl.java (modified) (5 diffs)
• services/AbstractStatefulBean.java (modified) (2 diffs)
• services/JobBean.java (modified) (3 diffs)
• services/RawFileBean.java (modified) (2 diffs)
• services/RawPixelsBean.java (modified) (2 diffs)
• services/RenderingBean.java (modified) (3 diffs)
• services/ThumbnailBean.java (modified) (4 diffs)

branches/3.0-Beta2/components/server/src/ome/logic/AbstractLevel1Service.java

@@ -46 +46 @@
      * necessary.
      */
-    protected transient BeanHelper beanHelper = new BeanHelper(this.getClass());
+    private transient BeanHelper beanHelper = new BeanHelper(this.getClass());
 
     public final void setQueryFactory(QueryFactory factory) {
-        beanHelper.throwIfAlreadySet(this.queryFactory, factory);
+        getBeanHelper().throwIfAlreadySet(this.queryFactory, factory);
         this.queryFactory = factory;
     }
@@ -58 +58 @@
 
     public final void setSecuritySystem(SecuritySystem security) {
-        beanHelper.throwIfAlreadySet(this.securitySystem, security);
+        getBeanHelper().throwIfAlreadySet(this.securitySystem, security);
         this.securitySystem = security;
     }
@@ -73 +73 @@
      */
     public void selfConfigure() {
-        beanHelper.configure(this);
+        getBeanHelper().configure(this);
+    }
+    
+    protected BeanHelper getBeanHelper() {
+        if (beanHelper == null) {
+            beanHelper = new BeanHelper(this.getClass());
+        }
+        return beanHelper;
     }
 

branches/3.0-Beta2/components/server/src/ome/logic/AbstractLevel2Service.java

@@ -33 +33 @@
 public abstract class AbstractLevel2Service implements SelfConfigurableService {
 
-    protected transient BeanHelper beanHelper = new BeanHelper(this.getClass());
+    private transient BeanHelper beanHelper = new BeanHelper(this.getClass());
     
     protected transient LocalUpdate iUpdate;
@@ -53 +53 @@
      */
     public void selfConfigure() {
-        beanHelper.configure(this);
+        getBeanHelper().configure(this);
     }
-    
+
+    protected BeanHelper getBeanHelper() {
+        if (beanHelper == null) {
+            beanHelper = new BeanHelper(this.getClass());
+        }
+        return beanHelper;
+    }
+
     public final void setUpdateService(LocalUpdate update) {
-        beanHelper.throwIfAlreadySet(this.iUpdate, update);
+        getBeanHelper().throwIfAlreadySet(this.iUpdate, update);
         this.iUpdate = update;
     }
 
     public final void setQueryFactory(QueryFactory qFactory) {
-        beanHelper.throwIfAlreadySet(this.queryFactory, qFactory);
+        getBeanHelper().throwIfAlreadySet(this.queryFactory, qFactory);
         this.queryFactory = qFactory;
     }
     
     public final void setQueryService(LocalQuery query) {
-        beanHelper.throwIfAlreadySet(this.iQuery, query);
+        getBeanHelper().throwIfAlreadySet(this.iQuery, query);
         this.iQuery = query;
     }
 
     public final void setSecuritySystem(SecuritySystem secSys) {
-        beanHelper.throwIfAlreadySet(this.sec, secSys);
+        getBeanHelper().throwIfAlreadySet(this.sec, secSys);
         this.sec = secSys;
     }

branches/3.0-Beta2/components/server/src/ome/logic/AdminImpl.java

@@ -117 +117 @@
     /** injector for usage by the container. Not for general use */
     public final void setJdbcTemplate(SimpleJdbcTemplate jdbcTemplate) {
-        beanHelper.throwIfAlreadySet(this.jdbc, jdbcTemplate);
+        getBeanHelper().throwIfAlreadySet(this.jdbc, jdbcTemplate);
         jdbc = jdbcTemplate;
     }
@@ -123 +123 @@
     /** injector for usage by the container. Not for general use */
     public final void setExtendedMetadata(ExtendedMetadata extMetadata) {
-        beanHelper.throwIfAlreadySet(this.em, extMetadata);
+        getBeanHelper().throwIfAlreadySet(this.em, extMetadata);
         em = extMetadata;
     }
@@ -129 +129 @@
     /** injector for usage by the container. Not for general use */
     public final void setSessionFactory(SessionFactory sessions) {
-        beanHelper.throwIfAlreadySet(this.sf, sessions);
+        getBeanHelper().throwIfAlreadySet(this.sf, sessions);
         sf = sessions;
     }
@@ -320 +320 @@
         // using Spring utilities to get MBeanServer
         MBeanServer mbeanServer = JmxUtils.locateMBeanServer();
-        beanHelper.getLogger().debug("Acquired MBeanServer.");
+        getBeanHelper().getLogger().debug("Acquired MBeanServer.");
         ObjectName name;
         try {
@@ -327 +327 @@
             mbeanServer.invoke(name, "flushAuthenticationCaches",
                     new Object[] {}, new String[] {});
-            beanHelper.getLogger().debug("Flushed authentication caches.");
+            getBeanHelper().getLogger().debug("Flushed authentication caches.");
         } catch (InstanceNotFoundException infe) {
-            beanHelper.getLogger().warn(
+            getBeanHelper().getLogger().warn(
                     string + " not found. Won't synchronize login cache.");
         } catch (Exception e) {
@@ -603 +603 @@
 
         if (count == 0) {
-            beanHelper.getLogger().info(
+            getBeanHelper().getLogger().info(
                     "No password found for user " + e.getOmeName()
                             + ". Cannot delete.");
@@ -767 +767 @@
 
                     // reporting
-                    if (beanHelper.getLogger().isDebugEnabled()) {
-                        beanHelper.getLogger().debug(counts);
+                    if (getBeanHelper().getLogger().isDebugEnabled()) {
+                        getBeanHelper().getLogger().debug(counts);
                     }
 

branches/3.0-Beta2/components/server/src/ome/logic/ConfigImpl.java

@@ -193 +193 @@
      */
     public final void setJdbcTemplate(SimpleJdbcTemplate jdbcTemplate) {
-        beanHelper.throwIfAlreadySet(jdbc, jdbcTemplate);
+        getBeanHelper().throwIfAlreadySet(jdbc, jdbcTemplate);
         this.jdbc = jdbcTemplate;
     }

branches/3.0-Beta2/components/server/src/ome/logic/PixelsImpl.java

@@ -63 +63 @@
 
     public final void setPixelsData(PixelsService pixelsData) {
-        beanHelper.throwIfAlreadySet(this.pixelsData, pixelsData);
+        getBeanHelper().throwIfAlreadySet(this.pixelsData, pixelsData);
         this.pixelsData = pixelsData;
     }

branches/3.0-Beta2/components/server/src/ome/logic/PojosImpl.java

@@ -503 +503 @@
                 if (key == null || c.getIds(key) == null
                         || c.getIds(key).size() == 0) {
-                    beanHelper.getLogger().warn(
+                    getBeanHelper().getLogger().warn(
                             " Skipping " + key + " in collection counts.");
                     continue;

branches/3.0-Beta2/components/server/src/ome/logic/RepositoryInfoImpl.java

@@ -83 +83 @@
          */
         public void setThumbnailService(ThumbnailService thumbnailService) {
-                beanHelper.throwIfAlreadySet(this.thumbnailService, thumbnailService);
+                getBeanHelper().throwIfAlreadySet(this.thumbnailService, thumbnailService);
                 this.thumbnailService = thumbnailService;
         }
@@ -93 +93 @@
          */
         public void setPixelsService(PixelsService pixelsService) {
-                beanHelper.throwIfAlreadySet(this.pixelsService, pixelsService);
+                getBeanHelper().throwIfAlreadySet(this.pixelsService, pixelsService);
                 this.pixelsService = pixelsService;
         }
@@ -103 +103 @@
          */
         public void setFileService(OriginalFilesService fileService) {
-                beanHelper.throwIfAlreadySet(this.fileService, fileService);
+                getBeanHelper().throwIfAlreadySet(this.fileService, fileService);
                 this.fileService = fileService;
         }

branches/3.0-Beta2/components/server/src/ome/logic/UpdateImpl.java

@@ -68 +68 @@
 
     public final void setQueryService(LocalQuery query) {
-        beanHelper.throwIfAlreadySet(this.localQuery, query);
+        getBeanHelper().throwIfAlreadySet(this.localQuery, query);
         this.localQuery = query;
     }
@@ -221 +221 @@
         }
 
-        if (beanHelper.getLogger().isDebugEnabled()) {
-            beanHelper.getLogger().debug(" Saving event before merge. ");
+        if (getBeanHelper().getLogger().isDebugEnabled()) {
+            getBeanHelper().getLogger().debug(" Saving event before merge. ");
         }
 
@@ -233 +233 @@
      */
     protected IObject internalSave(IObject obj, UpdateFilter filter) {
-        if (beanHelper.getLogger().isDebugEnabled()) {
-            beanHelper.getLogger().debug(" Internal save. ");
+        if (getBeanHelper().getLogger().isDebugEnabled()) {
+            getBeanHelper().getLogger().debug(" Internal save. ");
         }
 
@@ -243 +243 @@
 
     protected void internalDelete(IObject obj, UpdateFilter filter) {
-        if (beanHelper.getLogger().isDebugEnabled()) {
-            beanHelper.getLogger().debug(" Internal delete. ");
+        if (getBeanHelper().getLogger().isDebugEnabled()) {
+            getBeanHelper().getLogger().debug(" Internal delete. ");
         }
 
@@ -254 +254 @@
     private void afterUpdate(UpdateFilter filter) {
 
-        if (beanHelper.getLogger().isDebugEnabled()) {
-            beanHelper.getLogger().debug(" Post-save cleanup. ");
+        if (getBeanHelper().getLogger().isDebugEnabled()) {
+            getBeanHelper().getLogger().debug(" Post-save cleanup. ");
         }
 

branches/3.0-Beta2/components/server/src/ome/services/AbstractStatefulBean.java

@@ -30 +30 @@
         StatefulServiceInterface, Serializable {
 
-    protected transient BeanHelper beanHelper = new BeanHelper(this.getClass());
+    private transient BeanHelper beanHelper = new BeanHelper(this.getClass());
 
     protected transient LocalQuery iQuery;
@@ -43 +43 @@
      */
     public final void setQueryService(LocalQuery iQuery) {
-        beanHelper.throwIfAlreadySet(this.iQuery, iQuery);
+        getBeanHelper().throwIfAlreadySet(this.iQuery, iQuery);
         this.iQuery = iQuery;
     }
 
     public final void setSecuritySystem(SecuritySystem secSys) {
-        beanHelper.throwIfAlreadySet(this.sec, secSys);
+        getBeanHelper().throwIfAlreadySet(this.sec, secSys);
         this.sec = secSys;
     }
 
     public void selfConfigure() {
-        beanHelper.configure(this);
+        getBeanHelper().configure(this);
+    }
+    
+    protected BeanHelper getBeanHelper() {
+        if (beanHelper == null) {
+            beanHelper = new BeanHelper(this.getClass());
+        }
+        return beanHelper;
     }
 

branches/3.0-Beta2/components/server/src/ome/services/JobBean.java

@@ -194 +194 @@
      */
     public void setTypesService(ITypes typesService) {
-        beanHelper.throwIfAlreadySet(this.iTypes, typesService);
+        getBeanHelper().throwIfAlreadySet(this.iTypes, typesService);
         this.iTypes = typesService;
     }
@@ -205 +205 @@
      */
     public void setUpdateService(IUpdate updateService) {
-        beanHelper.throwIfAlreadySet(this.iUpdate, updateService);
+        getBeanHelper().throwIfAlreadySet(this.iUpdate, updateService);
         this.iUpdate = updateService;
     }
@@ -216 +216 @@
      */
     public void setProcessManager(ProcessManager procMgr) {
-        beanHelper.throwIfAlreadySet(this.pm, procMgr);
+        getBeanHelper().throwIfAlreadySet(this.pm, procMgr);
         this.pm = procMgr;
     }

branches/3.0-Beta2/components/server/src/ome/services/RawFileBean.java

@@ -117 +117 @@
      */
     public final void setOriginalFilesService(OriginalFilesService ioService) {
-        beanHelper.throwIfAlreadySet(this.ioService, ioService);
+        getBeanHelper().throwIfAlreadySet(this.ioService, ioService);
         this.ioService = ioService;
     }
@@ -127 +127 @@
      */
     public final void setIRepositoryInfo(IRepositoryInfo iRepositoryInfo) {
-        beanHelper.throwIfAlreadySet(this.iRepositoryInfo, iRepositoryInfo);
+        getBeanHelper().throwIfAlreadySet(this.iRepositoryInfo, iRepositoryInfo);
         this.iRepositoryInfo = iRepositoryInfo;
     }

branches/3.0-Beta2/components/server/src/ome/services/RawPixelsBean.java

@@ -113 +113 @@
 
     public final void setPixelsMetadata(IPixels metaService) {
-        beanHelper.throwIfAlreadySet(this.metadataService, metaService);
+        getBeanHelper().throwIfAlreadySet(this.metadataService, metaService);
         metadataService = metaService;
     }
 
     public final void setPixelsData(PixelsService dataService) {
-        beanHelper.throwIfAlreadySet(this.dataService, dataService);
+        getBeanHelper().throwIfAlreadySet(this.dataService, dataService);
         this.dataService = dataService;
     }
@@ -128 +128 @@
      */
     public final void setIRepositoryInfo(IRepositoryInfo iRepositoryInfo) {
-        beanHelper.throwIfAlreadySet(this.iRepositoryInfo, iRepositoryInfo);
+        getBeanHelper().throwIfAlreadySet(this.iRepositoryInfo, iRepositoryInfo);
         this.iRepositoryInfo = iRepositoryInfo;
     }

branches/3.0-Beta2/components/server/src/ome/services/RenderingBean.java

@@ -161 +161 @@
     /** set injector. For use during configuration. Can only be called once. */
     public void setPixelsMetadata(IPixels metaService) {
-        beanHelper.throwIfAlreadySet(this.pixMetaSrv, metaService);
+        getBeanHelper().throwIfAlreadySet(this.pixMetaSrv, metaService);
         pixMetaSrv = metaService;
     }
@@ -167 +167 @@
     /** set injector. For use during configuration. Can only be called once. */
     public void setPixelsData(PixelsService dataService) {
-        beanHelper.throwIfAlreadySet(this.pixDataSrv, dataService);
+        getBeanHelper().throwIfAlreadySet(this.pixDataSrv, dataService);
         pixDataSrv = dataService;
     }
@@ -188 +188 @@
     public void passivate() {
         closeRenderer();
-        beanHelper.passivationNotAllowed();
+        getBeanHelper().passivationNotAllowed();
     }
 

branches/3.0-Beta2/components/server/src/ome/services/ThumbnailBean.java

@@ -240 +240 @@
      */
     public void setRenderingEngine(RenderingEngine re) {
-        beanHelper.throwIfAlreadySet(this.re, re);
+        getBeanHelper().throwIfAlreadySet(this.re, re);
         this.re = re;
     }
@@ -251 +251 @@
      */
     public void setScaleService(IScale iScale) {
-        beanHelper.throwIfAlreadySet(this.iScale, iScale);
+        getBeanHelper().throwIfAlreadySet(this.iScale, iScale);
         this.iScale = iScale;
     }
@@ -262 +262 @@
      */
     public void setIoService(ThumbnailService ioService) {
-        beanHelper.throwIfAlreadySet(this.ioService, ioService);
+        getBeanHelper().throwIfAlreadySet(this.ioService, ioService);
         this.ioService = ioService;
     }
@@ -272 +272 @@
      */
     public final void setIRepositoryInfo(IRepositoryInfo iRepositoryInfo) {
-        beanHelper.throwIfAlreadySet(this.iRepositoryInfo, iRepositoryInfo);
+        getBeanHelper().throwIfAlreadySet(this.iRepositoryInfo, iRepositoryInfo);
         this.iRepositoryInfo = iRepositoryInfo;
     }