Changeset 5539

Timestamp:

07/11/08 17:10:07 (2 months ago)

Author:

jburel

Message:

cleaning

Files:

• trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser/view/WellsModel.java (modified) (3 diffs)

trunk/SRC/org/openmicroscopy/shoola/agents/dataBrowser/view/WellsModel.java

@@ -25 +25 @@
 
 //Java imports
+import java.awt.Dimension;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -51 +52 @@
 
 /** 
- * 
+ * A concrete model for a plate.
  *
  * @author  Jean-Marie Burel     
@@ -92 +93 @@
                 Set wellImageNodes = DataBrowserTranslator.transformHierarchy(wells, 
                                                         userID, 0);
-                
-                
-        Iterator<WellData> i = wells.iterator();
         rows = -1;
         columns = -1;
-        WellData well;
         int row, column;
-        while (i.hasNext()) {
-                well = i.next();
-                        row = well.getRow();
-                        column = well.getColumn();
-                        if (row > rows) rows = row;
-                        if (column > columns) columns = column;
-                }
-                columns++;
-                rows++;
-                
                 Iterator j = wellImageNodes.iterator();
                 WellImageNode node;
                 while (j.hasNext()) {
                         node = (WellImageNode) j.next();
-                        node.setRowDisplay(EditorUtil.LETTERS.get(node.getRow()+1));
-                        node.setColumnDisplay(""+(node.getColumn()+1));
+                        row = node.getRow();
+                        column = node.getColumn();
+                        if (row > rows) rows = row;
+                        if (column > columns) columns = column;
+                        //TODO: modify when info available from plate.
+                        node.setRowDisplay(EditorUtil.LETTERS.get(row+1)); 
+                        node.setColumnDisplay(""+(column+1));
                 }
+                columns++;
+                rows++;
                 //info should come from the plate.
                 for (int k = 1; k <= columns; k++)