Changeset 5640

Timestamp:

10/02/08 11:19:16 (7 weeks ago)

Author:

jburel

Message:

Fixed remaining bugs

Location:

branches/Beta3.1/SRC/org/openmicroscopy/shoola

Files:

• agents/dataBrowser/view/DataBrowserToolBar.java (modified) (3 diffs)
• agents/events/iviewer/ViewImage.java (modified) (3 diffs)
• agents/imviewer/actions/ProjectionAction.java (modified) (1 diff)
• agents/imviewer/util/proj/ProjectionDialog.java (modified) (6 diffs)
• agents/imviewer/util/proj/ProjectionDialogControl.java (modified) (4 diffs)
• agents/imviewer/util/proj/ProjectionSavingDialog.java (modified) (8 diffs)
• agents/imviewer/view/ImViewerControl.java (modified) (1 diff)
• agents/metadata/IconManager.java (modified) (1 diff)
• agents/metadata/browser/Browser.java (modified) (1 diff)
• agents/metadata/editor/ToolBar.java (modified) (1 diff)
• agents/metadata/editor/ViewedByUI.java (modified) (1 diff)
• agents/metadata/graphx/nuvola_folder_darkblue_open16.png (added)
• agents/metadata/view/MetadataViewerComponent.java (modified) (3 diffs)
• agents/treeviewer/view/StatusBar.java (modified) (2 diffs)
• env/data/OMEROGateway.java (modified) (2 diffs)
• util/ui/search/SearchPanel.java (modified) (1 diff)
• util/ui/search/SearchUtil.java (modified) (1 diff)

branches/Beta3.1/SRC/org/openmicroscopy/shoola/agents/dataBrowser/view/DataBrowserToolBar.java

@@ -323 +323 @@
                 thumbView = new JToggleButton(
                                         icons.getIcon(IconManager.THUMBNAIL_VIEW));
-                thumbView.setToolTipText("Thumbnails View.");
+                thumbView.setToolTipText("View as Thumbnails.");
                 thumbView.addActionListener(this);
                 thumbView.setActionCommand(""+DataBrowserUI.THUMB_VIEW);
@@ -330 +330 @@
                 columnsView = new JToggleButton(
                                 icons.getIcon(IconManager.COLUMN_VIEW));
-                columnsView.setToolTipText("Table View.");
+                columnsView.setToolTipText("View as Table.");
                 columnsView.addActionListener(this);
                 columnsView.setActionCommand(""+DataBrowserUI.COLUMNS_VIEW);
@@ -337 +337 @@
                 slideShowView = new JButton(
                                 icons.getIcon(IconManager.SLIDE_SHOW_VIEW));
-                slideShowView.setToolTipText("Slideshow");
+                slideShowView.setToolTipText("Show slideshow");
                 UIUtilities.unifiedButtonLookAndFeel(slideShowView);
                 slideShowView.addMouseListener(new MouseAdapter() {

branches/Beta3.1/SRC/org/openmicroscopy/shoola/agents/events/iviewer/ViewImage.java

@@ -36 +36 @@
 import org.openmicroscopy.shoola.env.rnd.RndProxyDef;
 
+import pojos.DataObject;
 import pojos.ImageData;
 
@@ -69 +70 @@
     private long                selectedUserID;
     
+    /** The parent object. */
+    private DataObject  parentContext;
+    
     /**
      * Creates a new instance.
@@ -83 +87 @@
         selectedUserID = -1;
     }
+    
+    /**
+     * Sets the parent of the image.
+     * 
+     * @param parentContext The parent to set.
+     */
+    public void setParentContext(DataObject parentContext)
+    {
+        this.parentContext = parentContext;     
+    }
+    
+    /**
+     * Returns the parent.
+     * 
+     * @return See above.
+     */
+    public DataObject getParentObject() { return parentContext; }
     
     /**

branches/Beta3.1/SRC/org/openmicroscopy/shoola/agents/imviewer/actions/ProjectionAction.java

@@ -58 +58 @@
     
     /** The description of the action. */
-    private static final String DESCRIPTION = "Projection.";
+    private static final String DESCRIPTION = "Open Projection Tool.";
     
     /** 

branches/Beta3.1/SRC/org/openmicroscopy/shoola/agents/imviewer/util/proj/ProjectionDialog.java

@@ -30 +30 @@
 import java.awt.Cursor;
 import java.awt.Dimension;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
@@ -92 +94 @@
         /** Bound property indicating to load the datasets containing the image. */
         public static final String              LOAD_DATASETS_PROPERTY = "loadDatasets";
+        
+        /** Bound property indicating to close the window. */
+        public static final String              CLOSE_DIALOG_PROPERTY = "closeDialog";
         
     /** Dimension of the box between the channel buttons. */
@@ -228 +233 @@
         types = new JComboBox(names);
         getRootPane().setDefaultButton(previewButton);
+        
+                addWindowListener(new WindowAdapter() {
+                        public void windowClosing(WindowEvent e) { 
+                                super.windowClosing(e);
+                                firePropertyChange(CLOSE_DIALOG_PROPERTY, Boolean.FALSE, 
+                                                Boolean.TRUE);
+                        }
+                });
         }
         
@@ -288 +301 @@
                                 {TableLayout.PREFERRED, TableLayout.FILL}};
                 body.setLayout(new TableLayout(tl));
