X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FPlatform.java;h=e2c148c3759e3cc67b597bf8f1703b4ee2c83881;hb=c6689b39ad4b2af85e942933599ccbba1ef9990d;hp=cbae0957c4448f57a24ebda02a43b30cff1ad96b;hpb=c55a2217bcedf009ad6db9cbaddbcc28b6bda06d;p=org.ibex.core.git

diff --git a/src/org/xwt/Platform.java b/src/org/xwt/Platform.java
index cbae095..e2c148c 100644
--- a/src/org/xwt/Platform.java
+++ b/src/org/xwt/Platform.java
@@ -49,7 +49,7 @@ public class Platform {
     // reflection.
 
     static {
-        System.out.println("Detecting JVM...");
+        System.err.println("Detecting JVM...");
         try {
             String vendor = System.getProperty("java.vendor", "");
             String version = System.getProperty("java.version", "");
@@ -57,14 +57,13 @@ public class Platform {
             String os_version = System.getProperty("os.version", "");
             String platform_class = null;
             
-            //if (os_name.startsWith("Mac OS X")) platform_class = "MacOSX";
-            if (vendor.startsWith("Free Software Foundation")) {
+            if (os_name.startsWith("Darwin")) platform_class = "Carbon";
+            else if (vendor.startsWith("Free Software Foundation")) {
                 if (os_name.startsWith("Window")) platform_class = "Win32";
-                else platform_class = "POSIX";
+                else platform_class = "X11";
             } else if (version.startsWith("1.1") && vendor.startsWith("Netscape")) platform_class = "Netscape";
             else if (version.startsWith("1.1") && vendor.startsWith("Microsoft")) platform_class = "Microsoft";
-            else if (version.startsWith("1.4")) platform_class = "Java14";
-            else if (!version.startsWith("1.0") && !version.startsWith("1.1")) platform_class = "Java12";
+            else if (!version.startsWith("1.0") && !version.startsWith("1.1")) platform_class = "Java2";
 
         // Disable 2d hardware acceleration on Jaguar
         if (os_name.equals("Mac OS X") && os_version.equals("10.2"))
@@ -176,6 +175,9 @@ public class Platform {
                 public Object get() { return o; }
             };
     }
+
+	/** Called once XWT is initialized and the application is running. */
+	protected void _running() {}
     
     /** quits XWT */
     protected void _exit() {
@@ -214,6 +216,11 @@ public class Platform {
     /** returns true iff the platform has a case-sensitive filesystem */
     protected boolean _isCaseSensitive() { return true; }
 
+    /** returns an InputStream to the builtin xwar */
+    protected InputStream _getBuiltinInputStream() {
+	return Platform.class.getClassLoader().getResourceAsStream("org/xwt/builtin.xwar");
+    }
+
     /** returns the value of the environment variable key, or null if no such key exists */
     protected String _getEnv(String key) {
         try {
@@ -242,6 +249,10 @@ public class Platform {
         return null;
     }
 
+    /** convert a JPEG into an Image */
+    protected ImageDecoder _decodeJPEG(InputStream is, String name) { return null; }
+
+
     // Static methods -- thunk to the instance /////////////////////////////////////////////////////////////////////////
 
     /** if true, org.xwt.Surface should generate Click messages automatically when a Release happens after a Press and the mouse has not moved much */
@@ -300,6 +311,9 @@ public class Platform {
     /** creates and returns a picture */
     public static Picture createPicture(int[] data, int w, int h) { return platform._createPicture(data, w, h); }
 
+    /** returns an InputStream to the builtin xwar */
+    public static InputStream getBuiltinInputStream() { return platform._getBuiltinInputStream(); }
+	
     /** creates and returns a picture */
     public static Picture createPicture(ImageDecoder i) { return platform._createPicture(i.getData(), i.getWidth(), i.getHeight()); }
 
@@ -340,6 +354,12 @@ public class Platform {
         platform._newBrowserWindow(url);
     }
 
+	/** Called once XWT is initialized and the application is running. */
+	public static void running() {
+		Log.log(Platform.class, "XWT is running");
+		platform._running();
+	}
+	
     /** quits XWT */
     public static void exit() {
         Log.log(Platform.class, "exiting via Platform.exit()");
@@ -402,6 +422,10 @@ public class Platform {
         return cachedProxyInfo;
     }
 
+    public static synchronized ImageDecoder decodeJPEG(InputStream is, String name) {
+	return platform._decodeJPEG(is, name);
+    }
+
     // Helpful font parsing stuff //////////////////////////////////////////////////////
 
     public static class ParsedFont {