Changeset 19242 for gli

Timestamp:

2009-04-23T18:48:02+12:00 (15 years ago)

Author:

ak19

Message:

Collection.getSubName() changed to getTailName() and all references to it. Subcollections has a special meaning, so do not want to confuse it with that.

Location:

gli/trunk/src/org/greenstone/gatherer/collection

Files:

• Collection.java (modified) (2 diffs)
• CollectionManager.java (modified) (1 diff)

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

@@ -181 +181 @@
      */
     public String getName() {
-    return getCollectionSubName();
-    }
-
-    /** @return just the sub-name of the collection: without any collection group prefix */
-    public String getCollectionSubName() {
+    return getCollectionTailName();
+    }
+
+    /** @return just the tail-name of the collection: without any collection group prefix */
+    public String getCollectionTailName() {
     return file.getParentFile().getName();
     }
@@ -221 +221 @@
         // shouldn't happen, but in case it does, just return the collection name.
         System.err.println("Current collection " + currentCollDir + " is not located inside collectdir " + "collectDir");
-        groupAndCol = getCollectionSubName();
+        groupAndCol = getCollectionTailName();
     }
 

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

@@ -917 +917 @@
 
     /** @return the subname of any collection (stripped of any collection-group). */
-    static public String getLoadedCollectionSubName()
+    static public String getLoadedCollectionTailName()
     {
     if (collection != null) {
-        return collection.getCollectionSubName();
+        return collection.getCollectionTailName();
     }