deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

cooja mac os x support

Browse source
This commit is contained in:
fros4943 2007-09-30 12:02:33 +00:00
parent 1793323e55
commit 0f4a25c8ff
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tools/cooja/java/se/sics/cooja/GUI.java
View file

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: GUI.java,v 1.63 2007/09/28 07:21:21 fros4943 Exp $ * $Id: GUI.java,v 1.64 2007/09/30 12:02:33 fros4943 Exp $
*/ */
package se.sics.cooja; package se.sics.cooja;
@ -73,6 +73,11 @@ public class GUI {
*/ */
public static final String EXTERNAL_TOOLS_WIN32_SETTINGS_FILENAME = "/external_tools_win32.config"; public static final String EXTERNAL_TOOLS_WIN32_SETTINGS_FILENAME = "/external_tools_win32.config";
/**
* External tools default Mac OS X settings filename.
*/
public static final String EXTERNAL_TOOLS_MACOSX_SETTINGS_FILENAME = "/external_tools_macosx.config";
/** /**
* External tools default Linux/Unix settings filename. * External tools default Linux/Unix settings filename.
*/ */
@ -2411,11 +2416,17 @@ public class GUI {
* Load external tools settings from default file. * Load external tools settings from default file.
*/ */
public static void loadExternalToolsDefaultSettings() { public static void loadExternalToolsDefaultSettings() {
String osName = System.getProperty("os.name").toLowerCase();
String filename = GUI.EXTERNAL_TOOLS_LINUX_SETTINGS_FILENAME; String filename = GUI.EXTERNAL_TOOLS_LINUX_SETTINGS_FILENAME;
if (System.getProperty("os.name").startsWith("Win")) { if (osName.startsWith("win")) {
filename = GUI.EXTERNAL_TOOLS_WIN32_SETTINGS_FILENAME; filename = GUI.EXTERNAL_TOOLS_WIN32_SETTINGS_FILENAME;
} else if (osName.startsWith("mac os x")) {
filename = GUI.EXTERNAL_TOOLS_MACOSX_SETTINGS_FILENAME;
} }
logger.info("Loading external tools user settings from: " + filename);
try { try {
InputStream in = GUI.class.getResourceAsStream(filename); InputStream in = GUI.class.getResourceAsStream(filename);
if (in == null) { if (in == null) {