mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-12-23 01:29:33 +00:00
cooja mac os x support
This commit is contained in:
parent
1793323e55
commit
0f4a25c8ff
@ -24,7 +24,7 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* 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;
|
||||
@ -73,6 +73,11 @@ public class GUI {
|
||||
*/
|
||||
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.
|
||||
*/
|
||||
@ -2411,11 +2416,17 @@ public class GUI {
|
||||
* Load external tools settings from default file.
|
||||
*/
|
||||
public static void loadExternalToolsDefaultSettings() {
|
||||
String osName = System.getProperty("os.name").toLowerCase();
|
||||
|
||||
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;
|
||||
} else if (osName.startsWith("mac os x")) {
|
||||
filename = GUI.EXTERNAL_TOOLS_MACOSX_SETTINGS_FILENAME;
|
||||
}
|
||||
|
||||
logger.info("Loading external tools user settings from: " + filename);
|
||||
|
||||
try {
|
||||
InputStream in = GUI.class.getResourceAsStream(filename);
|
||||
if (in == null) {
|
||||
|
Loading…
Reference in New Issue
Block a user