Changeset 13595


Ignore:
Timestamp:
2007-01-12T15:36:27+13:00 (15 years ago)
Author:
mdewsnip
Message:

Removed some more occurrences of Gatherer.c_man.

Location:
trunk/gli/src/org/greenstone/gatherer
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/gli/src/org/greenstone/gatherer/file/WorkspaceTreeNode.java

    r11625 r13595  
    3535import org.greenstone.gatherer.Gatherer;
    3636import org.greenstone.gatherer.collection.BasicCollectionConfiguration;  // !!! Don't like this here
    37 import org.greenstone.gatherer.collection.Collection;  // !!! Don't like this here
     37import org.greenstone.gatherer.collection.CollectionManager;  // !!! Don't like this here
    3838import org.greenstone.gatherer.util.ArrayTools;
    3939import org.greenstone.gatherer.util.StaticStrings;
     
    153153
    154154            // One last piece of magic so we can determine the current collection
    155             Collection collection = Gatherer.c_man.getCollection();
    156             if (collection != null) {
    157                 collection_root.is_in_loaded_collection = cols[i].getName().equals(collection.getName());
    158             }
     155            collection_root.is_in_loaded_collection = cols[i].getName().equals(CollectionManager.getLoadedCollectionName());
    159156            child_nodes.add(collection_root);
    160157            }
  • trunk/gli/src/org/greenstone/gatherer/gui/CreatePane.java

    r13582 r13595  
    162162     */
    163163    public CreatePane() {
    164     Collection collection = Gatherer.c_man.getCollection();
    165164    log_textarea = new JTextArea();
    166165    log_scroll = new JScrollPane(log_textarea);
  • trunk/gli/src/org/greenstone/gatherer/gui/DeleteCollectionPrompt.java

    r13586 r13595  
    294294        Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.LIBRARY_CONTENTS_CHANGED);
    295295
    296         if (Gatherer.c_man.getCollection() != null && collection.getShortName().equals(CollectionManager.getLoadedCollectionName())) {
     296        if (collection.getShortName().equals(CollectionManager.getLoadedCollectionName())) {
    297297            current_coll_deleted = true;
    298298        }
  • trunk/gli/src/org/greenstone/gatherer/gui/PreviewButton.java

    r13592 r13595  
    3636import org.greenstone.gatherer.Configuration;
    3737import org.greenstone.gatherer.Gatherer;
    38 import org.greenstone.gatherer.collection.Collection;
     38import org.greenstone.gatherer.collection.CollectionManager;
    3939import org.greenstone.gatherer.greenstone.LocalLibraryServer;
    4040import org.greenstone.gatherer.util.StaticStrings;
     
    7474    protected void configureHomeURL() {
    7575    // set up the home page for the current collection
    76     Collection current_collection = Gatherer.c_man.getCollection();
    7776    if (Gatherer.GS3) {
    7877        // don't do anything fancy here
    79         preview_address = Configuration.library_url.toString() + Configuration.getServletPath()+ "?a=p&sa=about&c=" + current_collection.getName()+"&l="+Configuration.getLanguage();
     78        preview_address = Configuration.library_url.toString() + Configuration.getServletPath() + "?a=p&sa=about&c=" + CollectionManager.getLoadedCollectionName() + "&l=" + Configuration.getLanguage();
    8079        return;
    8180    }
    82     preview_address = Configuration.library_url.toString()+"?c="+current_collection.getName()+"&l="+Configuration.getLanguage();
     81    preview_address = Configuration.library_url.toString() + "?c=" + CollectionManager.getLoadedCollectionName() + "&l=" + Configuration.getLanguage();
    8382
    8483    String main_args = "&a=p&p=about";
Note: See TracChangeset for help on using the changeset viewer.