Changeset 5670

Timestamp:

10/09/08 15:27:16 (6 weeks ago)

Author:

jburel

Message:

modified login sequence

Location:

trunk

Files:

• SRC/org/openmicroscopy/shoola/agents/imviewer/browser/BrowserModel.java (modified) (3 diffs)
• SRC/org/openmicroscopy/shoola/env/data/DataServicesFactory.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/env/data/OMEROGateway.java (modified) (5 diffs)
• config/container.xml (modified) (1 diff)
• config/ice.config (deleted)

trunk/SRC/org/openmicroscopy/shoola/agents/imviewer/browser/BrowserModel.java

@@ -40 +40 @@
 //Application-internal dependencies
 import org.openmicroscopy.shoola.agents.imviewer.IconManager;
+import org.openmicroscopy.shoola.agents.imviewer.ImViewerAgent;
 import org.openmicroscopy.shoola.agents.imviewer.actions.UnitBarSizeAction;
 import org.openmicroscopy.shoola.agents.imviewer.actions.ZoomAction;
@@ -47 +48 @@
 import org.openmicroscopy.shoola.agents.imviewer.view.ImViewer;
 import org.openmicroscopy.shoola.agents.imviewer.view.ViewerPreferences;
+import org.openmicroscopy.shoola.env.ui.UserNotifier;
 import org.openmicroscopy.shoola.util.image.geom.Factory;
 import org.openmicroscopy.shoola.util.ui.UIUtilities;
@@ -526 +528 @@
     {
         if (renderedImage == null) return;
-        if (zoomFactor != ZoomAction.DEFAULT_ZOOM_FACTOR) 
-            displayedImage = Factory.magnifyImage(renderedImage, zoomFactor, 0);//Factory.magnifyImage(zoomFactor, renderedImage);
-        //Factory.magnifyImage(renderedImage, zoomFactor, 0);
-        else displayedImage = renderedImage;
+        if (zoomFactor != ZoomAction.DEFAULT_ZOOM_FACTOR) {
+                BufferedImage img = null;
+                try {
+                                img = Factory.magnifyImage(renderedImage, zoomFactor, 0);
+                        } catch (Exception e) {
+                                UserNotifier un = ImViewerAgent.getRegistry().getUserNotifier();
+                                un.notifyInfo("Magnification", 
+                                                "An error occurs while magnifying the image.");
+                        }
+                        if (img != null) displayedImage = img;
+        } else displayedImage = renderedImage;
     }
    

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

@@ -147 +147 @@
         
                 //Try and read the Ice config file.
-                Properties config = loadConfig(c.resolveConfigFile(ICE_CONFIG_FILE));
+                //Properties config = loadConfig(c.resolveConfigFile(ICE_CONFIG_FILE));
                 
                 //Check what to do if null.
-                omeroGateway = new OMEROGateway(config, this);
-                
+                //omeroGateway = new OMEROGateway(config, this);
+        omeroGateway = new OMEROGateway(omeroInfo.getPort(), this);
+        
         //omeroGateway = new OMEROGateway(omeroInfo.getPort(), this);
                 //Create the adapters.

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

@@ -227 +227 @@
         private Properties                              iceConfig;
 
-        /** The Blitz client object, this is the entry point to the 
+        /** The port to connect. */
+        private int                                             port;
+        
+        /** 
+         * The Blitz client object, this is the entry point to the 
          * OMERO.Blitz Server. 
          */
@@ -851 +855 @@
         }
 
+        /**
+         * Creates a new instance.
+         * 
+         * @param iceConfig     The Ice configuration.
+         * @param dsFactory     A reference to the factory. Used whenever a broken 
+         *                                              link is detected to get the Login Service and try 
+         *                      reestablishing a valid link to <i>OMEDS</i>.
+         *                      Mustn't be <code>null</code>.
+         */
+        OMEROGateway(int port, DataServicesFactory dsFactory)
+        {
+                if (dsFactory == null) 
+                        throw new IllegalArgumentException("No Data service factory.");
+                this.dsFactory = dsFactory;
+                this.port = port;
+                thumbRetrieval = 0;
+        }
+        
         /**
          * Converts the specified POJO into the corresponding model.
@@ -1004 +1026 @@
                         
                         //Put value of hostname
+                        /*
                         Set keys = iceConfig.keySet();
                         Iterator i = keys.iterator();
@@ -1014 +1037 @@
                         }
                         blitzClient = new client(iceConfig);
+                        */
+                        if (port > 0) blitzClient = new client(hostName, port);
+                        else blitzClient = new client(hostName);
                         entry = blitzClient.createSession(userName, password);
                         connected = true;
@@ -1060 +1086 @@
                         thumbnailService = null;
                         fileStore = null;
-                        entry.closeOnDestroy();
+                        entry.destroy();
                         blitzClient.closeSession();
                         entry = null;

trunk/config/container.xml

@@ -34 +34 @@
    <!-- OMERO Data Server (OMERO) configuration.
          This entry specifies the hostname and the port to use to connect to 
-         OMERO.
+         OMERO using blitz
+         port using JBoss 1099
     -->
     <structuredEntry name="/services/OMERODS" type="OMERODS">
-      <port>1099</port>
+      <port>4063</port>
     </structuredEntry>