X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fplat%2FJava2.java;h=f575b3277f899a1d9fdf6b3914f12f1d4c182476;hb=b1f4bc6bdf2608bf2a6e9143abffdfd4fa0522e3;hp=f63317e6e6535cc579b92b9b092bb2d1fbb983a7;hpb=385312ed5ca70d71c767aa81fc2b4dd8f1ccdd79;p=org.ibex.core.git

diff --git a/src/org/ibex/plat/Java2.java b/src/org/ibex/plat/Java2.java
index f63317e..f575b32 100644
--- a/src/org/ibex/plat/Java2.java
+++ b/src/org/ibex/plat/Java2.java
@@ -7,9 +7,10 @@ import java.awt.image.*;
 import java.net.*;
 import java.util.*;
 import org.ibex.util.*;
-import org.ibex.*;
 import java.lang.reflect.*;
-
+import org.ibex.graphics.*;
+import org.ibex.core.*;
+import org.ibex.net.*;
 
 /** Platform class for most reasonable Java1.2+ Java2s */
 public class Java2 extends AWT {
@@ -20,13 +21,13 @@ public class Java2 extends AWT {
         // disable the focus manager so we can intercept the tab key
         String versionString = System.getProperty("java.version", "");
         int secondDecimal = versionString.substring(versionString.indexOf('.') + 1).indexOf('.');
-        if (secondDecimal != -1) versionString = versionString.substring(0, secondDecimal);
+        if (secondDecimal != -1) versionString = versionString.substring(0, versionString.indexOf('.') + 1 + secondDecimal);
         double version = Double.parseDouble(versionString);
         if (version >= 1.4) {
             isJava14 = true;
             try {
                 Toolkit t = java.awt.Toolkit.getDefaultToolkit();
-                Method m = java.awt.Toolkit.class.getMethod("setDynamicLayout", new Class[] { Boolean.class });
+                Method m = java.awt.Toolkit.class.getMethod("setDynamicLayout", new Class[] { Boolean.TYPE });
                 m.invoke(t, new Object[] { Boolean.TRUE });
             } catch (Exception e) {
                 Log.info(this, "Exception while trying to enable AWT Dynamic Layout");
@@ -41,11 +42,11 @@ public class Java2 extends AWT {
     }
 
     /** this is done with reflection in case a new version of the plugin comes out that doesn't let us pull the sun.plugin.* trick */
-    protected synchronized org.ibex.HTTP.Proxy _detectProxy() {
-        return (org.ibex.HTTP.Proxy)java.security.AccessController.doPrivileged(new java.security.PrivilegedAction() {
+    protected synchronized org.ibex.net.HTTP.Proxy _detectProxy() {
+        return (org.ibex.net.HTTP.Proxy)java.security.AccessController.doPrivileged(new java.security.PrivilegedAction() {
                 public Object run() {
                     try {
-                        org.ibex.HTTP.Proxy pi = new org.ibex.HTTP.Proxy();
+                        org.ibex.net.HTTP.Proxy pi = new org.ibex.net.HTTP.Proxy();
                         
                         Class PluginProxyHandler = Class.forName("sun.plugin.protocol.PluginProxyHandler");
                         Method getDefaultProxyHandler = PluginProxyHandler.getMethod("getDefaultProxyHandler", new Class[] { });
@@ -159,8 +160,8 @@ public class Java2 extends AWT {
         }
 
         public void mouseWheelMoved(MouseWheelEvent m) {
-            // TODO: Uncomment this once Scroll is implemented in the core
-            //if(m.getScrollType() == MouseWheelEvent.WHEEL_UNIT_SCROLL) { Scroll(m.getUnitsToScroll()); }
+            if (m.getScrollType() == MouseWheelEvent.WHEEL_UNIT_SCROLL)
+                VScroll(m.getUnitsToScroll());
         }
     }
 
@@ -176,17 +177,16 @@ public class Java2 extends AWT {
         private DataBuffer buf = null;
 
         // this doens't seem to work on Windows
-        public void drawGlyph(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {
-            AWTPicture src = (AWTPicture)source;
-            src.init();
+        public void drawGlyph(org.ibex.graphics.Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {
+            Image i2 = ((AWTGlyph)source).getImage();
             Graphics2D g2 = (Graphics2D)i.getGraphics();
             g2.setComposite(AlphaComposite.DstOut);
             g2.setClip(cx1, cy1, cx2 - cx1, cy2 - cy1);
-            g2.drawImage(src.i, dx, dy, null);
+            g2.drawImage(i2, dx, dy, null);
             g2.setComposite(AlphaComposite.DstOver);
-            g2.setColor(new Color((rgb & 0x00FF0000) >> 16, (rgb & 0x0000FF00) >> 8, (rgb & 0x000000FF)));
+            g2.setColor(new java.awt.Color((rgb & 0x00FF0000) >> 16, (rgb & 0x0000FF00) >> 8, (rgb & 0x000000FF)));
             g2.fillRect(dx, dy, cx2 - dx, cy2 - dy);
-            g2.drawImage(i, 0, 0, null);
+            g2.drawImage(i2, 0, 0, null);
             g2.setClip(0, 0, i.getWidth(null), i.getHeight(null));
         }