Changeset 5686

Timestamp:

10/14/08 10:26:04 (7 weeks ago)

Author:

jburel

Message:

cleaning

Location:

trunk/SRC/org/openmicroscopy/shoola

Files:

• agents/dataBrowser/DataBrowserTranslator.java (modified) (1 diff)
• util/ui/NotificationDialog.java (modified) (3 diffs)
• util/ui/ReferenceFramePanel.java (deleted)
• util/ui/border/ImageBorder.java (modified) (10 diffs)
• util/ui/lens/LensComponent.java (modified) (1 diff)
• util/ui/lens/LensController.java (modified) (1 diff)
• util/ui/lens/ZoomWindow.java (modified) (3 diffs)

trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser/DataBrowserTranslator.java

@@ -193 +193 @@
         return node;
     }
-
-    /**
-     * Transforms the images contained in the passed container.
-     * 
-     * @param uo                The data object to handle. Mustn't be <code>null</code>.
-     * @param userID    The id of the current user.
-     * @param groupID   The id of the group the current user selects when 
-     *                      retrieving the data.
-     * @return Collection of {@link ImageNode} or <code>null</code>.
-     */
-    private static Set transformImagesFrom(DataObject uo, long userID,
-                                        long groupID)
-    {
-        if (uo == null) 
-            throw new IllegalArgumentException("No Object.");
-        Set images = null;
-        Set children;
-        Iterator i, j;
-        DatasetData d;
-        if (uo instanceof DatasetData) {
-                d = (DatasetData) uo;
-                images = transformImages(d.getImages(), userID, groupID);
-        } else if (uo instanceof ProjectData) {
-                ProjectData pj = (ProjectData) uo;
-                children = pj.getDatasets();
-                if (children != null) {
-                        i = children.iterator();
-                        images = new HashSet();
-                        while (i.hasNext()) {
-                                        d = (DatasetData) i.next();
-                                        images.addAll(transformImages(d.getImages(), 
-                                                                userID, groupID));
-                                }
-                }
-        } else if (uo instanceof ImageData) {
-                images = new HashSet(1); 
-                if (isReadable(uo, userID, groupID))
-                images.add(linkImageTo((ImageData) uo, null));
-        } 
-        return images;
-    }
     
     /**

trunk/SRC/org/openmicroscopy/shoola/util/ui/NotificationDialog.java

@@ -41 +41 @@
 import javax.swing.JPanel;
 
+
+//Third-party libraries
 import layout.TableLayout;
-
-//Third-party libraries
 
 //Application-internal dependencies
@@ -214 +214 @@
         }
         
+        /**
+         * Initialises the UI.
+         * 
+         * @param message               The message to display.
+         * @param messageIcon   The icon laid out next to the message.
+         */
         private void initiliaze(String message, Icon messageIcon)
         {
@@ -222 +228 @@
                 buildGUI(message, messageIcon);
         }
+        
         /**
          * Creates a new dialog.

trunk/SRC/org/openmicroscopy/shoola/util/ui/border/ImageBorder.java

@@ -24 +24 @@
 
 // Java Imports
-
 import java.awt.Component;
 import java.awt.Graphics;
@@ -39 +38 @@
 
 //Application-internal dependencies
-
 import org.openmicroscopy.shoola.util.image.geom.Factory;
 
@@ -65 +63 @@
 {
     
-        /**
-         * The Images for the top of the border.
-         */
-    private Image               top_center, top_left, top_right;
-    
-    /**
-     * The Images for the left and right sides of the border.
-     */
-    private Image               left_center, right_center;
-    
-    /**
-     * The Images for the bottom of the border.
-     */
-    private Image               bottom_center, bottom_left, bottom_right;
+        /** The Image displayed in the centre of the top border. */
+    private Image       top_center;
+    
+    /** The Image displayed on the left of the top border. */
+    private Image       top_left;
+    
+    /** The Image displayed on the left of the top border. */
+    private Image       top_right;
+    
+    /** The image used for the left side of the border. */
+    private Image       left_center;
+    
+    /** The image used for the rigth side of the border. */
+    private Image       right_center;
+    
+        /** The Image displayed in the centre of the bottom border. */
+    private Image       bottom_center;
+    
+    /** The Image displayed on the left of the bottom border. */
+    private Image       bottom_left;
+    
+    /** The Image displayed on the right of the bottom border. */
+    private Image       bottom_right;
     
     /**
@@ -85 +92 @@
      * Insets calculated from the size of the side Images. 
      */
