Changeset 19225 for gli

Timestamp:

2009-04-23T14:30:16+12:00 (15 years ago)

Author:

kjdon

Message:

made the GLI title display teh qualified collection name

Location:

gli/trunk/src/org/greenstone/gatherer

Files:

• cdm/GeneralManager.java (modified) (1 diff)
• gui/GUIManager.java (modified) (5 diffs)

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

@@ -441 +441 @@
         // Set the title
         String collection_title = name_textfield.getText();
-        String collection_name = CollectionManager.getLoadedCollectionName();
+        String collection_name = CollectionManager.getLoadedGroupQualifiedCollectionName(true);
         Gatherer.g_man.setTitle(collection_title, collection_name);
-                collection_name_collectionmeta.setValue(name_textfield.getText());
+                collection_name_collectionmeta.setValue(collection_title);
         collection_title = null;
         collection_name = null;

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

@@ -331 +331 @@
     content_pane = (JPanel) this.getContentPane();
         content_pane.setComponentOrientation(Dictionary.getOrientation());
-        
+
     // Enable window-type events to be fired.
     enableEvents(AWTEvent.WINDOW_EVENT_MASK);
@@ -344 +344 @@
         Collection collection = Gatherer.c_man.getCollection();
         collection_title = collection.getTitle();
-        collection_name = collection.getName();
+        collection_name = collection.getGroupQualifiedName(true);
         collection = null;
         }
@@ -538 +538 @@
         Collection collection = Gatherer.c_man.getCollection();
         collection_title = collection.getTitle();
-        collection_name = collection.getName();
+        collection_name = collection.getGroupQualifiedName(true);
         collection = null;
     }
@@ -571 +571 @@
     if (collection_loaded) {
         Collection collection = Gatherer.c_man.getCollection();
-        setTitle(collection.getTitle(), collection.getName());
+        setTitle(collection.getTitle(), collection.getGroupQualifiedName(true));
     }
     else {
@@ -666 +666 @@
      */
     public void setTitle(String title, String name) {
+      
     // Finally display the collection name in the title bar.
     StringBuffer title_buffer = new StringBuffer(Configuration.getApplicationTitle());