Changeset 9184

Timestamp:

2005-02-25T10:41:48+13:00 (19 years ago)

Author:

mdewsnip

Message:

Fixes for Java 1.5.0.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/Subcollection.java (modified) (1 diff)
• gems/GEMS.java (modified) (2 diffs)
• gui/GComboBox.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/cdm/Subcollection.java

@@ -105 +105 @@
     // Object may be a String
     if (object instanceof String) {
-        return getName().compareTo(object);
+        return getName().compareTo((String) object);
     }
 

trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java

@@ -499 +499 @@
         if (event_source == file_new) {
         AddSetActionListener rah = new AddSetActionListener();
-        rah.show();
+        rah.setVisible(true);
+        // rah.show();
      
         return;
@@ -512 +513 @@
                 
                 SetSelectionDialog m = new SetSelectionDialog();
-                m.show();
+        m.setVisible(true);
+                // m.show();
                     
                 //once we have clicked 'ok' on the jdialog above, then we should have

trunk/gli/src/org/greenstone/gatherer/gui/GComboBox.java

@@ -317 +317 @@
 
     protected ComboPopup createPopup() {
-        BasicComboPopup popup = new BasicComboPopup( comboBox ) {
-            public void show() {
-            if(comboBox.getMaximumRowCount() > 0) {
-                Dimension popupSize = new Dimension( comboBox.getWidth(), getPopupHeightForRowCount( comboBox.getMaximumRowCount()));
-                Rectangle popupBounds = new Rectangle( 0, 0, popupSize.width, popupSize.height);
-                scroller.setMaximumSize( popupBounds.getSize() );
-                scroller.setPreferredSize( popupBounds.getSize() );
-                scroller.setMinimumSize( popupBounds.getSize() );
-                list.invalidate();
-                int selectedIndex = comboBox.getSelectedIndex();
-                if ( selectedIndex == -1 ) {
-                list.clearSelection();
-                }
-                else {
-                list.setSelectedIndex( selectedIndex );
-                }
-                list.ensureIndexIsVisible( list.getSelectedIndex() );
-                setLightWeightPopupEnabled( comboBox.isLightWeightPopupEnabled() );
-                show(arrowButton, arrowButton.getSize().width - (popupSize.width + 4), arrowButton.getSize().height);
-            }
-            }
-        };
+        BasicComboPopup popup = new BasicComboPopup(comboBox);
+        // ---- I don't know why this code is here... maybe it is needed for the Mac? ----
+//      {
+//          public void show() {
+//          if(comboBox.getMaximumRowCount() > 0) {
+//              Dimension popupSize = new Dimension( comboBox.getWidth(), getPopupHeightForRowCount( comboBox.getMaximumRowCount()));
+//              Rectangle popupBounds = new Rectangle( 0, 0, popupSize.width, popupSize.height);
+//              scroller.setMaximumSize( popupBounds.getSize() );
+//              scroller.setPreferredSize( popupBounds.getSize() );
+//              scroller.setMinimumSize( popupBounds.getSize() );
+//              list.invalidate();
+//              int selectedIndex = comboBox.getSelectedIndex();
+//              if ( selectedIndex == -1 ) {
+//              list.clearSelection();
+//              }
+//              else {
+//              list.setSelectedIndex( selectedIndex );
+//              }
+//              list.ensureIndexIsVisible( list.getSelectedIndex() );
+//              setLightWeightPopupEnabled( comboBox.isLightWeightPopupEnabled() );
+//              show(arrowButton, arrowButton.getSize().width - (popupSize.width + 4), arrowButton.getSize().height);
+//          }
+//          }
+//      };
         popup.getAccessibleContext().setAccessibleParent(comboBox);
         return popup;