projects
/
org.ibex.core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e53aa97
)
2002/07/19 05:30:16
author
megacz
<megacz@xwt.org>
Fri, 30 Jan 2004 06:49:21 +0000
(06:49 +0000)
committer
megacz
<megacz@xwt.org>
Fri, 30 Jan 2004 06:49:21 +0000
(06:49 +0000)
darcs-hash:
20040130064921
-2ba56-
b784f6f2ce89f8049b4b8d7ec4cb95c0d2e71063
.gz
CHANGES
patch
|
blob
|
history
src/org/xwt/Platform.java
patch
|
blob
|
history
diff --git
a/CHANGES
b/CHANGES
index
3176139
..
b42300f
100644
(file)
--- a/
CHANGES
+++ b/
CHANGES
@@
-298,3
+298,5
@@
18-Jul megacz Win32.java: changed dialog mapping to MS Sans Serif
18-Jul megacz Win32.java: changed dialog mapping to MS Sans Serif
+18-Jul megacz Platform.java: don't try to getEnv() on Win w/ jdk<1.4
+
diff --git
a/src/org/xwt/Platform.java
b/src/org/xwt/Platform.java
index
dc706f5
..
0a32481
100644
(file)
--- a/
src/org/xwt/Platform.java
+++ b/
src/org/xwt/Platform.java
@@
-214,9
+214,13
@@
public class Platform {
try {
String os = System.getProperty("os.name").toLowerCase();
Process p;
try {
String os = System.getProperty("os.name").toLowerCase();
Process p;
- if (os.indexOf("windows 9") > -1) {
+ if (os.indexOf("windows 9") != -1 || os.indexOf("windows me") != -1) {
+ // hack -- jdk1.2/1.3 on Win32 pop open an ugly DOS box; 1.4 does not
+ if (platform.getClass().getName().endsWith("Java12")) return null;
p = Runtime.getRuntime().exec("command.com /c set");
p = Runtime.getRuntime().exec("command.com /c set");
- } else if ( (os.indexOf("nt") > -1) || (os.indexOf("windows 2000") > -1) ) {
+ } else if (os.indexOf("windows") > -1) {
+ // hack -- jdk1.2/1.3 on Win32 pop open an ugly DOS box; 1.4 does not
+ if (platform.getClass().getName().endsWith("Java12")) return null;
p = Runtime.getRuntime().exec("cmd.exe /c set");
} else {
p = Runtime.getRuntime().exec("env");
p = Runtime.getRuntime().exec("cmd.exe /c set");
} else {
p = Runtime.getRuntime().exec("env");