Changeset 11624

Timestamp:

2006-04-07T13:34:03+12:00 (18 years ago)

Author:

mdewsnip

Message:

Moved PROGRAM_NAME and PROGRAM_VERSION strings out of Utility and into Gatherer.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (1 diff)
• feedback/FeedbackInterface.java (modified) (2 diffs)
• gui/AboutDialog.java (modified) (3 diffs)
• gui/GUIManager.java (modified) (1 diff)
• util/Utility.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -66 +66 @@
 public class Gatherer
 {
+    /** The name of the GLI. */
+    static final public String PROGRAM_NAME = "Greenstone Librarian Interface";
+    /** The current version of the GLI. */
+    static final public String PROGRAM_VERSION = "v2.70";
+
     static private Dimension size = new Dimension(800, 540);
 

trunk/gli/src/org/greenstone/gatherer/feedback/FeedbackInterface.java

@@ -16 +16 @@
 import com.sun.image.codec.jpeg.*;
 import javax.swing.Timer;
-import org.greenstone.gatherer.util.Utility;
+import org.greenstone.gatherer.Gatherer;
 
 /**
@@ -1483 +1483 @@
         err_array[11] = java_info;
         err_array[12] = "" + Locale.getDefault();
-        err_array[13] = Utility.PROGRAM_NAME + " " + Utility.PROGRAM_VERSION; 
+        err_array[13] = Gatherer.PROGRAM_NAME + " " + Gatherer.PROGRAM_VERSION; 
         err_array[14] = InetAddress.getLocalHost().getHostName();
         err_array[15] = InetAddress.getLocalHost().getHostAddress();

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

@@ -35 +35 @@
 import javax.swing.*;
 import org.greenstone.gatherer.Dictionary;
+import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.util.JarTools;
 import org.greenstone.gatherer.util.Utility;
@@ -60 +61 @@
      * @see org.greenstone.gatherer.gui.AboutDialog.CloseButtonListener
      * @see org.greenstone.gatherer.gui.GLIButton
-     * @see org.greenstone.gatherer.util.Utility#PROGRAM_NAME
-     * @see org.greenstone.gatherer.util.Utility#PROGRAM_VERSION
      */
     public AboutDialog(JFrame parent) {
@@ -76 +75 @@
     JLabel title_one_label = new JLabel();
     Dictionary.setText(title_one_label, "AboutDialog.Title_One");
-    JLabel title_two_label = new JLabel(Utility.PROGRAM_NAME + " " + Utility.PROGRAM_VERSION + " " + Dictionary.get("AboutDialog.Date"));
+    JLabel title_two_label = new JLabel(Gatherer.PROGRAM_NAME + " " + Gatherer.PROGRAM_VERSION + " " + Dictionary.get("AboutDialog.Date"));
     JLabel title_three_label = new JLabel();
     Dictionary.setText(title_three_label, "AboutDialog.Title_Two");

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

@@ -608 +608 @@
     public void setTitle(String title, String name) {
     // Finally display the collection name in the title bar.
-    StringBuffer title_buffer = new StringBuffer(Utility.PROGRAM_NAME);
+    StringBuffer title_buffer = new StringBuffer(Gatherer.PROGRAM_NAME);
     title_buffer.append(StaticStrings.SPACE_CHARACTER);
     title_buffer.append(StaticStrings.SPACE_CHARACTER);

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -69 +69 @@
     /** The default name of the perl executable under windows. */
     static final public String PERL_EXECUTABLE_WINDOWS = "Perl.exe";
-    /** The name of the GLI. */
-    static final public String PROGRAM_NAME = "Greenstone Librarian Interface";
-    /** The current version of the GLI. */
-    static final public String PROGRAM_VERSION = "v2.70";