Changeset 5628

Timestamp:

09/25/08 14:18:19 (2 months ago)

Author:

jburel

Message:

Fixed remaining problems

Location:

trunk

Files:

• .classpath (modified) (2 diffs)
• LIB/jakarta-oro-2.0.8.jar (added)
• SRC/org/openmicroscopy/shoola/agents/treeviewer/PlateWellsLoader.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/agents/treeviewer/view/ToolBar.java (modified) (1 diff)
• SRC/org/openmicroscopy/shoola/agents/treeviewer/view/TreeViewerWin.java (modified) (3 diffs)
• SRC/org/openmicroscopy/shoola/env/data/OMEROGateway.java (modified) (5 diffs)
• SRC/org/openmicroscopy/shoola/env/data/views/calls/ThumbnailSetLoader.java (modified) (3 diffs)
• SRC/org/openmicroscopy/shoola/util/ui/login/ScreenLogin.java (modified) (1 diff)
• build/dist.xml (modified) (1 diff)
• config/container.xml (modified) (1 diff)

trunk/.classpath

@@ -17 +17 @@
         <classpathentry kind="lib" path="LIB/JHotDraw-7.0.9.jar"/>
         <classpathentry kind="lib" path="LIB/persistence-api-1.0.jar"/>
-        <classpathentry kind="lib" path="LIB/jakarta-oro.jar"/>
         <classpathentry kind="lib" path="LIB/commons-validator.jar"/>
         <classpathentry kind="lib" path="LIB/commons-digester.jar"/>
@@ -35 +34 @@
         <classpathentry kind="lib" path="LIB/hibernate-search-3.0.1.GA.jar"/>
         <classpathentry kind="lib" path="LIB/hibernate-annotations-3.3.1.GA.jar"/>
+        <classpathentry kind="lib" path="LIB/jakarta-oro-2.0.8.jar"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

trunk/SRC/org/openmicroscopy/shoola/agents/treeviewer/PlateWellsLoader.java

@@ -35 +35 @@
 import org.openmicroscopy.shoola.agents.treeviewer.browser.TreeImageSet;
 import org.openmicroscopy.shoola.env.data.views.CallHandle;
-import pojos.ExperimenterData;
+
 
 /** 
- * 
+ * Loads the plate/wells.
+ * This class calls the <code>loadPlateWells</code> method in the
+ * <code>DataManagerView</code>. 
  *
  * @author  Jean-Marie Burel &nbsp;&nbsp;&nbsp;&nbsp;

trunk/SRC/org/openmicroscopy/shoola/agents/treeviewer/view/ToolBar.java

@@ -103 +103 @@
                 TreeViewerControl.CREATE_TOP_SCREEN));
         UIUtilities.unifiedButtonLookAndFeel(b);
-        bar.add(b);
+        //bar.add(b);
         
         b = new JButton(controller.getAction(

trunk/SRC/org/openmicroscopy/shoola/agents/treeviewer/view/TreeViewerWin.java

@@ -158 +158 @@
         //browser = (Browser) browsers.get(new Integer(
         //                                    Browser.CATEGORY_EXPLORER));
-        browser = (Browser) browsers.get(new Integer(Browser.SCREENS_EXPLORER));
-        if (browser.isDisplayed())
-            tabs.addTab(browser.getTitle(), browser.getIcon(), browser.getUI());
+        //browser = (Browser) browsers.get(new Integer(Browser.SCREENS_EXPLORER));
+        //if (browser.isDisplayed())
+        //    tabs.addTab(browser.getTitle(), browser.getIcon(), browser.getUI());
         browser = (Browser) browsers.get(new Integer(Browser.TAGS_EXPLORER));
         if (browser.isDisplayed())
@@ -217 +217 @@
         item.setAction(controller.getAction(
                         TreeViewerControl.SCREENS_EXPLORER));
-        menu.add(item);
+        //menu.add(item);
         item = new JCheckBoxMenuItem();
         browser = (Browser) browsers.get(new Integer(Browser.TAGS_EXPLORER));
@@ -249 +249 @@
         a = controller.getAction(TreeViewerControl.CREATE_TOP_SCREEN);
         item = new JMenuItem(a);
-        menu.add(item);
+        //menu.add(item);
         item.setText(a.getActionName());
         a = controller.getAction(TreeViewerControl.CREATE_OBJECT);

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

@@ -2654 +2654 @@
         
         /**
-         * Formats the elements of the passed array, the field to use.
-         * 
-         * @param terms
-         * @param field
+         * Formats the elements of the passed array. Adds the 
+         * passed field in front of each term.
+         * 
+         * @param terms The terms to format.
+         * @param field The string to add in front of the terms.
          * @return See above.
          */
@@ -2664 +2665 @@
                 if (terms == null || terms.length == 0) return null;
                 String[] formatted = new String[terms.length];
