Changeset 24704 for main/trunk/gli
- Timestamp:
- 2011-09-30T20:49:42+13:00 (13 years ago)
- Location:
- main/trunk/gli/src/org/greenstone/gatherer
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/gli/src/org/greenstone/gatherer/file/FileAssociationManager.java
r10323 r24704 74 74 XMLTools.setValue(entry, StaticStrings.MAC_OPEN_COMMAND); 75 75 } 76 else { // assume linux? 77 XMLTools.setValue(entry, StaticStrings.LINUX_OPEN_COMMAND); 78 } 76 79 } 77 80 command = null; … … 113 116 command = StaticStrings.MAC_OPEN_COMMAND; // "open %1" 114 117 } else { 115 118 // we try to look for a browser 116 119 String [] browsers = new String [] {"mozilla", "netscape"}; 117 120 for (int i=0; i<browsers.length; i++) { … … 121 124 } 122 125 } 126 if (command == null) { 127 command = StaticStrings.LINUX_OPEN_COMMAND; // "xdg-open %1" 128 } 123 129 } 124 130 … … 190 196 command = StaticStrings.MAC_OPEN_COMMAND; 191 197 } 192 198 199 else { // If we are on a linux, default to using the xdg-open program 200 command = StaticStrings.LINUX_OPEN_COMMAND; 201 } 202 193 203 // Otherwise display the dialog and ask the user to enter launching command. 194 204 if(command == null || command.length() == 0) { -
main/trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java
r24478 r24704 181 181 static final public String LEVELS_STR = "levels"; 182 182 static final public String LIBRARY_URL_ARGUMENT = "-library_url"; 183 static final public String LINUX_OPEN_COMMAND = "xdg-open %1"; 183 184 static final public String LOCAL_LIBRARY_ARGUMENT = "-local_library"; 184 185 static final public String LOAD_ARGUMENT = "-load"; … … 230 231 static final public String SEPARATOR_ATTRIBUTE = "separator"; 231 232 static final public String SEPARATOR_CHARACTER = "/"; 232 233 static final public String SERVICE_RACK_LIST_ELEMENT = "serviceRackList"; 233 234 static final public String SERVLET_ARGUMENT ="-servlet"; 234 235 static final public String SINGLE_QUOTE_CHARACTER = "'";
Note:
See TracChangeset
for help on using the changeset viewer.