-                TextualTwoKnobsSlider pp = new TextualTwoKnobsSlider();
-                pp.layoutComponents();
                 body.add(buildControlComponent(), "0, 0, 1, 0");
-                body.add(pp, "0, 0, 1, 0");
                 body.add(buildToolBar(), "0, 1");
                 body.add(uiDelegate, "1, 1");
@@ -432 +442 @@
                 statusLabel.setText("Projecting...");
                 firePropertyChange(PROJECTION_PREVIEW_PROPERTY, null, ref);
-                //setModal(true);
         }
         
@@ -522 +531 @@
         {
                 enableButtons(false);
+                setModal(false);
                 ProjectionSavingDialog d = new ProjectionSavingDialog(this, containers);
                 UIUtilities.centerAndShow(this, d);

branches/Beta3.1/SRC/org/openmicroscopy/shoola/agents/imviewer/util/proj/ProjectionDialogControl.java

@@ -31 +31 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
@@ -39 +38 @@
 //Application-internal dependencies
 import org.openmicroscopy.shoola.agents.imviewer.util.ChannelButton;
-import org.openmicroscopy.shoola.util.ui.UIUtilities;
 
 /** 
@@ -78 +76 @@
                 this.model = model;
         }
-
-        /** 
-         * Sets the datasets containing the image to project.
-         * 
-         * @param datasets The datasets containing the image.
-         */
-        public void setContainers(Collection datasets)
-        {
-                ProjectionSavingDialog d = new ProjectionSavingDialog(model, datasets);
-                UIUtilities.centerAndShow(d);
-        }
         
         /**
@@ -103 +90 @@
                         case PROJECT:
                                 model.loadDatasets();
-                                break;
                 }
         }

branches/Beta3.1/SRC/org/openmicroscopy/shoola/agents/imviewer/util/proj/ProjectionSavingDialog.java

@@ -43 +43 @@
 import javax.swing.Box;
 import javax.swing.BoxLayout;
-import javax.swing.ButtonGroup;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -51 +50 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JRadioButton;
 import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
@@ -109 +107 @@
         /** The text field hosting the name of the file. */
         private JTextField                                      nameField;
-        
-        /** Button to project the active channels. */
-        private JRadioButton                            activeChannels;
-        
-        /** Button to projec the whole image. */
-        private JRadioButton                            allChannels;
 
         /** Closes the window. */
@@ -229 +221 @@
                 selectionPane =  new JPanel();
                 selectionPane.setLayout(new BoxLayout(selectionPane, BoxLayout.Y_AXIS));
-        
-                activeChannels = new JRadioButton("Active channels");
-                allChannels = new JRadioButton("All channels");
-                allChannels.setSelected(true);
-                ButtonGroup group = new ButtonGroup();
-                group.add(allChannels);
-                group.add(activeChannels);
-
-                closeButton = new JButton("Close");
+                closeButton = new JButton("Cancel");
                 closeButton.setToolTipText(UIUtilities.formatToolTipText(
                                 "Close the window."));
@@ -316 +300 @@
          * @return See above.
          */
-        private JPanel buildChannelsPanel()
-        {
-                JPanel p = new JPanel();
-        p.setLayout(new BoxLayout(p, BoxLayout.Y_AXIS));
-        p.add(allChannels);
-        p.add(activeChannels);
-        return UIUtilities.buildComponentPanel(p);
-        }
-        
-        /**
-         * Builds and lays out the channels options.
-         * 
-         * @return See above.
-         */
         private JPanel buildTimeRangePanel()
         {
@@ -363 +333 @@
         double[][] tl = {{TableLayout.PREFERRED, TableLayout.FILL}, //columns
                                         {TableLayout.PREFERRED, TableLayout.PREFERRED, 5, 
-                                        TableLayout.PREFERRED, height, 5,
+                                        TableLayout.PREFERRED, TableLayout.PREFERRED, height, 5,
                                         TableLayout.PREFERRED, TableLayout.FILL} }; //rows
         content.setLayout(new TableLayout(tl));
@@ -372 +342 @@
         content.add(new JLabel(), "0, 2, 1, 2");
         content.add(UIUtilities.setTextFont("Save in "), "0, 3, l, c");
-        content.add(new JScrollPane(selectionPane), "1, 3, 1, 4");
+        content.add(UIUtilities.setTextFont("datasets "), "0, 4, l, c");
+        content.add(new JScrollPane(selectionPane), "1, 3, 1, 5");
         if (selection != null) {
                 Iterator i = selection.keySet().iterator();
@@ -378 +349 @@
                         selectionPane.add((JComponent) i.next());
         }
-        content.add(new JLabel(), "0, 5, 1, 5");
-        content.add(UIUtilities.setTextFont("Project "), "0, 6, l, c");
-        content.add(buildParametersPanel(), "1, 6, 1, 7");
+        content.add(new JLabel(), "0, 6, 1, 6");
+        content.add(UIUtilities.setTextFont("Project "), "0, 7, l, c");
+        content.add(buildParametersPanel(), "1, 7, 1, 8");
                 return content;
         }

branches/Beta3.1/SRC/org/openmicroscopy/shoola/agents/imviewer/view/ImViewerControl.java

@@ -829 +829 @@
                 } else if (ProjectionDialog.LOAD_DATASETS_PROPERTY.equals(pName)) {
                         model.loadContainers();
+                } else if (ProjectionDialog.CLOSE_DIALOG_PROPERTY.equals(pName)) {
+                        view.requestFocus();
                 }
         }

