Changeset 5785

Timestamp:

2003-11-05T13:46:44+13:00 (20 years ago)

Author:

mdewsnip

Message:

Commented out about 60 unused functions.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (5 diffs)
• Dictionary.java (modified) (1 diff)
• Gatherer.java (modified) (4 diffs)
• WGet.java (modified) (3 diffs)
• cdm/Classifier.java (modified) (1 diff)
• cdm/CollectionDesignManager.java (modified) (1 diff)
• cdm/CommandTokenizer.java (modified) (1 diff)
• cdm/DynamicListModel.java (modified) (2 diffs)
• cdm/LanguageManager.java (modified) (2 diffs)
• cdm/SubcollectionIndexManager.java (modified) (2 diffs)
• cdm/SubcollectionManager.java (modified) (1 diff)
• collection/Collection.java (modified) (3 diffs)
• collection/CollectionManager.java (modified) (4 diffs)
• collection/Job.java (modified) (1 diff)
• file/FileNode.java (modified) (1 diff)
• file/FileQueue.java (modified) (2 diffs)
• file/FileSystemModel.java (modified) (2 diffs)
• gui/CreatePane.java (modified) (1 diff)
• gui/LongProgressBar.java (modified) (1 diff)
• gui/MenuBar.java (modified) (1 diff)
• gui/SmarterTextArea.java (modified) (1 diff)
• msm/MSMAction.java (modified) (1 diff)
• msm/MSMEvent.java (modified) (2 diffs)
• msm/MSMPrompt.java (modified) (2 diffs)
• msm/MSMUtils.java (modified) (8 diffs)
• msm/MetadataSet.java (modified) (1 diff)
• msm/MetadataSetManager.java (modified) (4 diffs)
• shell/GShell.java (modified) (1 diff)
• undo/UndoManager.java (modified) (4 diffs)
• util/ArrayTools.java (modified) (2 diffs)
• util/GURL.java (modified) (2 diffs)
• util/HTMLStringTokenizer.java (modified) (1 diff)
• util/HashMap3D.java (modified) (2 diffs)
• util/Utility.java (modified) (8 diffs)
• valuetree/GValueModel.java (modified) (1 diff)
• valuetree/GValueNode.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/Configuration.java

@@ -301 +301 @@
 
     /** Retrieve the value of the named property as a Dimension. */