-    private Insets              insets;
+    private Insets      insets;
     
     /**
@@ -103 +110 @@
         Image bottom_left, Image bottom_center, Image bottom_right) 
     {
+        if (top_left == null)
+                throw new IllegalArgumentException("The top left image " +
+                                "cannot be null.");
+        if (top_center == null)
+                throw new IllegalArgumentException("The top center image " +
+                                "cannot be null.");
+        if (top_right == null)
+                throw new IllegalArgumentException("The top right image " +
+                                "cannot be null.");
+        if (left_center == null)
+                throw new IllegalArgumentException("The left  center image " +
+                                "cannot be null.");
+        if (right_center == null)
+                throw new IllegalArgumentException("The right  center image " +
+                                "cannot be null.");
+        if (bottom_left == null)
+                throw new IllegalArgumentException("The bottom left image " +
+                                "cannot be null.");
+        if (bottom_center == null)
+                throw new IllegalArgumentException("The bottom center image " +
+                                "cannot be null.");
+        if (bottom_right == null)
+                throw new IllegalArgumentException("The bottom right image " +
+                                "cannot be null.");
         this.top_left = top_left;
         this.top_center = top_center;
@@ -117 +148 @@
      * Otherwise, {@link Border#getBorderInsets(Component)} will return 
      * Insets calculated from the size of the side Images. 
+     * 
+     * @param insets The value to set.
      */
     public void setInsets(Insets insets) 
