projects
/
org.ibex.core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
split Java2 into Java2/Java4
[org.ibex.core.git]
/
src
/
org
/
ibex
/
plat
/
Platform.java
diff --git
a/src/org/ibex/plat/Platform.java
b/src/org/ibex/plat/Platform.java
index
5ad71c2
..
cc9eff9
100644
(file)
--- a/
src/org/ibex/plat/Platform.java
+++ b/
src/org/ibex/plat/Platform.java
@@
-1,4
+1,7
@@
-// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the GNU General Public License version 2 ("the License").
+// You may not use this file except in compliance with the License.
+
package org.ibex.plat;
import java.lang.reflect.*;
package org.ibex.plat;
import java.lang.reflect.*;
@@
-57,8
+60,8
@@
public abstract class Platform {
else if (os_name.startsWith("Darwin")) platform_class = "Darwin";
else platform_class = "X11";
}
else if (os_name.startsWith("Darwin")) platform_class = "Darwin";
else platform_class = "X11";
}
+ else if (version.startsWith("1.4")) platform_class = "Java4";
else if (!version.startsWith("1.0") && !version.startsWith("1.1")) platform_class = "Java2";
else if (!version.startsWith("1.0") && !version.startsWith("1.1")) platform_class = "Java2";
-
if (platform_class == null) {
Log.error(Platform.class, "Unable to detect JVM");
criticalAbort("Unable to detect JVM");
if (platform_class == null) {
Log.error(Platform.class, "Unable to detect JVM");
criticalAbort("Unable to detect JVM");
@@
-119,7
+122,7
@@
public abstract class Platform {
ret.Refresh();
}
try {
ret.Refresh();
}
try {
- if (b.get("titlebar") != null) ret.setTitleBarText((String)b.get("titlebar"));
+ if (b.get(JSU.S("titlebar")) != null) ret.setTitleBarText(JSU.toString(b.get(JSU.S("titlebar"))));
} catch (JSExn e) {
Log.warn(Platform.class, e);
}
} catch (JSExn e) {
Log.warn(Platform.class, e);
}