Changeset 18364 for gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java

Timestamp:

2009-01-12T11:40:15+13:00 (15 years ago)

Author:

kjdon

Message:

updated the rtl-gli branch with files from trunk. Result of a merge 14807:18318, and fixed some conflicts. I think this is the last commit following merging the files. Haven't tried to compile yet... here goes...

File:

• gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java (modified) (2 diffs)

gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java

@@ -248 +248 @@
     content_pane.add(bottom_pane, BorderLayout.SOUTH);
     // Final dialog setup & positioning.
+    getRootPane().setDefaultButton(create_button);
     Dimension screen_size = Configuration.screen_size;
     setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
@@ -288 +289 @@
     // Remote collections that aren't shared have the user's username prefixed to the collection name
     if (Gatherer.isGsdlRemote && personal_collection_button.isSelected()) {
-        name_buffer = new StringBuffer(RemoteGreenstoneServer.getUsername() + "-" + name_buffer.toString());
+        name_buffer = new StringBuffer(Gatherer.remoteGreenstoneServer.getUsername() + "-" + name_buffer.toString());
     }