@@ -127 +160 @@
      * Unless the insets have been manually set using {@link #setInsets(Insets)}
      * 
+     * @see See above.
      * @see Border#getBorderInsets(Component)
      */
     public Insets getBorderInsets(Component c) 
     {
-        if(insets != null) {
-            return insets;
-        } else {
-            return new Insets(top_center.getHeight(null),left_center.getWidth(null),
+        if (insets != null) return insets;
+        return 
+        new Insets(top_center.getHeight(null), left_center.getWidth(null),
                 bottom_center.getHeight(null), right_center.getWidth(null));
-        }
     }
     
@@ -144 +176 @@
      * @see AbstractBorder#paintBorder(Component, Graphics, int, int, int, int)
      */
-    public void paintBorder(Component c, Graphics g, int x, 
-                int y, int width, int height) 
-    {
-        Graphics2D g2 = (Graphics2D)g;
+    public void paintBorder(Component c, Graphics g, int x, int y, int width, 
+                int height) 
+    {
+        Graphics2D g2 = (Graphics2D) g;
         
         int tlw = top_left.getWidth(null);
@@ -168 +200 @@
         int brh = bottom_right.getHeight(null);
         
-        fillTexture(g2,top_left,        x,              y,              tlw,            tlh);
-        fillTexture(g2,top_center,      x+tlw,  y,              width-tlw-trw, tch);
-        fillTexture(g2,top_right,       x+width-trw,  y,        trw,    trh);
-        
-        fillTexture(g2,left_center,   x,        y+tlh,  lcw,    height-tlh-blh);
-        fillTexture(g2,right_center,  x+width-rcw, y+trh, rcw, height-trh-brh);
-        
-        fillTexture(g2,bottom_left,   x,        y+height-blh,   blw,    blh);
-        fillTexture(g2,bottom_center, x+blw, y+height-bch,      width-blw-brw, bch);
-        fillTexture(g2,bottom_right,  x+width-brw,  y+height-brh, brw,  brh);
+        fillTexture(g2, top_left, x, y, tlw, tlh);
+        fillTexture(g2, top_center, x+tlw, y, width-tlw-trw, tch);
+        fillTexture(g2, top_right, x+width-trw, y, trw, trh);
+        
+        fillTexture(g2, left_center, x, y+tlh, lcw, height-tlh-blh);
+        fillTexture(g2, right_center, x+width-rcw, y+trh, rcw, height-trh-brh);
+        
+        fillTexture(g2, bottom_left, x, y+height-blh, blw, blh);
+        fillTexture(g2, bottom_center, x+blw, y+height-bch, width-blw-brw, bch);
+        fillTexture(g2, bottom_right, x+width-brw, y+height-brh, brw, brh);
     }
     
@@ -184 +216 @@
      * a specified Image.
      * 
-     * @param g2                The Graphics2D object to fill
-     * @param img               The image to paint into the Graphics2D object
-     * @param x                 The x coordinate of the area to paint
-     * @param y                 The y coordinate of the area to paint
-     * @param w                 The width of the area to paint
-     * @param h                 The height of the area to paint
-     */
-    public static void fillTexture(Graphics2D g2, Image img, 
-                int x, int y, int w, int h) 
+     * @param g2  The Graphics2D object to fill
+     * @param img The image to paint into the Graphics2D object
+     * @param x   The x coordinate of the area to paint
+     * @param y   The y coordinate of the area to paint
+     * @param w   The width of the area to paint
+     * @param h The height of the area to paint
+     */
+    public static void fillTexture(Graphics2D g2, Image img, int x, int y, 
+                                                        int w, int h) 
     {
         BufferedImage buff = Factory.createImage(img);
-        Rectangle anchor = new Rectangle(x,y,
-            img.getWidth(null),img.getHeight(null));
+        Rectangle anchor = new Rectangle(x, y, img.getWidth(null),
+                                                img.getHeight(null));
         TexturePaint paint = new TexturePaint(buff,anchor);
         g2.setPaint(paint);

trunk/SRC/org/openmicroscopy/shoola/util/ui/lens/LensComponent.java

@@ -180 +180 @@
                 lens.addController(lensController);
                 lens.setLensColour(lensModel.getLensPreferredColour());
-                zoomWindow.addController(lensController);
                 menu = new LensMenu(this);
                 lens.setPopupMenu(menu.getPopupMenu());

trunk/SRC/org/openmicroscopy/shoola/util/ui/lens/LensController.java

@@ -22 +22 @@
  */
 package org.openmicroscopy.shoola.util.ui.lens;
+
 //Java imports
 import java.awt.Cursor;

trunk/SRC/org/openmicroscopy/shoola/util/ui/lens/ZoomWindow.java

@@ -52 +52 @@
         private ZoomWindowUI    zoomWindowUI;
         
-        /** Controller which manipulates the lens and zoomWindow images. */
-        private LensController  lensController;
-        
-        /** Parent component of the lens and ZoomWindow. */
-        private LensComponent   lensComponent;
-        
         /**
          * Constructor of the zoomWindow. This creates an instance of the 
@@ -68 +62 @@
         ZoomWindow(JFrame parent, LensComponent lensComponent)
         {
-                this.lensComponent = lensComponent;
                 zoomWindowUI = new ZoomWindowUI(parent, lensComponent);
         }
@@ -82 +75 @@
                 if (lensComponent == null)
                         throw new IllegalArgumentException("No parent.");
-                this.lensComponent = lensComponent;
                 zoomWindowUI = new ZoomWindowUI(null, lensComponent);
-        }
-        
-        /**
-         * Adds controller to the zoomWindow.
-         * 
-         * @param lensController        Reference to the control. 
-         *                                                      Mustn't be <code>null</code>.
-         */
-        void addController(LensController lensController)
-        {
-                if (lensController == null)
-                        throw new IllegalArgumentException("No control.");
-                this.lensController = lensController;
         }