Changeset 7540

Timestamp:

2004-06-02T17:28:44+12:00 (20 years ago)

Author:

mdewsnip

Message:

Some minor tidy ups with removing dead code.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• file/FileAssociationManager.java (modified) (1 diff)
• gui/EnrichPane.java (modified) (2 diffs)
• gui/GComboBox.java (modified) (1 diff)
• gui/MirrorPane.java (modified) (1 diff)
• gui/PreviewCommandDialog.java (modified) (1 diff)
• msm/ElementWrapper.java (modified) (1 diff)
• msm/MetadataSetManager.java (modified) (3 diffs)
• util/TableUtils.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/file/FileAssociationManager.java

@@ -37 +37 @@
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
-import org.greenstone.gatherer.util.WinRegistry;
 import org.w3c.dom.*;
 

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

@@ -54 +54 @@
 import org.greenstone.gatherer.gui.GLIButton;
 import org.greenstone.gatherer.gui.MetaEditPrompt;
-import org.greenstone.gatherer.gui.TransformCharacterTextField;
 import org.greenstone.gatherer.gui.WarningDialog;
 import org.greenstone.gatherer.gui.table.GTableModel;
@@ -68 +67 @@
 import org.greenstone.gatherer.util.PatternTokenizer;
 import org.greenstone.gatherer.util.StaticStrings;
-import org.greenstone.gatherer.util.TableUtils;
 import org.greenstone.gatherer.util.TreeSynchronizer;
 import org.greenstone.gatherer.util.Utility;

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

@@ -142 +142 @@
         ((Model)dataModel).clear();
     }
-    }
-
-    public int count() {
-    return dataModel.getSize();
     }
 

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

@@ -211 +211 @@
     }
 
-    public void setURL(String url) {
-    url_field.setText(url);
-    }
-
-
-    static public FileNode getWebCacheMapping()
-    {
-    if (Gatherer.config.get("workflow.mirror", true) || Gatherer.config.get("workflow.mirror", false)) {
-        /* @todo - add to dictionary */
-        return new FileNode(Utility.getCacheDir(), "Mirroring.Mirror_Cache");
-    }
-    return null;
-    }
+//      public void setURL(String url) {
+//      url_field.setText(url);
+//      }
+
+
+//      static public FileNode getWebCacheMapping()
+//      {
+//      if (Gatherer.config.get("workflow.mirror", true) || Gatherer.config.get("workflow.mirror", false)) {
+//          /* @todo - add to dictionary */
+//          return new FileNode(Utility.getCacheDir(), "Mirroring.Mirror_Cache");
+//      }
+//      return null;
+//      }
 
     /** A DepthEntry contains a depth value, as an int, and a representitive text string. This allows for a more meaningful appearance than '0' for instance. */

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

@@ -47 +47 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.gui.GComboBox;
 import org.greenstone.gatherer.gui.GLIButton;
 import org.greenstone.gatherer.gui.ModalDialog;
-import org.greenstone.gatherer.gui.NonWhitespaceField;
 import org.greenstone.gatherer.gui.OpenCollectionDialog;
 import org.greenstone.gatherer.gui.SimpleMenuBar;
-import org.greenstone.gatherer.util.TableUtils;
 import org.greenstone.gatherer.util.Utility;
 

trunk/gli/src/org/greenstone/gatherer/msm/ElementWrapper.java

@@ -209 +209 @@
     }
 
-    public void setHierarchy(boolean value) {
-    element.setAttribute(StaticStrings.HIERARCHY_ATTRIBUTE, (value ? StaticStrings.TRUE_STR : StaticStrings.FALSE_STR));
-    }
-
     public String toString() {
     return getNamespace() + MSMUtils.NS_SEP + getIdentity();

trunk/gli/src/org/greenstone/gatherer/msm/MetadataSetManager.java

@@ -377 +377 @@
     return all_elements;
     }
