Changeset 6622 for trunk/gli/src/org/greenstone/gatherer/util

Timestamp:

2004-01-27T16:35:34+13:00 (20 years ago)

Author:

jmt12

Message:

More modifications to mirroring including testing for a valid version of Wget (and complaining if its missing or it is old) and rearranging buttons on the GProgressBar

Location:

trunk/gli/src/org/greenstone/gatherer/util

Files:

• AppendLineOnlyFileDocument.java (modified) (2 diffs)
• StaticStrings.java (modified) (4 diffs)
• SynchronizedTreeModelTools.java (modified) (1 diff)

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

@@ -895 +895 @@
     }
 
-    /** Listens for actions on the read button, and if detected creates a new ReadTask to test the document. */
+    /** Listens for actions on the read button, and if detected creates a new ReadTask to test the document. 
+     * @author John Thompson, Greenstone Project, New Zealand Digital Library, University of Waikato
+     * @version 2.41 final
+     */
     static private class ReadButtonListener
     implements ActionListener {
@@ -918 +921 @@
     }
 
-    /** This threaded task opens a large document, aptly named 'big.txt', and then bombards the document object we are testing with lines from the file. This file should be several megs (such as Alice or TREC) to fully test functionality, thread conditions etc. */ 
+    /** This threaded task opens a large document, aptly named 'big.txt', and then bombards the document object we are testing with lines from the file. This file should be several megs (such as Alice or TREC) to fully test functionality, thread conditions etc. 
+     * @author John Thompson, Greenstone Project, New Zealand Digital Library, University of Waikato
+     * @version 2.41 final
+     */ 
     static private class ReadTask
     extends Thread {

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

@@ -140 +140 @@
     static final public String LANGUAGE_DEFAULT_STR                       = "defaultlanguage";
     static final public String LANGUAGE_STR                               = "language";
-    static final public String LANGUAGEDEPENDANT_ATTRIBUTE                = "language_dependant";
+    static final public String LANGUAGEDEPENDANT_ATTRIBUTE                = "language_dependent";
     static final public String LANGUAGES_ELEMENT                          = "Languages";
     static final public String LANGUAGES_STR                              = "languages";
@@ -167 +167 @@
     static final public String MGPP_ATTRIBUTE                             = "mgpp_enabled";
     static final public String MINUS_CHARACTER                            = "-";
+    static final public String MIRROR_ARGUMENT                            = "-mirror";
     static final public String MODE_STR                                   = "Mode: ";
     static final public String MODEGLI_ELEMENT                            = "ModeGLI";
@@ -175 +176 @@
     static final public String NEWLINE_ELEMENT                            = "NewLine";
     static final public String NO_LOAD_ARGUMENT                           = "-no_load";
+    static final public String NO_WGET_STR                                = "NoWGet";
     static final public String ONE_CHARACTER                              = "1";
     static final public String OPEN_PARENTHESIS_CHARACTER                 = "(";
@@ -232 +234 @@
     static final public String VALUE_ATTRIBUTE                            = "value";
     static final public String VALUE_TREE_ATTRIBUTE                       = "remember_values";
-    static final public String WIN_9X_OPEN_COMMAND = "command.com /c start \"%1\"";
-    static final public String WIN_OPEN_COMMAND = "cmd.exe /c start \"\" \"%1\"";
+    static final public String WGET_ARGUMENT                              = "-wget";
+    static final public String WGET_OLD_STR                               = "<WGet1.9";
+    static final public String WGET_STR                                   = "WGet1.9";
+    static final public String WIN_9X_OPEN_COMMAND                        = "command.com /c start \"%1\"";
+    static final public String WIN_OPEN_COMMAND                           = "cmd.exe /c start \"\" \"%1\"";
+    static final public String WORKFLOW_MIRROR                            = "workflow.mirror";
     static final public String YES_STR                                    = "yes";
     static final public String ZERO_CHARACTER                             = "0";

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

@@ -42 +42 @@
     }
 
-    static final public Runnable insertNodeInto(final DefaultTreeModel model, final MutableTreeNode parent, final MutableTreeNode target_node, boolean wait_allowed) {
+    static final public Runnable insertNodeInto(final DefaultTreeModel model, final MutableTreeNode parent, final MutableTreeNode target_node, final boolean wait_allowed) {
     final Runnable doInsertNodeInto = new Runnable() {
         public void run() {
             ///ystem.err.print("Running task... ");
+            Gatherer.println("insertNodeInto(" + model + ", " + parent + ", " + target_node + ", " + wait_allowed);
             int index = -1;
             int pos = 0;