Changeset 9755 for trunk/gli/src/org/greenstone/gatherer/gui

Timestamp:

2005-04-27T11:17:29+12:00 (19 years ago)

Author:

mdewsnip

Message:

Replaced all the nonsense where string arrays were created for running perl scripts with array lists. This removes a lot of duplicated code where the same things were added in different cases, and the silly (and error-prone) "new String[11]"s.

Location:

trunk/gli/src/org/greenstone/gatherer/gui

Files:

• ExplodeMetadataPrompt.java (modified) (2 diffs)
• ExportAsPrompt.java (modified) (1 diff)
• WriteCDImagePrompt.java (modified) (2 diffs)
• tree/DragTree.java (modified) (1 diff)

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

@@ -53 +53 @@
 import org.greenstone.gatherer.shell.GShellEvent;
 import org.greenstone.gatherer.shell.GShellListener;
-import org.greenstone.gatherer.util.ArrayTools;
 import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.util.XMLTools;
@@ -226 +225 @@
     }
 
-    private int explodeMetadata() {
-
-    String [] args;
+    private int explodeMetadata()
+    {
     if (Gatherer.isGsdlRemote) {
         // what here??
         return -1;
     }
-    if(Utility.isWindows()){
-        args = new String[5];
-        args[0] = Configuration.perl_path;
-        args[1] = "-S";
-        args[2] = Configuration.getScriptPath() + "explode_metadata_database.pl";
-        args[3] = "-plugin";
-        args[4] = plugin_name;
-    } else {
-        args = new String[3];
-        args[0] = Configuration.getScriptPath() + "explode_metadata_database.pl";
-        args[1] = "-plugin";
-        args[2] = plugin_name;
-
-    }
-    // add in all the options from the user
-    args = ArrayTools.add(args, options.getValues());
-    // add in the filename
-    args = ArrayTools.add(args, metadata_file.getPath());
-
+
+    // Generate the explode_metadata_database.pl command
+    ArrayList command_parts_list = new ArrayList();
+    if (Utility.isWindows() && (!Gatherer.isGsdlRemote)) {
+        command_parts_list.add(Configuration.perl_path);
+        command_parts_list.add("-S");
+    }
+    command_parts_list.add(Configuration.getScriptPath() + "explode_metadata_database.pl");
+    command_parts_list.add("-plugin");
+    command_parts_list.add(plugin_name);
+
+    // Add in all the options from the user
+    String[] explode_options = options.getValues();
+    for (int i = 0; i < explode_options.length; i++) {
+        command_parts_list.add(explode_options[i]);
+    }
+
+    // Add in the filename
+    command_parts_list.add(metadata_file.getPath());
+
+    // Run the explode_metadata_database.pl command
+    String[] command_parts = (String[]) command_parts_list.toArray(new String[0]);
     this.error_message = new StringBuffer();
-    GShell process = new GShell(args, GShell.EXPLODE, 3, this, null, GShell.GSHELL_EXPLODE);
+    GShell process = new GShell(command_parts, GShell.EXPLODE, 3, this, null, GShell.GSHELL_EXPLODE);
     //process.start();
     process.run();

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

@@ -278 +278 @@
     cd_title = title_field.getText();
     cd_title = cd_title.trim();
-    cd_title = cd_title.replaceAll("\"","");
-    int num_args = num_collections + 9;
-    boolean has_title = false;
-    if (!cd_title.equals("")) {
-        has_title = true;
-    }
-    String args[];
-    int next_arg = 0;
-    if(Utility.isWindows()) {
-        args = new String[num_args+2];
-        args[0] = Configuration.perl_path;
-        args[1] = "-S";
-        next_arg = 2;
-    } else {
-        args = new String[num_args];
+    cd_title = cd_title.replaceAll("\"", "");
+
+    String export_type = (String) saveas_combobox.getSelectedItem();
+
+    // Generate the export.pl command
+    ArrayList command_parts_list = new ArrayList();
+    if (Utility.isWindows() && (!Gatherer.isGsdlRemote)) {
+        command_parts_list.add(Configuration.perl_path);
+        command_parts_list.add("-S");
+    }
+    command_parts_list.add(Configuration.getScriptPath() + "export.pl");
+    command_parts_list.add("-gli");
+    command_parts_list.add("-language");
+    command_parts_list.add(Configuration.getLanguage());
+    command_parts_list.add("-removeold");
+    command_parts_list.add("-saveas");
+    command_parts_list.add(export_type);
+    command_parts_list.add("-exportdir");
+    command_parts_list.add(Configuration.gsdl_path + "tmp" + File.separator);
+
+    if (cd_title.equals("")) {
+        command_parts_list.add("exported_" + export_type);
+    }
+    else {
+        command_parts_list.add("exported_" + cd_title.replaceAll("\\s", ""));
     }
     
-    String export_type = (String)saveas_combobox.getSelectedItem();
-
-    args[next_arg] = Configuration.getScriptPath() + "export.pl";
-    next_arg++;
-    args[next_arg] = "-gli"; next_arg++; 
-    args[next_arg] = "-language"; next_arg++;
-    args[next_arg] = Configuration.getLanguage(); next_arg++;
-    args[next_arg] = "-removeold"; next_arg++;
-    args[next_arg] = "-saveas"; next_arg++;
-    args[next_arg] = export_type; next_arg++;   
-
-    args[next_arg] = "-exportdir"; next_arg++;
-    args[next_arg] = Configuration.gsdl_path+"tmp"+File.separator;
-    if(!has_title) {
-        args[next_arg] += "exported_" + export_type;
-    } else {
-        args[next_arg] += "exported_"+cd_title.replaceAll("\\s","");
-    }
-    next_arg++;
-
-    
-    for (int i=0; i<num_collections;i++,next_arg++) {
-        args[next_arg] = ((BasicCollectionConfiguration)selected_collections.get(i)).getShortName();
+    for (int i = 0; i < num_collections; i++) {
+        command_parts_list.add(((BasicCollectionConfiguration) selected_collections.get(i)).getShortName());
     }
 
     DebugStream.print("export command = ");
-    for (int i=0; i<args.length; i++) {
-        DebugStream.print(args[i]+" ");
-        System.err.print(args[i]+" ");
+    for (int i = 0; i < command_parts_list.size(); i++) {
+        DebugStream.print(command_parts_list.get(i) + " ");
+        System.err.print(command_parts_list.get(i) + " ");
     }
     DebugStream.println("");
     System.err.println("");
 
-    GShell process = new GShell(args, GShell.EXPORTAS, 3, this, null, GShell.GSHELL_EXPORTAS);
+    // Run the export.pl command
+    String[] command_parts = (String[]) command_parts_list.toArray(new String[0]);
+    GShell process = new GShell(command_parts, GShell.EXPORTAS, 3, this, null, GShell.GSHELL_EXPORTAS);
     process.start();
     //process.run();

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

@@ -240 +240 @@
      * @see org.greenstone.gatherer.util.Utility
      */
-    public void writeCDImageCollections() {
+    public void writeCDImageCollections()
+    {
     DebugStream.println("WriteCDImagePrompt.writeCDImageCollections()");
 
@@ -248 +249 @@
     cd_title = cd_title.trim();
     cd_title = cd_title.replaceAll("\"","");
-    int num_args = num_collections + 4;
-    boolean has_title = false;
+
+    // Generate the exportcol.pl command
+    ArrayList command_parts_list = new ArrayList();
+    if (Utility.isWindows() && (!Gatherer.isGsdlRemote)) {
+        command_parts_list.add(Configuration.perl_path);
+        command_parts_list.add("-S");
+    }
+    command_parts_list.add(Configuration.getScriptPath() + "exportcol.pl");
+    command_parts_list.add("-gli");
+    command_parts_list.add("-language");
+    command_parts_list.add(Configuration.getLanguage());
+
     if (!cd_title.equals("")) {
-        num_args += 2;
-        has_title = true;
-    }
-    String args[];
-    int next_arg = 0;
-    if(Utility.isWindows()) {
-        args = new String[num_args+2];
-        args[0] = Configuration.perl_path;
-        args[1] = "-S";
-        next_arg = 2;
-    } else {
-        args = new String[num_args];
-    }
-    
-    args[next_arg] = Configuration.getScriptPath() + "exportcol.pl";
-    next_arg++;
-    args[next_arg] = "-gli"; next_arg++;
-    args[next_arg] = "-language"; next_arg++;
-    args[next_arg] = Configuration.getLanguage(); next_arg++;
-
-    if (has_title) {
-        args[next_arg] = "-cdname"; next_arg++;
-        args[next_arg] = cd_title; next_arg++;
-    }
-    for (int i=0; i<num_collections;i++,next_arg++) {
-        args[next_arg] = ((BasicCollectionConfiguration)selected_collections.get(i)).getShortName();
-    }
-    
+        command_parts_list.add("-cdname");
+        command_parts_list.add(cd_title);
+    }
+
+    for (int i = 0; i < num_collections; i++) {
+        command_parts_list.add(((BasicCollectionConfiguration) selected_collections.get(i)).getShortName());
+    }
+
     DebugStream.print("export command = ");
-    for (int i=0; i<args.length; i++) {
-        DebugStream.print(args[i]+" ");
+    for (int i = 0; i < command_parts_list.size(); i++) {
+        DebugStream.print(command_parts_list.get(i) + " ");
     }
     DebugStream.println("");
-    GShell process = new GShell(args, GShell.CDIMAGE, 3, this, null, GShell.GSHELL_CDIMAGE);
+
+    // Run the exportcol.pl command
+    String[] command_parts = (String[]) command_parts_list.toArray(new String[0]);
+    GShell process = new GShell(command_parts, GShell.CDIMAGE, 3, this, null, GShell.GSHELL_CDIMAGE);
     process.start();
     //process.run();

trunk/gli/src/org/greenstone/gatherer/gui/tree/DragTree.java

@@ -16 +16 @@
 import org.greenstone.gatherer.file.FileNode;
 import org.greenstone.gatherer.file.FileSystemModel;
-import org.greenstone.gatherer.util.ArrayTools;
 import org.greenstone.gatherer.util.DragComponent;
 import org.greenstone.gatherer.util.DragGroup;