-    /** Returns all the elements within this set as a combobox model. 
-     * @return A MetadataComboBoxModel containing all the metadata elements from all the sets, with namespacing.
-     */
-    public MetadataComboBoxModel getElementModel() {
-    return new MetadataComboBoxModel(this);
-    }
+
     /** Retrieve a metadata element by its index.
      * @param index The specified index as an int.
@@ -477 +472 @@
     return null;
     }
-    /** Get all of the metadata elements as an array of nodelists.
-     * @return A NodeList[] of metadata elements.
-     */
-    /* private NodeList[] getNodeLists() {
-    NodeList elements[] = null;
-    int index = 0;
-    elements = new NodeList[getSets().size()]; // Remember not to count hidden metadata
-    for(Enumeration keys = mds_hashtable.keys(); keys.hasMoreElements(); ) {
-        MetadataSet mds = (MetadataSet)mds_hashtable.get(keys.nextElement());
-        if(!mds.getNamespace().equals(HIDDEN)) {
-        elements[index] = mds.getElements();
-        index++;
-        }
-    }
-    return elements;
-    } */
 
     /** Retrieve the named metadata set.
@@ -1020 +999 @@
     return (loader.searchForMetadata(destination, source, folder_level, dummy_run)?false:true);
     }
-    /** Build a vector of all the metadata sets that contain an element with the given name.
-     * @param name The name of an element as a String.
-     * @return A Vector of metadata sets.
-     * @see MSMPrompt (org.greenstone.gatherer.msm.MSMPrompt#selectSet)
-     */
-    public Vector setsThatContain(String name) {
-    Vector result = new Vector();
-    for(Enumeration keys = mds_hashtable.keys(); keys.hasMoreElements(); ) {
-        MetadataSet set = (MetadataSet) mds_hashtable.get(keys.nextElement());
-        if(set.getElement(name) != null) {
-        result.add(set);
-        }
-    }
-    return result;
-    }
 
     public final int size() {

trunk/gli/src/org/greenstone/gatherer/util/TableUtils.java

@@ -19 +19 @@
   // somewhat modified.
 
-  public static void setPreferredCellSizes(JTable table) {
-    TableModel model = table.getModel();
-    TableColumnModel colModel = table.getColumnModel();
+//    public static void setPreferredCellSizes(JTable table) {
+//      TableModel model = table.getModel();
+//      TableColumnModel colModel = table.getColumnModel();
 
-    for (int i = 0; i < model.getColumnCount(); i++) {
-      TableColumn column = colModel.getColumn(i);
+//      for (int i = 0; i < model.getColumnCount(); i++) {
+//        TableColumn column = colModel.getColumn(i);
 
-      int longestCell = 0;
-      int highestCell = 0;
+//        int longestCell = 0;
+//        int highestCell = 0;
 
-      for (int j = 0; j < model.getRowCount(); j++) {
-        Object value = model.getValueAt(j, i);
-        if (value == null) continue;
+//        for (int j = 0; j < model.getRowCount(); j++) {
+//          Object value = model.getValueAt(j, i);
+//          if (value == null) continue;
 
-        Component cell =
-          table.getDefaultRenderer(model.getColumnClass(i)).
-          getTableCellRendererComponent(table, value,
-                                        false, false, j, i);
+//          Component cell =
+//            table.getDefaultRenderer(model.getColumnClass(i)).
+//            getTableCellRendererComponent(table, value,
+//                                          false, false, j, i);
 
-        int width = cell.getPreferredSize().width;
-        int height = cell.getPreferredSize().height;
+//          int width = cell.getPreferredSize().width;
+//          int height = cell.getPreferredSize().height;
 
-        if (width > longestCell) longestCell = width;         
-        if (height > highestCell) highestCell = height;
-      }
+//          if (width > longestCell) longestCell = width;         
+//          if (height > highestCell) highestCell = height;
+//        }
 
-      Component headerComp = column.getHeaderRenderer().
-        getTableCellRendererComponent(table, column.getHeaderValue(),
-                                      false, false, 0, 0);
+//        Component headerComp = column.getHeaderRenderer().
+//          getTableCellRendererComponent(table, column.getHeaderValue(),
+//                                        false, false, 0, 0);
 
-      int headerWidth = headerComp.getPreferredSize().width;
-      int headerHeight = headerComp.getPreferredSize().height;
+//        int headerWidth = headerComp.getPreferredSize().width;
+//        int headerHeight = headerComp.getPreferredSize().height;
 
-      column.setPreferredWidth(Math.max(headerWidth, longestCell));
+//        column.setPreferredWidth(Math.max(headerWidth, longestCell));
 
-      int currentHeight = table.getRowHeight();
-      int preferredHeight = Math.max(headerHeight, highestCell);
+//        int currentHeight = table.getRowHeight();
+//        int preferredHeight = Math.max(headerHeight, highestCell);
 
-      table.setRowHeight(Math.max(currentHeight, preferredHeight));
-    }
-  }                                                                   
+//        table.setRowHeight(Math.max(currentHeight, preferredHeight));
+//      }
+//    }                                                                   
 
   /**