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

Timestamp:

2003-10-03T14:07:35+12:00 (21 years ago)

Author:

mdewsnip

Message:

Many more small improvements and tooltips added. Still more to come!

Location:

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

Files:

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

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

@@ -1 @@
-package org.greenstone.gatherer.shell;
 /**
  *#########################################################################
@@ -36 +35 @@
  *########################################################################
  */
+package org.greenstone.gatherer.shell;
+
 import java.awt.Component;
 import java.util.StringTokenizer;
 import javax.swing.JProgressBar;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.shell.GShellProgressMonitor;
+
 /** This implementation of <i>GShellProgressMonitor</i> is designed to parse and translate the progress of a import.pl call.
  * @author John Thompson, Greenstone Digital Library, University of Waikato
@@ -156 +159 @@
 
     public void saving() {
-    progress_bar.setString(Gatherer.dictionary.get("SaveProgressDialog.Title", (String)null));
+    progress_bar.setString(Dictionary.newget("SaveProgressDialog.Title"));
     progress_bar.setValue(MAX / (10 * 2));
     }
@@ -171 +174 @@
      */
     public void start() {
-    progress_bar.setString(Gatherer.dictionary.get("FileActions.Calculating_Size", (String)null));
+    progress_bar.setString(Dictionary.newget("FileActions.Calculating_Size"));
     progress_bar.setValue(MAX / 10);
     num_files = Gatherer.c_man.getCollection().getDocumentCount();

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

@@ -1 @@
-package org.greenstone.gatherer.shell;
 /**
  *#########################################################################
@@ -36 +35 @@
  *########################################################################
  */
+package org.greenstone.gatherer.shell;
+
 import java.io.*;
 import javax.swing.*;
 import javax.swing.event.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.Message;
 import org.greenstone.gatherer.msm.GreenstoneArchiveParser;
 import org.greenstone.gatherer.shell.GShellListener;
@@ -106 +107 @@
     }
     /** This method adds another shell listener to this process.
-      * @param listener The new <i>GShellListener</i>.
-      */
+     * @param listener The new <i>GShellListener</i>.
+     */
     public void addGShellListener(GShellListener listener) {
     listeners.add(GShellListener.class, listener);
     }
     /** This method removes a certain shell listener from this process.
-      * @param listener The <i>GShellListener</i> to be removed.
-      */
+     * @param listener The <i>GShellListener</i> to be removed.
+     */
     public void removeGShellListener(GShellListener listener) {
     listeners.remove(GShellListener.class, listener);
@@ -150 +151 @@
         }
         ///ystem.err.println("Command: " + command);
-        fireMessage(type, get("GShell.Command") + ": " + command, status);
+        fireMessage(type, Dictionary.newget("GShell.Command") + ": " + command, status);
                 
         Runtime rt = Runtime.getRuntime();
@@ -188 +189 @@
         if(prcs.exitValue() == 0) {
             status = OK;
-            fireMessage(type, typeAsString(type) + "> " + get("GShell.Success"), status);
+            fireMessage(type, typeAsString(type) + "> " + Dictionary.newget("GShell.Success"), status);
             
         } else {
             status = ERROR;
-            fireMessage(type, typeAsString(type) + "> " + get("GShell.Failure"), status);
+            fireMessage(type, typeAsString(type) + "> " + Dictionary.newget("GShell.Failure"), status);
             
         }
@@ -211 +212 @@
     // 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) + "> " + get("GShell.Parsing_Metadata_Start"), status);
+        fireMessage(type, typeAsString(type) + "> " + Dictionary.newget("GShell.Parsing_Metadata_Start"), status);
         new GreenstoneArchiveParser(progress, this);
-        fireMessage(type, typeAsString(type) + "> " + get("GShell.Parsing_Metadata_Complete"), status);
+        fireMessage(type, typeAsString(type) + "> " + Dictionary.newget("GShell.Parsing_Metadata_Complete"), status);
     }
     // Tidy up.
@@ -233 +234 @@
     }
     /** Method for firing a message to all interested listeners.
-      * @param type An <strong>int</strong> indicating the process type.
-      * @param message The message as a <strong>String</strong>.
-      * @param status An <strong>int</strong> specifying the current status of the process.
-      */
+     * @param type An <strong>int</strong> indicating the process type.
+     * @param message The message as a <strong>String</strong>.
+     * @param status An <strong>int</strong> specifying the current status of the process.
+     */
     public void fireMessage(int type, String message, int status) {
     GShellEvent event = new GShellEvent(this, 0, type, message, status);
@@ -248 +249 @@
 
     /** Method for firing a process begun event which is called, strangly enough, when the process begins.
-      * @param type An <strong>int</strong> indicating the process type.
-      * @param status An <strong>int</strong> specifying the current status of the process.
-      */
+     * @param type An <strong>int</strong> indicating the process type.
+     * @param status An <strong>int</strong> specifying the current status of the process.
+     */
     protected void fireProcessBegun(int type, int status) {
     GShellEvent event = new GShellEvent(this, 0, type, "", status);
@@ -261 +262 @@
     }
     /** Method for firing a process complete event which is called, no surprise here, when the process ends.
-      * @param type An <strong>int</strong> indicating the process type.
-      * @param status An <strong>int</strong> specifying the current status of the process.
-      */
+     * @param type An <strong>int</strong> indicating the process type.
+     * @param status An <strong>int</strong> specifying the current status of the process.
+     */
     protected void fireProcessComplete(int type, int status) {
     GShellEvent event = new GShellEvent(this, 0, type, "", status);
@@ -273 +274 @@
     }
     }
-    /** Retrieve a phrase from the dictionary based on the given key.
-      * @param key A <strong>String</strong> used to match against a phrase from the <strong>Dictionary</strong>.
-      * @return The phrase as a <strong>String</strong>.
-      */
-    private String get(String key) {
-    if(key.indexOf('.') == -1) {
-        key = "GShell." + key;
-    }
-    return Gatherer.dictionary.get(key);
-    }
+
     /** Method to determine if the user, via the progress monitor, has signalled stop. 
-      * @return A <strong>boolean</strong> indicating if the user wanted to stop.
-      */
+     * @return A <strong>boolean</strong> indicating if the user wanted to stop.
+     */
     private boolean hasSignalledStop() {
     boolean has_signalled_stop = false;
@@ -295 +287 @@
 
     /** Converts a type into a text representation.
-      * @param type An <strong>int</strong> which maps to a shell process type.
-      * @return A <strong>String</strong> which is the thread process's text name.
-      */
+     * @param type An <strong>int</strong> which maps to a shell process type.
+     * @return A <strong>String</strong> which is the thread process's text name.
+     */
     public String typeAsString(int type) {
     String name = null;
     switch(type) {
     case BUILD:
-        name = get("GShell.Build");
+        name = Dictionary.newget("GShell.Build");
         break;
     case IMPORT:
-        name = get("GShell.Import");
+        name = Dictionary.newget("GShell.Import");
         break;
     case NEW:
-        name = get("GShell.New");
+        name = Dictionary.newget("GShell.New");
         break;
     default:
-        name = get("GShell.Other");
+        name = Dictionary.newget("GShell.Other");
     }
     return name;