Changeset 5593 for trunk/gli/src/org/greenstone/gatherer/shell

Timestamp:

2003-10-07T15:35:23+13:00 (21 years ago)

Author:

mdewsnip

Message:

Changed calls to the Dictionary.

Location:

trunk/gli/src/org/greenstone/gatherer/shell

Files:

• GImportProgressMonitor.java (modified) (2 diffs)
• GShell.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/shell/GImportProgressMonitor.java

@@ -159 +159 @@
 
     public void saving() {
-    progress_bar.setString(Dictionary.newget("SaveProgressDialog.Title"));
+    progress_bar.setString(Dictionary.get("SaveProgressDialog.Title"));
     progress_bar.setValue(MAX / (10 * 2));
     }
@@ -174 +174 @@
      */
     public void start() {
-    progress_bar.setString(Dictionary.newget("FileActions.Calculating_Size"));
+    progress_bar.setString(Dictionary.get("FileActions.Calculating_Size"));
     progress_bar.setValue(MAX / 10);
     num_files = Gatherer.c_man.getCollection().getDocumentCount();

trunk/gli/src/org/greenstone/gatherer/shell/GShell.java

@@ -151 +151 @@
         }
         ///ystem.err.println("Command: " + command);
-        fireMessage(type, Dictionary.newget("GShell.Command") + ": " + command, status);
+        fireMessage(type, Dictionary.get("GShell.Command") + ": " + command, status);
                 
         Runtime rt = Runtime.getRuntime();
@@ -188 +188 @@
         if(prcs.exitValue() == 0) {
             status = OK;
-            fireMessage(type, typeAsString(type) + "> " + Dictionary.newget("GShell.Success"), status);
+            fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Success"), status);
         }
         else {
             status = ERROR;
-            fireMessage(type, typeAsString(type) + "> " + Dictionary.newget("GShell.Failure"), status);
+            fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Failure"), status);
         }
         }
@@ -210 +210 @@
     // If no error occured, and this was an import process we now extract any new metadata from the archive directory.
     if(status == OK && type == IMPORT) {
-        fireMessage(type, typeAsString(type) + "> " + Dictionary.newget("GShell.Parsing_Metadata_Start"), status);
+        fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Parsing_Metadata_Start"), status);
         new GreenstoneArchiveParser(progress, this);
-        fireMessage(type, typeAsString(type) + "> " + Dictionary.newget("GShell.Parsing_Metadata_Complete"), status);
+        fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Parsing_Metadata_Complete"), status);
     }
     // Tidy up.
@@ -292 +292 @@
     switch(type) {
     case BUILD:
-        name = Dictionary.newget("GShell.Build");
+        name = Dictionary.get("GShell.Build");
         break;
     case IMPORT:
-        name = Dictionary.newget("GShell.Import");
+        name = Dictionary.get("GShell.Import");
         break;
     case NEW:
-        name = Dictionary.newget("GShell.New");
+        name = Dictionary.get("GShell.New");
         break;
     default:
-        name = Dictionary.newget("GShell.Other");
+        name = Dictionary.get("GShell.Other");
     }
     return name;