-    public Dimension getDimension(String property, boolean general) {
+    /* private Dimension getDimension(String property, boolean general) {
     Dimension result = new Dimension(100, 100); // Default
     try {
@@ -315 +315 @@
     }
     return result;
-    }
+    } */
 
     /** Retrieve the value of the named property as a FontUIResource. */
@@ -512 +512 @@
 
     /** Set the named property, from the specified configuration, using the given Dimension value. */
-    public void setDimension(String property, boolean general, Dimension value) {
+    /* private void setDimension(String property, boolean general, Dimension value) {
     StringBuffer text = new StringBuffer("");
     text.append(value.width);
@@ -518 +518 @@
     text.append(value.height);
     setString(property, general, text.toString());
-    }
+    } */
 
     /** Set the named property, from the specified configuration, using the given Font value. */
@@ -541 +541 @@
 
     /** Set the named property, from the specified configuration, using the given integer value. */
-    public void setInt(String property, boolean general, int value) {
+    /* private void setInt(String property, boolean general, int value) {
     setString(property, general, String.valueOf(value));
-    }
+    } */
 
     /** Set the named property, from the specified configuration, using the given Locale value. */

trunk/gli/src/org/greenstone/gatherer/Dictionary.java

@@ -205 +205 @@
 
     /** Remove the component from our registered components list. */
-    public void deregister(Object component) {
+    /* private void deregister(Object component) {
     remove(component);
-    }
+    } */
 
     public void destroy() {

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -386 +386 @@
      * @see org.greenstone.gatherer.gui.GUIManager
      */
-    public JFrame getFrame() {
+    /* private JFrame getFrame() {
     return g_man;
-    }
+    } */
 
     /** Method to retrieve a reference to the metadata set manager class. This is then used to create the 'metadataset' commands in the collection configuration file.
@@ -394 +394 @@
      * @see org.greenstone.gatherer.collection.CollectionManager
      */
-    public MetadataSetManager getMSM() {
+    /* private MetadataSetManager getMSM() {
     if(c_man != null && c_man.getCollection() != null && c_man.getCollection().msm != null) {
         return c_man.getCollection().msm;
     }
     return null;
-    }
+    } */
 
     /** Used to 'spawn' a new child application when a file is double clicked.
@@ -658 +658 @@
      * @see javax.swing.UIManager
      */
-    static public void setUIFont (FontUIResource f, FontUIResource ttf){
+    static private void setUIFont(FontUIResource f, FontUIResource ttf) {
     // sets the default font for all Swing components.
     // ex.
@@ -672 +672 @@
     // Now set the tooltip font to some fixed width font
     UIManager.put("ToolTip.font", ttf);
-    }
+    }
 
     /** Loads the configuration file if one exists. Otherwise it creates a new one. Currently uses serialization.

trunk/gli/src/org/greenstone/gatherer/WGet.java

@@ -115 +115 @@
      * harvested.
      */
-    public void convertLinks() {
+    /* private void convertLinks() {
     Vector args = new Vector();
     Vector files = new Vector();
@@ -124 +124 @@
     args.add("debug.txt");
     args.add("-P");
-    args.add("/tmp/");
+    args.add("/tmp/"); */
 
     // Downloaded urls (two entries for each record). The pattern here is:
@@ -160 +160 @@
     //wren(args.size(), args.toArray(), urls.size(), urls.toArray(),
     //      files.size(), files.toArray());
-    }
+    /* } */
 
     /** This method is called to delete a certain job from the queue.

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

@@ -279 +279 @@
     }
 
-    public String getOldPositionString() {
+    /* private String getOldPositionString() {
     return old_position_string;
-    }
+    } */
 
     /** Generate the string showing this classifiers position. */

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

@@ -160 +160 @@
      * @return The files absolute path as a <strong>String</strong>.
      */
-    public String getFilename() {
+    /* private String getFilename() {
     return collect_config.getFile().getAbsolutePath();
-    }
+    } */
 
     /** Cause the current collection configuration to be written out to disk.

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

@@ -67 +67 @@
     }
 
-    public int getLastType() {
+    /* private int getLastType() {
     return last_type;
-    }
+    } */
 
-    public boolean isComment() {
+    /* private boolean isComment() {
     return (last_type == DOUBLE_QUOTE_ENCLOSED || last_type == QUOTE_ENCLOSED);
-    }
+    } */
 
     /** Method to retrieve the next token from the command, taking care to group tokens enclosed in speech marks.

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

@@ -91 +91 @@
     }
 
-    public DynamicListModel shallowCopy() {
+    /* private DynamicListModel shallowCopy() {
     DynamicListModel copy = new DynamicListModel();
     copy.setAutoOrder(auto_order);
@@ -98 +98 @@
     }
     return copy;
-    }
+    } */
 
     public Object getSelectedItem() {

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

@@ -142 +142 @@
      * @return A <strong>Language</strong> containing a two letter code.
      */
-    public Language getDefaultLanguage() {
+    /* private Language getDefaultLanguage() {
     // If no default is set...
     if(default_language != null && default_language.isAssigned()) {
@@ -148 +148 @@
     }
     return null;
-    }
+    } */
 
     /** Method to retrieve a certain language object by its code.

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

@@ -99 +99 @@
      * @return the default Index, or null if no such index assigned
      */
-    public SubcollectionIndex getDefaultSubcollectionIndex() {
+    /* private SubcollectionIndex getDefaultSubcollectionIndex() {
     if(default_index != null && default_index.isAssigned()) {
         return default_index;
@@ -106 +106 @@
         return null;
     }
-    }
+    } */
 
     /** Retrieve a certain subindex given its name.

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

@@ -132 +132 @@
      * @return an ArrayList of subcollections
      */
-    public ArrayList getSubcollections() {
+    /* private ArrayList getSubcollections() {
     return children();
-    }
+    } */
 
     /** Method to remove the given subcollection.

trunk/gli/src/org/greenstone/gatherer/collection/Collection.java

@@ -189 +189 @@
      * @return The <strong>File</strong> this name maps to, or <i>null</i> if no such mapping.
      */
-    public File getDirectoryMapping(String name) {
+    /* private File getDirectoryMapping(String name) {
     File result = null;
     try {
@@ -213 +213 @@
     }
     return result;
-    }
+    } */
     /** Retrieve the special directory mappings associated with this collection.
      * @return A <strong>HashMap</strong> containing mappings from names to directories.
@@ -250 +250 @@
     }
     /** Counts the number of folders used in the current record set. */
-    public int getFolderCount() {
+    /* private int getFolderCount() {
     return getCount((TreeNode)Gatherer.c_man.getRecordSet().getRoot(), true, false);
-    }
+    } */
     /** Determine if this collection has had an import action run upon it since the last major change.
      * @return <i>true</i> if an import has occured, <i>false</i> otherwise.
      */
-    public boolean getImported() {
+    /* private boolean getImported() {
     return get(IMPORTED);
-    }
+    } */
     /** Retrieve the short name for this collection. 
      * @return The name as a <strong>String</strong>.

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -462 +462 @@
      * @see org.greenstone.gatherer.collection.Collection
      */
-    public BuildOptions getBuildOptions() {
+    /* private BuildOptions getBuildOptions() {
     return collection.build_options;
-    }
+    } */
 
     /** Retrieve the current collection.
@@ -589 +589 @@
      * @see org.greenstone.gatherer.collection.Collection
      */
-    public String getCollectionTitle() {
+    /* private String getCollectionTitle() {
     if(collection != null) {
         return collection.getTitle();
     }
     return Dictionary.get("Collection.No_Collection");
-    }
+    } */
 
     /** Retrieve the record set (tree model) associated with the current collection. */
@@ -1110 +1110 @@
 
     /** Updates the given workspace tree model to reference the private cache of the currently loaded collection. */
-    public void updatePrivateWorkspace(DefaultTreeModel model) {
+    /* private void updatePrivateWorkspace(DefaultTreeModel model) {
     // Add Private workspace if a collection has been loaded.
     if(ready() && !Gatherer.config.get("workflow.mirror", true)) {
@@ -1121 +1121 @@
         model.insertNodeInto(private_workspace, root, 2);
     }
-    }
+    } */
     /** Called whenever the value tree of an metadata element changes in some way, such as the addition of a new value. We want to mark the collection so that it needs saving again.
      * @param event A <strong>MSMEvent</strong> containing details of the event that caused this message to be fired.

trunk/gli/src/org/greenstone/gatherer/collection/Job.java

@@ -478 +478 @@
      * @return A String representing the currently downloading url.
      */
-    public String getCurrent() {
+    /* private String getCurrent() {
     return current_url;
-    }
+    } */
 
     /** 

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

@@ -341 +341 @@
     }
 
-    public void setChildrenReadOnly(boolean children_readonly) {
+    /* private void setChildrenReadOnly(boolean children_readonly) {
     this.children_readonly = children_readonly;
-    }
+    } */
 
     public void setFile(File file) {

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

@@ -626 +626 @@
      * @param wait_allowed The new state of the wait_allowed flag, as a boolean.
      */
-    public void setWaitAllowed(boolean wait_allowed) {
+    /* private void setWaitAllowed(boolean wait_allowed) {
     this.wait_allowed = wait_allowed;
-    }
+    } */
     /** Restore the progress bar so that it updates normally.
      * @see org.greenstone.gatherer.gui.LongProgressBar
      */
-    synchronized public void unpause() {
+    /* synchronized private void unpause() {
     progress.setIndeterminate(false);
     if(previous != null) {
@@ -638 +638 @@
         previous = null;
     }
-    }
+    } */
     /** Called when the user makes some selection in one of the trees we are listening to. From this we update the status details. */
     public void valueChanged(TreeSelectionEvent event) {

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

@@ -196 +196 @@
     }
 
-    public void setPermanentFilter(String pattern) {
+    /* private void setPermanentFilter(String pattern) {
     if(pattern != null) {
         FileFilter new_filter = new FileFilter(pattern, false);
@@ -206 +206 @@
     }
     filters = null;
-    }
+    } */
 
     public void setTree(DragTree tree) {

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

@@ -317 +317 @@
      * @return The build <strong>GShellProgressMonitor</strong>.
      */
-    public GShellProgressMonitor getBuildProgress() {
+    /* private GShellProgressMonitor getBuildProgress() {
     return build_monitor;
-    }
+    } */
 
     /** Method to acquire the progress monitor associated with copying.
      * @return The copying <strong>GShellProgressMonitor</strong>.
      */
-    public GShellProgressMonitor getCopyProgress() {
+    /* private GShellProgressMonitor getCopyProgress() {
     return copy_monitor;
-    }
+    } */
 
     /** Method to acquire the progress monitor associated with import.
      * @return The import <strong>GShellProgressMonitor</strong>.
      */
-    public GShellProgressMonitor getImportProgress() {
+    /* private GShellProgressMonitor getImportProgress() {
     return import_monitor;
-    }
+    } */
 
     /** We are informed when this view pane loses focus so we can update build options. */

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

@@ -85 +85 @@
     }
 
-    public void refreshString() {
+    /* private void refreshString() {
     safeSetString(previous + "%");
-    }
+    } */
 
     public void reset() {

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

@@ -382 +382 @@
 
     /** Set the enabled state of one of the help menu items, based on its 'tabs' current state. Note that this method should only be called from the AWTEvent thread. */
-    public void tabEnabled(int tab_index, boolean state) {
+    /* private void tabEnabled(int tab_index, boolean state) {
     JMenuItem selected = help.getItem(tab_index + 2); // Remember general and separator items
     selected.setEnabled(state);
-    }
+    } */
 
     /** In order to provide context aware help advice we keep track of which

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

@@ -63 +63 @@
 
     /** we want to be able to set the text without the user being able to */
-    public void systemSetText(String text) {
+    /* private void systemSetText(String text) {
     init = true;
     setText(text);
     init = false;
-    }
+    } */
 
     private class UnchangingDocument 

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

@@ -127 +127 @@
      * @return A <strong>String</strong> stating the fully qualified name of the target element, within the namespace of one of the currently loaded metadata sets. 
      */
-    public String getTarget() {
+    /* private String getTarget() {
     return target;
-    }
-    public boolean isHFile() {
+    } */
+    /* private boolean isHFile() {
     return hfile;
-    }
+    } */
 }

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

@@ -149 +149 @@
     return new_metadata;
     } 
-    public GValueModel getNewModel() {
+    /* private GValueModel getNewModel() {
     return new_model;
-    }
+    } */
     /** Method to retrieve the old metadata associated with this event.
      * @return A <strong>Metadata</strong>, or <i>null</i> if there is none.
@@ -158 +158 @@
     return old_metadata;
     } 
-    public GValueModel getOldModel() {
+    /* private GValueModel getOldModel() {
     return old_model;
-    }
+    } */
     /** Method to retrieve of the profile associated with this event.
      * @return A <strong>MSMAction</strong> which details the action profile, or <i>null</i> if no profile exists.
      */
-    public MSMAction getProfile() {
+    /* private MSMAction getProfile() {
     return profile;
-    }
+    } */
     /** Retrieve the record associated with this event. */
     public FileNode getRecord() {

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

@@ -861 +861 @@
      * @return The metadata set the user has selected or null if no set selected.
      */
-    final public MetadataSet selectSet(String name) {
+    /* final private MetadataSet selectSet(String name) {
     String args[] = new String[1];
     args[0] = name;
@@ -941 +941 @@
     dialog = null;
     return null;
-    }
+    } */
 
     private class AddListener 

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

@@ -147 +147 @@
      * @return <i>true</i> if the path was found (including matching #text elements at the leaf), or <i>false</i> otherwise.
      */
-    static final public boolean containsPath(Node tree, Node path[]) {
+    /* static final private boolean containsPath(Node tree, Node path[]) {
     // If there is no tree then there are no values.
     if(tree == null) {
@@ -177 +177 @@
     }
     return false;        
-    }
+    } */
     /** Method to compare two metadata elements (of type Element, which is bound to get more than a bit confusing) for equality. This test may only check the structural (ie pretty much unchanging) consistancy, or may include the AssignedValue tree as well (which will be different for each collection I'd imagine).
      * @param a_set The <strong>MetadataSet</strong> a comes from.
@@ -390 +390 @@
      * @return The pattern as a String.
      */
-    static final public String getFileNamePattern(Node fileset) {
+    /* static final private String getFileNamePattern(Node fileset) {
     // Locate the child node called filename
     for(Node child = fileset.getFirstChild(); child != null; child = child.getNextSibling()) {
@@ -399 +399 @@
     }         
     return null;
-    }
+    } */
 
     /*************************************************************************/
@@ -406 +406 @@
      * @return A fully qualified identifier as a <strong>String</strong>
      */
-    static final public String getFullIdentifier(Node element, String namespace) {
+    /* static final private String getFullIdentifier(Node element, String namespace) {
     StringBuffer identifier_buffer = new StringBuffer();
     if(element == null) {
@@ -438 +438 @@
     namespace = null;
     return identifier_buffer.toString();
-    } // static public String getFullIdentier(Node element)
+    } */
 
     /*************************************************************************/
@@ -530 +530 @@
      * @return The description node or null if no such node.
      */
-    static final public Node getMetadataDescription(Node fileset) {
+    /* static final private Node getMetadataDescription(Node fileset) {
     // Locate the child node called filename
     for(Node child = fileset.getLastChild(); child != null; child = child.getPreviousSibling()) {
@@ -538 +538 @@
     }         
     return null;
-    }
+    } */
 
     /** Method to retrieve from the node given, a certain child node with the specified name.

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

@@ -301 +301 @@
      * @return A <strong>String</strong> containing the address. 
      */
-    public String getContact() {
+    /* private String getContact() {
     return root.getAttribute("contact");
-    }
+    } */
     /** Method to retrieve the name of the creator of this metadata set. 
      * @return A <strong>String</strong> containing the name.

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

@@ -466 +466 @@
      * @return A NodeList[] of metadata elements.
      */
-    public NodeList[] getNodeLists() {
+    /* private NodeList[] getNodeLists() {
     NodeList elements[] = null;
     int index = 0;
@@ -478 +478 @@
     }
     return elements;
-    }
+    } */
 
     /** Retrieve the named metadata set.
@@ -930 +930 @@
      * @param new_name The String to use as the new name.
      */
-    public void renameElement(ElementWrapper element, String new_name) {
+    /* private void renameElement(ElementWrapper element, String new_name) {
     Element e = element.getElement();
     String old_name = element.toString();
@@ -937 +937 @@
     old_name = null;
     e = null;
-    }
+    } */
     /** A method to save the state of this metadata set manager. First we ensure that the names of all included metadata sets have been added to the collection configuration file, then all of the metadata sets contained are exported with full content to the collect/<col_name>/metadata/ directory. 
      */

trunk/gli/src/org/greenstone/gatherer/shell/GShell.java

@@ -115 +115 @@
      * @param listener The <i>GShellListener</i> to be removed.
      */
-    public void removeGShellListener(GShellListener listener) {
+    /* private void removeGShellListener(GShellListener listener) {
     listeners.remove(GShellListener.class, listener);
-    }
+    } */
     /** Any threaded class must include this method to allow the thread body to be run. */
     public void run() {

trunk/gli/src/org/greenstone/gatherer/undo/UndoManager.java

@@ -260 +260 @@
     }
 
-    public void fileDeleted(long id, DragComponent source_model, FileNode source_parent, FileNode target_parent, FileNode record, boolean undo_event) {
+    /* private void fileDeleted(long id, DragComponent source_model, FileNode source_parent, FileNode target_parent, FileNode record, boolean undo_event) {
     UndoJob job = new UndoJob(id, source_model, source_parent, this, record, FILE_DELETE);
     if(undo_event) {
@@ -270 +270 @@
         redo.push(job);
     }
-    }
+    } */
 
     public void fileMoved(long id, DragComponent source_model, FileNode source_parent, DragComponent target_model, FileNode target_parent, FileNode record, boolean undo_event) {
@@ -339 +339 @@
     }
 
-    static final public File generateUniqueFile(FileNode record) {
+    /* static final private File generateUniqueFile(FileNode record) {
     String filename_raw = ArrayTools.objectArrayToString(record.getPath());
     int hash_code = filename_raw.hashCode();
@@ -349 +349 @@
     }
     return file;
-    }
+    } */
 
     private void showTree() {

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

@@ -181 +181 @@
      * @return The same <strong>FileNode[]</strong> sans its head element.
      */
-    static final public FileNode[] tail(FileNode a[]) {
+    /* static final private FileNode[] tail(FileNode a[]) {
     if(a.length == 1) {
         return null;
@@ -188 +188 @@
     System.arraycopy(a, 1, b, 0, b.length);
     return b;
-    }
+    } */
      
     /** Append a Metadata object onto an array of Metadata objects. */

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

@@ -124 +124 @@
     }
 
-    public String getLocalFile() {
+    /* private String getLocalFile() {
     String local_file = getPath() + File.separator + getFile();
     // Strip msdos roots if they're still there.
@@ -131 +131 @@
     }
     return local_file;
-    }
+    } */
 
     public String getPath() {

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

@@ -96 +96 @@
      * @return A <strong>String</strong> representing the token.
      */
-    public String sameToken() {
+    /* private String sameToken() {
     return previous;
-    }
+    } */
     /** Parses the next token and stores it in current.
      */

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

@@ -124 +124 @@
      * @return The first unique instance of the target <strong>Metadata</strong> which may in fact be the same metadata given as a paramater.
      */
-    public Metadata locate(Metadata metadata) {
+    /* private Metadata locate(Metadata metadata) {
     Metadata result = null;
     if(metadata != null) {
@@ -146 +146 @@
     }
     return result;
-    }
+    } */
     /** Put an entry into this three dimensional hash mapping.
      * @param key_one The first key, to store this value under, as an <strong>Object</strong>.

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

@@ -160 +160 @@
     /** The image for a toggle button whose state is 'off'. */
     static final public ImageIcon OFF_ICON = new ImageIcon(ClassLoader.getSystemResource("images/cross.gif"));
-    /** Method to turn a file from with the system file tree into a tree path for insertion into a tree.
-     * @param file The <strong>File</strong> whose tree path you are attempting to discover.
-     * @param in_col A <i>boolean</i> indicating whether we are looking for a file within a collection of not. If <i>true</i> then the tree paths head in the collection name, and no element in the path refers to the import directory. Otherwise the paths head will be one of the system roots and all traversed file locations will exist in the path.
-     * @return A <strong>TreePath</strong> which traverses the file system tree to the specified file.
-     */
-    public static TreePath createTreePath(File file, boolean in_col) {
-    TreePath path = null;
-    // Get the absolute path of the file.
-    String abs_path = file.getAbsolutePath();
-    while(file != null) {
-        // If we are looking for a node within our collection, we expect
-        // its path from root to be <col_name>/... without any higher
-        // details and without gimport. So if we encounter a gimport we
-        // skip to its parent, add that, then return.
-        if(in_col && file.getName().equals("gimport")) {
-        file = file.getParentFile();
-        if(path == null) {
-            path = new TreePath(file.getName());
-        }
-        else {
-            path = path.pathByAddingChild(file.getName());
-        }
-        file = null;
-        }
-        else {
-        if(path == null) {
-            path = new TreePath(file.getName());
-        }
-        else {
-            path = path.pathByAddingChild(file.getName());
-        }
-        file = file.getParentFile();
-        }
-    }
-    // Unfortunately we've created the path in reverse order so we have to
-    // reverse it.
-    Object temp[] = new Object[path.getPathCount()];
-    for(int i = 0; i < temp.length; i++) {
-        temp[(temp.length - 1) - i] = path.getPathComponent(i);
-    }
-    return new TreePath(temp);
-    }
 
     /** Decodes a string of text so its safe to use in a Greenstone configuration file. Esentially replaces "\n" with a newline.
@@ -221 +179 @@
      * @return The decoded <strong>String</strong>.
      */
-    public static String decodeString(String encoded) {
+    /* private static String decodeString(String encoded) {
     String decoded = "";
     for(int i = 0; i < encoded.length(); i++) {
@@ -239 +197 @@
     }
     return decoded;
-    }
+    } */
     /** It turns out that in Java you have to make sure a directory is empty before you delete it (much like unix I suppose), and so just like unix I'll have to set up a recursive delete function.
      * @param file The <strong>File</strong> you want to delete.
@@ -260 +218 @@
     }
 
-    static public String encodeGreenstone(String raw) {
+    /* static private String encodeGreenstone(String raw) {
     raw = raw.replaceAll("<", "&lt;");
     raw = raw.replaceAll(">", "&gt;");
     raw = raw.replaceAll("\n", "\\\\n");
     return raw;
-    }
+    } */
 
     /** Using this method we can request that a certain document be written, as valid XML, to a certain output stream. This makes use of the Xerces Serialization suite, which should in no way be confused with the usual method of Serialization used by Java. */
@@ -578 +536 @@
      * @return A <strong>String</strong> representation of the mirroring depth padded to length characters.
      */
-    public static String getDepthString(int length) {
+    /* private static String getDepthString(int length) {
     return pad("" + Gatherer.self.config.getInt("mirroring.depth", false), length);
-    }
+    } */
     /** Method which constructs the etc directory given a certain collection.
      * @param col_dir The location of the collection directory as a <strong>String</strong>.
@@ -646 +604 @@
 
 
-    static public File getRecycleDirectory() {
+    /* static private File getRecycleDirectory() {
     return new File(RECYCLE);
-    }
+    } */
 
     /** Determine whether a character is a hexidecimal one.
@@ -900 +858 @@
      * @return A filtered <strong>File[]</strong> containing only those drives that are accessible and/or are floppy-disk media drives.
      */
-    public static File[] validateDrives(File roots[]) {
+    /* private static File[] validateDrives(File roots[]) {
     Vector valid = new Vector();
     for(int i = 0; i < roots.length; i++) {
@@ -914 +872 @@
     }
     return roots;
-    }
+    } */
 }

trunk/gli/src/org/greenstone/gatherer/valuetree/GValueModel.java

@@ -253 +253 @@
      * this value in.
      */ 
-    public GValueNode updateValue(String new_value, String old_value, GValueNode subject) {
+    /* private GValueNode updateValue(String new_value, String old_value, GValueNode subject) {
     return addValue(new_value, subject, null);
-    }
+    } */
 
     private GValueModel copy() {

trunk/gli/src/org/greenstone/gatherer/valuetree/GValueNode.java

@@ -92 +92 @@
      * @return <i>true</i> if there is a matching child node, <i>false</i> otherwise.
      */
-    public boolean containsValue(String value) {
+    /* private boolean containsValue(String value) {
     if(default_value != null) {
         return false;
     }
     return getValue(value) != null;
-    }
+    } */
 
     /** Returns an enumeration of the child nodes.