Changeset 22054 for main

Timestamp:

2010-05-06T13:07:31+12:00 (14 years ago)

Author:

ak19

Message:

Modified BaseProperty so that the "start" commands for different operating systems is stored statically which is helpful for BrowserLauncher

Location:

main/trunk/greenstone3/src/java/org/greenstone/server

Files:

• BaseProperty.java (modified) (1 diff)
• BrowserLauncher.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/server/BaseProperty.java

@@ -12 +12 @@
     public final String WEB_PORT;
 
-    public final String WIN_9X_OPEN_COMMAND = "command.com /c start %1";
-    public final String WIN_OPEN_COMMAND = "cmd.exe /c start \"\" %1";
-    public final String MAC_OPEN_COMMAND = "open %1";
+    public static final String WIN_9X_OPEN_COMMAND = "command.com /c start %1";
+    public static final String WIN_OPEN_COMMAND = "cmd.exe /c start \"\" %1";
+    public static final String MAC_OPEN_COMMAND = "open %1";
 
     public final String BROWSER_PATH = "browser.path";

main/trunk/greenstone3/src/java/org/greenstone/server/BrowserLauncher.java

@@ -40 +40 @@
         // we use cmd and start
         if (Misc.isWindows9x()) {
-        this.command = BaseServer.Property.WIN_9X_OPEN_COMMAND;//"command.com /c start \""+url+"\"";
+        this.command = BaseProperty.WIN_9X_OPEN_COMMAND;//"command.com /c start \""+url+"\"";
         } else {
-        this.command = BaseServer.Property.WIN_OPEN_COMMAND;//"cmd.exe /c start \"\" \""+url+"\"";
+        this.command = BaseProperty.WIN_OPEN_COMMAND;//"cmd.exe /c start \"\" \""+url+"\"";
         }
     } else if (Misc.isMac()) {
-        this.command = BaseServer.Property.MAC_OPEN_COMMAND; // "open %1"
+        this.command = BaseProperty.MAC_OPEN_COMMAND; // "open %1"
     } else {
          // we try to look for a browser