Menu
▾
▴
[X3d-commits] SF.net SVN: x3d:[12012] www.web3d.org/x3d/tools/X3dEdit3.2/X3D/src/org/ web3d/x3d/options/X3dOptions.java
|
From: <bru...@us...> - 2013-04-03 04:55:52
|
Revision: 12012
http://x3d.svn.sourceforge.net/x3d/?rev=12012&view=rev
Author: brutzman
Date: 2013-04-03 04:55:44 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
begin building support for other launching other web browsers, update X3D browser defaults
Modified Paths:
--------------
www.web3d.org/x3d/tools/X3dEdit3.2/X3D/src/org/web3d/x3d/options/X3dOptions.java
Modified: www.web3d.org/x3d/tools/X3dEdit3.2/X3D/src/org/web3d/x3d/options/X3dOptions.java
===================================================================
--- www.web3d.org/x3d/tools/X3dEdit3.2/X3D/src/org/web3d/x3d/options/X3dOptions.java 2013-04-03 04:54:39 UTC (rev 12011)
+++ www.web3d.org/x3d/tools/X3dEdit3.2/X3D/src/org/web3d/x3d/options/X3dOptions.java 2013-04-03 04:55:44 UTC (rev 12012)
@@ -184,69 +184,107 @@
public static String XJ3D_EXECUTABLE_PATH_DEFAULT;
public static String OTHER_EXECUTABLE_PATH_DEFAULT;
public static String OTHER_EXECUTABLE_NAME_DEFAULT;
+
+ public static String AMAYA_EXECUTABLE_PATH_DEFAULT;
+ public static String CHROME_EXECUTABLE_PATH_DEFAULT;
+ public static String FIREFOX_EXECUTABLE_PATH_DEFAULT;
+ public static String INTERNETEXPLORER_EXECUTABLE_PATH_DEFAULT;
+ public static String OPERA_EXECUTABLE_PATH_DEFAULT;
+ public static String SAFARI_EXECUTABLE_PATH_DEFAULT;
+
public static String LAUNCH_INTERVAL_DEFAULT;
// platform defaults:
- private static final String winxpContactPathDefault = "C:\\Program Files\\Bitmanagement Software\\BS Contact\\BSContact.exe";
- private static final String winxpContactGeoPathDefault = "C:\\Program Files\\Bitmanagement Software\\BS Contact Geo\\BSContact.exe";
- private static final String winxpFreeWrlPathDefault = "C:\\Program Files\\freeWRL\\freeWRL.exe";
-//private static final String winxpFreeWrlPathDefault = "C:\\Program Files\\freeWRL\\launchdir\\freeWRL_launcher.exe"; // alternative
- private static final String winxpHeilanPathDefault = "C:\\Program Files\\HeilanBrowser-0.15\\HeilanBrowser.exe";
- private static final String winxpInstRealPathDefault = "C:\\Program Files\\Instant Reality\\bin\\InstantPlayer.exe";
- private static final String winxpOctagaPathDefault = "C:\\Program Files\\Octaga\\Octaga Player 4.0\\OctagaPlayer.exe";
- private static final String winxpSwirlX3DPlayerPathDefault = "C:\\Program Files\\Pinecoast\\SwirlViewer\\SwView.exe";
- private static final String winxpVivatyPlayerPathDefault = "C:\\Program Files\\Vivaty\\VivatyPlayer\\VivatyPlayer.exe";
- private static final String winxpXj3DPathDefault = "C:\\Program Files\\Xj3D\\browser.bat";
- private static final String winxpOtherPathDefault = "";
- private static final String winxpOtherNameDefault = "(See X3D-Edit Preferences)";
-
- private static final String windows64ContactPathDefault = "C:\\Program Files\\Bitmanagement Software\\BS Contact\\BSContact.exe";
- private static final String windows64ContactGeoPathDefault = "C:\\Program Files\\Bitmanagement Software\\BS Contact Geo\\BSContact.exe";
- private static final String windows64FreeWrlPathDefault = "C:\\Program Files (x86)\\freeWRL\\freeWRL.exe";
-//private static final String windows64FreeWrlPathDefault = "C:\\Program Files (x86)\\freeWRL\\launchdir\\freeWRL_launcher.exe"; // alternative
- private static final String windows64HeilanPathDefault = "C:\\Program Files (x86)\\HeilanBrowser-0.15\\HeilanBrowser.exe";
- private static final String windows64InstRealPathDefault = "C:\\Program Files\\Instant Reality\\bin\\InstantPlayer.exe";
- private static final String windows64OctagaPathDefault = "C:\\Program Files\\Octaga\\Octaga Player 4.0 (64-bit)\\OctagaPlayer.exe";
- private static final String windows64SwirlX3DPlayerPathDefault = "C:\\Program Files (x86)\\Pinecoast\\SwirlViewer\\SwView.exe";
- private static final String windows64VivatyPlayerPathDefault = "C:\\Program Files (x86)\\Vivaty\\VivatyPlayer\\VivatyPlayer.exe";
- private static final String windows64Xj3DPathDefault = "C:\\Program Files (x86)\\Xj3D\\browser.bat";
- private static final String windows64OtherPathDefault = "";
- private static final String windows64OtherNameDefault = "(See X3D-Edit Preferences)";
+ private static final String winxpContactPathDefault = "C:\\Program Files\\Bitmanagement Software\\BS Contact\\BSContact.exe";
+ private static final String winxpContactGeoPathDefault = "C:\\Program Files\\Bitmanagement Software\\BS Contact Geo\\BSContact.exe";
+ private static final String winxpFreeWrlPathDefault = "C:\\Program Files\\freeWRL\\freeWRL.exe";
+//private static final String winxpFreeWrlPathDefault = "C:\\Program Files\\freeWRL\\launchdir\\freeWRL_launcher.exe"; // alternative
+ private static final String winxpHeilanPathDefault = "C:\\Program Files\\HeilanBrowser-0.15\\HeilanBrowser.exe";
+ private static final String winxpInstRealPathDefault = "C:\\Program Files\\Instant Reality\\bin\\InstantPlayer.exe";
+ private static final String winxpOctagaPathDefault = "C:\\Program Files\\Octaga\\Octaga Player 4.0\\OctagaPlayer.exe";
+ private static final String winxpSwirlX3DPlayerPathDefault = "C:\\Program Files\\Pinecoast\\SwirlViewer\\SwView.exe";
+ private static final String winxpVivatyPlayerPathDefault = "C:\\Program Files\\Vivaty\\VivatyPlayer\\VivatyPlayer.exe";
+ private static final String winxpXj3DPathDefault = "C:\\Program Files\\Xj3D\\browser.bat";
+ private static final String winxpOtherPathDefault = ""; // user configured
+ private static final String winxpOtherNameDefault = "(See X3D-Edit Preferences)";
+ private static final String winxpAmayaPathDefault = "C:\\Program Files\\Amaya\\WindowsWX\\bin\\amaya.exe";
+ private static final String winxpChromePathDefault = "C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe";
+ private static final String winxpFirefoxPathDefault = "C:\\Program Files\\Mozilla Firefox\\firefox.exe";
+ private static final String winxpInternetExplorerPathDefault = "C:\\Program Files\\Internet Explorer\\iexplore.exe";
+ private static final String winxpOperaPathDefault = "C:\\Program Files\\Opera\\opera.exe";
+ private static final String winxpSafariPathDefault = "C:\\Program Files\\Safari\\Safari.exe";
+
+ private static final String windows64ContactPathDefault = "C:\\Program Files\\Bitmanagement Software\\BS Contact\\BSContact.exe";
+ private static final String windows64ContactGeoPathDefault = "C:\\Program Files\\Bitmanagement Software\\BS Contact Geo\\BSContact.exe";
+ private static final String windows64FreeWrlPathDefault = "C:\\Program Files (x86)\\freeWRL\\freeWRL.exe";
+//private static final String windows64FreeWrlPathDefault = "C:\\Program Files (x86)\\freeWRL\\launchdir\\freeWRL_launcher.exe"; // alternative
+ private static final String windows64HeilanPathDefault = "C:\\Program Files (x86)\\HeilanBrowser-0.15\\HeilanBrowser.exe";
+ private static final String windows64InstRealPathDefault = "C:\\Program Files\\Instant Reality\\bin\\InstantPlayer.exe";
+ private static final String windows64OctagaPathDefault = "C:\\Program Files\\Octaga\\Octaga Player 4.0 (64-bit)\\OctagaPlayer.exe";
+ private static final String windows64SwirlX3DPlayerPathDefault = "C:\\Program Files (x86)\\Pinecoast\\SwirlViewer\\SwView.exe";
+ private static final String windows64VivatyPlayerPathDefault = "C:\\Program Files (x86)\\Vivaty\\VivatyPlayer\\VivatyPlayer.exe";
+ private static final String windows64Xj3DPathDefault = "C:\\Program Files (x86)\\Xj3D\\browser.bat";
+ private static final String windows64OtherPathDefault = ""; // user configured
+ private static final String windows64OtherNameDefault = "(See X3D-Edit Preferences)";
+ private static final String windows64AmayaPathDefault = "C:\\Program Files (x86)\\Amaya\\WindowsWX\\bin\\amaya.exe";
+ private static final String windows64ChromePathDefault = "C:\\Program Files\\Google (x86)\\Chrome\\Application\\chrome.exe";
+ private static final String windows64FirefoxPathDefault = "C:\\Program Files\\Mozilla Firefox (x86)\\firefox.exe";
+ private static final String windows64InternetExplorerPathDefault = "C:\\Program Files\\Internet Explorer (x86)\\iexplore.exe";
+ private static final String windows64OperaPathDefault = "C:\\Program Files\\Opera (x86)\\opera.exe";
+ private static final String windows64SafariPathDefault = "C:\\Program Files\\Safari (x86)\\Safari.exe";
- private static final String macosxContactPathDefault = "/Applications/BS Contact.app"; // TODO verify BitManagement handled install path problem
- private static final String macosxContactGeoPathDefault = "/Applications/BS Contact Geo.app"; // TODO verify BitManagement handled install path problem
- private static final String macosxFreeWrlPathDefault = "/Applications/FreeWRL/FreeWrl.app";
- private static final String macosxHeilanPathDefault = "/Applications/HeilanBrowser.app";
- private static final String macosxInstRealPathDefault = "/Applications/Instant Player.app";
- private static final String macosxOctagaPathDefault = "/Applications/Octaga Player.app";
- private static final String macosxSwirlX3DPlayerPathDefault= ""; // No Mac version as of 17 July 2008
- private static final String macosxVivatyPlayerPathDefault = ""; // No Mac version as of 17 July 2008
- private static final String macosxXj3DPathDefault = "/Applications/Xj3D/Xj3DBrowser.app";
- private static final String macosxOtherPathDefault = "";
- private static final String macosxOtherNameDefault = "(See X3D-Edit Preferences)";
+ private static final String macosxContactPathDefault = "/Applications/BS Contact.app"; // TODO verify BitManagement handled install path problem
+ private static final String macosxContactGeoPathDefault = "/Applications/BS Contact Geo.app"; // TODO verify BitManagement handled install path problem
+ private static final String macosxFreeWrlPathDefault = "/Applications/FreeWRL/FreeWrl.app";
+ private static final String macosxHeilanPathDefault = "/Applications/HeilanBrowser.app";
+ private static final String macosxInstRealPathDefault = "/Applications/Instant Player.app";
+ private static final String macosxOctagaPathDefault = "/Applications/Octaga Player.app";
+ private static final String macosxSwirlX3DPlayerPathDefault = ""; // No Mac version as of 17 July 2008
+ private static final String macosxVivatyPlayerPathDefault = ""; // No Mac version as of 17 July 2008
+ private static final String macosxXj3DPathDefault = "/Applications/Xj3D/Xj3DBrowser.app";
+ private static final String macosxOtherPathDefault = ""; // user configured
+ private static final String macosxOtherNameDefault = "(See X3D-Edit Preferences)";
+ private static final String macosxAmayaPathDefault = "";
+ private static final String macosxChromePathDefault = "";
+ private static final String macosxFirefoxPathDefault = "";
+ private static final String macosxInternetExplorerPathDefault = "";
+ private static final String macosxOperaPathDefault = "";
+ private static final String macosxSafariPathDefault = "";
- private static final String otherContactPathDefault = "ContactPlayer";
- private static final String otherContactGeoPathDefault = "ContactGeoPlayer";
- private static final String otherFreeWrlPathDefault = "FreeWrlPlayer";
- private static final String otherHeilanPathDefault = "HeilanBrowser";
- private static final String otherInstRealPathDefault = "InstantPlayer";
- private static final String otherOctagaPathDefault = "OctagaPlayer";
- private static final String otherSwirlX3DPlayerPathDefault = "SwirlX3DPlayer";
- private static final String otherVivatyPlayerPathDefault = "VivatyPlayer";
- private static final String otherXj3DPathDefault = "Xj3DPlayer";
- private static final String otherOtherPathDefault = "";
- private static final String otherOtherNameDefault = "(see X3D-Edit Preferences)";
+ private static final String otherContactPathDefault = "ContactPlayer";
+ private static final String otherContactGeoPathDefault = "ContactGeoPlayer";
+ private static final String otherFreeWrlPathDefault = "FreeWrlPlayer";
+ private static final String otherHeilanPathDefault = "HeilanBrowser";
+ private static final String otherInstRealPathDefault = "InstantPlayer";
+ private static final String otherOctagaPathDefault = "OctagaPlayer";
+ private static final String otherSwirlX3DPlayerPathDefault = "SwirlX3DPlayer";
+ private static final String otherVivatyPlayerPathDefault = "VivatyPlayer";
+ private static final String otherXj3DPathDefault = "Xj3DPlayer";
+ private static final String otherOtherPathDefault = ""; // user configured
+ private static final String otherOtherNameDefault = "(see X3D-Edit Preferences)";
+ private static final String otherAmayaPathDefault = "";
+ private static final String otherChromePathDefault = "";
+ private static final String otherFirefoxPathDefault = "";
+ private static final String otherInternetExplorerPathDefault = "";
+ private static final String otherOperaPathDefault = "";
+ private static final String otherSafariPathDefault = "";
- private static final String downloadSiteContact = "http://www.bitmanagement.de";
- private static final String downloadSiteContactGeo = "http://www.bitmanagement.de";
- private static final String downloadSiteFreeWrl = "http://www.crc.ca/FreeWRL";
- private static final String downloadSiteHeilan = "http://www.niallmoody.com/heilan";
- private static final String downloadSiteInstReal = "http://instantreality.org";
- private static final String downloadSiteOctaga = "http://www.octaga.com";
- private static final String downloadSiteSwirlX3DPlayer = "http://www.pinecoast.com";
- private static final String downloadSiteVivatyPlayer = "http://www.vivaty.com";
- private static final String downloadSiteXj3D = "http://www.Xj3D.org";
- private static final String downloadSiteOther = "http://www.web3d.org/x3d/content/examples/X3dResources.html#Applications";
+ private static final String downloadSiteContact = "http://www.bitmanagement.de";
+ private static final String downloadSiteContactGeo = "http://www.bitmanagement.de";
+ private static final String downloadSiteFreeWrl = "http://www.crc.ca/FreeWRL";
+ private static final String downloadSiteHeilan = "http://www.niallmoody.com/heilan";
+ private static final String downloadSiteInstReal = "http://instantreality.org";
+ private static final String downloadSiteOctaga = "http://www.octaga.com";
+ private static final String downloadSiteSwirlX3DPlayer = "http://www.pinecoast.com";
+ private static final String downloadSiteVivatyPlayer = "http://www.vivaty.com";
+ private static final String downloadSiteXj3D = "http://www.Xj3D.org";
+ private static final String downloadSiteOther = "http://www.web3d.org/x3d/content/examples/X3dResources.html#Applications";
+ private static final String downloadAmayaPathDefault = "http://www.w3.org/Amaya";
+ private static final String downloadChromePathDefault = "http://www.google.com/chrome";
+ private static final String downloadFirefoxPathDefault = "http://www.mozilla.org/firefox";
+ private static final String downloadInternetExplorerPathDefault = "http://windows.microsoft.com/en-US/internet-explorer/download-ie";
+ private static final String downloadPOperaathDefault = "http://www.opera.com";
+ private static final String downloadSafariPathDefault = "http://www.apple.com/safari";
private static String launchInterval = "1"; // units in seconds
@@ -267,17 +305,23 @@
if (os_name.equals("Mac OS X") || os_name.contains("Mac"))
{
- CONTACT_EXECUTABLE_PATH_DEFAULT = macosxContactPathDefault;
- CONTACT_GEO_EXECUTABLE_PATH_DEFAULT = macosxContactGeoPathDefault;
- FREEWRL_EXECUTABLE_PATH_DEFAULT = macosxFreeWrlPathDefault;
- HEILAN_EXECUTABLE_PATH_DEFAULT = macosxHeilanPathDefault;
- INSTANTREALITY_EXECUTABLE_PATH_DEFAULT = macosxInstRealPathDefault;
- OCTAGA_EXECUTABLE_PATH_DEFAULT = macosxOctagaPathDefault;
- SWIRLX3DPLAYER_EXECUTABLE_PATH_DEFAULT = macosxSwirlX3DPlayerPathDefault;
- VIVATYPLAYER_EXECUTABLE_PATH_DEFAULT = macosxVivatyPlayerPathDefault;
- XJ3D_EXECUTABLE_PATH_DEFAULT = macosxXj3DPathDefault;
- OTHER_EXECUTABLE_PATH_DEFAULT = macosxOtherPathDefault;
- OTHER_EXECUTABLE_NAME_DEFAULT = macosxOtherNameDefault;
+ CONTACT_EXECUTABLE_PATH_DEFAULT = macosxContactPathDefault;
+ CONTACT_GEO_EXECUTABLE_PATH_DEFAULT = macosxContactGeoPathDefault;
+ FREEWRL_EXECUTABLE_PATH_DEFAULT = macosxFreeWrlPathDefault;
+ HEILAN_EXECUTABLE_PATH_DEFAULT = macosxHeilanPathDefault;
+ INSTANTREALITY_EXECUTABLE_PATH_DEFAULT = macosxInstRealPathDefault;
+ OCTAGA_EXECUTABLE_PATH_DEFAULT = macosxOctagaPathDefault;
+ SWIRLX3DPLAYER_EXECUTABLE_PATH_DEFAULT = macosxSwirlX3DPlayerPathDefault;
+ VIVATYPLAYER_EXECUTABLE_PATH_DEFAULT = macosxVivatyPlayerPathDefault;
+ XJ3D_EXECUTABLE_PATH_DEFAULT = macosxXj3DPathDefault;
+ OTHER_EXECUTABLE_PATH_DEFAULT = macosxOtherPathDefault;
+ OTHER_EXECUTABLE_NAME_DEFAULT = macosxOtherNameDefault;
+ AMAYA_EXECUTABLE_PATH_DEFAULT = macosxAmayaPathDefault;
+ CHROME_EXECUTABLE_PATH_DEFAULT = macosxChromePathDefault;
+ FIREFOX_EXECUTABLE_PATH_DEFAULT = macosxFirefoxPathDefault;
+ INTERNETEXPLORER_EXECUTABLE_PATH_DEFAULT= macosxInternetExplorerPathDefault;
+ OPERA_EXECUTABLE_PATH_DEFAULT = macosxOperaPathDefault;
+ SAFARI_EXECUTABLE_PATH_DEFAULT = macosxSafariPathDefault;
}
// crude test for Program Files directory on 64-bit machines
else if ((os_name.equals("Windows XP") || os_name.contains("Windows")) && os_path.contains("(x86)"))
@@ -293,6 +337,12 @@
XJ3D_EXECUTABLE_PATH_DEFAULT = windows64Xj3DPathDefault;
OTHER_EXECUTABLE_PATH_DEFAULT = windows64OtherPathDefault;
OTHER_EXECUTABLE_NAME_DEFAULT = windows64OtherNameDefault;
+ AMAYA_EXECUTABLE_PATH_DEFAULT = windows64AmayaPathDefault;
+ CHROME_EXECUTABLE_PATH_DEFAULT = windows64ChromePathDefault;
+ FIREFOX_EXECUTABLE_PATH_DEFAULT = windows64FirefoxPathDefault;
+ INTERNETEXPLORER_EXECUTABLE_PATH_DEFAULT= windows64InternetExplorerPathDefault;
+ OPERA_EXECUTABLE_PATH_DEFAULT = windows64OperaPathDefault;
+ SAFARI_EXECUTABLE_PATH_DEFAULT = windows64SafariPathDefault;
}
else if (os_name.equals("Windows XP") || os_name.contains("Windows"))
{
@@ -307,6 +357,12 @@
XJ3D_EXECUTABLE_PATH_DEFAULT = winxpXj3DPathDefault;
OTHER_EXECUTABLE_PATH_DEFAULT = winxpOtherPathDefault;
OTHER_EXECUTABLE_NAME_DEFAULT = winxpOtherNameDefault;
+ AMAYA_EXECUTABLE_PATH_DEFAULT = winxpAmayaPathDefault;
+ CHROME_EXECUTABLE_PATH_DEFAULT = winxpChromePathDefault;
+ FIREFOX_EXECUTABLE_PATH_DEFAULT = winxpFirefoxPathDefault;
+ INTERNETEXPLORER_EXECUTABLE_PATH_DEFAULT= winxpInternetExplorerPathDefault;
+ OPERA_EXECUTABLE_PATH_DEFAULT = winxpOperaPathDefault;
+ SAFARI_EXECUTABLE_PATH_DEFAULT = winxpSafariPathDefault;
}
else
{
@@ -321,6 +377,12 @@
XJ3D_EXECUTABLE_PATH_DEFAULT = otherXj3DPathDefault;
OTHER_EXECUTABLE_PATH_DEFAULT = otherOtherPathDefault;
OTHER_EXECUTABLE_NAME_DEFAULT = otherOtherNameDefault;
+ AMAYA_EXECUTABLE_PATH_DEFAULT = otherAmayaPathDefault;
+ CHROME_EXECUTABLE_PATH_DEFAULT = otherChromePathDefault;
+ FIREFOX_EXECUTABLE_PATH_DEFAULT = otherFirefoxPathDefault;
+ INTERNETEXPLORER_EXECUTABLE_PATH_DEFAULT= otherInternetExplorerPathDefault;
+ OPERA_EXECUTABLE_PATH_DEFAULT = otherOperaPathDefault;
+ SAFARI_EXECUTABLE_PATH_DEFAULT = otherSafariPathDefault;
}
LAUNCH_INTERVAL_DEFAULT = launchInterval;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|