Changeset 19242

Show
Ignore:
Timestamp:
23.04.2009 18:48:02 (10 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:
2 modified

Legend:

Unmodified
Added
Removed
  • gli/trunk/src/org/greenstone/gatherer/collection/Collection.java

    r19227 r19242  
    181181     */ 
    182182    public String getName() { 
    183     return getCollectionSubName(); 
    184     } 
    185  
    186     /** @return just the sub-name of the collection: without any collection group prefix */ 
    187     public String getCollectionSubName() { 
     183    return getCollectionTailName(); 
     184    } 
     185 
     186    /** @return just the tail-name of the collection: without any collection group prefix */ 
     187    public String getCollectionTailName() { 
    188188    return file.getParentFile().getName(); 
    189189    } 
     
    221221        // shouldn't happen, but in case it does, just return the collection name. 
    222222        System.err.println("Current collection " + currentCollDir + " is not located inside collectdir " + "collectDir"); 
    223         groupAndCol = getCollectionSubName(); 
     223        groupAndCol = getCollectionTailName(); 
    224224    } 
    225225 
  • gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java

    r19203 r19242  
    917917 
    918918    /** @return the subname of any collection (stripped of any collection-group). */ 
    919     static public String getLoadedCollectionSubName() 
     919    static public String getLoadedCollectionTailName() 
    920920    { 
    921921    if (collection != null) { 
    922         return collection.getCollectionSubName(); 
     922        return collection.getCollectionTailName(); 
    923923    } 
    924924