Changeset 5618

Timestamp:

09/18/08 14:50:31 (2 months ago)

Author:

jburel

Message:

Added safety net when info not in container.xml.
Moved code

Location:

trunk/SRC/org/openmicroscopy/shoola

Files:

• agents/measurement/util/ui/ColourIcon.java (deleted)
• agents/measurement/util/ui/ColourListRenderer.java (modified) (4 diffs)
• env/data/views/calls/ThumbnailSetLoader.java (modified) (2 diffs)
• util/ui/ColourIcon.java (added)

trunk/SRC/org/openmicroscopy/shoola/agents/measurement/util/ui/ColourListRenderer.java

@@ -37 +37 @@
 
 //Application-internal dependencies
+import org.openmicroscopy.shoola.util.ui.ColourIcon;
 
 /** 
@@ -58 +59 @@
 {
         
-        /** Create the colouricon which will hold the colours. */
-        private static ColourIcon icon = new ColourIcon(15, 15);
+        /** The gap between the icon and the text. */
+        private static final int  GAP = 20;
+        
+        /** Create the icon which will hold the colours. */
+        private static ColourIcon icon;// = new ColourIcon(15, 15);
         
         /** Border colour of the cell when the icon is selected. */
-        private Border lineBorder = BorderFactory.createLineBorder(Color.gray, 1);
+        private Border lineBorder;
         
         /** Border colour of the cell when the icon is not selected. */
-        private Border emptyBorder = BorderFactory.createEmptyBorder(2, 2, 2, 2);
+        private Border emptyBorder;
                 
+        
+        
         /**
          * Creates a new instance.
@@ -76 +82 @@
         setHorizontalAlignment(CENTER);
         setVerticalAlignment(CENTER);
+        icon = new ColourIcon(12, 12);
+        lineBorder = BorderFactory.createLineBorder(Color.gray, 1);
+        emptyBorder = BorderFactory.createEmptyBorder(2, 2, 2, 2);
     }
         
         /** 
-     * Overridden method
+     * Overridden method to set the color icon.
          * @see ListCellRenderer#getListCellRendererComponent(JList, Object, int, 
      *                                                  boolean, boolean)
          */
-        public Component getListCellRendererComponent(JList list,
-            Object value,
-            int index,
-            boolean isSelected,
-            boolean hasFocus) 
+        public Component getListCellRendererComponent(JList list, Object value,
+            int index, boolean isSelected, boolean hasFocus) 
         {
                 Object [] array = (Object[]) value;
@@ -95 +101 @@
                 
                 setIcon(icon);
-                this.setVerticalAlignment(SwingConstants.CENTER);
-                this.setIconTextGap(40);
+                setVerticalAlignment(SwingConstants.CENTER);
+                setIconTextGap(GAP);
                 setText((String) array[1]);
                 if (isSelected)

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

@@ -117 +117 @@
         if (pxd == null)
                 return Factory.createDefaultImageThumbnail();
-        /*
-        int sizeX = maxLength, sizeY = maxLength;
-        
-        
-        double pixSizeX = pxd.getSizeX();
-        double pixSizeY = pxd.getSizeY();
-        double ratio = pixSizeX/pixSizeY;
-        if (ratio < 1) sizeX *= ratio;
-        else if (ratio > 1 && ratio != 0) sizeY *= 1/ratio;
-        Dimension d = Factory.computeThumbnailSize(maxLength, maxLength, 
-                        pxd.getSizeX(), pxd.getSizeY());
-        
-        
-                return Factory.createDefaultImageThumbnail(sizeX, sizeY);
-                */
         Dimension d = Factory.computeThumbnailSize(maxLength, maxLength, 
                         pxd.getSizeX(), pxd.getSizeY());
@@ -143 +128 @@
     private void computeFetchSize()
     {
-        int value = (Integer) context.lookup(LookupNames.THUMBNAIL_FETCH_SZ);
+        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");
+                value = (Integer) fSize;
+        }
         if (value <= 0) value = FETCH_SIZE;
         UserCredentials uc = 
                         (UserCredentials) context.lookup(LookupNames.USER_CREDENTIALS);
         double f = 0;
+        Object fSpeed = null;
         switch (uc.getSpeedLevel()) {
                         case UserCredentials.MEDIUM:
-                                f = (Double) context.lookup(
+                                fSpeed = context.lookup(
                                                 LookupNames.THUMBNAIL_FETCH_MEDIUM_SPEED);
-                                
+                                if (fSpeed == null || !(fSpeed instanceof Double)) {
+                                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);
                                 break;
                         case UserCredentials.LOW:
-                                f = (Double) context.lookup(
+                                fSpeed = context.lookup(
                                                 LookupNames.THUMBNAIL_FETCH_LOW_SPEED);
+                                if (fSpeed == null || !(fSpeed instanceof Double)) {
+                                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);