Changeset 5622

Timestamp:

09/22/08 09:33:10 (2 months ago)

Author:

jburel

Message:

Fixed problem when conn. has expired and user wants to preview projection

Location:

trunk/SRC/org/openmicroscopy/shoola

Files:

• agents/imviewer/ProjectionSaver.java (modified) (2 diffs)
• agents/imviewer/view/ImViewer.java (modified) (1 diff)
• agents/imviewer/view/ImViewerComponent.java (modified) (3 diffs)
• agents/imviewer/view/ImViewerModel.java (modified) (2 diffs)
• env/data/DataServicesFactory.java (modified) (1 diff)

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/ProjectionSaver.java

@@ -31 +31 @@
 //Application-internal dependencies
 import org.openmicroscopy.shoola.agents.imviewer.view.ImViewer;
+import org.openmicroscopy.shoola.env.data.DSOutOfServiceException;
 import org.openmicroscopy.shoola.env.data.events.DSCallAdapter;
 import org.openmicroscopy.shoola.env.data.model.ProjectionParam;
@@ -144 +145 @@
         msg.print(exc);
         registry.getLogger().error(this, msg);
+        if (exc instanceof DSOutOfServiceException) {
+                System.err.println("OUT of service.");
+        }
         switch (index) {
                         case PREVIEW:
-                                viewer.setRenderProjected(null);
+                                if (exc instanceof DSOutOfServiceException) {
+                                        viewer.reload(exc);
+                                        load();
+                                } else viewer.setRenderProjected(null);
                                 break;
                         case PROJECTION:

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/view/ImViewer.java

@@ -552 +552 @@
          * @param e The exception to handle.
          */
-        public void reload(Exception e);
+        public void reload(Throwable e);
 
         /**

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/view/ImViewerComponent.java

@@ -1382 +1382 @@
                 try {
 
-                        for (int k = 0; k < model.getMaxC(); k++) {
+                        for (int k = 0; k < model.getMaxC(); k++) 
                                 model.setChannelActive(k, k == index);
-                        }
+                        
                         image = model.getSplitComponentImage();
                         List active = model.getActiveChannels();
@@ -1392 +1392 @@
                                 model.setChannelActive(index, true);
                         }
-
 
                 } catch (Exception ex) {
@@ -1717 +1716 @@
         /** 
          * Implemented as specified by the {@link ImViewer} interface.
-         * @see ImViewer#reload(Exception)
-         */
-        public void reload(Exception e)
+         * @see ImViewer#reload(Throwable)
+         */
+        public void reload(Throwable e)
         {
                 Logger logger = ImViewerAgent.getRegistry().getLogger();

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/view/ImViewerModel.java

@@ -545 +545 @@
                 //state = ImViewer.LOADING_IMAGE;
                 try {
-                        //component.setImage(os.renderImage(pixelsID, pDef));
                         return currentRndControl.renderPlane(pDef);
                 } catch (Exception e) {
@@ -551 +550 @@
                 }
                 return null;
-                //OmeroImageService os = ImViewerAgent.getRegistry().getImageService();
-                //return os.renderImage(pixelsID, pDef);
         }
 

trunk/SRC/org/openmicroscopy/shoola/env/data/DataServicesFactory.java

@@ -122 +122 @@
         OMEROInfo omeroInfo = (OMEROInfo) registry.lookup(LookupNames.OMERODS);
         omeroGateway = new OMEROGateway(omeroInfo.getPort(), this);
-        //System.err.println(omeroGateway.isUpgradeRequired());
                 //Create the adapters.
         ds = new OmeroDataServiceImpl(omeroGateway, registry);