Changeset 8002

Timestamp:

2004-08-19T15:07:52+12:00 (20 years ago)

Author:

mdewsnip

Message:

Tightened up many public functions to private.

Location:

trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• ClassifierManager.java (modified) (5 diffs)
• CollectionDesignManager.java (modified) (1 diff)
• FormatManager.java (modified) (4 diffs)
• IndexManager.java (modified) (6 diffs)
• LanguageManager.java (modified) (2 diffs)
• PlugInManager.java (modified) (6 diffs)
• SearchTypeManager.java (modified) (3 diffs)
• SubcollectionIndexManager.java (modified) (4 diffs)
• SubcollectionManager.java (modified) (4 diffs)
• SuperCollectionManager.java (modified) (2 diffs)

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

@@ -90 +90 @@
      * @see org.greenstone.gatherer.cdm.DynamicListModel
      */
-    public void addClassifier(Classifier classifier) {
+    private void addClassifier(Classifier classifier) {
     if(!library.contains(classifier)) {
         library.add(classifier);
@@ -100 +100 @@
      * @see org.greenstone.gatherer.cdm.DynamicListModel
      */
-    public void assignClassifier(Classifier classifier) {
+    private void assignClassifier(Classifier classifier) {
     if(!contains(classifier)) {
         Element element = classifier.getElement();
@@ -199 +199 @@
      * @param all true to move to move all the way, false for a single step.
      */
-    public void moveClassifier(Classifier classifier, boolean direction, boolean all) {
+    private void moveClassifier(Classifier classifier, boolean direction, boolean all) {
     if(getSize() < 2) {
         Gatherer.println("Not enough classifiers to allow moving.");
@@ -260 +260 @@
      * @see org.greenstone.gatherer.cdm.DynamicListModel
      */
-    public void removeClassifier(Classifier classifier) {
+    private void removeClassifier(Classifier classifier) {
     remove(classifier);
     Gatherer.c_man.configurationChanged();
@@ -268 +268 @@
      * @see org.greenstone.gatherer.util.Utility
      */
-    public void saveClassifiers() {
+    private void saveClassifiers() {
     try {
         FileOutputStream file = new FileOutputStream(Utility.BASE_DIR + "classifiers.dat");

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

@@ -111 +111 @@
      * @see org.greenstone.gatherer.cdm.TranslationView
      */
-    public void loadDesignDetails() {
+    private void loadDesignDetails() {
     // Create the command information managers, registering the config file with each as necessary
     language_manager = new LanguageManager(collect_config.getLanguages());

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

@@ -108 +108 @@
      * @param format The <strong>Format</strong> to add.
      */
-    public void addFormat(Format format) {
+    private void addFormat(Format format) {
     if(!contains(format)) {
         Element element = format.getElement();
@@ -134 +134 @@
      * @param index The location of the desired format, as an <i>int</i>.
      */
-    public Format getFormat(int index) {
+    private Format getFormat(int index) {
     Format result = null;
     if(0 < index && index < getSize()) {
@@ -142 +142 @@
     }
 
-    public Format getFormat(String name) {
+    private Format getFormat(String name) {
     int model_size = getSize();
     for(int index = 0; index < model_size; index++) {
@@ -166 +166 @@
      * @param format The <strong>Format</strong> to remove.
      */
-    public void removeFormat(Format format) {
+    private void removeFormat(Format format) {
     remove(format);
     Gatherer.c_man.configurationChanged();

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

@@ -88 +88 @@
      * @see org.greenstone.gatherer.collection.CollectionManager
      */
-    public void addIndex(Index index, CollectionMeta metadatum) {
+    private void addIndex(Index index, CollectionMeta metadatum) {
     ///ystem.err.println("Adding an index: " + index.toString());
     if(!contains(index)) {
@@ -111 +111 @@
     }
 
-    public void addLevel(Level level, CollectionMeta metadatum) {
+    private void addLevel(Level level, CollectionMeta metadatum) {
     if(!levels_model.contains(level)) {
         CollectionDesignManager.collectionmeta_manager.addMetadatum(metadatum);
@@ -202 +202 @@
     }
 
-    public void moveIndex(Index index, boolean move_up) {
+    private void moveIndex(Index index, boolean move_up) {
     // Determine the indexes current position
     int position = indexOf(index);
@@ -232 +232 @@
     }
 
-    public void moveLevel(Level level, boolean move_up) {
+    private void moveLevel(Level level, boolean move_up) {
     // Determine the leveles current position
     int position = levels_model.indexOf(level);
@@ -269 +269 @@
      * @see org.greenstone.gatherer.collection.CollectionManager
      */
-    public void removeIndex(Index index) {
+    private void removeIndex(Index index) {
     if(index != null) {
         // Remove any current metadata from this index
@@ -291 +291 @@
     }
 
-    public void removeLevel(Level level) {
+    private void removeLevel(Level level) {
     if(level != null) {
         // Remove any current metadata from this level

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

@@ -127 +127 @@
      * @see org.greenstone.gatherer.collection.CollectionManager
      */
-    public void addLanguage(Language language) {
+    private void addLanguage(Language language) {
     if(!contains(language)) {
         Element element = language.getElement();
@@ -201 +201 @@
      * @see org.greenstone.gatherer.collection.CollectionManager
      */
-    public void removeLanguage(Language language) {
+    private void removeLanguage(Language language) {
     remove(language);
     if(default_language != null && default_language.equals(language)) {

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

@@ -81 +81 @@
      * @param plugin the new base PlugIn
      */
-    public void addPlugIn(PlugIn plugin) {
-    if(!library.contains(plugin)) {
-        library.add(plugin);
-    }
+    private void addPlugIn(PlugIn plugin) {
+    if(!library.contains(plugin)) {
+        library.add(plugin);
+    }
     }
 
@@ -90 +90 @@
      * @param plugin the PlugIn to assign
      */
-    public void assignPlugIn(PlugIn plugin) {
+    private void assignPlugIn(PlugIn plugin) {
     if(plugin.getName().equals(StaticStrings.RECPLUG_STR) || plugin.getName().equals(StaticStrings.ARCPLUG_STR)) {
         addAfter(plugin, separator_plugin); // Adds after separator
@@ -171 +171 @@
      */
     // why are all the error notices there when the buttons are disabled is you cant move???
-    public void movePlugIn(PlugIn plugin, boolean direction, boolean all) {
+    private void movePlugIn(PlugIn plugin, boolean direction, boolean all) {
     // Can't ever move RecPlug or ArcPlug
     if(super.getSize() < 4) {
@@ -274 +274 @@
      * @param plugin The <strong>PlugIn</strong> to remove.
      */
-    public void removePlugIn(PlugIn plugin) {
+    private void removePlugIn(PlugIn plugin) {
     remove(plugin);
     Gatherer.c_man.configurationChanged();
@@ -281 +281 @@
     /** Method to cache the current contents of library (known plugins) to file.
      */
-    public void savePlugIns() {
+    private void savePlugIns() {
     try {
         FileOutputStream file = new FileOutputStream(Utility.BASE_DIR + "plugins.dat");
@@ -296 +296 @@
      * @param modify_row_count true to hide the last three lines, false otherwise
      */
-    public void setHideLines(boolean modify_row_count) {
+    private void setHideLines(boolean modify_row_count) {
     this.modify_row_count = modify_row_count;
     int original_size = super.getSize();

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

@@ -68 +68 @@
     }
 
-    public void addSearchType(SearchType searchtype) {
+    private void addSearchType(SearchType searchtype) {
     if(!contains(searchtype)) {
         add(getSize(), searchtype);
@@ -104 +104 @@
     }
 
-    public void moveSearchType(SearchType search_type, boolean direction) {
+    private void moveSearchType(SearchType search_type, boolean direction) {
     // Try to move the classifier one step in the desired direction.
     int index = indexOf(search_type);
@@ -133 +133 @@
     }
 
-    public void removeSearchType(SearchType searchtype) {
+    private void removeSearchType(SearchType searchtype) {
     if(contains(searchtype)) {
         remove(searchtype);

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

@@ -73 +73 @@
      * @see org.greenstone.gatherer.collection.CollectionManager
      */
-    public void addSubcollectionIndex(SubcollectionIndex subindex) {
+    private void addSubcollectionIndex(SubcollectionIndex subindex) {
     if(!contains(subindex)) {
         add(getSize(), subindex);
@@ -112 +112 @@
      * @return the SubcollectionIndex requested or null if no such subindex
      */
-    public SubcollectionIndex getSubcollectionIndex(String id) {
+    private SubcollectionIndex getSubcollectionIndex(String id) {
     int size = getSize();
     for(int i = 0; i < size; i++) {
@@ -135 +135 @@
      * @see org.greenstone.gatherer.collection.CollectionManager
      */
-    public void removeSubcollectionIndex(SubcollectionIndex subindex) {
+    private void removeSubcollectionIndex(SubcollectionIndex subindex) {
     if(subindex != null) {
         // Remove any current metadata from this index
@@ -174 +174 @@
      * @see org.greenstone.gatherer.cdm.SubcollectionIndex
      */
-    public void setDefaultSubcollectionIndex(SubcollectionIndex index) {
+    private void setDefaultSubcollectionIndex(SubcollectionIndex index) {
     if(index != null) {
         if(default_index == null) {

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

@@ -89 +89 @@
      * @see org.greenstone.gatherer.collection.CollectionManager
      */
-    public void addSubcollection(Subcollection subcollection) {
+    private void addSubcollection(Subcollection subcollection) {
     if(!contains(subcollection)) {
         Element element = subcollection.getElement();
@@ -121 +121 @@
      * @return the requested Subcollection or null if no such subcollection exists.
      */
-    public Subcollection getSubcollection(String name) {
+    private Subcollection getSubcollection(String name) {
     Subcollection result = null;
     int size = getSize();
@@ -133 +133 @@
     }
 
-    /** Method to get all of the subcollections defined.
-     * @return an ArrayList of subcollections
-     */
-    /* private ArrayList getSubcollections() {
-    return children();
-    } */
 
     /** Called when the detail mode has changed which in turn may cause several design elements to be available/hidden
@@ -154 +148 @@
      * @see org.greenstone.gatherer.collection.CollectionManager
      */
-    public void removeSubcollection(Subcollection subcollection) {
+    private void removeSubcollection(Subcollection subcollection) {
     remove(subcollection);
     Gatherer.c_man.configurationChanged();
     }
 
-    public void updateSubcollection(Subcollection subcollection, String name, boolean include, String source, String pattern, String flags) {
+    private void updateSubcollection(Subcollection subcollection, String name, boolean include, String source, String pattern, String flags) {
     subcollection.setFlags(flags);
     subcollection.setInclusive(include);

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

@@ -71 +71 @@
     }
 
-    public void addSuperCollection(SuperCollection supercollection) {
+    private void addSuperCollection(SuperCollection supercollection) {
     if(!contains(supercollection)) {
         add(getSize(), supercollection);
@@ -101 +101 @@
     }
 
-    public void removeSuperCollection(SuperCollection supercollection) {
+    private void removeSuperCollection(SuperCollection supercollection) {
     remove(supercollection);
     }