Changeset 24704

Timestamp:

2011-09-30T20:49:42+13:00 (13 years ago)

Author:

ak19

Message:

Dr Bainbridge found a default Linux file open command (xdg-open). This is now used for file associations when the user has not provided one.

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• file/FileAssociationManager.java (modified) (4 diffs)
• util/StaticStrings.java (modified) (2 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);
+            }
         }
         command = null;
@@ -113 +116 @@
         command = StaticStrings.MAC_OPEN_COMMAND; // "open %1"
     } else {
-        // we try to look for a browser
+        // we try to look for a browser
         String [] browsers = new String [] {"mozilla", "netscape"};
         for (int i=0; i<browsers.length; i++) {
@@ -121 +124 @@
         }
         }
+        if (command == null) {  
+            command = StaticStrings.LINUX_OPEN_COMMAND; // "xdg-open %1"
+        }   
     }
 
@@ -190 +196 @@
             command = StaticStrings.MAC_OPEN_COMMAND;
         }
-
+        
+        else { // If we are on a linux, default to using the xdg-open program
+            command = StaticStrings.LINUX_OPEN_COMMAND;
+        }
+        
         // Otherwise display the dialog and ask the user to enter launching command.
         if(command == null || command.length() == 0) {

main/trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java

@@ -181 +181 @@
     static final public String LEVELS_STR = "levels";
     static final public String LIBRARY_URL_ARGUMENT = "-library_url";
+    static final public String LINUX_OPEN_COMMAND = "xdg-open %1";
     static final public String LOCAL_LIBRARY_ARGUMENT = "-local_library";
     static final public String LOAD_ARGUMENT = "-load";
@@ -230 +231 @@
     static final public String SEPARATOR_ATTRIBUTE = "separator";
     static final public String SEPARATOR_CHARACTER = "/";
-  static final public String SERVICE_RACK_LIST_ELEMENT = "serviceRackList";
+    static final public String SERVICE_RACK_LIST_ELEMENT = "serviceRackList";
     static final public String SERVLET_ARGUMENT ="-servlet";
     static final public String SINGLE_QUOTE_CHARACTER = "'";