Changeset 6260

Timestamp:

2003-12-12T17:58:10+13:00 (20 years ago)

Author:

jmt12

Message:

Added default 'open' command if under Mac

File:

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

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

@@ -33 +33 @@
 import org.greenstone.gatherer.gui.FileAssociationDialog;
 import org.greenstone.gatherer.msm.MSMUtils;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.util.WinRegistry;
@@ -65 +66 @@
         String extension = entry.getAttribute(EXTENSION_ATTRIBUTE);
         String command = MSMUtils.getValue(entry);
-        // If we encounter a command of "", and we are on windows, we try to automatically set this command.
-        if(command.length() == 0 && Utility.isWindows()) {
-            // Create a dummy filename with the appropriate extension
-            String dummy_file = "dummy." + extension;
-            command = WinRegistry.openCommand(dummy_file);
-            // If this succeeded add the association.
-            if(command != null) {
-            // Remember to replace the dummy filename with %1
-            command = command.replaceAll(dummy_file, FILENAME_ARG);
-            // Replace the text in this node.
-            MSMUtils.setValue(entry, command);
+        // If we encounter a command of ""...
+        if(command.length() == 0) {
+            // and if we are on windows, we try to automatically set this command.
+            if(Utility.isWindows()) {
+            // Create a dummy filename with the appropriate extension
+            String dummy_file = "dummy." + extension;
+            command = WinRegistry.openCommand(dummy_file);
+            // If this succeeded add the association.
+            if(command != null) {
+                // Remember to replace the dummy filename with %1
+                command = command.replaceAll(dummy_file, FILENAME_ARG);
+                // Replace the text in this node.
+                MSMUtils.setValue(entry, command);
+            }
+            dummy_file = null;
             }
-            dummy_file = null;
+            // and if we are on windows, we default to the open program
+            if(Utility.isMac()) {
+            MSMUtils.setValue(entry, StaticStrings.MAC_OPEN_COMMAND);
+            }
         }
         command = null;
@@ -109 +117 @@
     // for now uder linux get the fileassoc thing. but eventually want a separate thing.
     // pretend we are tyring to open an html file
+    // Mmmoooo. - jmt12
     String extension = "html";
     Element entry = getCommand(extension);
@@ -163 +172 @@
         Element entry = getCommand(extension);
         if(entry != null) {
+        ///ystem.err.println("Retrieved Value From Cache");
         command = MSMUtils.getValue(entry); 
         }
         if(command == null || command.length() == 0) {
+        ///ystem.err.println("No Existing Command");
         // If command is null, and we are on windows try searching the registry.
         if(Utility.isWindows()) {
+            ///ystem.err.println("Is Windows");
             command = WinRegistry.openCommand(filename);
         }
+        // If we are on a mac, default to using the open program
+        else if(Utility.isMac()) {
+            ///ystem.err.println("Is Mac");
+            command = StaticStrings.MAC_OPEN_COMMAND;
+        }
+
         // Otherwise display the dialog and ask the user to enter launching command.
         if(command == null || command.length() == 0) {
+            ///ystem.err.println("Show Dialog");
             // Show the dialog which forces a user to select the launch command for a certain file.
             FileAssociationDialog dialog = new FileAssociationDialog(this);