2003/09/12 01:23:02

[org.ibex.core.git] / src / org / xwt / Platform.java

diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index c7ace6a..fcdc9d9 100644 (file)
--- a/src/org/xwt/Platform.java
+++ b/src/org/xwt/Platform.java
@@ -57,7 +57,7 @@ public class Platform {
             String os_version = System.getProperty("os.version", "");
             String platform_class = null;
             
-            if (os_name.startsWith("Darwin")) platform_class = "Carbon";
+            if (os_name.startsWith("Darwin")) platform_class = "Darwin";
             else if (vendor.startsWith("Free Software Foundation")) {
                 if (os_name.startsWith("Window")) platform_class = "Win32";
                 else platform_class = "X11";
@@ -211,7 +211,15 @@ public class Platform {
 
     /** returns an InputStream to the builtin xwar */
     protected InputStream _getBuiltinInputStream() {
-        return Platform.class.getClassLoader().getResourceAsStream("org/xwt/builtin.xwar");
+       try {
+           return new FileInputStream("builtin.xwar");
+           /*
+           return new ByteArrayInputStream(org.bouncycastle.util.encoders.Base64.decode(org.xwt.Builtin.encoded));
+           */
+       } catch (Exception e) {
+           Log.log(this, e);
+           return null;
+       }
     }
 
     /** returns the value of the environment variable key, or null if no such key exists */