Changeset 24707 for main/trunk/gli/src/org/greenstone/gatherer/file/FileAssociationManager.java

Timestamp:

2011-10-03T14:13:03+13:00 (13 years ago)

Author:

ak19

Message:

Reverting code committed last time which started using xdg-open as the default FileAssociation command for Linux. This doesn't work on the CentOS here which doesn't recognise xdg-open and says it can't find it (installed). The old code used to popup the FileAssociation dialog instead for Linux, so that the user could choose something that would work, rather than what the code does now: fail quietly.

File:

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

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

@@ -74 +74 @@
             XMLTools.setValue(entry, StaticStrings.MAC_OPEN_COMMAND);
             }
-            else { // assume linux?
-            XMLTools.setValue(entry, StaticStrings.LINUX_OPEN_COMMAND);
-            }
+            //else { XMLTools.setValue(entry, StaticStrings.LINUX_OPEN_COMMAND); } // assume linux?
         }
         command = null;
@@ -124 +122 @@
         }
         }
-        if (command == null) {  
-            command = StaticStrings.LINUX_OPEN_COMMAND; // "xdg-open %1"
-        }   
+        //if (command == null) { command = StaticStrings.LINUX_OPEN_COMMAND; } // "xdg-open %1"
     }
 
@@ -197 +193 @@
         }
         
-        else { // If we are on a linux, default to using the xdg-open program
-            command = StaticStrings.LINUX_OPEN_COMMAND;
-        }
+        //else { command = StaticStrings.LINUX_OPEN_COMMAND; } // If linux, default to using xdg-open
         
         // Otherwise display the dialog and ask the user to enter launching command.