Changeset 22054

Show
Ignore:
Timestamp:
06.05.2010 13:07:31 (9 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/server/BaseProperty.java

    r18868 r22054  
    1212    public final String WEB_PORT; 
    1313 
    14     public final String WIN_9X_OPEN_COMMAND = "command.com /c start %1"; 
    15     public final String WIN_OPEN_COMMAND = "cmd.exe /c start \"\" %1"; 
    16     public final String MAC_OPEN_COMMAND = "open %1"; 
     14    public static final String WIN_9X_OPEN_COMMAND = "command.com /c start %1"; 
     15    public static final String WIN_OPEN_COMMAND = "cmd.exe /c start \"\" %1"; 
     16    public static final String MAC_OPEN_COMMAND = "open %1"; 
    1717 
    1818    public final String BROWSER_PATH = "browser.path"; 
  • main/trunk/greenstone3/src/java/org/greenstone/server/BrowserLauncher.java

    r20918 r22054  
    4040        // we use cmd and start 
    4141        if (Misc.isWindows9x()) { 
    42         this.command = BaseServer.Property.WIN_9X_OPEN_COMMAND;//"command.com /c start \""+url+"\""; 
     42        this.command = BaseProperty.WIN_9X_OPEN_COMMAND;//"command.com /c start \""+url+"\""; 
    4343        } else { 
    44         this.command = BaseServer.Property.WIN_OPEN_COMMAND;//"cmd.exe /c start \"\" \""+url+"\""; 
     44        this.command = BaseProperty.WIN_OPEN_COMMAND;//"cmd.exe /c start \"\" \""+url+"\""; 
    4545        } 
    4646    } else if (Misc.isMac()) { 
    47         this.command = BaseServer.Property.MAC_OPEN_COMMAND; // "open %1" 
     47        this.command = BaseProperty.MAC_OPEN_COMMAND; // "open %1" 
    4848    } else { 
    4949         // we try to look for a browser