Changeset 6539 for trunk/gli/src/org/greenstone/gatherer/file

Timestamp:

2004-01-16T16:04:59+13:00 (20 years ago)

Author:

jmt12

Message:

Heres a bunch of other changed files. If it wasn't a Friday afternoon I might be bothered finding out what I actually changed in them. Such changes include: a new option or three on preferences, a bug fix for the GDM classes, several changes to CDM to allow for G2.39 configuration files, a fix to Codec to allow for quotes in format strings and more work on CommandTokenizer to allow for stupid, stupid, stupid collectionextra's starting with speech marks then a new line. Plus other stuff. And things. Peace Out.

Location:

trunk/gli/src/org/greenstone/gatherer/file

Files:

• FileAssociationManager.java (modified) (3 diffs)
• FileManager.java (modified) (1 diff)
• FileQueue.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/file/FileAssociationManager.java

@@ -105 +105 @@
 
     public String getBrowserCommand(String url) {
-    String command = null;
+    System.err.println("Get browser command: " + url);
+    // First off we try to retrieve one from the configuration
+    String command = Gatherer.config.getPreviewCommand();
+    // If that worked, substitute in the url and return
+    if(command != null && command.length() > 0) {
+        command = command.replaceAll("%1", url);
+        System.err.println("Result = " + command);
+        return command;
+    }
+    // Failing that we have to prompt the user for what they want to do, but we do our best to provide a sensible default (if available).
+    // For windows we can have a pretty good guess
     if(Utility.isWindows()) {
         // we use cmd and start
@@ -113 +123 @@
         command = StaticStrings.WIN_OPEN_COMMAND;//"cmd.exe /c start \"\" \""+url+"\"";
         }
-        command = command.replaceAll(FILENAME_ARG, url);
-        return command;
-    }
+    }
+
+    // Now prompt the user
+    FileAssociationDialog dialog = new FileAssociationDialog(this);
+    command = dialog.display(true, command);
+    dialog.dispose();
+    dialog = null;
+
+    // Store the result if any
+    if(command != null) {
+        Gatherer.config.setPreviewCommand(command);
+    }
+
     // for now uder linux get the fileassoc thing. but eventually want a separate thing.
-    // pretend we are tyring to open an html file
+    // pretend we are trying to open an html file
     // Mmmoooo. - jmt12
+    /*
     String extension = "html";
     Element entry = getCommand(extension);
@@ -140 +161 @@
         MSMUtils.setValue(entry, command.replaceAll("temp.html", FILENAME_ARG));
     }
-    
+    */
     // if we haven't got a command by now, we'll never get one
-    if (command == null) return null;
+    if (command == null) {
+        System.err.println("Result = " + command);
+        return null;
+    }
     // Replace %1 with the url in quotes
     command = command.replaceAll(FILENAME_ARG, url);
+    System.err.println("Result = " + command);
     return command;
     }

trunk/gli/src/org/greenstone/gatherer/file/FileManager.java

@@ -63 +63 @@
     return count;
     }
+
+    public boolean complain_if_no_sets = true;
 
     /** Not only the queue of files to be moved, but also the object that moves them. */

trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java

@@ -645 +645 @@
             completed_folder_mappings.clear();
             recycle_folder_mappings.clear();
+            
+            // Reset whether we complain about no sets.
+            if(Gatherer.f_man != null) {
+                Gatherer.f_man.complain_if_no_sets = true;
+            }
+
             // Now wait if applicable.
             if(return_immediately) {