Changeset 7516

Timestamp:

2004-06-01T11:27:13+12:00 (20 years ago)

Author:

kjdon

Message:

on windows dont use the registry to get commands, just use teh start command

File:

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

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

@@ -58 +58 @@
         for(int i = 0; i < entries.getLength(); i++) {
         Element entry = (Element) entries.item(i);
-        String extension = entry.getAttribute(StaticStrings.EXTENSION_ATTRIBUTE);
         String command = MSMUtils.getValue(entry);
         // If we encounter a command of ""...
         if(command.length() == 0) {
-            // and if we are on windows, we try to automatically set this command.
+            // if we are on windows, we default to the start 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);
+            if (Utility.isWindows9x()) {
+                MSMUtils.setValue(entry, StaticStrings.WIN_9X_OPEN_COMMAND);
+            } else {
+                MSMUtils.setValue(entry, StaticStrings.WIN_OPEN_COMMAND);
             }
-            dummy_file = null;
             }
-            // and if we are on windows, we default to the open program
-            if(Utility.isMac()) {
+            // and if we are on mac, we default to the open program
+            else if(Utility.isMac()) {
             MSMUtils.setValue(entry, StaticStrings.MAC_OPEN_COMMAND);
             }
         }
         command = null;
-        extension = null;
         entry = null;
         }
@@ -184 +176 @@
         // 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);
             //try the start command
             if (Utility.isWindows9x()) {
@@ -197 +187 @@
         // 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;
         }