-                for (int i = 0; i < terms.length; i++) {
+                for (int i = 0; i < terms.length; i++) 
                         formatted[i] = field+":"+terms[i];
-                }
                 return formatted;
         }
         
         /**
-         * 
-         * @param terms
-         * @param firstField
-         * @param sep
-         * @param secondField
-         * @return
+         * Formats the elements of the passed array. Adds the 
+         * passed field in front of each term.
+         * @param terms                 The terms to format.
+         * @param firstField    The string to add in front of the terms.
+         * @param sep                   Separator used to join, exclude etc.
+         * @param secondField   The string to add in front of the terms.
+         * @return See above.
          */
         private String[] formatText(String[] terms, String firstField, String sep,
@@ -2686 +2687 @@
                         formatted[i] = firstField+":"+terms[i]+" "+sep+" ";
                         formatted[i] += secondField+":"+terms[i];
-                        System.err.println(formatted[i]);
                 }
                 return formatted;
@@ -2726 +2726 @@
                                         break;
                                 case SearchDataContext.ANNOTATION_TIME:
-                                        service.onlyAnnotatedBetween(start, end);
-                                        break;
-                                                
+                                        service.onlyAnnotatedBetween(start, end);       
                         }
                 }
@@ -2815 +2813 @@
                                         service.bySomeMustNone(fSome, fMust, fNone);
                                         size = handleSearchResult(Image.class, rType, service);
-                                        if (size instanceof Integer) 
+                                        if (size instanceof Integer)
                                                 results.put(key, size);
                                         service.clearQueries();

trunk/SRC/org/openmicroscopy/shoola/env/data/views/calls/ThumbnailSetLoader.java

@@ -130 +130 @@
         int value = -1;
         Object fSize = context.lookup(LookupNames.THUMBNAIL_FETCH_SZ);
-        if (fSize == null || !(fSize instanceof Integer)) {
-                context.getLogger().warn(this, "Thumbnail fetching size not set");
+
+        if (fSize != null && (fSize instanceof Integer)) 
                 value = (Integer) fSize;
-        }
+        else context.getLogger().warn(this, "Thumbnail fetching size not set");
         if (value <= 0) value = FETCH_SIZE;
         UserCredentials uc = 
@@ -143 +143 @@
                                 fSpeed = context.lookup(
                                                 LookupNames.THUMBNAIL_FETCH_MEDIUM_SPEED);
-                                if (fSpeed == null || !(fSpeed instanceof Double)) {
+                                if (fSpeed != null && (fSpeed instanceof Double)) 
+                                        f = (Double) fSpeed;
+                        else 
                                 context.getLogger().warn(this, "Thumbnail " +
                                                 "fetching factor not set");
-                                f = (Double) fSpeed;
-                        }
                                 if (f <= 0 || f > 1) f = FETCH_MEDIUM_SPEED;
                                 fetchSize = (int) (value*f);
@@ -154 +154 @@
                                 fSpeed = context.lookup(
                                                 LookupNames.THUMBNAIL_FETCH_LOW_SPEED);
-                                if (fSpeed == null || !(fSpeed instanceof Double)) {
+                                if (fSpeed != null && (fSpeed instanceof Double)) 
+                                        f = (Double) fSpeed;
+                        else 
                                 context.getLogger().warn(this, "Thumbnail " +
                                                 "fetching factor not set");
-                                f = (Double) fSpeed;
-                        }
                                 if (f <= 0 || f > 1) f = FETCH_LOW_SPEED;
                                 fetchSize = (int) (value*f);

trunk/SRC/org/openmicroscopy/shoola/util/ui/login/ScreenLogin.java

@@ -338 +338 @@
                 JPanel mainPanel = new JPanel();
                 int g = 5;
-                mainPanel.setBorder(BorderFactory.createEmptyBorder(g, g, g, g));
+                int t = 10;
+                mainPanel.setBorder(BorderFactory.createEmptyBorder(t, g, t, g));
                 mainPanel.setOpaque(false);
                 double[][] size = {{TableLayout.PREFERRED, TableLayout.FILL, 

trunk/build/dist.xml

@@ -55 +55 @@
   <property name="dist.jar.file" value="omero.insight.jar"/>
   <property name="dist.bundle.name" value="omero.insight"/> 
-  <property name="dist.bundle.version" value="Beta3.1rc1"/>
+  <property name="dist.bundle.version" value="Beta3.1rc3"/>
   <fileset id="dist.launch.scripts" dir="${base.launch.dir}">
     <include name="*.sh"/>

trunk/config/container.xml

@@ -267 +267 @@
    * 
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-    <entry name="Version">Beta3.1</entry>
+    <entry name="Version">Beta3.1rc3</entry>
     <entry name="SoftwareName">OMERO.insight</entry>
     <entry name="AboutFile">about.xml</entry>