improved Java2 AWT performance

[org.ibex.core.git] / src / org / ibex / plat / Java2.java

diff --git a/src/org/ibex/plat/Java2.java b/src/org/ibex/plat/Java2.java
index 0263a5b..7a1909b 100644 (file)
--- a/src/org/ibex/plat/Java2.java
+++ b/src/org/ibex/plat/Java2.java
@@ -26,7 +26,7 @@ public class Java2 extends AWT {
             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");
@@ -176,17 +176,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.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.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));
         }