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

Timestamp:

2004-02-09T15:55:22+13:00 (20 years ago)

Author:

kjdon

Message:

tidied up preview stuff. if windows and mac, just uses the start/open command and never prompts the user for a browser. if linux, prompts the user (should be changed to look for netscape and mozilla first). now use new prompt, PreviewCommandDialog, to get the browser, not the file association dialog which is really confusing

File:

• trunk/gli/src/org/greenstone/gatherer/file/FileAssociationManager.java (modified) (3 diffs)

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

@@ -32 +32 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.gui.FileAssociationDialog;
+import org.greenstone.gatherer.gui.PreviewCommandDialog;
 import org.greenstone.gatherer.msm.MSMUtils;
 import org.greenstone.gatherer.util.StaticStrings;
@@ -104 +105 @@
         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
+    command = null;
+    // Failing that we have a guess at a sensible default 
     if(Utility.isWindows()) {
         // we use cmd and start
@@ -113 +114 @@
         command = StaticStrings.WIN_OPEN_COMMAND;//"cmd.exe /c start \"\" \""+url+"\"";
         }
-    }
-
-    // Now prompt the user
-    FileAssociationDialog dialog = new FileAssociationDialog(this);
-    command = dialog.display(true, command);
-    dialog.dispose();
-    dialog = null;
+    } else if (Utility.isMac()) {
+        command = StaticStrings.MAC_OPEN_COMMAND; // "open %1"
+    } else {
+        // we try to look for a browser
+    }
+    
+    // if we still haven't found something, prompt the user
+    if (command == null) {
+        PreviewCommandDialog dialog = new PreviewCommandDialog();
+        command = dialog.display();
+        dialog.dispose();
+        dialog = null;
+    }
 
     // Store the result if any
-    if(command != null) {
+    if(command != null && !command.equals("")) {
         Gatherer.config.setPreviewCommand(command);
-    }
-
-    // for now uder linux get the fileassoc thing. but eventually want a separate thing.
-    // pretend we are trying to open an html file
-    // Mmmoooo. - jmt12
-
+        command = command.replaceAll(FILENAME_ARG, url);
+        Gatherer.println("Result = " + command);
+        return command;
+    }
     // if we haven't got a command by now, we'll never get one
-    if (command == null) {
-        Gatherer.println("Result = " + command);
-        return null;
-    }
-    // Replace %1 with the url in quotes
-    command = command.replaceAll(FILENAME_ARG, url);
-    Gatherer.println("Result = " + command);
-    return command;
+    Gatherer.println("Result = null");
+    return null;
+    
     }