branches/Beta3.1/SRC/org/openmicroscopy/shoola/agents/metadata/IconManager.java

@@ -218 +218 @@
                 relPaths[URL] = "nuvola_browser16.png";
                 //relPaths[PROJECT] = "nuvola_document16.png";
-                relPaths[PROJECT] = "nuvola_folder_blue_open16.png"; 
-                relPaths[PROJECT] = "nuvola_folder_blue_open16.png";
+                relPaths[PROJECT] = "nuvola_folder_darkblue_open16.png"; 
         relPaths[DATASET] = "nuvola_folder_image16.png";
         relPaths[IMAGE] = "nuvola_image16.png";

branches/Beta3.1/SRC/org/openmicroscopy/shoola/agents/metadata/browser/Browser.java

@@ -54 +54 @@
 
         /** The title related to this component. */
-        public static final String              TITLE = "Related to";
+        public static final String              TITLE = "Contained in";
         
         /** Bound property indicating that nodes are selected. */

branches/Beta3.1/SRC/org/openmicroscopy/shoola/agents/metadata/editor/ToolBar.java

@@ -131 +131 @@
                 saveButton.setEnabled(false);
                 downloadButton = new JButton(icons.getIcon(IconManager.DOWNLOAD));
-                downloadButton.setToolTipText("Download the archived files.");
+                downloadButton.setToolTipText("Download the Archived File(s).");
                 downloadButton.addActionListener(this);
                 downloadButton.setActionCommand(""+DOWNLOAD);
                 downloadButton.setEnabled(false);
                 infoButton = new JButton(icons.getIcon(IconManager.INFO));
-                infoButton.setToolTipText("View image's info.");
+                infoButton.setToolTipText("View Image's info.");
                 infoButton.addActionListener(this);
                 infoButton.setActionCommand(""+INFO);

branches/Beta3.1/SRC/org/openmicroscopy/shoola/agents/metadata/editor/ViewedByUI.java

@@ -120 +120 @@
                 IconManager icons = IconManager.getInstance();
                 listView = new JToggleButton(icons.getIcon(IconManager.LIST_VIEW));
-                listView.setToolTipText("List View");
+                listView.setToolTipText("View as List.");
                 listView.setActionCommand(""+LIST_VIEW);
                 listView.addActionListener(this);
                 gridView = new JToggleButton(icons.getIcon(IconManager.GRID_VIEW));
