Changeset 2294 for branches

Timestamp:

03/11/08 12:08:39 (8 months ago)

Author:

brain

Message:

Updated the historyDB to use the new JPicker calendar

Location:

branches/3.0-Beta2.3/components/bioformats-omero/src/ome/formats

Files:

• OMEROMetadataStore.java (modified) (2 diffs)
• importer/FileQueueHandler.java (modified) (1 diff)
• importer/HistoryHandler.java (modified) (1 diff)
• importer/HistoryTable.java (modified) (4 diffs)
• importer/LoginDialog.java (modified) (1 diff)
• importer/Main.java (modified) (2 diffs)

branches/3.0-Beta2.3/components/bioformats-omero/src/ome/formats/OMEROMetadataStore.java

@@ -357 +357 @@
     }
 
+    
+    /**
+     * Retrieves a dataset from the OMERO server.
+     * @param datasetId The Id of the dataset to retrieve.
+     * @return See above.
+     */
+    public Dataset getDataset(long datasetId)
+    {
+        return iQuery.get(Dataset.class, datasetId);
+    }
+    
     public String getDatasetName(long datasetID)
     {
@@ -1683 +1694 @@
         throw new RuntimeException("Un-implemented.");
     }
+
 }

branches/3.0-Beta2.3/components/bioformats-omero/src/ome/formats/importer/FileQueueHandler.java

@@ -46 +46 @@
     
     @SuppressWarnings("unused")
-    public ImportHandler       importHandler;f
+    public ImportHandler       importHandler;
     private OMEROMetadataStore  store;
  

branches/3.0-Beta2.3/components/bioformats-omero/src/ome/formats/importer/HistoryHandler.java

@@ -14 +14 @@
 {
 
-    private Main            viewer;
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
     private HistoryTable    table;
-    
-    
     
     HistoryHandler(Main viewer)
     {
-        this.viewer = viewer;
         this.setOpaque(false);
         setLayout(new BorderLayout());

branches/3.0-Beta2.3/components/bioformats-omero/src/ome/formats/importer/HistoryTable.java

@@ -3 +3 @@
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.FontMetrics;
@@ -39 +38 @@
 import javax.swing.table.TableColumnModel;
 
-import com.toedter.calendar.JDateChooser;
+import org.jdesktop.swingx.JXDatePicker;
 
 import layout.TableLayout;
@@ -93 +92 @@
     JLabel                  toLabel;
     
-    JDateChooser            fromDate;
-    JDateChooser            toDate;
+    JXDatePicker            fromDate;
+    JXDatePicker            toDate;
     
     JTextField              searchField;
@@ -155 +154 @@
         topSidePanel = gui.addBorderedPanel(mainPanel, topSideTable, " Date Filter ", debug);
         
-        int cbSize = 24;
-        fromDate = new JDateChooser();
-        fromDate.addPropertyChangeListener("date", this);
-        fromDate.setDateFormatString(DATE_FORMAT);
-        fromDate.getJCalendar().setPreferredSize(new Dimension(300,200));
-        
-        fromDate.getCalendarButton().setMinimumSize(new Dimension(cbSize,cbSize));
-        fromDate.getCalendarButton().setPreferredSize(new Dimension(cbSize,cbSize));
-        fromDate.getCalendarButton().setMaximumSize(new Dimension(cbSize,cbSize));
-        fromDate.getCalendarButton().setSize(new Dimension(cbSize,cbSize));
-
-        toDate = new JDateChooser();
-        toDate.addPropertyChangeListener("date", this);
-        toDate.setDateFormatString(DATE_FORMAT);
-        toDate.getJCalendar().setPreferredSize(new Dimension(300,200));
-        
-        
-        toDate.getCalendarButton().setMinimumSize(new Dimension(cbSize,cbSize));
-        toDate.getCalendarButton().setPreferredSize(new Dimension(cbSize,cbSize));
-        toDate.getCalendarButton().setMaximumSize(new Dimension(cbSize,cbSize));
-        toDate.getCalendarButton().setSize(new Dimension(cbSize,cbSize));
+        String[] dateFormats = new String[1];
+        dateFormats[0] = DATE_FORMAT;
+        
+        fromDate = new JXDatePicker();
+        fromDate.setToolTipText("Pick a from date.");
+        //fromDate.getEditor().setEditable(false);
+        //fromDate.setEditable(false);
+        fromDate.setFormats(dateFormats);
+
+        toDate = new JXDatePicker();
+        toDate.setToolTipText("Pick a to date.");
+        //toDate.getEditor().setEditable(false);
+        //toDate.setEditable(false);
+        toDate.setFormats(dateFormats);
         
         fromLabel = new JLabel("From (yy/mm/dd):");

branches/3.0-Beta2.3/components/bioformats-omero/src/ome/formats/importer/LoginDialog.java

@@ -31 +31 @@
 
 import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JDialog;

branches/3.0-Beta2.3/components/bioformats-omero/src/ome/formats/importer/Main.java

@@ -56 +56 @@
     private static final long   serialVersionUID = 1228000122345370913L;
 
-    public static String        versionText = "Beta 2.3.1";
+    public static String        versionText = "Beta 2.3.2";
     
     /** The data of the last release date. */
@@ -107 +107 @@
 
     private JTextPane           debugTextPane;
-    
-    private JTextPane           historyTextPane;
 
     @SuppressWarnings("unused")