-                gridView.setToolTipText("Grid View");
+                gridView.setToolTipText("View as Grid.");
                 gridView.setActionCommand(""+GRID_VIEW);
                 gridView.addActionListener(this);

branches/Beta3.1/SRC/org/openmicroscopy/shoola/agents/metadata/view/MetadataViewerComponent.java

@@ -316 +316 @@
                         dialog = new MessageBox(view, "Save Annotations", 
                                                          "Do you want to attach the annotations to: ");
+                        dialog.setNoText("Cancel");
+                        dialog.setYesText("OK");
                         JPanel p = new JPanel();
                         p.setLayout(new BoxLayout(p, BoxLayout.Y_AXIS));
@@ -345 +347 @@
                         dialog = new MessageBox(view, "Save Annotations", 
                                                          "Do you want to attach the annotations to: ");
+                        dialog.setNoText("Cancel");
+                        dialog.setYesText("OK");
                         JPanel p = new JPanel();
                         p.setLayout(new BoxLayout(p, BoxLayout.Y_AXIS));
@@ -390 +394 @@
                         dialog = new MessageBox(view, "Save Annotations", 
                                      "Do you want to attach the annotations to: ");
+                        dialog.setNoText("Cancel");
+                        dialog.setYesText("OK");
                         JPanel p = new JPanel();
                         p.setLayout(new BoxLayout(p, BoxLayout.Y_AXIS));

branches/Beta3.1/SRC/org/openmicroscopy/shoola/agents/treeviewer/view/StatusBar.java

@@ -99 +99 @@
     {
         icons = IconManager.getInstance();
-        progressLabel = new JLabel(icons.getIcon(IconManager.PROGRESS));
+        progressLabel = new JLabel(icons.getIcon(IconManager.TRANSPARENT));
         progressBar = new JProgressBar();
         progressBar.setIndeterminate(true);
@@ -186 +186 @@
         progressBar.setVisible(!hide);
         progressLabel.setEnabled(!hide);
+        if (hide) progressLabel.setIcon(icons.getIcon(IconManager.TRANSPARENT));
+        else progressLabel.setIcon(icons.getIcon(IconManager.PROGRESS));
     }
     

branches/Beta3.1/SRC/org/openmicroscopy/shoola/env/data/OMEROGateway.java

@@ -642 +642 @@
         {
                 if (terms == null || terms.size() == 0) return null;
-                String value;
-                int n;
-                char[] arr;
-                String v;
-                String[] formattedTerms = new String[terms.size()];
-                Iterator<String> j = terms.iterator();
-                int k = 0;
-                while (j.hasNext()) {
-                        value = j.next();
-                        if (startWithWildCard(value)) 
-                                service.setAllowLeadingWildcard(true);
-                        //format string
-                        n = value.length();
-                        arr = new char[n];
-                        v = "";
-                        value.getChars(0, n, arr, 0);  
-                        for (int i = 0; i < arr.length; i++) {
-                                if (SUPPORTED_SPECIAL_CHAR.contains(arr[i])) 
-                                        v += "\\"+arr[i];
-                                else v += arr[i];
-                        }
-                        formattedTerms[k] = v.toLowerCase() ;
-                }
-
-                return formattedTerms;
+                String[] values = new String[terms.size()];
+                Iterator<String> i = terms.iterator();
+                int index = 0;
+                while (i.hasNext()) {
+                        values[index] = i.next();
+                        index++;
+                }
+                return prepareTextSearch(values, service);
         }
 
@@ -2806 +2789 @@
                                 fNone = formatText(none, "url");
                         }
-                        
                         owner = owners.iterator();
                         if (fSome != null) {

branches/Beta3.1/SRC/org/openmicroscopy/shoola/util/ui/search/SearchPanel.java

@@ -1041 +1041 @@
                 String text = allTermsArea.getText();
                 List l = SearchUtil.splitTerms(text);
+                System.err.println(l);
                 if (l.size() > 0) 
                         return (String[]) l.toArray(new String[] {});

branches/Beta3.1/SRC/org/openmicroscopy/shoola/util/ui/search/SearchUtil.java

@@ -111 +111 @@
                                 value = value.trim();
                                 if (value.length() != 0 && !value.equals(ALL) && 
-                                                !value.equals(COMMA_SEPARATOR)) l.add(value);
+                                                !value.equals(COMMA_SEPARATOR)) {
+                                        if (value.contains(",")) value = value.replace(",", "");
+                                        l.add(value);
+                                }
                         }
                 }