swingme-svn — subversion diffs

[Swingme-svn] SF.net SVN: swingme:[2472] iOSME/src

[<yu...@us...>]

Revision: 2472
          http://sourceforge.net/p/swingme/code/2472
Author:   yuranet
Date:     2021-06-23 14:30:51 +0000 (Wed, 23 Jun 2021)
Log Message:
-----------
exit and rotate work

Modified Paths:
--------------
    iOSME/src/javax/microedition/midlet/MIDlet.java
    iOSME/src/net/yura/ios/CanvasView.java

Modified: iOSME/src/javax/microedition/midlet/MIDlet.java
===================================================================
--- iOSME/src/javax/microedition/midlet/MIDlet.java	2021-06-23 14:11:07 UTC (rev 2471)
+++ iOSME/src/javax/microedition/midlet/MIDlet.java	2021-06-23 14:30:51 UTC (rev 2472)
@@ -3,7 +3,7 @@
 import java.util.Map;
 import java.util.Properties;
 import javax.microedition.io.ConnectionNotFoundException;
-
+import apple.c.Globals;
 import apple.uikit.UIApplication;
 
 public abstract class MIDlet {
@@ -37,7 +37,7 @@
     protected abstract void startApp() throws MIDletStateChangeException;
 
     public final void notifyDestroyed() {
-        //AndroidMeActivity.DEFAULT_ACTIVITY.finish();
+        Globals.exit(0);
 
         new Thread() {
             public void run() {

Modified: iOSME/src/net/yura/ios/CanvasView.java
===================================================================
--- iOSME/src/net/yura/ios/CanvasView.java	2021-06-23 14:11:07 UTC (rev 2471)
+++ iOSME/src/net/yura/ios/CanvasView.java	2021-06-23 14:30:51 UTC (rev 2472)
@@ -13,6 +13,7 @@
 import apple.uikit.UITouch;
 import apple.uikit.UIView;
 import apple.uikit.c.UIKit;
+import apple.uikit.enums.UIViewContentMode;
 
 public class CanvasView extends UIView {
 
@@ -27,7 +28,7 @@
     protected CanvasView(Pointer peer) {
         super(peer);
 
-
+        //setContentMode(UIViewContentMode.Redraw); // does not work here for some reason
         //setFocusable(true);
         //setFocusableInTouchMode(true);
     }
@@ -38,6 +39,7 @@
 
     public void setCanvas(Canvas canvas) {
         this.canvas = canvas;
+        setContentMode(UIViewContentMode.Redraw); // tells it to repaint if size changes
         setNeedsDisplay();
     }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2471] SwingME/src/net/yura/mobile/gui

[<yu...@us...>]

Revision: 2471
          http://sourceforge.net/p/swingme/code/2471
Author:   yuranet
Date:     2021-06-23 14:11:07 +0000 (Wed, 23 Jun 2021)
Log Message:
-----------
detect running on ios

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/DesktopPane.java
    SwingME/src/net/yura/mobile/gui/Midlet.java

Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java	2021-06-23 12:22:40 UTC (rev 2470)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java	2021-06-23 14:11:07 UTC (rev 2471)
@@ -140,9 +140,9 @@
     public boolean IPHONE_SCROLL;
     public boolean QWERTY_KAYPAD; // if true the multi letter per number is disabled
     public boolean USE_SOFT_KEY_CLEAR; // Nokia S40 does not have a dedicated delete key
-    public boolean HIDDEN_MENU; // on android and blackberry the menu and back are hardware buttons
+    public boolean HIDDEN_MENU; // on old android and blackberry the menu and back are hardware buttons
     public boolean HIDDEN_BACK;
-    public boolean GRID_MENU; // on android
+    public boolean GRID_MENU; // on old android
 
     // object variables
     protected Midlet midlet;
@@ -190,19 +190,21 @@
      */
     public DesktopPane(Midlet m, int back, Image sph) {
 
-        SOFT_KEYS = Midlet.getPlatform() != Midlet.PLATFORM_ME4SE && Midlet.getPlatform() != Midlet.PLATFORM_ANDROID && Midlet.getPlatform() != Midlet.PLATFORM_BLACKBERRY;
-        HIDDEN_MENU = Midlet.getPlatform() == Midlet.PLATFORM_ANDROID || Midlet.getPlatform() == Midlet.PLATFORM_BLACKBERRY;
-        HIDDEN_BACK = Midlet.getPlatform() == Midlet.PLATFORM_ANDROID || Midlet.getPlatform() == Midlet.PLATFORM_BLACKBERRY;
+        int platform = Midlet.getPlatform();
 
-        VERY_BIG_SCREEN = Midlet.getPlatform() == Midlet.PLATFORM_ME4SE;
-        MAX_CLOSE_BUTTONS = Midlet.getPlatform() == Midlet.PLATFORM_ME4SE;
-        IPHONE_SCROLL = Midlet.getPlatform() != Midlet.PLATFORM_ME4SE;
+        SOFT_KEYS = platform != Midlet.PLATFORM_ME4SE && platform != Midlet.PLATFORM_ANDROID && platform != Midlet.PLATFORM_IOS && platform != Midlet.PLATFORM_BLACKBERRY;
+        HIDDEN_MENU = platform == Midlet.PLATFORM_ANDROID || platform == Midlet.PLATFORM_BLACKBERRY;
+        HIDDEN_BACK = platform == Midlet.PLATFORM_ANDROID || platform == Midlet.PLATFORM_BLACKBERRY;
 
-        QWERTY_KAYPAD = Midlet.getPlatform() == Midlet.PLATFORM_ME4SE || Midlet.getPlatform() == Midlet.PLATFORM_ANDROID || (Midlet.getPlatform() == Midlet.PLATFORM_BLACKBERRY && !KeyEvent.BLACKBERRY_ITUT);
+        VERY_BIG_SCREEN = platform == Midlet.PLATFORM_ME4SE;
+        MAX_CLOSE_BUTTONS = platform == Midlet.PLATFORM_ME4SE;
+        IPHONE_SCROLL = platform != Midlet.PLATFORM_ME4SE;
 
-        USE_SOFT_KEY_CLEAR = Midlet.getPlatform() == Midlet.PLATFORM_NOKIA_S40;
-        GRID_MENU = Midlet.getPlatform() == Midlet.PLATFORM_ANDROID;
+        QWERTY_KAYPAD = platform == Midlet.PLATFORM_ME4SE || platform == Midlet.PLATFORM_ANDROID || platform == Midlet.PLATFORM_IOS || (platform == Midlet.PLATFORM_BLACKBERRY && !KeyEvent.BLACKBERRY_ITUT);
 
+        USE_SOFT_KEY_CLEAR = platform == Midlet.PLATFORM_NOKIA_S40;
+        GRID_MENU = platform == Midlet.PLATFORM_ANDROID;
+
         desktop = this;
 
         background = back;

Modified: SwingME/src/net/yura/mobile/gui/Midlet.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/Midlet.java	2021-06-23 12:22:40 UTC (rev 2470)
+++ SwingME/src/net/yura/mobile/gui/Midlet.java	2021-06-23 14:11:07 UTC (rev 2471)
@@ -47,6 +47,7 @@
     public static final int PLATFORM_WTK = 9;
     public static final int PLATFORM_ANDROID = 10;
     public static final int PLATFORM_BLACKBERRY = 11;
+    public static final int PLATFORM_IOS = 12;
 
     private static int platform = detectPlatform();
 
@@ -136,8 +137,13 @@
             currentPlatform = ""; // Avoid null pointer exceptions
         }
 
+        // detect ios before android as it has a few android classes in it
+        if (hasClass("apple.uikit.UIView")) {
+            return PLATFORM_IOS;
+        }
+
         // detecting Android BEFORE Nokia platform as Nokia X is both android+nokia
-        if (hasClass("android.app.Activity")) {
+        if (hasClass("android.app.Activity")) { // or android.content.Context ?
             return PLATFORM_ANDROID;
         }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2470] iOSME/src/javax/microedition/lcdui/ Graphics.java

[<yu...@us...>]

Revision: 2470
          http://sourceforge.net/p/swingme/code/2470
Author:   yuranet
Date:     2021-06-23 12:22:40 +0000 (Wed, 23 Jun 2021)
Log Message:
-----------
clipping fixed

Modified Paths:
--------------
    iOSME/src/javax/microedition/lcdui/Graphics.java

Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java	2021-06-23 11:41:23 UTC (rev 2469)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java	2021-06-23 12:22:40 UTC (rev 2470)
@@ -112,8 +112,10 @@
     private CGRect getClipBounds() {
         if (dirtyClip) {
             clipBounds = CoreGraphics.CGContextGetClipBoundingBox(context);
-            clipBounds.origin().setX(clipBounds.origin().x() - tx);
-            clipBounds.origin().setY(clipBounds.origin().y() - ty);
+            // WARNING!! for some really strange reason this does not work!??!
+            //clipBounds.origin().setX(clipBounds.origin().x() - tx);
+            //clipBounds.origin().setY(clipBounds.origin().y() - ty);
+            clipBounds.setOrigin(new CGPoint(clipBounds.origin().x() - tx, clipBounds.origin().y() - ty));
             dirtyClip = false;
         }
         return clipBounds;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2469] iOSME/src/javax/microedition/lcdui/ Graphics.java

[<yu...@us...>]

Revision: 2469
          http://sourceforge.net/p/swingme/code/2469
Author:   yuranet
Date:     2021-06-23 11:41:23 +0000 (Wed, 23 Jun 2021)
Log Message:
-----------
slightly better clipping

Modified Paths:
--------------
    iOSME/src/javax/microedition/lcdui/Graphics.java

Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java	2021-06-23 10:56:56 UTC (rev 2468)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java	2021-06-23 11:41:23 UTC (rev 2469)
@@ -82,6 +82,17 @@
         return ty;
     }
 
+    public void setClip(int x, int y, int w, int h) {
+        CoreGraphics.CGContextResetClip(context);
+        CoreGraphics.CGContextClipToRect(context, getRect(x, y, w, h));
+        dirtyClip = true;
+    }
+
+    public void clipRect(int x, int y, int w, int h) {
+        CoreGraphics.CGContextClipToRect(context, getRect(x, y, w, h));
+        dirtyClip = true;
+    }
+
     public int getClipX() {
         return (int)getClipBounds().origin().x();
     }
@@ -98,17 +109,41 @@
         return (int)getClipBounds().size().height();
     }
 
-    public void clipRect(int x, int y, int w, int h) {
-        CoreGraphics.CGContextClipToRect(context, new CGRect(new CGPoint(tx+x, ty+y), new CGSize(w, h)));
-        dirtyClip = true;
+    private CGRect getClipBounds() {
+        if (dirtyClip) {
+            clipBounds = CoreGraphics.CGContextGetClipBoundingBox(context);
+            clipBounds.origin().setX(clipBounds.origin().x() - tx);
+            clipBounds.origin().setY(clipBounds.origin().y() - ty);
+            dirtyClip = false;
+        }
+        return clipBounds;
     }
 
-    public void setClip(int x, int y, int w, int h) {
-        CoreGraphics.CGContextRestoreGState(context);
-        CoreGraphics.CGContextSaveGState(context);
-        clipRect(x, y, w, h);
+    public void setStrokeStyle(int stroke) {
+        this.stroke = stroke;
     }
 
+    public int getStrokeStyle() {
+        return stroke;
+    }
+
+    public void setStrokeWidth(int i) {
+        CoreGraphics.CGContextSetLineWidth(context, i);
+    }
+
+    public int getStrokeWidth() {
+        // TODO keep local var for this
+        throw new UnsupportedOperationException();
+        //return (int) paint.getStrokeWidth();
+    }
+
+    public void setColor(int color) {
+        this.color = getColor(color);
+        CGColorRef cgColorRef = this.color.CGColor();
+        CoreGraphics.CGContextSetStrokeColorWithColor(context, cgColorRef);
+        CoreGraphics.CGContextSetFillColorWithColor(context, cgColorRef);
+    }
+
     public int getColor() {
         NFloatPtr alpha = PtrFactory.newNFloatReference();
         NFloatPtr red = PtrFactory.newNFloatReference();
@@ -132,13 +167,19 @@
         return UIColor.colorWithRedGreenBlueAlpha(red, green, blue, alpha);
     }
 
-    public void setColor(int color) {
-        this.color = getColor(color);
-        CGColorRef cgColorRef = this.color.CGColor();
-        CoreGraphics.CGContextSetStrokeColorWithColor(context, cgColorRef);
-        CoreGraphics.CGContextSetFillColorWithColor(context, cgColorRef);
+    public void scale(double sx, double sy) {
+        CoreGraphics.CGContextTranslateCTM(context, tx, ty);
+        CoreGraphics.CGContextScaleCTM(context, sx, sy);
+        CoreGraphics.CGContextTranslateCTM(context, - tx * sx, - ty * sy);
+
+        dirtyClip = true;
     }
 
+    public void setColorMatrix(ColorMatrix cm) {
+        throw new UnsupportedOperationException();
+        //paint.setColorFilter( cm==null?null:new ColorMatrixColorFilter(cm) );
+    }
+
     public void drawImage(javax.microedition.lcdui.Image image, int x, int y, int anchor) {
 
         if (anchor == 0) {
@@ -175,17 +216,6 @@
     }
 
     public void drawLine(int x1, int y1, int x2, int y2) {
-        if (x1 > x2) {
-            x1++;
-        } else {
-            x2++;
-        }
-        if (y1 > y2) {
-            y1++;
-        } else {
-            y2++;
-        }
-
         CoreGraphics.CGContextMoveToPoint(context, tx+x1, ty+y1); //start at this point
         CoreGraphics.CGContextAddLineToPoint(context, tx+x2, ty+y2); //draw to this point
         CoreGraphics.CGContextStrokePath(context); // and now draw the Path!
@@ -502,19 +532,7 @@
         canvas.restore();
     }
 */
-    public void setColorMatrix(ColorMatrix cm) {
-        throw new UnsupportedOperationException();
-        //paint.setColorFilter( cm==null?null:new ColorMatrixColorFilter(cm) );
-    }
 
-    public void setStrokeStyle(int stroke) {
-        this.stroke = stroke;
-    }
-
-    public int getStrokeStyle() {
-        return stroke;
-    }
-
     public void fillTriangle(int x1, int y1, int x2, int y2, int x3, int y3) {
         CoreGraphics.CGContextSetLineWidth(context, 1.0);
         CoreGraphics.CGContextMoveToPoint(context, tx+x1, ty+y1);
@@ -556,32 +574,4 @@
         //paint.setAlpha(a);
         throw new UnsupportedOperationException();
     }
-
-    public void scale(double sx, double sy) {
-        CoreGraphics.CGContextTranslateCTM(context, tx, ty);
-        CoreGraphics.CGContextScaleCTM(context, sx, sy);
-        CoreGraphics.CGContextTranslateCTM(context, - tx * sx, - ty * sy);
-
-        dirtyClip = true;
-    }
-
-    private CGRect getClipBounds() {
-        if (dirtyClip) {
-            clipBounds = CoreGraphics.CGContextGetClipBoundingBox(context);
-            clipBounds.origin().setX(clipBounds.origin().x() - tx);
-            clipBounds.origin().setY(clipBounds.origin().y() - ty);
-            dirtyClip = false;
-        }
-        return clipBounds;
-    }
-
-    public int getStrokeWidth() {
-        // TODO keep local var for this
-        throw new UnsupportedOperationException();
-        //return (int) paint.getStrokeWidth();
-    }
-
-    public void setStrokeWidth(int i) {
-        CoreGraphics.CGContextSetLineWidth(context, i);
-    }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2468] iOSME/src/javax/microedition/lcdui/ Graphics.java

[<yu...@us...>]

Revision: 2468
          http://sourceforge.net/p/swingme/code/2468
Author:   yuranet
Date:     2021-06-23 10:56:56 +0000 (Wed, 23 Jun 2021)
Log Message:
-----------
arcs work

Modified Paths:
--------------
    iOSME/src/javax/microedition/lcdui/Graphics.java

Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java	2021-06-23 10:24:47 UTC (rev 2467)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java	2021-06-23 10:56:56 UTC (rev 2468)
@@ -68,6 +68,20 @@
         dirtyClip = true;
     }
 
+    public void translate(int x, int y) {
+        tx += x;
+        ty += y;
+        dirtyClip = true;
+    }
+
+    public int getTranslateX() {
+        return tx;
+    }
+
+    public int getTranslateY() {
+        return ty;
+    }
+
     public int getClipX() {
         return (int)getClipBounds().origin().x();
     }
@@ -84,6 +98,17 @@
         return (int)getClipBounds().size().height();
     }
 
+    public void clipRect(int x, int y, int w, int h) {
+        CoreGraphics.CGContextClipToRect(context, new CGRect(new CGPoint(tx+x, ty+y), new CGSize(w, h)));
+        dirtyClip = true;
+    }
+
+    public void setClip(int x, int y, int w, int h) {
+        CoreGraphics.CGContextRestoreGState(context);
+        CoreGraphics.CGContextSaveGState(context);
+        clipRect(x, y, w, h);
+    }
+
     public int getColor() {
         NFloatPtr alpha = PtrFactory.newNFloatReference();
         NFloatPtr red = PtrFactory.newNFloatReference();
@@ -276,63 +301,38 @@
         //}
     }
 
-    public void clipRect(int x, int y, int w, int h) {
-        CoreGraphics.CGContextClipToRect(context, new CGRect(new CGPoint(tx+x, ty+y), new CGSize(w, h)));
-        dirtyClip = true;
-    }
+    public void drawArc(int x, int y, int width, int height, int startAngle, int arcAngle) {
+        CGPoint center = new CGPoint(tx + x + width / 2, ty + y + height / 2);
 
-    public void setClip(int x, int y, int w, int h) {
-        CoreGraphics.CGContextRestoreGState(context);
         CoreGraphics.CGContextSaveGState(context);
-        clipRect(x, y, w, h);
-    }
 
-    public void fillArc(int x, int y, int width, int height, int startAngle, int arcAngle) {
-/*
-        CGContextSaveGState(theCGContext);
-        CGPoint center = CGPointMake(x + width / 2.0, y + height / 2.0);
-        UIBezierPath* clip = [UIBezierPath bezierPathWithArcCenter:center
-                                                            radius:max(width, height)
-                                                        startAngle:startAngle
-                                                          endAngle:endAngle
-                                                         clockwise:YES];
-        [clip addLineToPoint:center];
-        [clip closePath];
-        [clip addClip];
+        UIBezierPath clip = UIBezierPath.bezierPathWithArcCenterRadiusStartAngleEndAngleClockwise(center, Math.max(width / 2, height/ 2), startAngle, arcAngle, true);
+        clip.addLineToPoint(center);
+        clip.closePath();
+        clip.addClip();
 
-        UIBezierPath *arc = [UIBezierPath bezierPathWithOvalInRect:CGRectMake(x, y, width, height)];
-        [[UIColor blackColor] setStroke];
-        [arc stroke];
+        UIBezierPath bezierPath = UIBezierPath.bezierPathWithOvalInRect(getRect(x, y, width, height));
+        CoreGraphics.CGContextAddPath(context, bezierPath.CGPath());
+        CoreGraphics.CGContextStrokePath(context);
 
-        CGContextRestoreGState(theCGContext);
- */
-
-        //paint.setStyle(Paint.Style.FILL);
-        //RectF rect = new RectF(tx+x, ty+y, tx+x + width, ty+y + height);
-        //canvas.drawArc(rect, startAngle, arcAngle, false, paint);
-        throw new UnsupportedOperationException();
+        CoreGraphics.CGContextRestoreGState(context);
     }
 
-    public void translate(int x, int y) {
-        tx += x;
-        ty += y;
-        dirtyClip = true;
-    }
+    public void fillArc(int x, int y, int width, int height, int startAngle, int arcAngle) {
+        CGPoint center = new CGPoint(tx + x + width / 2, ty + y + height / 2);
 
-    public int getTranslateX() {
-        return tx;
-    }
+        CoreGraphics.CGContextSaveGState(context);
 
-    public int getTranslateY() {
-        return ty;
-    }
+        UIBezierPath clip = UIBezierPath.bezierPathWithArcCenterRadiusStartAngleEndAngleClockwise(center, Math.max(width / 2, height/ 2), startAngle, arcAngle, true);
+        clip.addLineToPoint(center);
+        clip.closePath();
+        clip.addClip();
 
-    public void drawArc(int x, int y, int width, int height, int startAngle,
-            int arcAngle) {
-        //paint.setStyle(Paint.Style.STROKE);
-        //RectF rect = new RectF(tx+x, ty+y, tx+x + width, ty+y + height);
-        //canvas.drawArc(rect, startAngle, arcAngle, false, paint);
-        throw new UnsupportedOperationException();
+        UIBezierPath bezierPath = UIBezierPath.bezierPathWithOvalInRect(getRect(x, y, width, height));
+        CoreGraphics.CGContextAddPath(context, bezierPath.CGPath());
+        CoreGraphics.CGContextFillPath(context);
+
+        CoreGraphics.CGContextRestoreGState(context);
     }
 
     public void drawChar(char character, int x, int y, int anchor) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2467] iOSME/src/javax/microedition/lcdui

[<yu...@us...>]

Revision: 2467
          http://sourceforge.net/p/swingme/code/2467
Author:   yuranet
Date:     2021-06-23 10:24:47 +0000 (Wed, 23 Jun 2021)
Log Message:
-----------
fix startup and repaint not working

Modified Paths:
--------------
    iOSME/src/javax/microedition/lcdui/Canvas.java
    iOSME/src/javax/microedition/lcdui/Graphics.java

Modified: iOSME/src/javax/microedition/lcdui/Canvas.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Canvas.java	2021-06-22 20:23:37 UTC (rev 2466)
+++ iOSME/src/javax/microedition/lcdui/Canvas.java	2021-06-23 10:24:47 UTC (rev 2467)
@@ -5,6 +5,8 @@
 import apple.coregraphics.struct.CGPoint;
 import apple.coregraphics.struct.CGRect;
 import apple.coregraphics.struct.CGSize;
+import apple.foundation.NSOperationQueue;
+import apple.foundation.NSThread;
 import apple.uikit.UIView;
 
 public abstract class Canvas extends Displayable {
@@ -123,13 +125,38 @@
 
     public void repaint(int x, int y, int w, int h) {
         CGRect rect = new CGRect(new CGPoint(x, y), new CGSize(w, h));
-        canvasView.setNeedsDisplayInRect(rect);
+        // we can only ever call setNeedsDisplay from main thread or it does nothing
+        if (NSThread.isMainThread_static()) {
+            canvasView.setNeedsDisplayInRect(rect);
+        }
+        else {
+            NSOperationQueue.mainQueue().addOperationWithBlock(new NSOperationQueue.Block_addOperationWithBlock() {
+                @Override
+                public void call_addOperationWithBlock() {
+                    canvasView.setNeedsDisplayInRect(rect);
+                }
+            });
+        }
     }
 
     public void repaint() {
+        // we can only ever call setNeedsDisplay from main thread or it does nothing
         if (canvasView != null) {
-            canvasView.setNeedsDisplay();
+            if (NSThread.isMainThread_static()) {
+                canvasView.setNeedsDisplay();
+            }
+            else {
+                NSOperationQueue.mainQueue().addOperationWithBlock(new NSOperationQueue.Block_addOperationWithBlock() {
+                    @Override
+                    public void call_addOperationWithBlock() {
+                        canvasView.setNeedsDisplay();
+                    }
+                });
+            }
         }
+        else {
+            System.out.println("WARN repaint called when canvasView is " + canvasView);
+        }
     }
 
     protected void keyPressed(int keyCode) {

Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java	2021-06-22 20:23:37 UTC (rev 2466)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java	2021-06-23 10:24:47 UTC (rev 2467)
@@ -254,6 +254,7 @@
             attributes.put(UIKit.NSFontAttributeName(), font.font);
             attributes.put(UIKit.NSForegroundColorAttributeName(), color);
 
+            // https://developer.apple.com/library/archive/documentation/StringsTextFonts/Conceptual/CoreText_Programming/Overview/Overview.html
             NSAttributedString attributedString = NSAttributedString.alloc().initWithStringAttributes(str, attributes);
             CTLineRef line = CoreText.CTLineCreateWithAttributedString(ObjCRuntime.cast(attributedString, CFAttributedStringRef.class));
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2466] SwingMETest/ios

[<yu...@us...>]

Revision: 2466
          http://sourceforge.net/p/swingme/code/2466
Author:   yuranet
Date:     2021-06-22 20:23:37 +0000 (Tue, 22 Jun 2021)
Log Message:
-----------
launching works on ios

Modified Paths:
--------------
    SwingMETest/ios/xcode/SwingMEDemo/Info.plist

Added Paths:
-----------
    SwingMETest/ios/proguard.append.cfg
    SwingMETest/ios/src/main/resources/

Added: SwingMETest/ios/proguard.append.cfg
===================================================================
--- SwingMETest/ios/proguard.append.cfg	                        (rev 0)
+++ SwingMETest/ios/proguard.append.cfg	2021-06-22 20:23:37 UTC (rev 2466)
@@ -0,0 +1,3 @@
+
+-keep class net.yura.mobile.test.MyMidlet { *; }
+

Modified: SwingMETest/ios/xcode/SwingMEDemo/Info.plist
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Info.plist	2021-06-22 20:04:15 UTC (rev 2465)
+++ SwingMETest/ios/xcode/SwingMEDemo/Info.plist	2021-06-22 20:23:37 UTC (rev 2466)
@@ -27,7 +27,9 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MOE.Main.Class</key>
-	<string>org.moe.samples.planets.ios.Main</string>
+	<string>net.yura.ios.SwingMEiOSApplication</string>
+	<key>SwingME.Main.Class</key>
+	<string>net.yura.mobile.test.MyMidlet</string>
 	<key>UIApplicationExitsOnSuspend</key>
 	<false/>
 	<key>UILaunchStoryboardName</key>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2465] iOSME/src

[<yu...@us...>]

Revision: 2465
          http://sourceforge.net/p/swingme/code/2465
Author:   yuranet
Date:     2021-06-22 20:04:15 +0000 (Tue, 22 Jun 2021)
Log Message:
-----------
basic touch events work

Modified Paths:
--------------
    iOSME/src/javax/microedition/lcdui/Canvas.java
    iOSME/src/net/yura/ios/CanvasView.java

Modified: iOSME/src/javax/microedition/lcdui/Canvas.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Canvas.java	2021-06-22 19:44:48 UTC (rev 2464)
+++ iOSME/src/javax/microedition/lcdui/Canvas.java	2021-06-22 20:04:15 UTC (rev 2465)
@@ -165,6 +165,18 @@
 
     }
 
+    public void firePointerPressed(int x, int y) {
+        pointerPressed(x, y);
+    }
+
+    public void firePointerReleased(int x, int y) {
+        pointerReleased(x, y);
+    }
+
+    public void firePointerDragged(int x, int y) {
+        pointerDragged(x, y);
+    }
+
     // Multi-touch. Not available in MIDP
     public void multitouchEvent(int[] type, int[] x, int[] y) {
 

Modified: iOSME/src/net/yura/ios/CanvasView.java
===================================================================
--- iOSME/src/net/yura/ios/CanvasView.java	2021-06-22 19:44:48 UTC (rev 2464)
+++ iOSME/src/net/yura/ios/CanvasView.java	2021-06-22 20:04:15 UTC (rev 2465)
@@ -6,8 +6,11 @@
 import apple.coregraphics.struct.CGPoint;
 import apple.coregraphics.struct.CGRect;
 import apple.coregraphics.struct.CGSize;
+import apple.foundation.NSSet;
 import apple.uikit.UIBezierPath;
 import apple.uikit.UIColor;
+import apple.uikit.UIEvent;
+import apple.uikit.UITouch;
 import apple.uikit.UIView;
 import apple.uikit.c.UIKit;
 
@@ -72,8 +75,40 @@
         canvas.doPaint(graphics);
     }
 
+    @Override
+    public void touchesBeganWithEvent(NSSet<? extends UITouch> touches, UIEvent event) {
+        super.touchesBeganWithEvent(touches, event);
 
-        /*
+        UITouch touch = touches.anyObject();
+
+        CGPoint point = touch.locationInView(this);
+
+        canvas.firePointerPressed((int)point.x(), (int)point.y());
+    }
+
+    @Override
+    public void touchesEndedWithEvent(NSSet<? extends UITouch> touches, UIEvent event) {
+        super.touchesEndedWithEvent(touches, event);
+
+        UITouch touch = touches.anyObject();
+
+        CGPoint point = touch.locationInView(this);
+
+        canvas.firePointerReleased((int)point.x(), (int)point.y());
+    }
+
+    @Override
+    public void touchesMovedWithEvent(NSSet<? extends UITouch> touches, UIEvent event) {
+        super.touchesMovedWithEvent(touches, event);
+
+        UITouch touch = touches.anyObject();
+
+        CGPoint point = touch.locationInView(this);
+
+        canvas.firePointerDragged((int)point.x(), (int)point.y());
+    }
+
+    /*
         @Override
         public boolean onKeyDown(int keyCode, KeyEvent event) {
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2464] iOSME/src/javax/microedition/lcdui/ Graphics.java

[<yu...@us...>]

Revision: 2464
          http://sourceforge.net/p/swingme/code/2464
Author:   yuranet
Date:     2021-06-22 19:44:48 +0000 (Tue, 22 Jun 2021)
Log Message:
-----------
font are right way round now

Modified Paths:
--------------
    iOSME/src/javax/microedition/lcdui/Graphics.java

Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java	2021-06-22 18:54:03 UTC (rev 2463)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java	2021-06-22 19:44:48 UTC (rev 2464)
@@ -218,11 +218,12 @@
             anchor = javax.microedition.lcdui.Graphics.TOP | javax.microedition.lcdui.Graphics.LEFT;
         }
 
+        // https://www.cocoanetics.com/2010/02/understanding-uifont/
         if ((anchor & javax.microedition.lcdui.Graphics.TOP) != 0) {
-            newy -= 0;
+            newy += font.font.ascender(); // is positive
         }
         else if ((anchor & javax.microedition.lcdui.Graphics.BOTTOM) != 0) {
-            newy -= font.getHeight();
+            newy += font.font.descender(); // is negative
         }
 
         if ((anchor & javax.microedition.lcdui.Graphics.HCENTER) != 0) {
@@ -242,6 +243,7 @@
             //CoreFoundation.CFRelease(attributedStringRef);
             //CoreFoundation.CFRelease(stringRef);
 
+            // this does not require pissing about with TextMatrix, maybe i should use this
             //UIKit.UIGraphicsPushContext(context);
             //NSString string = NSString.stringWithString(str);
             //string.drawAtPointWithAttributes(new CGPoint(tx + newx, ty + newy), font.getAsNSDictionary());
@@ -255,9 +257,12 @@
             NSAttributedString attributedString = NSAttributedString.alloc().initWithStringAttributes(str, attributes);
             CTLineRef line = CoreText.CTLineCreateWithAttributedString(ObjCRuntime.cast(attributedString, CFAttributedStringRef.class));
 
+            // https://blog.spacemanlabs.com/2011/08/quick-tip-drawing-core-text-right-side-up/
+            CoreGraphics.CGContextSetTextMatrix(context, CoreGraphics.CGAffineTransformMakeScale(1.0f, -1.0f));
             CoreGraphics.CGContextSetTextPosition(context, tx + newx, ty + newy);
             CoreText.CTLineDraw(line, context);
 
+            CoreGraphics.CGContextSetTextMatrix(context, CoreGraphics.CGAffineTransformIdentity());
             CoreFoundation.CFRelease(line);
         //}
         //else {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2463] iOSME/src

[<yu...@us...>]

Revision: 2463
          http://sourceforge.net/p/swingme/code/2463
Author:   yuranet
Date:     2021-06-22 18:54:03 +0000 (Tue, 22 Jun 2021)
Log Message:
-----------
getColor works

Modified Paths:
--------------
    iOSME/src/javax/microedition/lcdui/Graphics.java
    iOSME/src/net/yura/ios/SwingMEiOSApplication.java

Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java	2021-06-22 16:17:29 UTC (rev 2462)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java	2021-06-22 18:54:03 UTC (rev 2463)
@@ -6,7 +6,6 @@
 import apple.coregraphics.opaque.CGColorRef;
 import apple.coregraphics.opaque.CGContextRef;
 import apple.coregraphics.opaque.CGFontRef;
-import apple.coregraphics.struct.CGAffineTransform;
 import apple.coregraphics.struct.CGPoint;
 import apple.coregraphics.struct.CGRect;
 import apple.coregraphics.struct.CGSize;
@@ -13,7 +12,7 @@
 import apple.coretext.c.CoreText;
 import apple.coretext.opaque.CTLineRef;
 import apple.foundation.NSAttributedString;
-import apple.foundation.NSString;
+import apple.foundation.NSMutableDictionary;
 import apple.uikit.UIBezierPath;
 import apple.uikit.UIColor;
 import apple.uikit.c.UIKit;
@@ -20,6 +19,8 @@
 import apple.uikit.enums.UIRectCorner;
 import javax.microedition.lcdui.game.Sprite;
 import android.graphics.ColorMatrix;
+import org.moe.natj.general.ptr.NFloatPtr;
+import org.moe.natj.general.ptr.impl.PtrFactory;
 import org.moe.natj.objc.ObjCRuntime;
 
 public class Graphics {
@@ -35,6 +36,7 @@
 
     private CGContextRef context;
     private Font font = Font.getDefaultFont();
+    private UIColor color;
 
     private int tx, ty;
     private int stroke;
@@ -83,9 +85,18 @@
     }
 
     public int getColor() {
-        //return paint.getColor();
-        // TODO keep local var
-        throw new UnsupportedOperationException();
+        NFloatPtr alpha = PtrFactory.newNFloatReference();
+        NFloatPtr red = PtrFactory.newNFloatReference();
+        NFloatPtr green = PtrFactory.newNFloatReference();
+        NFloatPtr blue = PtrFactory.newNFloatReference();
+        if (color.getRedGreenBlueAlpha(red, green, blue, alpha)) {
+            int r = (int)Math.round(255 * red.getValue());
+            int g = (int)Math.round(255 * green.getValue());
+            int b = (int)Math.round(255 * blue.getValue());
+            int a = (int)Math.round(255 * alpha.getValue());
+            return ((a << 24) & 0xFF000000) | ((r << 16) & 0x00FF0000) | ((g << 8) & 0x0000FF00) | (b & 0x000000FF);
+        }
+        throw new IllegalStateException("color not in RGB format");
     }
 
     public static UIColor getColor(int argb) {
@@ -97,10 +108,10 @@
     }
 
     public void setColor(int color) {
-        CGColorRef cgColorRef = getColor(color).CGColor();
+        this.color = getColor(color);
+        CGColorRef cgColorRef = this.color.CGColor();
         CoreGraphics.CGContextSetStrokeColorWithColor(context, cgColorRef);
         CoreGraphics.CGContextSetFillColorWithColor(context, cgColorRef);
-
     }
 
     public void drawImage(javax.microedition.lcdui.Image image, int x, int y, int anchor) {
@@ -236,7 +247,12 @@
             //string.drawAtPointWithAttributes(new CGPoint(tx + newx, ty + newy), font.getAsNSDictionary());
             //UIKit.UIGraphicsPopContext();
 
-            NSAttributedString attributedString = NSAttributedString.alloc().initWithStringAttributes(str, font.getAsNSDictionary());
+
+            NSMutableDictionary attributes = NSMutableDictionary.dictionaryWithCapacity(2);
+            attributes.put(UIKit.NSFontAttributeName(), font.font);
+            attributes.put(UIKit.NSForegroundColorAttributeName(), color);
+
+            NSAttributedString attributedString = NSAttributedString.alloc().initWithStringAttributes(str, attributes);
             CTLineRef line = CoreText.CTLineCreateWithAttributedString(ObjCRuntime.cast(attributedString, CFAttributedStringRef.class));
 
             CoreGraphics.CGContextSetTextPosition(context, tx + newx, ty + newy);

Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java	2021-06-22 16:17:29 UTC (rev 2462)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java	2021-06-22 18:54:03 UTC (rev 2463)
@@ -71,6 +71,7 @@
 
         UIScreen screen = UIScreen.mainScreen();
 
+        //CGRect statusBar = application.statusBarFrame();
         CGRect bounds = screen.bounds();
         window = UIWindow.alloc().initWithFrame(bounds);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2462] iOSME/src/javax/microedition/lcdui

[<yu...@us...>]

Revision: 2462
          http://sourceforge.net/p/swingme/code/2462
Author:   yuranet
Date:     2021-06-22 16:17:29 +0000 (Tue, 22 Jun 2021)
Log Message:
-----------
fonts draw

Modified Paths:
--------------
    iOSME/src/javax/microedition/lcdui/Font.java
    iOSME/src/javax/microedition/lcdui/Graphics.java

Modified: iOSME/src/javax/microedition/lcdui/Font.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Font.java	2021-06-22 14:47:05 UTC (rev 2461)
+++ iOSME/src/javax/microedition/lcdui/Font.java	2021-06-22 16:17:29 UTC (rev 2462)
@@ -1,6 +1,7 @@
 package javax.microedition.lcdui;
 
 import java.util.Hashtable;
+import java.util.Map;
 import apple.coregraphics.struct.CGSize;
 import apple.foundation.NSDictionary;
 import apple.foundation.NSString;
@@ -28,7 +29,7 @@
 
 	private static Font[] fontsBySpecifier = { DEFAULT_FONT, DEFAULT_FONT };
 
-	private static Hashtable fonts = new Hashtable();
+	private static Map<String, Font> fonts = new Hashtable();
 
 	private int face;
 
@@ -176,11 +177,14 @@
         }
 
 		NSString string = NSString.stringWithString(str);
-		NSDictionary attributes = NSDictionary.dictionaryWithObjectForKey(font, UIKit.NSFontAttributeName());
-		CGSize size = string.sizeWithAttributes(attributes);
+		CGSize size = string.sizeWithAttributes(getAsNSDictionary());
 		return (int)size.width();
 	}
 
+	public NSDictionary<String, ?> getAsNSDictionary() {
+		return (NSDictionary<String, ?>)NSDictionary.dictionaryWithObjectForKey(font, UIKit.NSFontAttributeName());
+	}
+
 	public int substringWidth(String str, int offset, int len) {
 		return stringWidth(str.substring(offset, offset + len));
 	}

Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java	2021-06-22 14:47:05 UTC (rev 2461)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java	2021-06-22 16:17:29 UTC (rev 2462)
@@ -6,6 +6,7 @@
 import apple.coregraphics.opaque.CGColorRef;
 import apple.coregraphics.opaque.CGContextRef;
 import apple.coregraphics.opaque.CGFontRef;
+import apple.coregraphics.struct.CGAffineTransform;
 import apple.coregraphics.struct.CGPoint;
 import apple.coregraphics.struct.CGRect;
 import apple.coregraphics.struct.CGSize;
@@ -12,6 +13,7 @@
 import apple.coretext.c.CoreText;
 import apple.coretext.opaque.CTLineRef;
 import apple.foundation.NSAttributedString;
+import apple.foundation.NSString;
 import apple.uikit.UIBezierPath;
 import apple.uikit.UIColor;
 import apple.uikit.c.UIKit;
@@ -32,7 +34,7 @@
     public static final int VCENTER  = 2;
 
     private CGContextRef context;
-    private Font font;
+    private Font font = Font.getDefaultFont();
 
     private int tx, ty;
     private int stroke;
@@ -204,50 +206,52 @@
         if (anchor == 0) {
             anchor = javax.microedition.lcdui.Graphics.TOP | javax.microedition.lcdui.Graphics.LEFT;
         }
-/*
 
         if ((anchor & javax.microedition.lcdui.Graphics.TOP) != 0) {
-            newy -= androidFont.getFontMetricsInt().ascent;
+            newy -= 0;
         }
         else if ((anchor & javax.microedition.lcdui.Graphics.BOTTOM) != 0) {
-            newy -= androidFont.getFontMetricsInt().descent;
+            newy -= font.getHeight();
         }
 
         if ((anchor & javax.microedition.lcdui.Graphics.HCENTER) != 0) {
-            newx -= paintFont.measureText(str) / 2;
+            newx -= font.stringWidth(str) / 2;
         }
         else if ((anchor & javax.microedition.lcdui.Graphics.RIGHT) != 0) {
-            newx -= paintFont.measureText(str);
+            newx -= font.stringWidth(str);
         }
 
-        if (str.indexOf('\n')<0) {
-            canvas.drawText(str, tx+newx, ty+newy, paintFont);
-        }
-        else {
-            String[] lines = str.split("\n");
-            int yp = ty+newy;
-            for (int c=0;c<lines.length;c++) {
-        	canvas.drawText(lines[c], tx+newx, yp, paintFont);
-        	yp = yp + font.getHeight();
-            }
-        }
-*/
-        // not sure if its possible to do it this way
-        //CFStringRef stringRef = CoreFoundation.CFStringCreateWithCString(CoreFoundation.kCFAllocatorDefault(), str, CFStringBuiltInEncodings.UTF8);
-        //CFAttributedStringRef attributedStringRef = CoreFoundation.CFAttributedStringCreate(CoreFoundation.kCFAllocatorDefault(), stringRef, null);
-        //CTLineRef line = CoreText.CTLineCreateWithAttributedString(attributedStringRef);
-        // then draw string
-        //CoreFoundation.CFRelease(attributedStringRef);
-        //CoreFoundation.CFRelease(stringRef);
+        //if (str.indexOf('\n')<0) {
 
+            // not sure if its possible to do it this way
+            //CFStringRef stringRef = CoreFoundation.CFStringCreateWithCString(CoreFoundation.kCFAllocatorDefault(), str, CFStringBuiltInEncodings.UTF8);
+            //CFAttributedStringRef attributedStringRef = CoreFoundation.CFAttributedStringCreate(CoreFoundation.kCFAllocatorDefault(), stringRef, dict with font);
+            //CTLineRef line = CoreText.CTLineCreateWithAttributedString(attributedStringRef);
+            // then draw string
+            //CoreFoundation.CFRelease(attributedStringRef);
+            //CoreFoundation.CFRelease(stringRef);
 
-        NSAttributedString attributedString = NSAttributedString.alloc().initWithString(str);
-        CTLineRef line = CoreText.CTLineCreateWithAttributedString(ObjCRuntime.cast(attributedString, CFAttributedStringRef.class));
+            //UIKit.UIGraphicsPushContext(context);
+            //NSString string = NSString.stringWithString(str);
+            //string.drawAtPointWithAttributes(new CGPoint(tx + newx, ty + newy), font.getAsNSDictionary());
+            //UIKit.UIGraphicsPopContext();
 
-        CoreGraphics.CGContextSetTextPosition(context, newx, newy);
-        CoreText.CTLineDraw(line, context);
+            NSAttributedString attributedString = NSAttributedString.alloc().initWithStringAttributes(str, font.getAsNSDictionary());
+            CTLineRef line = CoreText.CTLineCreateWithAttributedString(ObjCRuntime.cast(attributedString, CFAttributedStringRef.class));
 
-        CoreFoundation.CFRelease(line);
+            CoreGraphics.CGContextSetTextPosition(context, tx + newx, ty + newy);
+            CoreText.CTLineDraw(line, context);
+
+            CoreFoundation.CFRelease(line);
+        //}
+        //else {
+        //    String[] lines = str.split("\n");
+        //    int yp = ty+newy;
+        //    for (int c=0;c<lines.length;c++) {
+        //        canvas.drawText(lines[c], tx+newx, yp, paintFont);
+        //        yp = yp + font.getHeight();
+        //    }
+        //}
     }
 
     public void clipRect(int x, int y, int w, int h) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2461] iOSME/src

[<yu...@us...>]

Revision: 2461
          http://sourceforge.net/p/swingme/code/2461
Author:   yuranet
Date:     2021-06-22 14:47:05 +0000 (Tue, 22 Jun 2021)
Log Message:
-----------
painting rects works

Modified Paths:
--------------
    iOSME/src/javax/microedition/lcdui/Graphics.java
    iOSME/src/net/yura/ios/AppController.java
    iOSME/src/net/yura/ios/CanvasView.java
    iOSME/src/net/yura/ios/SwingMEiOSApplication.java

Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java	2021-06-22 10:33:32 UTC (rev 2460)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java	2021-06-22 14:47:05 UTC (rev 2461)
@@ -12,8 +12,10 @@
 import apple.coretext.c.CoreText;
 import apple.coretext.opaque.CTLineRef;
 import apple.foundation.NSAttributedString;
+import apple.uikit.UIBezierPath;
 import apple.uikit.UIColor;
 import apple.uikit.c.UIKit;
+import apple.uikit.enums.UIRectCorner;
 import javax.microedition.lcdui.game.Sprite;
 import android.graphics.ColorMatrix;
 import org.moe.natj.objc.ObjCRuntime;
@@ -39,6 +41,10 @@
     private CGRect clipBounds = new CGRect();
     private boolean dirtyClip = true;
 
+    public Graphics() {
+
+    }
+
     public Graphics(CGContextRef ctx) {
         context = ctx;
     }
@@ -47,6 +53,11 @@
         return context;
     }
 
+    public void setContext(CGContextRef context) {
+        this.context = context;
+        reset();
+    }
+
     public void reset() {
         tx = 0;
         ty = 0;
@@ -90,20 +101,6 @@
 
     }
 
-    public void fillRect(int x, int y, int width, int height) {
-        CGRect rectangle = new CGRect(new CGPoint(tx + x, ty + y), new CGSize(width, height));
-        CoreGraphics.CGContextAddRect(context, rectangle);
-        //CoreGraphics.CGContextSetFillColorWithColor(context, getColor(getColor()).CGColor());
-        CoreGraphics.CGContextFillPath(context);
-    }
-
-    public void fillRoundRect(int x, int y, int width, int height, int rx,
-            int ry) {
-        //paint.setStyle(Paint.Style.FILL);
-        //canvas.drawRoundRect(new RectF(tx+x, ty+y, tx+x + width, ty+y + height), rx, y, paint);
-        throw new UnsupportedOperationException();
-    }
-
     public void drawImage(javax.microedition.lcdui.Image image, int x, int y, int anchor) {
 
         if (anchor == 0) {
@@ -156,19 +153,36 @@
         CoreGraphics.CGContextStrokePath(context); // and now draw the Path!
     }
 
+    private CGRect getRect(int x, int y, int width, int height) {
+        return new CGRect(new CGPoint(tx + x, ty + y), new CGSize(width, height));
+    }
+
     public void drawRect(int x, int y, int width, int height) {
-        CGRect rectangle = new CGRect(new CGPoint(tx + x, ty + y), new CGSize(width, height));
+        CGRect rectangle = getRect(x, y, width, height);
         CoreGraphics.CGContextAddRect(context, rectangle);
         CoreGraphics.CGContextStrokePath(context);
     }
 
-    public void drawRoundRect(int x, int y, int width, int height, int rx,
-            int ry) {
-        //paint.setStyle(Paint.Style.STROKE);
-        //canvas.drawRoundRect(new RectF(tx+x, ty+y, tx+x + width, ty+y + height), rx, ry, paint);
-        throw new UnsupportedOperationException();
+    public void drawRoundRect(int x, int y, int width, int height, int rx, int ry) {
+        CGRect rectangle = getRect(x, y, width, height);
+        UIBezierPath bezierPath = UIBezierPath.bezierPathWithRoundedRectByRoundingCornersCornerRadii(rectangle, UIRectCorner.AllCorners, new CGSize(rx, ry));
+        CoreGraphics.CGContextAddPath(context, bezierPath.CGPath());
+        CoreGraphics.CGContextStrokePath(context);
     }
 
+    public void fillRect(int x, int y, int width, int height) {
+        CGRect rectangle = getRect(x, y, width, height);
+        CoreGraphics.CGContextAddRect(context, rectangle);
+        CoreGraphics.CGContextFillPath(context);
+    }
+
+    public void fillRoundRect(int x, int y, int width, int height, int rx, int ry) {
+        CGRect rectangle = getRect(x, y, width, height);
+        UIBezierPath bezierPath = UIBezierPath.bezierPathWithRoundedRectByRoundingCornersCornerRadii(rectangle, UIRectCorner.AllCorners, new CGSize(rx, ry));
+        CoreGraphics.CGContextAddPath(context, bezierPath.CGPath());
+        CoreGraphics.CGContextFillPath(context);
+    }
+
     public Font getFont() {
         return font;
     }
@@ -176,6 +190,9 @@
     public void setFont(Font font) {
         // Use ObjCRuntime.cast or CRuntime.cast to cast between c types and oc types
         // https://www.noisyfox.io/moe-native-types.html
+        if (font == null) {
+            font = Font.getDefaultFont();
+        }
         CoreGraphics.CGContextSetFont(context, ObjCRuntime.cast(font.font, CGFontRef.class));
         this.font = font;
     }
@@ -479,7 +496,6 @@
         CoreGraphics.CGContextAddLineToPoint(context, tx+x3, ty+y3);
         CoreGraphics.CGContextAddLineToPoint(context, tx+x1, ty+y1);
         CoreGraphics.CGContextClosePath(context);
-        CoreGraphics.CGContextSetFillColorWithColor(context, getColor(getColor()).CGColor());
         CoreGraphics.CGContextFillPath(context);
     }
 
@@ -527,7 +543,7 @@
         if (dirtyClip) {
             clipBounds = CoreGraphics.CGContextGetClipBoundingBox(context);
             clipBounds.origin().setX(clipBounds.origin().x() - tx);
-            clipBounds.origin().setY(clipBounds.origin().y() - tx);
+            clipBounds.origin().setY(clipBounds.origin().y() - ty);
             dirtyClip = false;
         }
         return clipBounds;

Modified: iOSME/src/net/yura/ios/AppController.java
===================================================================
--- iOSME/src/net/yura/ios/AppController.java	2021-06-22 10:33:32 UTC (rev 2460)
+++ iOSME/src/net/yura/ios/AppController.java	2021-06-22 14:47:05 UTC (rev 2461)
@@ -31,9 +31,6 @@
     public void viewDidLoad() {
         super.viewDidLoad();
 
-        // TODO remove title
-        setTitle("SwingME App");
-
         // TODO is this needed?
         view().setBackgroundColor(UIColor.whiteColor());
 

Modified: iOSME/src/net/yura/ios/CanvasView.java
===================================================================
--- iOSME/src/net/yura/ios/CanvasView.java	2021-06-22 10:33:32 UTC (rev 2460)
+++ iOSME/src/net/yura/ios/CanvasView.java	2021-06-22 14:47:05 UTC (rev 2461)
@@ -30,28 +30,28 @@
     }
 
     private Canvas canvas;
+    private Graphics graphics = new Graphics();
     private double width, height;
 
     public void setCanvas(Canvas canvas) {
         this.canvas = canvas;
+        setNeedsDisplay();
     }
 
     @Override
     public void drawRect(CGRect rect) {
-        UIColor.blackColor().set();
-        UIBezierPath.bezierPathWithRect(this.bounds()).fill();
+        //UIColor.blackColor().set();
+        //UIBezierPath.bezierPathWithRect(this.bounds()).fill();
 
-        UIColor.orangeColor().set();
+        //if (canvas == null) {
+            UIColor.orangeColor().set();
+            CGPoint cgPoint = new CGPoint(100, 100);
+            UIBezierPath.bezierPathWithArcCenterRadiusStartAngleEndAngleClockwise(cgPoint, 10, 0, 2 * Math.PI, true).fill();
+        //}
 
-        CGPoint cgPoint = new CGPoint(20, 20);
-        UIBezierPath.bezierPathWithArcCenterRadiusStartAngleEndAngleClockwise(cgPoint, 10, 0, 2 * Math.PI, true).fill();
-
-
         CGRect bounds = bounds();
         CGSize size = bounds.size();
 
-        Graphics graphics = new Graphics(UIKit.UIGraphicsGetCurrentContext());
-
         // Check for size changes...
         if (width != size.width() || height != size.height()) {
 
@@ -66,14 +66,9 @@
 
             width = size.width();
             height = size.height();
-
         }
 
-        // in case there was a error in the last paint, we HAVE to call reset here to reset the tx and ty
-        graphics.reset(); // reset to the last save, i.e. when the setCanvas was called
-
-        graphics.clipRect((int)rect.origin().x(), (int)rect.origin().y(), (int)rect.size().width(), (int)rect.size().height());
-
+        graphics.setContext(UIKit.UIGraphicsGetCurrentContext());
         canvas.doPaint(graphics);
     }
 

Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java	2021-06-22 10:33:32 UTC (rev 2460)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java	2021-06-22 14:47:05 UTC (rev 2461)
@@ -66,7 +66,7 @@
     public boolean applicationDidFinishLaunchingWithOptions(UIApplication application, NSDictionary launchOptions) {
         UIViewController vc = AppController.alloc().init();
         UINavigationController navigationController = UINavigationController.alloc().init();
-
+        navigationController.setNavigationBarHidden(true);
         navigationController.initWithRootViewController(vc);
 
         UIScreen screen = UIScreen.mainScreen();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2460] iOSME/src

[<yu...@us...>]

Revision: 2460
          http://sourceforge.net/p/swingme/code/2460
Author:   yuranet
Date:     2021-06-22 10:33:32 +0000 (Tue, 22 Jun 2021)
Log Message:
-----------
get main class from plist

Modified Paths:
--------------
    iOSME/src/javax/microedition/lcdui/Display.java
    iOSME/src/javax/microedition/midlet/MIDlet.java
    iOSME/src/net/yura/ios/BundleConnection.java
    iOSME/src/net/yura/ios/SwingMEiOSApplication.java

Modified: iOSME/src/javax/microedition/lcdui/Display.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Display.java	2021-06-21 18:08:33 UTC (rev 2459)
+++ iOSME/src/javax/microedition/lcdui/Display.java	2021-06-22 10:33:32 UTC (rev 2460)
@@ -200,8 +200,12 @@
         });
     }
 
-    public void vibrate(int duration) {
+    /**
+     * @return true if the vibrator can be controlled by the application and this display is in the foreground, false otherwise
+     */
+    public boolean vibrate(int duration) {
         // TODO vibrate
+        return true;
     }
 
     public void flashBacklight(int duration) {

Modified: iOSME/src/javax/microedition/midlet/MIDlet.java
===================================================================
--- iOSME/src/javax/microedition/midlet/MIDlet.java	2021-06-21 18:08:33 UTC (rev 2459)
+++ iOSME/src/javax/microedition/midlet/MIDlet.java	2021-06-22 10:33:32 UTC (rev 2460)
@@ -4,6 +4,8 @@
 import java.util.Properties;
 import javax.microedition.io.ConnectionNotFoundException;
 
+import apple.uikit.UIApplication;
+
 public abstract class MIDlet {
     public static final String PROTOCOL_HTTP = "http://";
     public static final String PROTOCOL_HTTPS = "https://";
@@ -166,6 +168,7 @@
             }
             else {
                 // TODO handle opening Urls
+                //UIApplication.openURL()
             }
         } catch (Throwable e) {
             //#debug debug

Modified: iOSME/src/net/yura/ios/BundleConnection.java
===================================================================
--- iOSME/src/net/yura/ios/BundleConnection.java	2021-06-21 18:08:33 UTC (rev 2459)
+++ iOSME/src/net/yura/ios/BundleConnection.java	2021-06-22 10:33:32 UTC (rev 2460)
@@ -109,15 +109,20 @@
         return path.lastModified();
     }
 
+    /**
+     * @return hidden files are not returned, Directories are denoted with a trailing slash "/" in their returned name.
+     */
     @Override
     public Enumeration list() throws IOException {
         String[] list = path.list();
+        // TODO add trailing "/" to directories
+        // TODO do not return hidden files
         return Collections.enumeration(Arrays.asList(list));
     }
 
     @Override
     public Enumeration list(String filter, boolean includeHidden) throws IOException {
-        return null;
+        throw new UnsupportedOperationException();
     }
 
     @Override

Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java	2021-06-21 18:08:33 UTC (rev 2459)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java	2021-06-22 10:33:32 UTC (rev 2460)
@@ -11,6 +11,7 @@
 import apple.NSObject;
 import apple.coregraphics.struct.CGRect;
 import apple.foundation.NSArray;
+import apple.foundation.NSBundle;
 import apple.foundation.NSDictionary;
 import apple.foundation.c.Foundation;
 import apple.foundation.enums.NSSearchPathDirectory;
@@ -79,8 +80,15 @@
 
         setupSystemProperties();
 
-        startSwingMEApp("net.yura.domination.mobile.flashgui.DominationMain");
+        NSBundle mainBundle = NSBundle.mainBundle();
+        String mainClass = (String)mainBundle.objectForInfoDictionaryKey("SwingME.Main.Class");
 
+        if (mainClass == null) {
+            throw new IllegalStateException("'SwingME.Main.Class' not set in app 'info.plist'");
+        }
+
+        startSwingMEApp(mainClass);
+
         return true;
     }
 
@@ -88,9 +96,14 @@
 
         NSArray paths = Foundation.NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory.DocumentDirectory, NSSearchPathDomainMask.UserDomainMask, true);
         String documentsDirectory = (String)paths.objectAtIndex(0);
-
         System.setProperty("user.home", documentsDirectory);
 
+        NSBundle mainBundle = NSBundle.mainBundle();
+        String versionName = (String)mainBundle.objectForInfoDictionaryKey("CFBundleShortVersionString");
+        String versionCode = (String)mainBundle.objectForInfoDictionaryKey("CFBundleVersion");
+        System.setProperty("versionName", versionName);
+        System.setProperty("versionCode", versionCode);
+
         //System.out.println("user.home=" + System.getProperty("user.home"));
     }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2459] SwingMETest

[<yu...@us...>]

Revision: 2459
          http://sourceforge.net/p/swingme/code/2459
Author:   yuranet
Date:     2021-06-21 18:08:33 +0000 (Mon, 21 Jun 2021)
Log Message:
-----------
ios SwingMETest demo added

Modified Paths:
--------------
    SwingMETest/build.gradle
    SwingMETest/settings.gradle

Added Paths:
-----------
    SwingMETest/android/
    SwingMETest/android/AndroidManifest.xml
    SwingMETest/android/assets/
    SwingMETest/android/build.gradle
    SwingMETest/android/res/
    SwingMETest/ios/
    SwingMETest/ios/build.gradle
    SwingMETest/ios/src/
    SwingMETest/ios/src/main/
    SwingMETest/ios/src/main/java/
    SwingMETest/ios/xcode/
    SwingMETest/ios/xcode/SwingMEDemo/
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Contents.json
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-1.png
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-10.png
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-11.png
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-12.png
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-2.png
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-3.png
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-4.png
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-5.png
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-6.png
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-7.png
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-8.png
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-9.png
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76.png
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ico...@2x...
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/Contents.json
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/MOELogo.imageset/
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/MOELogo.imageset/Contents.json
    SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/MOELogo.imageset/moe-logo-200x200.png
    SwingMETest/ios/xcode/SwingMEDemo/Info.plist
    SwingMETest/ios/xcode/SwingMEDemo/LaunchScreen.storyboard
    SwingMETest/ios/xcode/SwingMEDemo/main.cpp
    SwingMETest/ios/xcode/SwingMEDemo-Test/
    SwingMETest/ios/xcode/SwingMEDemo-Test/Info.plist
    SwingMETest/ios/xcode/SwingMEDemo-Test/main.cpp
    SwingMETest/ios/xcode/SwingMEDemo.xcodeproj/
    SwingMETest/ios/xcode/SwingMEDemo.xcodeproj/project.pbxproj

Removed Paths:
-------------
    SwingMETest/AndroidManifest.xml
    SwingMETest/assets/
    SwingMETest/res/

Deleted: SwingMETest/AndroidManifest.xml
===================================================================
--- SwingMETest/AndroidManifest.xml	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/AndroidManifest.xml	2021-06-21 18:08:33 UTC (rev 2459)
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="net.yura.mobile.test"
-      android:versionCode="1"
-      android:versionName="1.0">
-
-    <uses-sdk android:targetSdkVersion="30" />
-
-    <uses-feature android:name="android.hardware.camera" android:required="false" />
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> 
-    <uses-permission android:name="android.permission.SEND_SMS" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
-    <instrumentation
-        android:name="android.test.InstrumentationTestRunner"
-        android:targetPackage="net.yura.mobile.test" />
-
-    <application
-        android:name="net.yura.android.AndroidMeApp"
-        android:debuggable="true"
-        android:hardwareAccelerated="true"
-        android:icon="@drawable/icon"
-        android:label="@string/app_name"
-        android:theme="@style/AndroidME"
-        android:usesCleartextTraffic="true">
-        <activity android:name="net.yura.android.AndroidMeActivity"
-                  android:launchMode="singleTask"
-                  android:label="@string/app_name"
-                  android:windowSoftInputMode="adjustResize|stateHidden"
-                  android:configChanges="orientation|keyboard|keyboardHidden|screenLayout|uiMode|screenSize|smallestScreenSize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name="net.yura.android.TestTimePickerActivity" 
-                  android:theme="@style/Dialog"
-        />
-
-	<activity android:name="net.yura.android.datepicker.CalendarPickerActivity" android:configChanges="orientation|keyboard|keyboardHidden" android:windowSoftInputMode="stateHidden" android:theme="@style/Dialog"/>
-
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <!--
-    can use this when you dont want to make difference assets for different resolutions
-    <supports-screens android:anyDensity="false"/>
-    THIS DOES NOT WORK IF hardwareAccelerated=true!!!!
-    -->
-
-</manifest>

Index: SwingMETest/android
===================================================================
--- SwingMETest/android	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/android	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/android
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+build
+android.iml
Copied: SwingMETest/android/AndroidManifest.xml (from rev 2458, SwingMETest/AndroidManifest.xml)
===================================================================
--- SwingMETest/android/AndroidManifest.xml	                        (rev 0)
+++ SwingMETest/android/AndroidManifest.xml	2021-06-21 18:08:33 UTC (rev 2459)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="net.yura.mobile.test"
+      android:versionCode="1"
+      android:versionName="1.0">
+
+    <uses-sdk android:targetSdkVersion="30" />
+
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> 
+    <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <instrumentation
+        android:name="android.test.InstrumentationTestRunner"
+        android:targetPackage="net.yura.mobile.test" />
+
+    <application
+        android:name="net.yura.android.AndroidMeApp"
+        android:debuggable="true"
+        android:hardwareAccelerated="true"
+        android:icon="@drawable/icon"
+        android:label="@string/app_name"
+        android:theme="@style/AndroidME"
+        android:usesCleartextTraffic="true">
+        <activity android:name="net.yura.android.AndroidMeActivity"
+                  android:launchMode="singleTask"
+                  android:label="@string/app_name"
+                  android:windowSoftInputMode="adjustResize|stateHidden"
+                  android:configChanges="orientation|keyboard|keyboardHidden|screenLayout|uiMode|screenSize|smallestScreenSize">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name="net.yura.android.TestTimePickerActivity" 
+                  android:theme="@style/Dialog"
+        />
+
+	<activity android:name="net.yura.android.datepicker.CalendarPickerActivity" android:configChanges="orientation|keyboard|keyboardHidden" android:windowSoftInputMode="stateHidden" android:theme="@style/Dialog"/>
+
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <!--
+    can use this when you dont want to make difference assets for different resolutions
+    <supports-screens android:anyDensity="false"/>
+    THIS DOES NOT WORK IF hardwareAccelerated=true!!!!
+    -->
+
+</manifest>

Added: SwingMETest/android/build.gradle
===================================================================
--- SwingMETest/android/build.gradle	                        (rev 0)
+++ SwingMETest/android/build.gradle	2021-06-21 18:08:33 UTC (rev 2459)
@@ -0,0 +1,29 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileOptions.encoding = 'cp1252'
+    compileSdkVersion 23
+    buildToolsVersion '27.0.3'
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['../test', '../../AndroidME/src_Test']
+            resources.srcDirs = []
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
+    }
+    // this is to avoid the @TargetApi missing on methods giving errors.
+    lintOptions {
+        abortOnError false
+    }
+    defaultConfig {
+        minSdkVersion 4
+    }
+}
+
+dependencies {
+    implementation rootProject
+    implementation project(':AndroidME')
+}

Modified: SwingMETest/build.gradle
===================================================================
--- SwingMETest/build.gradle	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/build.gradle	2021-06-21 18:08:33 UTC (rev 2459)
@@ -1,50 +1,50 @@
-allprojects {
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
     repositories {
         mavenCentral()
         jcenter()
         google()
     }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.3.3'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
 }
 
-buildscript {
+allprojects {
     repositories {
         mavenCentral()
         jcenter()
         google()
     }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.3'
-    }
 }
 
-apply plugin: 'com.android.application'
 
-dependencies {
-    implementation project(':AndroidME')
+apply plugin: 'java-library'
+
+compileJava {
+    targetCompatibility = 1.7
+    sourceCompatibility = 1.7
+    options.encoding = "cp1252"
 }
 
-android {
-    compileOptions.encoding = 'cp1252'
-    compileSdkVersion 23
-    buildToolsVersion '27.0.3'
-
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src', '../AndroidME/src_Test', 'test']
-            resources.srcDirs = ['resources']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
+sourceSets {
+    main {
+        java {
+            srcDirs = ['src']
         }
+        resources {
+            srcDirs = ['resources']
+        }
     }
-    // this is to avoid the @TargetApi missing on methods giving errors.
-    lintOptions {
-        abortOnError false
-    }
-    defaultConfig {
-        minSdkVersion 4
-    }
 }
 
+dependencies {
+    implementation project(":SwingME")
 
+    // these are needed for compile only, the actual versions used are specific to android/ios
+    compileOnly fileTree(dir: 'lib', include: ['midletrunner.jar', 'opt.jar'])
+}

Index: SwingMETest/ios
===================================================================
--- SwingMETest/ios	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+build
+ios.iml
Added: SwingMETest/ios/build.gradle
===================================================================
--- SwingMETest/ios/build.gradle	                        (rev 0)
+++ SwingMETest/ios/build.gradle	2021-06-21 18:08:33 UTC (rev 2459)
@@ -0,0 +1,39 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenLocal()
+    }
+    dependencies {
+        // Multi-OS Engine plugin
+        classpath group: 'org.multi-os-engine', name: 'moe-gradle', version: '1.7.+'
+    }
+}
+
+// Apply plugins
+apply plugin: 'moe'
+
+// Set source and target to Java 8
+sourceCompatibility = "1.8"
+targetCompatibility = "1.8"
+
+// Set maven repository
+repositories {
+    jcenter()
+}
+
+// Exclude all files from Gradle's test runner
+test { exclude '**' }
+
+// Setup Multi-OS Engine
+moe {
+    xcode {
+        project 'xcode/SwingMEDemo.xcodeproj'
+        mainTarget 'SwingMEDemo'
+        testTarget 'SwingMEDemo-Test'
+    }
+}
+
+dependencies {
+    implementation rootProject
+    implementation project(":iOSME")
+}

Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Contents.json
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Contents.json	                        (rev 0)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Contents.json	2021-06-21 18:08:33 UTC (rev 2459)
@@ -0,0 +1,174 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "Icon-76-3.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Icon-76-2.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Icon-76-5.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Icon-76-10.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Icon-76-11.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Icon-76-6.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "57x57"
+    },
+    {
+      "filename" : "Ic...@2x...",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "57x57"
+    },
+    {
+      "filename" : "Ic...@2x...",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Icon-76-7.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Icon-76-8.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "50x50"
+    },
+    {
+      "filename" : "Ic...@2x...",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "50x50"
+    },
+    {
+      "filename" : "Icon-76-9.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "72x72"
+    },
+    {
+      "filename" : "Ic...@2x...",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "72x72"
+    },
+    {
+      "filename" : "Icon-76-1.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "Ic...@2x...",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "Ico...@2x...",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    },
+    {
+      "filename" : "Icon-76.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "29x29",
+      "unassigned" : true
+    },
+    {
+      "filename" : "Icon-76-4.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29",
+      "unassigned" : true
+    },
+    {
+      "filename" : "Icon-76-12.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40",
+      "unassigned" : true
+    },
+    {
+      "filename" : "Ic...@2x...",
+      "unassigned" : true
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-1.png
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-1.png
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-1.png	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-1.png	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-1.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-10.png
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-10.png
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-10.png	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-10.png	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-10.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-11.png
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-11.png
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-11.png	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-11.png	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-11.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-12.png
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-12.png
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-12.png	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-12.png	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-12.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-2.png
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-2.png
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-2.png	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-2.png	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-2.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-3.png
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-3.png
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-3.png	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-3.png	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-3.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-4.png
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-4.png
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-4.png	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-4.png	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-4.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-5.png
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-5.png
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-5.png	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-5.png	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-5.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-6.png
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-6.png
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-6.png	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-6.png	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-6.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-7.png
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-7.png
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-7.png	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-7.png	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-7.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-8.png
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-8.png
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-8.png	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-8.png	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-8.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-9.png
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-9.png
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-9.png	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-9.png	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76-9.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76.png
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76.png
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76.png	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76.png	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Icon-76.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ic...@2x...
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ico...@2x...
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ico...@2x...
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ico...@2x...	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ico...@2x...	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/AppIcon.appiconset/Ico...@2x...
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/Contents.json
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/Contents.json	                        (rev 0)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/Contents.json	2021-06-21 18:08:33 UTC (rev 2459)
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/MOELogo.imageset/Contents.json
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/MOELogo.imageset/Contents.json	                        (rev 0)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/MOELogo.imageset/Contents.json	2021-06-21 18:08:33 UTC (rev 2459)
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "moe-logo-200x200.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Added: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/MOELogo.imageset/moe-logo-200x200.png
===================================================================
(Binary files differ)

Index: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/MOELogo.imageset/moe-logo-200x200.png
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/MOELogo.imageset/moe-logo-200x200.png	2021-06-16 13:13:55 UTC (rev 2458)
+++ SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/MOELogo.imageset/moe-logo-200x200.png	2021-06-21 18:08:33 UTC (rev 2459)

Property changes on: SwingMETest/ios/xcode/SwingMEDemo/Assets.xcassets/MOELogo.imageset/moe-logo-200x200.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: SwingMETest/ios/xcode/SwingMEDemo/Info.plist
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/Info.plist	                        (rev 0)
+++ SwingMETest/ios/xcode/SwingMEDemo/Info.plist	2021-06-21 18:08:33 UTC (rev 2459)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIcons</key>
+	<dict/>
+	<key>CFBundleIcons~ipad</key>
+	<dict/>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>MOE.Main.Class</key>
+	<string>org.moe.samples.planets.ios.Main</string>
+	<key>UIApplicationExitsOnSuspend</key>
+	<false/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UIRequiresFullScreen</key>
+	<true/>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>

Added: SwingMETest/ios/xcode/SwingMEDemo/LaunchScreen.storyboard
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/LaunchScreen.storyboard	                        (rev 0)
+++ SwingMETest/ios/xcode/SwingMEDemo/LaunchScreen.storyboard	2021-06-21 18:08:33 UTC (rev 2459)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina4_0" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
+                        <viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="MOELogo" translatesAutoresizingMaskIntoConstraints="NO" id="sZB-Rr-ZbP">
+                                <rect key="frame" x="110" y="234" width="100" height="100"/>
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="sZB-Rr-ZbP" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="Vur-cH-QNl"/>
+                            <constraint firstItem="sZB-Rr-ZbP" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="iCJ-od-YMr"/>
+                        </constraints>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="165" y="166"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="MOELogo" width="100" height="100"/>
+    </resources>
+</document>

Added: SwingMETest/ios/xcode/SwingMEDemo/main.cpp
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo/main.cpp	                        (rev 0)
+++ SwingMETest/ios/xcode/SwingMEDemo/main.cpp	2021-06-21 18:08:33 UTC (rev 2459)
@@ -0,0 +1,5 @@
+#include <MOE/MOE.h>
+
+int main(int argc, char *argv[]) {
+    return moevm(argc, argv);
+}

Added: SwingMETest/ios/xcode/SwingMEDemo-Test/Info.plist
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo-Test/Info.plist	                        (rev 0)
+++ SwingMETest/ios/xcode/SwingMEDemo-Test/Info.plist	2021-06-21 18:08:33 UTC (rev 2459)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>MOE.Main.Class</key>
+	<string>org.moe.mdt.junit.MoeRemoteTestRunner</string>
+	<key>UIApplicationExitsOnSuspend</key>
+	<false/>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UIRequiresFullScreen</key>
+	<true/>
+</dict>
+</plist>

Added: SwingMETest/ios/xcode/SwingMEDemo-Test/main.cpp
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo-Test/main.cpp	                        (rev 0)
+++ SwingMETest/ios/xcode/SwingMEDemo-Test/main.cpp	2021-06-21 18:08:33 UTC (rev 2459)
@@ -0,0 +1,5 @@
+#include <MOE/MOE.h>
+
+int main(int argc, char *argv[]) {
+    return moevm(argc, argv);
+}

Added: SwingMETest/ios/xcode/SwingMEDemo.xcodeproj/project.pbxproj
===================================================================
--- SwingMETest/ios/xcode/SwingMEDemo.xcodeproj/project.pbxproj	                        (rev 0)
+++ SwingMETest/ios/xcode/SwingMEDemo.xcodeproj/project.pbxproj	2021-06-21 18:08:33 UTC (rev 2459)
@@ -0,0 +1,560 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		1EB428300B74058219B2CC6F /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC4876D3960503C5F9FA285C /* main.cpp */; };
+		3BA71D9CB0A3A28438105777 /* moe-main-interfaces.m in Sources */ = {isa = PBXBuildFile; fileRef = 1EB08A0C79A9F530D95B3E8B /* moe-main-interfaces.m */; };
+		583D44871E40B4910048FF77 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 583D44861E40B4910048FF77 /* main.cpp */; };
+		583D448A1E40B4B90048FF77 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 583D44881E40B4B90048FF77 /* Assets.xcassets */; };
+		583D448B1E40B4B90048FF77 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 583D44891E40B4B90048FF77 /* LaunchScreen.storyboard */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		059D4793969FAA098EC55C20 /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		94EE0C6F67F900F4BD78BB4C /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		196A02442E4F584ABA797266 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = "SwingMEDemo-Test/Info.plist"; sourceTree = SOURCE_ROOT; };
+		1EB08A0C79A9F530D95B3E8B /* moe-main-interfaces.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = "moe-main-interfaces.m"; path = "../build/moe/main/ui-headers/moe-main-interfaces.m"; sourceTree = "<group>"; };
+		484E50E912C53A6976896EA4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = SwingMEDemo/Info.plist; sourceTree = SOURCE_ROOT; };
+		583D44861E40B4910048FF77 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
+		583D44881E40B4B90048FF77 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		583D44891E40B4B90048FF77 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
+		9793DC7BCA03B1F0E1B02782 /* SwingMEDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwingMEDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		B7A3E898974177A2A2F0C417 /* SwingMEDemo-Test.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "SwingMEDemo-Test.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		DC4876D3960503C5F9FA285C /* main.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		A2BC52023A389D56ABDD2BFB /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		AB93DBBFAE3DF58FA576FA39 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		11236C66490972FB1EA3F4E7 /* Multi-OS Engine */ = {
+			isa = PBXGroup;
+			children = (
+				1EB08A0C79A9F530D95B3E8B /* moe-main-interfaces.m */,
+			);
+			name = "Multi-OS Engine";
+			sourceTree = "<group>";
+		};
+		235E336D9FBC6ED908F4C9C7 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Frameworks;
+			sourceTree = "<group>";
+		};
+		24D12A0CC041D52E8DD7E2AC = {
+			isa = PBXGroup;
+			children = (
+				4D85E57E486ED51FA34DE305 /* SwingMEDemo */,
+				73D1721AB6220D74E351DD53 /* SwingMEDemo-Test */,
+				235E336D9FBC6ED908F4C9C7 /* Frameworks */,
+				ADBAFA50E5D6822524142090 /* Products */,
+				11236C66490972FB1EA3F4E7 /* Multi-OS Engine */,
+			);
+			sourceTree = "<group>";
+		};
+		41917924B290C9C6B97F1709 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				583D44861E40B4910048FF77 /* main.cpp */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+		4D85E57E486ED51FA34DE305 /* SwingMEDemo */ = {
+			isa = PBXGroup;
+			children = (
+				484E50E912C53A6976896EA4 /* Info.plist */,
+				583D44881E40B4B90048FF77 /* Assets.xcassets */,
+				583D44891E40B4B90048FF77 /* LaunchScreen.storyboard */,
+				7EA67FDFC4E01224F187EAA7 /* Supporting Files */,
+			);
+			path = SwingMEDemo;
+			sourceTree = "<group>";
+		};
+		73D1721AB6220D74E351DD53 /* SwingMEDemo-Test */ = {
+			isa = PBXGroup;
+			children = (
+				196A02442E4F584ABA797266 /* Info.plist */,
+				41917924B290C9C6B97F1709 /* Supporting Files */,
+			);
+			path = "SwingMEDemo-Test";
+			sourceTree = "<group>";
+		};
+		7EA67FDFC4E01224F187EAA7 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				DC4876D3960503C5F9FA285C /* main.cpp */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+		ADBAFA50E5D6822524142090 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				9793DC7BCA03B1F0E1B02782 /* SwingMEDemo.app */,
+				B7A3E898974177A2A2F0C417 /* SwingMEDemo-Test.app */,
+			);
+			path = Products;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		088AE52DA4AF76BC466B1DD6 /* SwingMEDemo-Test */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 0DBD5A82988E65115A8497AF /* Build configuration list for PBXNativeTarget "SwingMEDemo-Test" */;
+			buildPhases = (
+				DC94886E502D79B018836015 /* Compile Sources (MOE) */,
+				AB93DBBFAE3DF58FA576FA39 /* Frameworks */,
+				E3FE32E080B0915B1F64142E /* Resources */,
+				97BD55B7DE8D3BE0ACFBE05E /* Sources */,
+				94EE0C6F67F900F4BD78BB4C /* Embed Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "SwingMEDemo-Test";
+			productName = "SwingMEDemo-Test";
+			productReference = B7A3E898974177A2A2F0C417 /* SwingMEDemo-Test.app */;
+			productType = "com.apple.product-type.application";
+		};
+		1FD253CDC4B80AD0B7CECF92 /* SwingMEDemo */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = DA9CF15504AD1A14A9232F71 /* Build configuration list for PBXNativeTarget "SwingMEDemo" */;
+			buildPhases = (
+				4241AE1906862286C246DE16 /* Compile Sources (MOE) */,
+				A2BC52023A389D56ABDD2BFB /* Frameworks */,
+				B839CFB9915E7C1F867A9156 /* Resources */,
+				18E494547B5B55FA84151043 /* Sources */,
+				059D4793969FAA098EC55C20 /* Embed Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = SwingMEDemo;
+			productName = SwingMEDemo;
+			productReference = 9793DC7BCA03B1F0E1B02782 /* SwingMEDemo.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		97E567E2EAE1A23C1C0DA17B /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0820;
+				ORGANIZATIONNAME = "My Company";
+			};
+			buildConfigurationList = EE1B76AC2D4C44432A7FA818 /* Build configuration list for PBXProject "SwingMEDemo" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				English,
+				en,
+				Base,
+			);
+			mainGroup = 24D12A0CC041D52E8DD7E2AC;
+			productRefGroup = ADBAFA50E5D6822524142090 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				1FD253CDC4B80AD0B7CECF92 /* SwingMEDemo */,
+				088AE52DA4AF76BC466B1DD6 /* SwingMEDemo-Test */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		B839CFB9915E7C1F867A9156 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				583D448A1E40B4B90048FF77 /* Assets.xcassets in Resources */,
+				583D448B1E40B4B90048FF77 /* LaunchScreen.storyboard in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		E3FE32E080B0915B1F64142E /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		4241AE1906862286C246DE16 /* Compile Sources (MOE) */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Compile Sources (MOE)";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/bash;
+			shellScript = "set -e\n\nexport MOE_BUILD_SOURCE_SET=\"main\"\n\n# Check project directory\nif [ ! -d \"$MOE_PROJECT_DIR\" ]; then\n    echo \"$0:$LINENO:1: error: 'MOE_PROJECT_DIR' doesn't point to a directory!\"; exit 1;\nfi\ncd \"$MOE_PROJECT_DIR\"\n\n# Export JAVA_HOME\nexport JAVA_HOME=$(/usr/libexec/java_home -v 1.8)\n\n# Utility function for finding the Gradle implementation\nfunction findGradle {\n    CD=\"$PWD\"\n    while [ \"$CD\" != \"\" ]; do\n        echo \"Looking for gradlew in $CD\"\n        if [ -x \"$CD/gradlew\" ]; then\n            GRADLE_EXEC=$CD/gradlew\n            return 0\n        fi\n        CD=\"${CD%/*}\"\n    done\n\n    echo \"Checking with 'which'\"\n    GRADLE_EXEC=$(which 'gradle')\n\n    if [ \"$GRADLE_EXEC\" = \"\" ]; then\n        echo \"Failed to locate 'gradle' executable!\"\n        exit 1\n    fi\n}\n\n# Build project with Gradle\nif [ -z \"$MOE_GRADLE_EXTERNAL_BUILD\" ]; then\n    findGradle\n    \"$GRADLE_EXEC\" --no-daemon moeXcodeInternal -s\nfi\n\n# Check output directory\nif [ ! -d \"${MOE_PROJECT_BUILD_DIR}\" ]; then\n    echo \"$0:$LINENO:1: error: 'MOE_PROJECT_BUILD_DIR' doesn't point to a directory!\"; exit 1;\nfi\n\n# Copy some resources\nmkdir -p \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\"\ncp \"${MOE_PROJECT_BUILD_DIR}/moe/${MOE_BUILD_SOURCE_SET}/application.jar\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\"\ncp \"${MOE_PROJECT_BUILD_DIR}/moe/${MOE_BUILD_SOURCE_SET}/preregister.txt\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\"\nif [ \"${MOE_BUILD_SOURCE_SET}\" == \"test\" ]; then\n    cp \"${MOE_PROJECT_BUILD_DIR}/moe/${MOE_BUILD_SOURCE_SET}/classlist.txt\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\"\nfi\n\n# Copy android CA certificates on demand\nif [ \"${MOE_COPY_ANDROID_CACERTS}\" == \"YES\" ]; then\n    rm -rf \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/android_root/etc/security/cacerts\"\n    mkdir -p \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/android_root/etc/security/cacerts\"\n    unzip \"${MOE_SDK_PATH}/sdk/moe-core-certificates.zip\" -d \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/android_root/etc/security/cacerts\"\nfi\n\n# Copy and sign MOE framework\nrsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \\\n    \"${MOE_FRAMEWORK_PATH}/MOE.framework\" \"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/\"\nif [ \"${VALID_ARCHS}\" == \"arm64\" ] || [ \"${VALID_ARCHS}\" == \"x86_64\" ]; then\n    if [ \"${PLATFORM_NAME}\" == \"iphonesimulator\" ]; then\n        lipo -thin x86_64 -output \"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MOE.framework/MOE\" \"${MOE_FRAMEWORK_PATH}/MOE.framework/MOE\"\n    else\n        lipo -thin arm64 -output \"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MOE.framework/MOE\" \"${MOE_FRAMEWORK_PATH}/MOE.framework/MOE\"\n    fi\nfi\nif [ -n \"${EXPANDED_CODE_SIGN_IDENTITY}\" -a \"${CODE_SIGNING_REQUIRED}\" != \"NO\" -a \"${CODE_SIGNING_ALLOWED}\" != \"NO\" ]; then\n    /usr/bin/codesign --force --sign $EXPANDED_CODE_SIGN_IDENTITY $OTHER_CODE_SIGN_FLAGS \\\n        --preserve-metadata=identifier,entitlements \"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MOE.framework\"\nfi\n";
+		};
+		DC94886E502D79B018836015 /* Compile Sources (MOE) */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Compile Sources (MOE)";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/bash;
+			shellScript = "set -e\n\nexport MOE_BUILD_SOURCE_SET=\"test\"\n\n# Check project directory\nif [ ! -d \"$MOE_PROJECT_DIR\" ]; then\n    echo \"$0:$LINENO:1: error: 'MOE_PROJECT_DIR' doesn't point to a directory!\"; exit 1;\nfi\ncd \"$MOE_PROJECT_DIR\"\n\n# Export JAVA_HOME\nexport JAVA_HOME=$(/usr/libexec/java_home -v 1.8)\n\n# Utility function for finding the Gradle implementation\nfunction findGradle {\n    CD=\"$PWD\"\n    while [ \"$CD\" != \"\" ]; do\n        echo \"Looking for gradlew in $CD\"\n        if [ -x \"$CD/gradlew\" ]; then\n            GRADLE_EXEC=$CD/gradlew\n            return 0\n        fi\n        CD=\"${CD%/*}\"\n    done\n\n    echo \"Checking with 'which'\"\n    GRADLE_EXEC=$(which 'gradle')\n\n    if [ \"$GRADLE_EXEC\" = \"\" ]; then\n        echo \"Failed to locate 'gradle' executable!\"\n        exit 1\n    fi\n}\n\n# Build project with Gradle\nif [ -z \"$MOE_GRADLE_EXTERNAL_BUILD\" ]; then\n    findGradle\n    \"$GRADLE_EXEC\" --no-daemon moeXcodeInternal -s\nfi\n\n# Check output directory\nif [ ! -d \"${MOE_PROJECT_BUILD_DIR}\" ]; then\n    echo \"$0:$LINENO:1: error: 'MOE_PROJECT_BUILD_DIR' doesn't point to a directory!\"; exit 1;\nfi\n\n# Copy some resources\nmkdir -p \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\"\ncp \"${MOE_PROJECT_BUILD_DIR}/moe/${MOE_BUILD_SOURCE_SET}/application.jar\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\"\ncp \"${MOE_PROJECT_BUILD_DIR}/moe/${MOE_BUILD_SOURCE_SET}/preregister.txt\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\"\nif [ \"${MOE_BUILD_SOURCE_SET}\" == \"test\" ]; then\n    cp \"${MOE_PROJECT_BUILD_DIR}/moe/${MOE_BUILD_SOURCE_SET}/classlist.txt\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\"\nfi\n\n# Copy android CA certificates on demand\nif [ \"${MOE_COPY_ANDROID_CACERTS}\" == \"YES\" ]; then\n    rm -rf \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/android_root/etc/security/cacerts\"\n    mkdir -p \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/android_root/etc/security...
 
[truncated message content]

[Swingme-svn] SF.net SVN: swingme:[2458] iOSME

[<yu...@us...>]

Revision: 2458
          http://sourceforge.net/p/swingme/code/2458
Author:   yuranet
Date:     2021-06-16 13:13:55 +0000 (Wed, 16 Jun 2021)
Log Message:
-----------
can set font

Modified Paths:
--------------
    iOSME/src/javax/microedition/lcdui/Graphics.java
    iOSME/src/javax/microedition/lcdui/Image.java
    iOSME/src/javax/microedition/m3g/Graphics3D.java
    iOSME/src/net/yura/ios/iOSJpegEncoder.java

Property Changed:
----------------
    iOSME/

Index: iOSME
===================================================================
--- iOSME	2021-06-15 18:28:15 UTC (rev 2457)
+++ iOSME	2021-06-16 13:13:55 UTC (rev 2458)

Property changes on: iOSME
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+build
+iOSME.iml
Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java	2021-06-15 18:28:15 UTC (rev 2457)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java	2021-06-16 13:13:55 UTC (rev 2458)
@@ -1,21 +1,22 @@
 package javax.microedition.lcdui;
 
 import apple.corefoundation.c.CoreFoundation;
-import apple.corefoundation.enums.CFStringBuiltInEncodings;
 import apple.corefoundation.opaque.CFAttributedStringRef;
-import apple.corefoundation.opaque.CFStringRef;
 import apple.coregraphics.c.CoreGraphics;
 import apple.coregraphics.opaque.CGColorRef;
 import apple.coregraphics.opaque.CGContextRef;
+import apple.coregraphics.opaque.CGFontRef;
 import apple.coregraphics.struct.CGPoint;
 import apple.coregraphics.struct.CGRect;
 import apple.coregraphics.struct.CGSize;
 import apple.coretext.c.CoreText;
 import apple.coretext.opaque.CTLineRef;
+import apple.foundation.NSAttributedString;
 import apple.uikit.UIColor;
 import apple.uikit.c.UIKit;
 import javax.microedition.lcdui.game.Sprite;
 import android.graphics.ColorMatrix;
+import org.moe.natj.objc.ObjCRuntime;
 
 public class Graphics {
     public static final int BASELINE = 64;
@@ -29,7 +30,7 @@
     public static final int VCENTER  = 2;
 
     private CGContextRef context;
-    private javax.microedition.lcdui.Font font;
+    private Font font;
 
     private int tx, ty;
     private int stroke;
@@ -70,6 +71,7 @@
 
     public int getColor() {
         //return paint.getColor();
+        // TODO keep local var
         throw new UnsupportedOperationException();
     }
 
@@ -131,7 +133,7 @@
         UIKit.UIGraphicsBeginImageContext(imageRect.size());
         UIKit.UIGraphicsPushContext(context);
 
-        image.getBitmap().drawInRect(imageRect);
+        image.getUIImage().drawInRect(imageRect);
 
         UIKit.UIGraphicsPopContext();
         UIKit.UIGraphicsEndImageContext();
@@ -167,11 +169,14 @@
         throw new UnsupportedOperationException();
     }
 
-    public javax.microedition.lcdui.Font getFont() {
+    public Font getFont() {
         return font;
     }
 
-    public void setFont(javax.microedition.lcdui.Font font) {
+    public void setFont(Font font) {
+        // Use ObjCRuntime.cast or CRuntime.cast to cast between c types and oc types
+        // https://www.noisyfox.io/moe-native-types.html
+        CoreGraphics.CGContextSetFont(context, ObjCRuntime.cast(font.font, CGFontRef.class));
         this.font = font;
     }
 
@@ -180,25 +185,24 @@
         int newy = y;
 
         if (anchor == 0) {
-            anchor = javax.microedition.lcdui.Graphics.TOP
-                    | javax.microedition.lcdui.Graphics.LEFT;
+            anchor = javax.microedition.lcdui.Graphics.TOP | javax.microedition.lcdui.Graphics.LEFT;
         }
 /*
-        FontManager androidFont = FontManager.getFont(font);
-        Paint paintFont = androidFont.getPaint();
 
         if ((anchor & javax.microedition.lcdui.Graphics.TOP) != 0) {
             newy -= androidFont.getFontMetricsInt().ascent;
-        } else if ((anchor & javax.microedition.lcdui.Graphics.BOTTOM) != 0) {
+        }
+        else if ((anchor & javax.microedition.lcdui.Graphics.BOTTOM) != 0) {
             newy -= androidFont.getFontMetricsInt().descent;
         }
+
         if ((anchor & javax.microedition.lcdui.Graphics.HCENTER) != 0) {
             newx -= paintFont.measureText(str) / 2;
-        } else if ((anchor & javax.microedition.lcdui.Graphics.RIGHT) != 0) {
+        }
+        else if ((anchor & javax.microedition.lcdui.Graphics.RIGHT) != 0) {
             newx -= paintFont.measureText(str);
         }
 
-        paintFont.setColor(paint.getColor());
         if (str.indexOf('\n')<0) {
             canvas.drawText(str, tx+newx, ty+newy, paintFont);
         }
@@ -212,18 +216,21 @@
         }
 */
         // not sure if its possible to do it this way
-        //NSAttributedString attributedString = NSAttributedString.alloc().initWithString(str);
+        //CFStringRef stringRef = CoreFoundation.CFStringCreateWithCString(CoreFoundation.kCFAllocatorDefault(), str, CFStringBuiltInEncodings.UTF8);
+        //CFAttributedStringRef attributedStringRef = CoreFoundation.CFAttributedStringCreate(CoreFoundation.kCFAllocatorDefault(), stringRef, null);
+        //CTLineRef line = CoreText.CTLineCreateWithAttributedString(attributedStringRef);
+        // then draw string
+        //CoreFoundation.CFRelease(attributedStringRef);
+        //CoreFoundation.CFRelease(stringRef);
 
-        CFStringRef stringRef = CoreFoundation.CFStringCreateWithCString(CoreFoundation.kCFAllocatorDefault(), str, CFStringBuiltInEncodings.UTF8);
-        CFAttributedStringRef attributedStringRef = CoreFoundation.CFAttributedStringCreate(CoreFoundation.kCFAllocatorDefault(), stringRef, null);
-        CTLineRef line = CoreText.CTLineCreateWithAttributedString(attributedStringRef);
 
-        CoreGraphics.CGContextSetTextPosition(context, x, y);
+        NSAttributedString attributedString = NSAttributedString.alloc().initWithString(str);
+        CTLineRef line = CoreText.CTLineCreateWithAttributedString(ObjCRuntime.cast(attributedString, CFAttributedStringRef.class));
+
+        CoreGraphics.CGContextSetTextPosition(context, newx, newy);
         CoreText.CTLineDraw(line, context);
 
         CoreFoundation.CFRelease(line);
-        CoreFoundation.CFRelease(attributedStringRef);
-        CoreFoundation.CFRelease(stringRef);
     }
 
     public void clipRect(int x, int y, int w, int h) {
@@ -266,7 +273,6 @@
     public void translate(int x, int y) {
         tx += x;
         ty += y;
-        //canvas.translate(x, y);
         dirtyClip = true;
     }
 
@@ -447,7 +453,7 @@
 
         int a = paint.getAlpha();
         paint.setAlpha(0xFF); // we do not support alpha when drawing images
-        canvas.drawBitmap(src.getBitmap(), srcRect, dstRect, paint);
+        canvas.drawBitmap(src.getUIImage(), srcRect, dstRect, paint);
         paint.setAlpha(a);
 
         canvas.restore();
@@ -510,9 +516,10 @@
     }
 
     public void scale(double sx, double sy) {
-        // TODO this is not being done at the right location, tx,ty
+        CoreGraphics.CGContextTranslateCTM(context, tx, ty);
         CoreGraphics.CGContextScaleCTM(context, sx, sy);
-        //canvas.scale((float)sx, (float)sy,tx,ty);
+        CoreGraphics.CGContextTranslateCTM(context, - tx * sx, - ty * sy);
+
         dirtyClip = true;
     }
 

Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java	2021-06-15 18:28:15 UTC (rev 2457)
+++ iOSME/src/javax/microedition/lcdui/Image.java	2021-06-16 13:13:55 UTC (rev 2458)
@@ -185,7 +185,7 @@
         this.bitmap = bitmap;
     }
 
-    public UIImage getBitmap() {
+    public UIImage getUIImage() {
         return bitmap;
     }
 

Modified: iOSME/src/javax/microedition/m3g/Graphics3D.java
===================================================================
--- iOSME/src/javax/microedition/m3g/Graphics3D.java	2021-06-15 18:28:15 UTC (rev 2457)
+++ iOSME/src/javax/microedition/m3g/Graphics3D.java	2021-06-16 13:13:55 UTC (rev 2458)
@@ -52,7 +52,7 @@
             targetGraphics.setColor(background.getColor());
             targetGraphics.fillRect(vpX, vpY, vpW, vpH);
         } else {
-            UIImage image = background.getImage().getImage().getBitmap();
+            UIImage image = background.getImage().getImage().getUIImage();
             CGContextRef context = targetGraphics.getContext();
             int tx = targetGraphics.getTranslateX();
             int ty = targetGraphics.getTranslateY();

Modified: iOSME/src/net/yura/ios/iOSJpegEncoder.java
===================================================================
--- iOSME/src/net/yura/ios/iOSJpegEncoder.java	2021-06-15 18:28:15 UTC (rev 2457)
+++ iOSME/src/net/yura/ios/iOSJpegEncoder.java	2021-06-16 13:13:55 UTC (rev 2458)
@@ -17,7 +17,7 @@
 
     @Override
     public void complete() throws MediaException {
-        NSData data = UIKit.UIImageJPEGRepresentation(image.getBitmap(), 0.95);
+        NSData data = UIKit.UIImageJPEGRepresentation(image.getUIImage(), 0.95);
         // TODO there must be a better way to do this
         byte[] bytes = data.bytes().getBytePtr().toByteArray((int)data.length());
         try {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2457] iOSME/src

[<yu...@us...>]

Revision: 2457
          http://sourceforge.net/p/swingme/code/2457
Author:   yuranet
Date:     2021-06-15 18:28:15 +0000 (Tue, 15 Jun 2021)
Log Message:
-----------
can load app assets

Modified Paths:
--------------
    iOSME/src/javax/microedition/io/Connector.java
    iOSME/src/net/yura/ios/SwingMEiOSApplication.java

Added Paths:
-----------
    iOSME/src/net/yura/ios/BundleConnection.java

Modified: iOSME/src/javax/microedition/io/Connector.java
===================================================================
--- iOSME/src/javax/microedition/io/Connector.java	2021-06-13 18:13:39 UTC (rev 2456)
+++ iOSME/src/javax/microedition/io/Connector.java	2021-06-15 18:28:15 UTC (rev 2457)
@@ -1,5 +1,6 @@
 package javax.microedition.io;
 
+import net.yura.ios.BundleConnection;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -23,11 +24,10 @@
         return open(name, READ_WRITE);
     }
 
-    public static final Connection open(String name, int mode)
-            throws IOException {
+    public static final Connection open(String name, int mode) throws IOException {
         Connection connection = null;
         if (name.startsWith(PROTOCOL_ASSET)) {
-            //connection = new AndroidAssetConnection(name.substring( PROTOCOL_ASSET.length() ));
+            connection = new BundleConnection(name.substring( PROTOCOL_ASSET.length() ));
         }
         else if (name.startsWith(PROTOCOL_FILE)) {
             //connection = new AndroidFileConnection(name);
@@ -58,24 +58,20 @@
         return connection;
     }
 
-    public static final DataInputStream openDataInputStream(String name)
-            throws IOException {
+    public static final DataInputStream openDataInputStream(String name) throws IOException {
         return new DataInputStream(openInputStream(name));
     }
 
-    public static final DataOutputStream openDataOutputStream(String name)
-            throws IOException {
+    public static final DataOutputStream openDataOutputStream(String name) throws IOException {
         return new DataOutputStream(openOutputStream(name));
     }
 
-    public static final InputStream openInputStream(String name)
-            throws IOException {
+    public static final InputStream openInputStream(String name) throws IOException {
         Connection connection = open(name, READ);
         return ((InputConnection) connection).openInputStream();
     }
 
-    public static final OutputStream openOutputStream(String name)
-            throws IOException {
+    public static final OutputStream openOutputStream(String name) throws IOException {
         Connection connection = open(name, WRITE);
         return ((OutputConnection) connection).openOutputStream();
     }

Added: iOSME/src/net/yura/ios/BundleConnection.java
===================================================================
--- iOSME/src/net/yura/ios/BundleConnection.java	                        (rev 0)
+++ iOSME/src/net/yura/ios/BundleConnection.java	2021-06-15 18:28:15 UTC (rev 2457)
@@ -0,0 +1,208 @@
+package net.yura.ios;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.MalformedURLException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Enumeration;
+import javax.microedition.io.file.FileConnection;
+import apple.foundation.NSBundle;
+
+public class BundleConnection implements FileConnection {
+
+    private File path;
+
+    public BundleConnection(String path) throws IOException {
+        String main = NSBundle.mainBundle().resourcePath();
+        this.path = new File(main + "/" + path);
+    }
+
+    /**
+     * @return -1 if the file system is not accessible
+     */
+    @Override
+    public long availableSize() {
+        return -1;
+    }
+
+    @Override
+    public boolean canRead() {
+        return path.canRead();
+    }
+
+    @Override
+    public boolean canWrite() {
+        return false;
+    }
+
+    @Override
+    public void create() throws IOException {
+        throw new SecurityException("can not write to bundle");
+    }
+
+    @Override
+    public void delete() throws IOException {
+        throw new SecurityException("can not delete from bundle");
+    }
+
+    @Override
+    public long directorySize(boolean includeSubDirs) throws IOException {
+        if (path.isFile()) {
+            throw new IOException("can not call on file");
+        }
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean exists() {
+        return path.exists();
+    }
+
+    @Override
+    public long fileSize() throws IOException {
+        return path.length();
+    }
+
+    @Override
+    public String getName() {
+        return path.getName();
+    }
+
+    @Override
+    public String getPath() {
+        return path.getPath();
+    }
+
+    @Override
+    public String getURL() {
+        try {
+            return path.toURI().toURL().toString();
+        }
+        catch (MalformedURLException ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+
+    @Override
+    public boolean isDirectory() {
+        return path.isDirectory();
+    }
+
+    @Override
+    public boolean isHidden() {
+        return path.isHidden();
+    }
+
+    @Override
+    public boolean isOpen() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public long lastModified() {
+        return path.lastModified();
+    }
+
+    @Override
+    public Enumeration list() throws IOException {
+        String[] list = path.list();
+        return Collections.enumeration(Arrays.asList(list));
+    }
+
+    @Override
+    public Enumeration list(String filter, boolean includeHidden) throws IOException {
+        return null;
+    }
+
+    @Override
+    public void mkdir() throws IOException {
+        throw new SecurityException("not not write here");
+    }
+
+    @Override
+    public DataInputStream openDataInputStream() throws IOException {
+        return new DataInputStream(openInputStream());
+    }
+
+    @Override
+    public DataOutputStream openDataOutputStream() throws IOException {
+        throw new SecurityException("not not write here");
+    }
+
+    @Override
+    public InputStream openInputStream() throws IOException {
+        return new FileInputStream(path);
+    }
+
+    @Override
+    public OutputStream openOutputStream() throws IOException {
+        throw new SecurityException("not not write here");
+    }
+
+    @Override
+    public OutputStream openOutputStream(long byteOffset) throws IOException {
+        throw new SecurityException("not not write here");
+    }
+
+    @Override
+    public void rename(String newName) throws IOException {
+        throw new SecurityException("not not write here");
+    }
+
+    @Override
+    public void setFileConnection(String fileName) throws IOException {
+        if (fileName.equals("..")) {
+            throw new UnsupportedOperationException();
+        }
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void setHidden(boolean hidden) throws IOException {
+        throw new SecurityException("not not write here");
+    }
+
+    @Override
+    public void setReadable(boolean readable) throws IOException {
+        // do nothing
+    }
+
+    @Override
+    public void setWritable(boolean writable) throws IOException {
+        throw new SecurityException("not not write here");
+    }
+
+    @Override
+    public long totalSize() {
+        return path.getTotalSpace();
+    }
+
+    @Override
+    public void truncate(long byteOffset) throws IOException {
+        throw new SecurityException("not not write here");
+    }
+
+    /**
+     * @return -1 if the file system is not accessible
+     */
+    @Override
+    public long usedSize() {
+        return -1;
+    }
+
+    @Override
+    public void close() throws IOException {
+        // dont need to do anything
+    }
+
+    @Override
+    public String toString() {
+        return path.toString();
+    }
+}

Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java	2021-06-13 18:13:39 UTC (rev 2456)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java	2021-06-15 18:28:15 UTC (rev 2457)
@@ -10,7 +10,11 @@
 import javax.microedition.midlet.MIDlet;
 import apple.NSObject;
 import apple.coregraphics.struct.CGRect;
+import apple.foundation.NSArray;
 import apple.foundation.NSDictionary;
+import apple.foundation.c.Foundation;
+import apple.foundation.enums.NSSearchPathDirectory;
+import apple.foundation.enums.NSSearchPathDomainMask;
 import apple.uikit.UIApplication;
 import apple.uikit.UINavigationController;
 import apple.uikit.UIScreen;
@@ -73,11 +77,23 @@
 
         window.makeKeyAndVisible();
 
+        setupSystemProperties();
+
         startSwingMEApp("net.yura.domination.mobile.flashgui.DominationMain");
 
         return true;
     }
 
+    private static void setupSystemProperties() {
+
+        NSArray paths = Foundation.NSSearchPathForDirectoriesInDomains(NSSearchPathDirectory.DocumentDirectory, NSSearchPathDomainMask.UserDomainMask, true);
+        String documentsDirectory = (String)paths.objectAtIndex(0);
+
+        System.setProperty("user.home", documentsDirectory);
+
+        //System.out.println("user.home=" + System.getProperty("user.home"));
+    }
+
     private void startSwingMEApp(String className) {
         try {
             Class myClass = Class.forName(className);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2456] me4se/build.xml

[<yu...@us...>]

Revision: 2456
          http://sourceforge.net/p/swingme/code/2456
Author:   yuranet
Date:     2021-06-13 18:13:39 +0000 (Sun, 13 Jun 2021)
Log Message:
-----------
deploy script update

Modified Paths:
--------------
    me4se/build.xml

Modified: me4se/build.xml
===================================================================
--- me4se/build.xml	2021-06-13 18:08:38 UTC (rev 2455)
+++ me4se/build.xml	2021-06-13 18:13:39 UTC (rev 2456)
@@ -188,11 +188,17 @@
 
     <target name="deploy" depends="build-jars" description="copy lib to some other places">
         <copy file="dist/midletrunner.jar" todir="../SwingMETest/lib"/>
-        <copy file="dist/opt.jar" todir="../SwingMETest/lib"/>
-        <copy file="dist/m3gbasic.jar" todir="../SwingMETest/lib"/>
-        <copy file="dist/midletrunner.jar" todir="../AgentClient/lib"/>
+        <copy file="dist/opt.jar" todir="../SwingMETest/lib"/><!-- PIM & BT -->
+        <copy file="dist/m3gbasic.jar" todir="../SwingMETest/lib"/><!-- SCALE DRAW & JPEG SAVE -->
+
+        <copy file="dist/midletrunner.jar" todir="../SwingME/lib"/>
+        <copy file="dist/opt.jar" todir="../SwingME/lib"/><!-- PIM & BT -->
+        <copy file="dist/m3gbasic.jar" todir="../SwingME/lib"/><!-- SCALE DRAW & JPEG SAVE -->
+
         <copy file="dist/midletrunner.jar" todir="../ToolsME/lib"/>
-        <copy file="dist/midletrunner.jar" todir="../Domination/lib"/>
+
+        <copy file="dist/midletrunner.jar" todir="../Domination/swingUI/lib"/>
+        <copy file="dist/m3gbasic.jar" todir="../Domination/swingUI/lib"/><!-- SCALE DRAW & JPEG SAVE -->
     </target>
 
         <target name="clean" description="del all build files">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2455] SwingME

[<yu...@us...>]

Revision: 2455
          http://sourceforge.net/p/swingme/code/2455
Author:   yuranet
Date:     2021-06-13 18:08:38 +0000 (Sun, 13 Jun 2021)
Log Message:
-----------
api fix

Modified Paths:
--------------
    SwingME/lib/midletrunner.jar

Property Changed:
----------------
    SwingME/

Index: SwingME
===================================================================
--- SwingME	2021-06-13 18:00:13 UTC (rev 2454)
+++ SwingME	2021-06-13 18:08:38 UTC (rev 2455)

Property changes on: SwingME
___________________________________________________________________
Modified: svn:ignore
## -6,3 +6,4 ##
 .project
 Application Descriptor
 build.properties
+SwingME.iml
Modified: SwingME/lib/midletrunner.jar
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2454] me4se/src

[<yu...@us...>]

Revision: 2454
          http://sourceforge.net/p/swingme/code/2454
Author:   yuranet
Date:     2021-06-13 18:00:13 +0000 (Sun, 13 Jun 2021)
Log Message:
-----------
spelling fix 3

Modified Paths:
--------------
    me4se/src/javax/microedition/io/file/FileConnection.java
    me4se/src/org/me4se/psi/java1/gcf/file/AssetConnection.java
    me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java

Modified: me4se/src/javax/microedition/io/file/FileConnection.java
===================================================================
--- me4se/src/javax/microedition/io/file/FileConnection.java	2021-06-13 15:50:28 UTC (rev 2453)
+++ me4se/src/javax/microedition/io/file/FileConnection.java	2021-06-13 18:00:13 UTC (rev 2454)
@@ -150,9 +150,5 @@
 	 * @return
 	 */
 	public OutputStream openOutputStream(long byteOffset) throws IOException;
-
-        // YURA FIX
-	public void setWritable(boolean writable) throws IOException;
-
 }
 

Modified: me4se/src/org/me4se/psi/java1/gcf/file/AssetConnection.java
===================================================================
--- me4se/src/org/me4se/psi/java1/gcf/file/AssetConnection.java	2021-06-13 15:50:28 UTC (rev 2453)
+++ me4se/src/org/me4se/psi/java1/gcf/file/AssetConnection.java	2021-06-13 18:00:13 UTC (rev 2454)
@@ -165,10 +165,6 @@
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    public void setWritable(boolean writable) throws IOException {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
     public DataInputStream openDataInputStream() throws IOException {
         return new DataInputStream(openInputStream());
     }

Modified: me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java	2021-06-13 15:50:28 UTC (rev 2453)
+++ me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java	2021-06-13 18:00:13 UTC (rev 2454)
@@ -342,11 +342,6 @@
 		file = null;
 		mode = -1;
 	}
-
-	public void setWritable(boolean writable) throws IOException {
-		// TODO
-	}
-
 }
 
 /*

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2453] me4se/src

[<yu...@us...>]

Revision: 2453
          http://sourceforge.net/p/swingme/code/2453
Author:   yuranet
Date:     2021-06-13 15:50:28 +0000 (Sun, 13 Jun 2021)
Log Message:
-----------
spelling fix 2

Modified Paths:
--------------
    me4se/src/javax/microedition/io/file/FileConnection.java
    me4se/src/org/me4se/psi/java1/gcf/file/AssetConnection.java
    me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java

Modified: me4se/src/javax/microedition/io/file/FileConnection.java
===================================================================
--- me4se/src/javax/microedition/io/file/FileConnection.java	2021-06-13 15:41:52 UTC (rev 2452)
+++ me4se/src/javax/microedition/io/file/FileConnection.java	2021-06-13 15:50:28 UTC (rev 2453)
@@ -107,7 +107,7 @@
 	/**
 	 * @API PDAP-1.0
 	 */
-	public boolean rename(java.lang.String newName) throws IOException;
+	public void rename(java.lang.String newName) throws IOException;
 
 	/**
 	 * @API PDAP-1.0

Modified: me4se/src/org/me4se/psi/java1/gcf/file/AssetConnection.java
===================================================================
--- me4se/src/org/me4se/psi/java1/gcf/file/AssetConnection.java	2021-06-13 15:41:52 UTC (rev 2452)
+++ me4se/src/org/me4se/psi/java1/gcf/file/AssetConnection.java	2021-06-13 15:50:28 UTC (rev 2453)
@@ -129,7 +129,7 @@
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    public boolean rename(String newName) throws IOException {
+    public void rename(String newName) throws IOException {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 

Modified: me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java	2021-06-13 15:41:52 UTC (rev 2452)
+++ me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java	2021-06-13 15:50:28 UTC (rev 2453)
@@ -232,12 +232,12 @@
 		if (!file.mkdir()) throw new IOException("Failed to create directory " + file);
 	}
 
-	public boolean rename(String newName) {
-		if (file.exists()) {
-			return file.renameTo(new File(file.getParent(),newName));
+	public void rename(String newName) throws IOException {
+		if (!file.exists()) {
+			throw new IOException("file does not exist " + file);
 		}
-		else {
-			return false;
+		if (!file.renameTo(new File(file.getParent(), newName))) {
+			throw new IOException("can not rename file " + file + " " + newName);
 		}
 	}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2452] me4se/src

[<yu...@us...>]

Revision: 2452
          http://sourceforge.net/p/swingme/code/2452
Author:   yuranet
Date:     2021-06-13 15:41:52 +0000 (Sun, 13 Jun 2021)
Log Message:
-----------
spelling fix

Modified Paths:
--------------
    me4se/src/javax/microedition/io/file/FileConnection.java
    me4se/src/org/me4se/psi/java1/gcf/file/AssetConnection.java
    me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java

Modified: me4se/src/javax/microedition/io/file/FileConnection.java
===================================================================
--- me4se/src/javax/microedition/io/file/FileConnection.java	2021-06-13 15:05:30 UTC (rev 2451)
+++ me4se/src/javax/microedition/io/file/FileConnection.java	2021-06-13 15:41:52 UTC (rev 2452)
@@ -127,7 +127,7 @@
 	/**
 	 * @API PDAP-1.0
 	 */
-	public void setWriteable(boolean writable) throws IOException;
+	public void setWritable(boolean writable) throws IOException;
 
 	/**
 	 * @API PDAP-1.0

Modified: me4se/src/org/me4se/psi/java1/gcf/file/AssetConnection.java
===================================================================
--- me4se/src/org/me4se/psi/java1/gcf/file/AssetConnection.java	2021-06-13 15:05:30 UTC (rev 2451)
+++ me4se/src/org/me4se/psi/java1/gcf/file/AssetConnection.java	2021-06-13 15:41:52 UTC (rev 2452)
@@ -145,7 +145,7 @@
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    public void setWriteable(boolean writable) throws IOException {
+    public void setWritable(boolean writable) throws IOException {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 

Modified: me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java	2021-06-13 15:05:30 UTC (rev 2451)
+++ me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java	2021-06-13 15:41:52 UTC (rev 2452)
@@ -267,7 +267,7 @@
 	/*
 	 * We be left out ! Currently  RuntimeException is thrown. Perhaps we should simply do nothing.
 	 */
-	public void setWriteable(boolean tf) throws IOException {
+	public void setWritable(boolean tf) throws IOException {
 			throw new IOException("FileConnection.setWritable() not implemented.");
 	}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2451] iOSME/src/javax/microedition/lcdui/Font.java

[<yu...@us...>]

Revision: 2451
          http://sourceforge.net/p/swingme/code/2451
Author:   yuranet
Date:     2021-06-13 15:05:30 +0000 (Sun, 13 Jun 2021)
Log Message:
-----------
font more correct

Modified Paths:
--------------
    iOSME/src/javax/microedition/lcdui/Font.java

Modified: iOSME/src/javax/microedition/lcdui/Font.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Font.java	2021-06-13 14:50:52 UTC (rev 2450)
+++ iOSME/src/javax/microedition/lcdui/Font.java	2021-06-13 15:05:30 UTC (rev 2451)
@@ -24,8 +24,7 @@
 	public static final int FONT_STATIC_TEXT = 0;
 	public static final int FONT_INPUT_TEXT = 1;
 
-	private static final Font DEFAULT_FONT = new Font(Font.FACE_SYSTEM,
-			Font.STYLE_PLAIN, Font.SIZE_MEDIUM);
+	private static final Font DEFAULT_FONT = new Font(Font.FACE_SYSTEM, Font.STYLE_PLAIN, Font.SIZE_MEDIUM);
 
 	private static Font[] fontsBySpecifier = { DEFAULT_FONT, DEFAULT_FONT };
 
@@ -43,25 +42,58 @@
 
 	UIFont font;
 
-	// NOTE: We support negative sizes, meaning literal font sizes.
+	/**
+	 * NOTE: We support negative sizes, meaning literal font sizes.
+	 */
 	private Font(int face, int style, int size) {
-		if ((face != FACE_SYSTEM) && (face != FACE_MONOSPACE)
-				&& (face != FACE_PROPORTIONAL)) {
+		if ((face != FACE_SYSTEM) && (face != FACE_MONOSPACE) && (face != FACE_PROPORTIONAL)) {
 			throw new IllegalArgumentException();
 		}
-		if (!(isPlain() || isBold() || isItalic() || isUnderlined())) {
-			throw new IllegalArgumentException();
-		}
 		if (size >= 0 && size != SIZE_SMALL && size != SIZE_MEDIUM && size != SIZE_LARGE) {
 			throw new IllegalArgumentException("size: "+size);
 		}
 
+		this.style = style;
+
+		if (!(isPlain() || isBold() || isItalic() || isUnderlined())) {
+			throw new IllegalArgumentException();
+		}
+
 		this.face = face;
-		this.style = style;
 		this.size = size;
 
-		// TODO get font based on other params too
-		font = UIFont.systemFontOfSize(size);
+		double fontSize;
+		switch (size) {
+			case SIZE_SMALL:
+				fontSize = 12d;
+				break;
+			case SIZE_MEDIUM:
+				fontSize = 17d;
+				break;
+			case SIZE_LARGE:
+				fontSize = 22d;
+				break;
+			default:
+				fontSize = - size;
+				break;
+		}
+
+		double weight;
+		if (isBold()) {
+			weight = UIKit.UIFontWeightBold();
+		}
+		else {
+			weight = UIKit.UIFontWeightRegular();
+		}
+
+		if (face == FACE_MONOSPACE) {
+			font = UIFont.monospacedSystemFontOfSizeWeight(fontSize, weight);
+		}
+		else {
+			font = UIFont.systemFontOfSizeWeight(fontSize, weight);
+		}
+
+		// TODO add support for italic and underline
 	}
 
 	public static Font getDefaultFont() {
@@ -115,7 +147,7 @@
 
 	public int getHeight() {
 		if (height == -1) {
-			return (int)font.xHeight();
+			return (int)font.lineHeight();
 		}
 		return height;
 	}
@@ -122,10 +154,8 @@
 
 	public int getBaselinePosition() {
 		if (baselinePosition == -1) {
-			//baselinePosition = FontManager.getFont(this).getBaselinePosition();
-			throw new RuntimeException("not implemented");
+			return - (int)font.ascender();
 		}
-
 		return baselinePosition;
 	}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2450] AndroidME/src_MIDP/javax/microedition/lcdui/ Font.java

[<yu...@us...>]

Revision: 2450
          http://sourceforge.net/p/swingme/code/2450
Author:   yuranet
Date:     2021-06-13 14:50:52 +0000 (Sun, 13 Jun 2021)
Log Message:
-----------
font code cleanup

Modified Paths:
--------------
    AndroidME/src_MIDP/javax/microedition/lcdui/Font.java

Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Font.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Font.java	2021-06-13 14:27:46 UTC (rev 2449)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Font.java	2021-06-13 14:50:52 UTC (rev 2450)
@@ -17,14 +17,11 @@
  *  License along with this library; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 package javax.microedition.lcdui;
 
 import java.util.Hashtable;
-
 import net.yura.android.lcdui.FontManager;
 
-
 public final class Font {
 	public static final int STYLE_PLAIN = 0;
 	public static final int STYLE_BOLD = 1;
@@ -42,8 +39,7 @@
 	public static final int FONT_STATIC_TEXT = 0;
 	public static final int FONT_INPUT_TEXT = 1;
 
-	private static final Font DEFAULT_FONT = new Font(Font.FACE_SYSTEM,
-			Font.STYLE_PLAIN, Font.SIZE_MEDIUM);
+	private static final Font DEFAULT_FONT = new Font(Font.FACE_SYSTEM, Font.STYLE_PLAIN, Font.SIZE_MEDIUM);
 
 	private static Font[] fontsBySpecifier = { DEFAULT_FONT, DEFAULT_FONT };
 
@@ -61,19 +57,20 @@
 
 	// NOTE: We support negative sizes, meaning literal font sizes.
 	private Font(int face, int style, int size) {
-		if ((face != FACE_SYSTEM) && (face != FACE_MONOSPACE)
-				&& (face != FACE_PROPORTIONAL)) {
+		if ((face != FACE_SYSTEM) && (face != FACE_MONOSPACE) && (face != FACE_PROPORTIONAL)) {
 			throw new IllegalArgumentException();
 		}
-		if (!(isPlain() || isBold() || isItalic() || isUnderlined())) {
-			throw new IllegalArgumentException();
-		}
 		if (size >= 0 && size != SIZE_SMALL && size != SIZE_MEDIUM && size != SIZE_LARGE) {
 			throw new IllegalArgumentException("size: "+size);
 		}
 
+		this.style = style;
+
+		if (!(isPlain() || isBold() || isItalic() || isUnderlined())) {
+			throw new IllegalArgumentException();
+		}
+
 		this.face = face;
-		this.style = style;
 		this.size = size;
 	}
 
@@ -82,9 +79,9 @@
 	}
 
 	public static Font getFont(int specifier) {
-		if (specifier != Font.FONT_INPUT_TEXT
-				&& specifier != Font.FONT_STATIC_TEXT)
+		if (specifier != Font.FONT_INPUT_TEXT && specifier != Font.FONT_STATIC_TEXT) {
 			throw new IllegalArgumentException("Bad specifier");
+		}
 		return fontsBySpecifier[specifier];
 	}
 
@@ -130,7 +127,6 @@
 		if (height == -1) {
 			height = FontManager.getFont(this).getHeight();
 		}
-
 		return height;
 	}
 
@@ -138,7 +134,6 @@
 		if (baselinePosition == -1) {
 			baselinePosition = FontManager.getFont(this).getBaselinePosition();
 		}
-
 		return baselinePosition;
 	}
 
@@ -167,5 +162,4 @@
 	public int hashCode() {
 		return style + size + face;
 	}
-
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2449] iOSME/src

[<yu...@us...>]

Revision: 2449
          http://sourceforge.net/p/swingme/code/2449
Author:   yuranet
Date:     2021-06-13 14:27:46 +0000 (Sun, 13 Jun 2021)
Log Message:
-----------
some more methods added

Modified Paths:
--------------
    iOSME/src/javax/microedition/lcdui/Font.java
    iOSME/src/javax/microedition/lcdui/Graphics.java
    iOSME/src/net/yura/ios/AppController.java
    iOSME/src/net/yura/ios/SwingMEiOSApplication.java

Modified: iOSME/src/javax/microedition/lcdui/Font.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Font.java	2021-06-11 12:20:55 UTC (rev 2448)
+++ iOSME/src/javax/microedition/lcdui/Font.java	2021-06-13 14:27:46 UTC (rev 2449)
@@ -1,26 +1,11 @@
-/*
- *  MicroEmulator
- *  Copyright (C) 2001-2005 Bartek Teodorczyk <ba...@ba...>
- *  Copyright (C) 2005 Andres Navarro
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
 package javax.microedition.lcdui;
 
 import java.util.Hashtable;
+import apple.coregraphics.struct.CGSize;
+import apple.foundation.NSDictionary;
+import apple.foundation.NSString;
+import apple.uikit.UIFont;
+import apple.uikit.c.UIKit;
 
 public final class Font {
 	public static final int STYLE_PLAIN = 0;
@@ -56,6 +41,8 @@
 
 	private int height = -1;
 
+	UIFont font;
+
 	// NOTE: We support negative sizes, meaning literal font sizes.
 	private Font(int face, int style, int size) {
 		if ((face != FACE_SYSTEM) && (face != FACE_MONOSPACE)
@@ -72,6 +59,9 @@
 		this.face = face;
 		this.style = style;
 		this.size = size;
+
+		// TODO get font based on other params too
+		font = UIFont.systemFontOfSize(size);
 	}
 
 	public static Font getDefaultFont() {
@@ -79,9 +69,9 @@
 	}
 
 	public static Font getFont(int specifier) {
-		if (specifier != Font.FONT_INPUT_TEXT
-				&& specifier != Font.FONT_STATIC_TEXT)
+		if (specifier != Font.FONT_INPUT_TEXT && specifier != Font.FONT_STATIC_TEXT) {
 			throw new IllegalArgumentException("Bad specifier");
+		}
 		return fontsBySpecifier[specifier];
 	}
 
@@ -125,10 +115,8 @@
 
 	public int getHeight() {
 		if (height == -1) {
-			//height = FontManager.getFont(this).getHeight();
-			throw new RuntimeException("not implemented");
+			return (int)font.xHeight();
 		}
-
 		return height;
 	}
 
@@ -142,8 +130,7 @@
 	}
 
 	public int charWidth(char ch) {
-		//return FontManager.getFont(this).charWidth(ch);
-		throw new RuntimeException("not implemented");
+		return stringWidth(String.valueOf(ch));
 	}
 
 	public int charsWidth(char[] ch, int offset, int length) {
@@ -150,8 +137,7 @@
 	    if (ch == null) {
 	        throw new NullPointerException();
 	    }
-		//return FontManager.getFont(this).charsWidth(ch, offset, length);
-		throw new RuntimeException("not implemented");
+		return stringWidth(new String(ch, offset, length));
 	}
 
 	public int stringWidth(String str) {
@@ -158,8 +144,11 @@
 	    if (str == null) {
             throw new NullPointerException();
         }
-		//return FontManager.getFont(this).stringWidth(str);
-		throw new RuntimeException("not implemented");
+
+		NSString string = NSString.stringWithString(str);
+		NSDictionary attributes = NSDictionary.dictionaryWithObjectForKey(font, UIKit.NSFontAttributeName());
+		CGSize size = string.sizeWithAttributes(attributes);
+		return (int)size.width();
 	}
 
 	public int substringWidth(String str, int offset, int len) {
@@ -169,5 +158,4 @@
 	public int hashCode() {
 		return style + size + face;
 	}
-
 }

Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java	2021-06-11 12:20:55 UTC (rev 2448)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java	2021-06-13 14:27:46 UTC (rev 2449)
@@ -1,6 +1,9 @@
 package javax.microedition.lcdui;
 
 import apple.corefoundation.c.CoreFoundation;
+import apple.corefoundation.enums.CFStringBuiltInEncodings;
+import apple.corefoundation.opaque.CFAttributedStringRef;
+import apple.corefoundation.opaque.CFStringRef;
 import apple.coregraphics.c.CoreGraphics;
 import apple.coregraphics.opaque.CGColorRef;
 import apple.coregraphics.opaque.CGContextRef;
@@ -9,10 +12,8 @@
 import apple.coregraphics.struct.CGSize;
 import apple.coretext.c.CoreText;
 import apple.coretext.opaque.CTLineRef;
-import apple.foundation.NSAttributedString;
 import apple.uikit.UIColor;
 import apple.uikit.c.UIKit;
-
 import javax.microedition.lcdui.game.Sprite;
 import android.graphics.ColorMatrix;
 
@@ -210,15 +211,19 @@
             }
         }
 */
-        //CoreFoundation.CFAttributedStringCreate();
+        // not sure if its possible to do it this way
+        //NSAttributedString attributedString = NSAttributedString.alloc().initWithString(str);
 
-        //CoreText.CTLineCreateWithAttributedString
+        CFStringRef stringRef = CoreFoundation.CFStringCreateWithCString(CoreFoundation.kCFAllocatorDefault(), str, CFStringBuiltInEncodings.UTF8);
+        CFAttributedStringRef attributedStringRef = CoreFoundation.CFAttributedStringCreate(CoreFoundation.kCFAllocatorDefault(), stringRef, null);
+        CTLineRef line = CoreText.CTLineCreateWithAttributedString(attributedStringRef);
 
         CoreGraphics.CGContextSetTextPosition(context, x, y);
-        //CoreText.CTLineDraw(null, context);
+        CoreText.CTLineDraw(line, context);
 
-        //NSAttributedString
-        throw new UnsupportedOperationException();
+        CoreFoundation.CFRelease(line);
+        CoreFoundation.CFRelease(attributedStringRef);
+        CoreFoundation.CFRelease(stringRef);
     }
 
     public void clipRect(int x, int y, int w, int h) {
@@ -522,6 +527,7 @@
     }
 
     public int getStrokeWidth() {
+        // TODO keep local var for this
         throw new UnsupportedOperationException();
         //return (int) paint.getStrokeWidth();
     }

Modified: iOSME/src/net/yura/ios/AppController.java
===================================================================
--- iOSME/src/net/yura/ios/AppController.java	2021-06-11 12:20:55 UTC (rev 2448)
+++ iOSME/src/net/yura/ios/AppController.java	2021-06-13 14:27:46 UTC (rev 2449)
@@ -31,7 +31,7 @@
     public void viewDidLoad() {
         super.viewDidLoad();
 
-        // TODO is this needed?
+        // TODO remove title
         setTitle("SwingME App");
 
         // TODO is this needed?

Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java	2021-06-11 12:20:55 UTC (rev 2448)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java	2021-06-13 14:27:46 UTC (rev 2449)
@@ -2,7 +2,11 @@
 
 import org.moe.natj.general.Pointer;
 import org.moe.natj.general.ann.RegisterOnStartup;
+import org.moe.natj.general.ptr.BytePtr;
+import org.moe.natj.general.ptr.Ptr;
+import org.moe.natj.general.ptr.impl.PtrFactory;
 import org.moe.natj.objc.ann.Selector;
+import java.io.UnsupportedEncodingException;
 import javax.microedition.midlet.MIDlet;
 import apple.NSObject;
 import apple.coregraphics.struct.CGRect;
@@ -19,7 +23,29 @@
 public class SwingMEiOSApplication extends NSObject implements UIApplicationDelegate {
 
     public static void main(String[] args) {
-        UIKit.UIApplicationMain(0, null, null, SwingMEiOSApplication.class.getName());
+
+        /*
+         * When simulating other languages, Xcode will add arguments to the app which we would
+         * like to pass to UIApplicationMain.
+         * The code below will convert the Java String array to native pointers.
+         */
+        @SuppressWarnings("unchecked") Ptr<BytePtr> argsPtr = (Ptr<BytePtr>) PtrFactory.newPointerPtr(Byte
+                .class, 2, args.length, true, false);
+        Ptr<BytePtr> argsPtrIt = argsPtr;
+        for (String arg : args) {
+            final byte[] bytes;
+            try {
+                bytes = arg.getBytes("UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                throw new RuntimeException(e);
+            }
+            final BytePtr ptr = PtrFactory.newWeakByteArray(bytes.length + 1);
+            ptr.copyFrom(bytes);
+            argsPtrIt.set(ptr);
+            argsPtrIt = (Ptr<BytePtr>) argsPtrIt.ofs(1);
+        }
+
+        UIKit.UIApplicationMain(args.length, argsPtr, null, SwingMEiOSApplication.class.getName());
     }
 
     @Selector("alloc")

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Swingme-svn] SF.net SVN: swingme:[2448] iOSME/src

[<yu...@us...>]

Revision: 2448
          http://sourceforge.net/p/swingme/code/2448
Author:   yuranet
Date:     2021-06-11 12:20:55 +0000 (Fri, 11 Jun 2021)
Log Message:
-----------
iOSME added, compiles but does not run yet

Modified Paths:
--------------
    AndroidME/build.gradle
    SwingME/build.xml

Added Paths:
-----------
    SwingME/build.gradle
    SwingME/lib/m3gbasic.jar
    SwingME/lib/midletrunner.jar
    SwingME/lib/opt.jar
    iOSME/
    iOSME/build.gradle
    iOSME/src/
    iOSME/src/android/
    iOSME/src/android/graphics/
    iOSME/src/android/graphics/ColorMatrix.java
    iOSME/src/com/
    iOSME/src/com/nokia/
    iOSME/src/com/nokia/mid/
    iOSME/src/com/nokia/mid/ui/
    iOSME/src/com/nokia/mid/ui/DirectGraphics.java
    iOSME/src/com/nokia/mid/ui/DirectUtils.java
    iOSME/src/javax/
    iOSME/src/javax/microedition/
    iOSME/src/javax/microedition/amms/
    iOSME/src/javax/microedition/amms/GlobalManager.java
    iOSME/src/javax/microedition/amms/MediaProcessor.java
    iOSME/src/javax/microedition/amms/control/
    iOSME/src/javax/microedition/amms/control/ImageFormatControl.java
    iOSME/src/javax/microedition/io/
    iOSME/src/javax/microedition/io/Connection.java
    iOSME/src/javax/microedition/io/ConnectionNotFoundException.java
    iOSME/src/javax/microedition/io/Connector.java
    iOSME/src/javax/microedition/io/ContentConnection.java
    iOSME/src/javax/microedition/io/HttpConnection.java
    iOSME/src/javax/microedition/io/HttpsConnection.java
    iOSME/src/javax/microedition/io/InputConnection.java
    iOSME/src/javax/microedition/io/OutputConnection.java
    iOSME/src/javax/microedition/io/SecurityInfo.java
    iOSME/src/javax/microedition/io/ServerSocketConnection.java
    iOSME/src/javax/microedition/io/SocketConnection.java
    iOSME/src/javax/microedition/io/StreamConnection.java
    iOSME/src/javax/microedition/io/StreamConnectionNotifier.java
    iOSME/src/javax/microedition/io/file/
    iOSME/src/javax/microedition/io/file/FileConnection.java
    iOSME/src/javax/microedition/io/file/FileSystemListener.java
    iOSME/src/javax/microedition/io/file/FileSystemRegistry.java
    iOSME/src/javax/microedition/lcdui/
    iOSME/src/javax/microedition/lcdui/AlertType.java
    iOSME/src/javax/microedition/lcdui/Canvas.java
    iOSME/src/javax/microedition/lcdui/Command.java
    iOSME/src/javax/microedition/lcdui/CommandListener.java
    iOSME/src/javax/microedition/lcdui/Display.java
    iOSME/src/javax/microedition/lcdui/Displayable.java
    iOSME/src/javax/microedition/lcdui/Font.java
    iOSME/src/javax/microedition/lcdui/Graphics.java
    iOSME/src/javax/microedition/lcdui/Image.java
    iOSME/src/javax/microedition/lcdui/Screen.java
    iOSME/src/javax/microedition/lcdui/TextBox.java
    iOSME/src/javax/microedition/lcdui/TextField.java
    iOSME/src/javax/microedition/lcdui/game/
    iOSME/src/javax/microedition/lcdui/game/GameCanvas.java
    iOSME/src/javax/microedition/lcdui/game/Layer.java
    iOSME/src/javax/microedition/lcdui/game/Sprite.java
    iOSME/src/javax/microedition/m3g/
    iOSME/src/javax/microedition/m3g/Background.java
    iOSME/src/javax/microedition/m3g/Graphics3D.java
    iOSME/src/javax/microedition/m3g/Image2D.java
    iOSME/src/javax/microedition/media/
    iOSME/src/javax/microedition/media/Control.java
    iOSME/src/javax/microedition/media/Controllable.java
    iOSME/src/javax/microedition/media/Manager.java
    iOSME/src/javax/microedition/media/MediaException.java
    iOSME/src/javax/microedition/media/Player.java
    iOSME/src/javax/microedition/media/PlayerListener.java
    iOSME/src/javax/microedition/media/TonePlayer.java
    iOSME/src/javax/microedition/media/control/
    iOSME/src/javax/microedition/media/control/ToneControl.java
    iOSME/src/javax/microedition/media/control/VolumeControl.java
    iOSME/src/javax/microedition/midlet/
    iOSME/src/javax/microedition/midlet/MIDlet.java
    iOSME/src/javax/microedition/midlet/MIDletStateChangeException.java
    iOSME/src/javax/microedition/pki/
    iOSME/src/javax/microedition/pki/Certificate.java
    iOSME/src/javax/microedition/pki/CertificateException.java
    iOSME/src/net/
    iOSME/src/net/yura/
    iOSME/src/net/yura/ios/
    iOSME/src/net/yura/ios/AppController.java
    iOSME/src/net/yura/ios/CanvasView.java
    iOSME/src/net/yura/ios/SwingMEiOSApplication.java
    iOSME/src/net/yura/ios/iOSJpegEncoder.java

Modified: AndroidME/build.gradle
===================================================================
--- AndroidME/build.gradle	2021-05-12 21:58:52 UTC (rev 2447)
+++ AndroidME/build.gradle	2021-06-11 12:20:55 UTC (rev 2448)
@@ -21,7 +21,7 @@
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src_Android','src_JSR120_SMS','src_JSR135_Multimedia','src_JSR179_Location','src_JSR184_3D','src_JSR234_Advanced_Multimedia','src_JSR82_Bluetooth','src_MIDP','src_SwingME_plaf','../UtilME/src','../SwingME/src']
+            java.srcDirs = ['src_Android','src_JSR120_SMS','src_JSR135_Multimedia','src_JSR179_Location','src_JSR184_3D','src_JSR234_Advanced_Multimedia','src_JSR82_Bluetooth','src_MIDP','src_SwingME_plaf']
             res.srcDirs = ['res']
         }
     }
@@ -29,3 +29,7 @@
         minSdkVersion 4
     }
 }
+
+dependencies {
+    api project(":SwingME")
+}

Added: SwingME/build.gradle
===================================================================
--- SwingME/build.gradle	                        (rev 0)
+++ SwingME/build.gradle	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,20 @@
+apply plugin: 'java-library'
+
+compileJava {
+    targetCompatibility = 1.6
+    sourceCompatibility = 1.6
+    options.encoding = "cp1252"
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs = ['src', '../UtilME/src', '../UtilME/src_se']
+        }
+    }
+}
+
+dependencies {
+    compileOnly fileTree(dir: 'lib', include: ['*.jar'])
+    api fileTree(dir: '../UtilME/lib', include: ['*.jar'])
+}


Property changes on: SwingME/build.gradle
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: SwingME/build.xml
===================================================================
--- SwingME/build.xml	2021-05-12 21:58:52 UTC (rev 2447)
+++ SwingME/build.xml	2021-06-11 12:20:55 UTC (rev 2448)
@@ -18,7 +18,7 @@
             <mkdir dir="build"/>
             <mkdir dir="dist"/>
 
-            <javac debug="on" srcdir="src" destdir="build" source="1.4" target="1.4" classpath="../SwingMETest/lib/midletrunner.jar:../SwingMETest/lib/opt.jar:../SwingMETest/lib/m3gbasic.jar:lib/UtilME.jar" encoding="Cp1252"/>
+            <javac debug="on" srcdir="src" destdir="build" source="1.4" target="1.4" classpath="lib/UtilME.jar:lib/midletrunner.jar:lib/m3gbasic.jar:lib/opt.jar" encoding="Cp1252"/>
 
             <unzip src="lib/UtilME.jar" dest="build"/>
 

Copied: SwingME/lib/m3gbasic.jar (from rev 2447, SwingMETest/lib/m3gbasic.jar)
===================================================================
(Binary files differ)

Copied: SwingME/lib/midletrunner.jar (from rev 2447, SwingMETest/lib/midletrunner.jar)
===================================================================
(Binary files differ)

Copied: SwingME/lib/opt.jar (from rev 2447, SwingMETest/lib/opt.jar)
===================================================================
(Binary files differ)

Added: iOSME/build.gradle
===================================================================
--- iOSME/build.gradle	                        (rev 0)
+++ iOSME/build.gradle	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,25 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath group: 'org.multi-os-engine', name: 'moe-gradle', version: '1.7.+'
+    }
+}
+
+apply plugin: 'moe-sdk'
+
+sourceCompatibility = "1.8"
+targetCompatibility = "1.8"
+
+sourceSets {
+    main {
+        java {
+            srcDirs('src')
+        }
+    }
+}
+
+dependencies {
+    compileOnly files(moe.platformJar, moe.sdk.coreJar)
+}
\ No newline at end of file


Property changes on: iOSME/build.gradle
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/android/graphics/ColorMatrix.java
===================================================================
--- iOSME/src/android/graphics/ColorMatrix.java	                        (rev 0)
+++ iOSME/src/android/graphics/ColorMatrix.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,180 @@
+package android.graphics;
+
+public class ColorMatrix {
+    private final float[] mArray = new float[20];
+
+    public ColorMatrix() {
+        this.reset();
+    }
+
+    public ColorMatrix(float[] src) {
+        System.arraycopy(src, 0, this.mArray, 0, 20);
+    }
+
+    public ColorMatrix(ColorMatrix src) {
+        System.arraycopy(src.mArray, 0, this.mArray, 0, 20);
+    }
+
+    public final float[] getArray() {
+        return this.mArray;
+    }
+
+    public void reset() {
+        float[] a = this.mArray;
+
+        for(int i = 19; i > 0; --i) {
+            a[i] = 0.0F;
+        }
+
+        a[0] = a[6] = a[12] = a[18] = 1.0F;
+    }
+
+    public void set(ColorMatrix src) {
+        System.arraycopy(src.mArray, 0, this.mArray, 0, 20);
+    }
+
+    public void set(float[] src) {
+        System.arraycopy(src, 0, this.mArray, 0, 20);
+    }
+
+    public void setScale(float rScale, float gScale, float bScale, float aScale) {
+        float[] a = this.mArray;
+
+        for(int i = 19; i > 0; --i) {
+            a[i] = 0.0F;
+        }
+
+        a[0] = rScale;
+        a[6] = gScale;
+        a[12] = bScale;
+        a[18] = aScale;
+    }
+
+    public void setRotate(int axis, float degrees) {
+        this.reset();
+        float radians = degrees * 3.1415927F / 180.0F;
+        float cosine = (float)Math.cos((double)radians);
+        float sine = (float)Math.sin((double)radians);
+        switch(axis) {
+            case 0:
+                this.mArray[6] = this.mArray[12] = cosine;
+                this.mArray[7] = sine;
+                this.mArray[11] = -sine;
+                break;
+            case 1:
+                this.mArray[0] = this.mArray[17] = cosine;
+                this.mArray[2] = sine;
+                this.mArray[15] = -sine;
+                break;
+            case 2:
+                this.mArray[0] = this.mArray[6] = cosine;
+                this.mArray[1] = sine;
+                this.mArray[5] = -sine;
+                break;
+            default:
+                throw new RuntimeException();
+        }
+
+    }
+
+    public void setConcat(ColorMatrix matA, ColorMatrix matB) {
+        Object tmp = null;
+        float[] var9;
+        if(matA != this && matB != this) {
+            var9 = this.mArray;
+        } else {
+            var9 = new float[20];
+        }
+
+        float[] a = matA.mArray;
+        float[] b = matB.mArray;
+        int index = 0;
+
+        for(int j = 0; j < 20; j += 5) {
+            for(int i = 0; i < 4; ++i) {
+                var9[index++] = a[j + 0] * b[i + 0] + a[j + 1] * b[i + 5] + a[j + 2] * b[i + 10] + a[j + 3] * b[i + 15];
+            }
+
+            var9[index++] = a[j + 0] * b[4] + a[j + 1] * b[9] + a[j + 2] * b[14] + a[j + 3] * b[19] + a[j + 4];
+        }
+
+        if(var9 != this.mArray) {
+            System.arraycopy(var9, 0, this.mArray, 0, 20);
+        }
+
+    }
+
+    public void preConcat(ColorMatrix prematrix) {
+        this.setConcat(this, prematrix);
+    }
+
+    public void postConcat(ColorMatrix postmatrix) {
+        this.setConcat(postmatrix, this);
+    }
+
+    public void setSaturation(float sat) {
+        this.reset();
+        float[] m = this.mArray;
+        float invSat = 1.0F - sat;
+        float R = 0.213F * invSat;
+        float G = 0.715F * invSat;
+        float B = 0.072F * invSat;
+        m[0] = R + sat;
+        m[1] = G;
+        m[2] = B;
+        m[5] = R;
+        m[6] = G + sat;
+        m[7] = B;
+        m[10] = R;
+        m[11] = G;
+        m[12] = B + sat;
+    }
+
+    public void setRGB2YUV() {
+        this.reset();
+        float[] m = this.mArray;
+        m[0] = 0.299F;
+        m[1] = 0.587F;
+        m[2] = 0.114F;
+        m[5] = -0.16874F;
+        m[6] = -0.33126F;
+        m[7] = 0.5F;
+        m[10] = 0.5F;
+        m[11] = -0.41869F;
+        m[12] = -0.08131F;
+    }
+
+    public void setYUV2RGB() {
+        this.reset();
+        float[] m = this.mArray;
+        m[2] = 1.402F;
+        m[5] = 1.0F;
+        m[6] = -0.34414F;
+        m[7] = -0.71414F;
+        m[10] = 1.0F;
+        m[11] = 1.772F;
+        m[12] = 0.0F;
+    }
+
+    public int filterRGB(int x, int y, int rgb) {
+        int R = rgb >> 16 & 255;
+        int G = rgb >> 8 & 255;
+        int B = rgb >> 0 & 255;
+        int A = rgb >> 24 & 255;
+        int r = clamp(this.mArray[0] * (float)R + this.mArray[1] * (float)G + this.mArray[2] * (float)B + this.mArray[3] * (float)A + this.mArray[4]);
+        int g = clamp(this.mArray[5] * (float)R + this.mArray[6] * (float)G + this.mArray[7] * (float)B + this.mArray[8] * (float)A + this.mArray[9]);
+        int b = clamp(this.mArray[10] * (float)R + this.mArray[11] * (float)G + this.mArray[12] * (float)B + this.mArray[13] * (float)A + this.mArray[14]);
+        int a = clamp(this.mArray[15] * (float)R + this.mArray[16] * (float)G + this.mArray[17] * (float)B + this.mArray[18] * (float)A + this.mArray[19]);
+        return (a & 255) << 24 | (r & 255) << 16 | (g & 255) << 8 | (b & 255) << 0;
+    }
+
+    private static int clamp(float value) {
+        if(value < 0.0F) {
+            value = 0.0F;
+        } else if(value > 255.0F) {
+            value = 255.0F;
+        }
+
+        return (int)value;
+    }
+}


Property changes on: iOSME/src/android/graphics/ColorMatrix.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/com/nokia/mid/ui/DirectGraphics.java
===================================================================
--- iOSME/src/com/nokia/mid/ui/DirectGraphics.java	                        (rev 0)
+++ iOSME/src/com/nokia/mid/ui/DirectGraphics.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,36 @@
+package com.nokia.mid.ui;
+
+import javax.microedition.lcdui.Graphics;
+import apple.coregraphics.opaque.CGContextRef;
+import apple.coregraphics.c.CoreGraphics;
+import apple.uikit.UIColor;
+
+public class DirectGraphics {
+
+    private Graphics g;
+
+    public DirectGraphics(Graphics graphics) {
+        g = graphics;
+    }
+
+    public void fillPolygon(int[] xPoints, int xOffset, int[] yPoints, int yOffset, int nPoints, int argbColor) {
+        int tx = g.getTranslateX();
+        int ty = g.getTranslateY();
+        CGContextRef context = g.getContext();
+
+        if (nPoints > 0) {
+            CoreGraphics.CGContextSetLineWidth(context, 1.0);
+            CoreGraphics.CGContextMoveToPoint(context, tx + xPoints[xOffset++], ty + yPoints[yOffset++]);
+            for (int i = 1; i < nPoints; ++i) {
+                CoreGraphics.CGContextAddLineToPoint(context, tx + xPoints[xOffset++], ty + yPoints[yOffset++]);
+            }
+            CoreGraphics.CGContextClosePath(context);
+            CoreGraphics.CGContextSetFillColorWithColor(context, Graphics.getColor(argbColor).CGColor());
+            CoreGraphics.CGContextFillPath(context);
+        }
+    }
+
+    public void setARGBColor(int rgb) {
+        CoreGraphics.CGContextSetStrokeColorWithColor(g.getContext(), Graphics.getColor(rgb).CGColor());
+    }
+}


Property changes on: iOSME/src/com/nokia/mid/ui/DirectGraphics.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/com/nokia/mid/ui/DirectUtils.java
===================================================================
--- iOSME/src/com/nokia/mid/ui/DirectUtils.java	                        (rev 0)
+++ iOSME/src/com/nokia/mid/ui/DirectUtils.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,9 @@
+package com.nokia.mid.ui;
+
+import javax.microedition.lcdui.Graphics;
+
+public class DirectUtils {
+    public static DirectGraphics getDirectGraphics(Graphics graphics) {
+        return new DirectGraphics(graphics);
+    }
+}


Property changes on: iOSME/src/com/nokia/mid/ui/DirectUtils.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/amms/GlobalManager.java
===================================================================
--- iOSME/src/javax/microedition/amms/GlobalManager.java	                        (rev 0)
+++ iOSME/src/javax/microedition/amms/GlobalManager.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,12 @@
+package javax.microedition.amms;
+
+import net.yura.ios.iOSJpegEncoder;
+
+public class GlobalManager {
+    public static MediaProcessor createMediaProcessor(String string) {
+        if ("image/raw".equals(string)) {
+            return new iOSJpegEncoder();
+        }
+        throw new RuntimeException();
+    }
+}


Property changes on: iOSME/src/javax/microedition/amms/GlobalManager.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/amms/MediaProcessor.java
===================================================================
--- iOSME/src/javax/microedition/amms/MediaProcessor.java	                        (rev 0)
+++ iOSME/src/javax/microedition/amms/MediaProcessor.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,17 @@
+package javax.microedition.amms;
+
+import java.io.OutputStream;
+
+public interface MediaProcessor extends javax.microedition.media.Controllable {
+
+    /**
+     * The API for this method says it HAS to take an {@link Object}, or we could get a NoSuchMethodError
+     * But the only Object that is allowed is {@link javax.microedition.lcdui.Image}
+     * @param image an instance of {@link javax.microedition.lcdui.Image}
+     */
+    void setInput(Object image);
+
+    void setOutput(OutputStream outputStream);
+
+    void complete() throws javax.microedition.media.MediaException;
+}


Property changes on: iOSME/src/javax/microedition/amms/MediaProcessor.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/amms/control/ImageFormatControl.java
===================================================================
--- iOSME/src/javax/microedition/amms/control/ImageFormatControl.java	                        (rev 0)
+++ iOSME/src/javax/microedition/amms/control/ImageFormatControl.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,10 @@
+package javax.microedition.amms.control;
+
+public interface ImageFormatControl extends javax.microedition.media.Control {
+
+    /**
+     * @param string "image/jpeg" or "image/png"
+     */
+    public void setFormat(String string);
+
+}


Property changes on: iOSME/src/javax/microedition/amms/control/ImageFormatControl.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/io/Connection.java
===================================================================
--- iOSME/src/javax/microedition/io/Connection.java	                        (rev 0)
+++ iOSME/src/javax/microedition/io/Connection.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,8 @@
+package javax.microedition.io;
+
+import java.io.IOException;
+
+public interface Connection
+{
+    void close() throws IOException;
+}


Property changes on: iOSME/src/javax/microedition/io/Connection.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/io/ConnectionNotFoundException.java
===================================================================
--- iOSME/src/javax/microedition/io/ConnectionNotFoundException.java	                        (rev 0)
+++ iOSME/src/javax/microedition/io/ConnectionNotFoundException.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,11 @@
+package javax.microedition.io;
+
+import java.io.IOException;
+
+public class ConnectionNotFoundException extends IOException
+{
+    public ConnectionNotFoundException( String message )
+    {
+        super( message );
+    }
+}


Property changes on: iOSME/src/javax/microedition/io/ConnectionNotFoundException.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/io/Connector.java
===================================================================
--- iOSME/src/javax/microedition/io/Connector.java	                        (rev 0)
+++ iOSME/src/javax/microedition/io/Connector.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,104 @@
+package javax.microedition.io;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class Connector {
+    public static final int READ = 0x01;
+    public static final int WRITE = 0x02;
+    public static final int READ_WRITE = READ | WRITE;
+
+    private static final String PROTOCOL_ASSET = "file:///android_asset/";
+    private static final String PROTOCOL_FILE = "file:";
+    private static final String PROTOCOL_SOCKET = "socket:";
+    private static final String PROTOCOL_SSL = "ssl:";
+    private static final String PROTOCOL_HTTP = "http:";
+    private static final String PROTOCOL_HTTPS = "https:";
+    private static final String PROTOCOL_SMS = "sms:";
+
+    public static final Connection open(String name) throws IOException {
+        return open(name, READ_WRITE);
+    }
+
+    public static final Connection open(String name, int mode)
+            throws IOException {
+        Connection connection = null;
+        if (name.startsWith(PROTOCOL_ASSET)) {
+            //connection = new AndroidAssetConnection(name.substring( PROTOCOL_ASSET.length() ));
+        }
+        else if (name.startsWith(PROTOCOL_FILE)) {
+            //connection = new AndroidFileConnection(name);
+        }
+        else if (name.startsWith(PROTOCOL_SOCKET)) {
+            //connection = getSocketConnection(name);
+        }
+        else if (name.startsWith(PROTOCOL_SSL)) {
+            //connection = getSSLSocketConnection(name);
+        }
+        else if (name.startsWith(PROTOCOL_SMS)) {
+            //connection =  new MessageConnectionImpl(name);
+        }
+        else if (name.startsWith(PROTOCOL_HTTP)) {
+            //connection =  new HttpConnectionImpl(name, mode);
+        }
+        else if (name.startsWith(PROTOCOL_HTTPS)) {
+            //connection =  new HttpsConnectionImpl(name, mode);
+        }
+        else {
+            //connection = new AndroidURLConnection(name);
+        }
+
+        if (connection == null) {
+            throw new UnsupportedOperationException(name);
+        }
+
+        return connection;
+    }
+
+    public static final DataInputStream openDataInputStream(String name)
+            throws IOException {
+        return new DataInputStream(openInputStream(name));
+    }
+
+    public static final DataOutputStream openDataOutputStream(String name)
+            throws IOException {
+        return new DataOutputStream(openOutputStream(name));
+    }
+
+    public static final InputStream openInputStream(String name)
+            throws IOException {
+        Connection connection = open(name, READ);
+        return ((InputConnection) connection).openInputStream();
+    }
+
+    public static final OutputStream openOutputStream(String name)
+            throws IOException {
+        Connection connection = open(name, WRITE);
+        return ((OutputConnection) connection).openOutputStream();
+    }
+/*
+    private static Connection getSocketConnection(String name) throws IOException {
+        int portSepIndex = name.lastIndexOf(':');
+        int port = Integer.parseInt(name.substring(portSepIndex + 1));
+        String host = name.substring( (PROTOCOL_SOCKET+"//").length(), portSepIndex);
+
+        if (host.length() > 0) {
+            return new SocketConnection(host, port);
+        } else {
+            return new ServerSocketConnection(port);
+        }
+    }
+
+    private static Connection getSSLSocketConnection(String name) throws IOException {
+        int portSepIndex = name.lastIndexOf(':');
+        int port = Integer.parseInt(name.substring(portSepIndex + 1));
+        String host = name.substring( (PROTOCOL_SSL+"//").length(), portSepIndex);
+
+        java.net.Socket socket = javax.net.ssl.SSLSocketFactory.getDefault().createSocket(host,port);
+        return new SocketConnection(socket);
+    }
+*/
+}


Property changes on: iOSME/src/javax/microedition/io/Connector.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/io/ContentConnection.java
===================================================================
--- iOSME/src/javax/microedition/io/ContentConnection.java	                        (rev 0)
+++ iOSME/src/javax/microedition/io/ContentConnection.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,37 @@
+/**
+ *  MicroEmulator
+ *  Copyright (C) 2001 Bartek Teodorczyk <ba...@ba...>
+ *
+ *  It is licensed under the following two licenses as alternatives:
+ *    1. GNU Lesser General Public License (the "LGPL") version 2.1 or any newer version
+ *    2. Apache License (the "AL") Version 2.0
+ *
+ *  You may not use this file except in compliance with at least one of
+ *  the above two licenses.
+ *
+ *  You may obtain a copy of the LGPL at
+ *      http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ *
+ *  You may obtain a copy of the AL at
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the LGPL or the AL for the specific language governing permissions and
+ *  limitations.
+ *  
+ *  @version $Id: ContentConnection.java 1605 2008-02-25 21:07:14Z barteo $
+ */
+
+package javax.microedition.io;
+
+public interface ContentConnection extends StreamConnection {
+
+	String getType();
+
+	String getEncoding();
+
+	long getLength();
+
+}


Property changes on: iOSME/src/javax/microedition/io/ContentConnection.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/io/HttpConnection.java
===================================================================
--- iOSME/src/javax/microedition/io/HttpConnection.java	                        (rev 0)
+++ iOSME/src/javax/microedition/io/HttpConnection.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,118 @@
+/*
+ *  MicroEmulator
+ *  Copyright (C) 2001 Bartek Teodorczyk <ba...@ba...>
+ *
+ *  It is licensed under the following two licenses as alternatives:
+ *    1. GNU Lesser General Public License (the "LGPL") version 2.1 or any newer version
+ *    2. Apache License (the "AL") Version 2.0
+ *
+ *  You may not use this file except in compliance with at least one of
+ *  the above two licenses.
+ *
+ *  You may obtain a copy of the LGPL at
+ *      http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ *
+ *  You may obtain a copy of the AL at
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the LGPL or the AL for the specific language governing permissions and
+ *  limitations.
+ */
+
+package javax.microedition.io;
+
+import java.io.IOException;
+
+public interface HttpConnection extends ContentConnection {
+
+    static final String HEAD = "HEAD";
+    static final String GET = "GET";
+    static final String POST = "POST";
+
+    static final int HTTP_OK = 200;
+    static final int HTTP_CREATED = 201;
+    static final int HTTP_ACCEPTED = 202;
+    static final int HTTP_NOT_AUTHORITATIVE = 203;
+    static final int HTTP_NO_CONTENT = 204;
+    static final int HTTP_RESET = 205;
+    static final int HTTP_PARTIAL = 206;
+
+    static final int HTTP_MULT_CHOICE = 300;
+    static final int HTTP_MOVED_PERM = 301;
+    static final int HTTP_MOVED_TEMP = 302;
+    static final int HTTP_SEE_OTHER = 303;
+    static final int HTTP_NOT_MODIFIED = 304;
+    static final int HTTP_USE_PROXY = 305;
+    static final int HTTP_TEMP_REDIRECT = 307;
+
+    static final int HTTP_BAD_REQUEST = 400;
+    static final int HTTP_UNAUTHORIZED = 401;
+    static final int HTTP_PAYMENT_REQUIRED = 402;
+    static final int HTTP_FORBIDDEN = 403;
+    static final int HTTP_NOT_FOUND = 404;
+    static final int HTTP_BAD_METHOD = 405;
+    static final int HTTP_NOT_ACCEPTABLE = 406;
+    static final int HTTP_PROXY_AUTH = 407;
+    static final int HTTP_CLIENT_TIMEOUT = 408;
+    static final int HTTP_CONFLICT = 409;
+    static final int HTTP_GONE = 410;
+    static final int HTTP_LENGTH_REQUIRED = 411;
+    static final int HTTP_PRECON_FAILED = 412;
+    static final int HTTP_ENTITY_TOO_LARGE = 413;
+    static final int HTTP_REQ_TOO_LONG = 414;
+    static final int HTTP_UNSUPPORTED_TYPE = 415;
+    static final int HTTP_UNSUPPORTED_RANGE = 416;
+    static final int HTTP_EXPECT_FAILED = 417;
+
+    static final int HTTP_INTERNAL_ERROR = 500;
+    static final int HTTP_NOT_IMPLEMENTED = 501;
+    static final int HTTP_BAD_GATEWAY = 502;
+    static final int HTTP_UNAVAILABLE = 503;
+    static final int HTTP_GATEWAY_TIMEOUT = 504;
+    static final int HTTP_VERSION = 505;
+
+    String getURL();
+
+    String getProtocol();
+
+    String getHost();
+
+    String getFile();
+
+    String getRef();
+
+    String getQuery();
+
+    int getPort();
+
+    String getRequestMethod();
+
+    void setRequestMethod(String method) throws IOException;
+
+    String getRequestProperty(String key);
+
+    void setRequestProperty(String key, String value) throws IOException;
+
+    int getResponseCode() throws IOException;
+
+    String getResponseMessage() throws IOException;
+
+    long getExpiration() throws IOException;
+
+    long getDate() throws IOException;
+
+    long getLastModified() throws IOException;
+
+    String getHeaderField(String name) throws IOException;
+
+    int getHeaderFieldInt(String name, int def) throws IOException;
+
+    long getHeaderFieldDate(String name, long def) throws IOException;
+
+    String getHeaderField(int n) throws IOException;
+
+    String getHeaderFieldKey(int n) throws IOException;
+}


Property changes on: iOSME/src/javax/microedition/io/HttpConnection.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/io/HttpsConnection.java
===================================================================
--- iOSME/src/javax/microedition/io/HttpsConnection.java	                        (rev 0)
+++ iOSME/src/javax/microedition/io/HttpsConnection.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,10 @@
+package javax.microedition.io;
+
+import java.io.*;
+
+public interface HttpsConnection extends HttpConnection {
+
+    public SecurityInfo getSecurityInfo() throws IOException;
+
+    public int getPort();
+}


Property changes on: iOSME/src/javax/microedition/io/HttpsConnection.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/io/InputConnection.java
===================================================================
--- iOSME/src/javax/microedition/io/InputConnection.java	                        (rev 0)
+++ iOSME/src/javax/microedition/io/InputConnection.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,14 @@
+package javax.microedition.io;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public interface InputConnection extends Connection
+{
+    DataInputStream openDataInputStream()
+        throws IOException;
+    
+    InputStream openInputStream()
+        throws IOException;
+}


Property changes on: iOSME/src/javax/microedition/io/InputConnection.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/io/OutputConnection.java
===================================================================
--- iOSME/src/javax/microedition/io/OutputConnection.java	                        (rev 0)
+++ iOSME/src/javax/microedition/io/OutputConnection.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,14 @@
+package javax.microedition.io;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+public interface OutputConnection extends Connection
+{
+    DataOutputStream openDataOutputStream()
+        throws IOException;
+    
+    OutputStream openOutputStream()
+        throws IOException;
+}


Property changes on: iOSME/src/javax/microedition/io/OutputConnection.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/io/SecurityInfo.java
===================================================================
--- iOSME/src/javax/microedition/io/SecurityInfo.java	                        (rev 0)
+++ iOSME/src/javax/microedition/io/SecurityInfo.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,14 @@
+package javax.microedition.io;
+
+import javax.microedition.pki.Certificate;
+
+public interface SecurityInfo {
+
+    public Certificate getServerCertificate();
+
+    public String getProtocolVersion();
+
+    public String getProtocolName();
+
+    public String getCipherSuite();
+}


Property changes on: iOSME/src/javax/microedition/io/SecurityInfo.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/io/ServerSocketConnection.java
===================================================================
--- iOSME/src/javax/microedition/io/ServerSocketConnection.java	                        (rev 0)
+++ iOSME/src/javax/microedition/io/ServerSocketConnection.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,35 @@
+/*
+ *  MicroEmulator
+ *  Copyright (C) 2001-2006 Bartek Teodorczyk <ba...@ba...>
+ *
+ *  It is licensed under the following two licenses as alternatives:
+ *    1. GNU Lesser General Public License (the "LGPL") version 2.1 or any newer version
+ *    2. Apache License (the "AL") Version 2.0
+ *
+ *  You may not use this file except in compliance with at least one of
+ *  the above two licenses.
+ *
+ *  You may obtain a copy of the LGPL at
+ *      http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ *
+ *  You may obtain a copy of the AL at
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the LGPL or the AL for the specific language governing permissions and
+ *  limitations.
+ */
+
+package javax.microedition.io;
+
+import java.io.IOException;
+
+public interface ServerSocketConnection extends StreamConnectionNotifier {
+	
+	public String getLocalAddress() throws IOException;
+	
+	public int getLocalPort() throws IOException;
+
+}


Property changes on: iOSME/src/javax/microedition/io/ServerSocketConnection.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/io/SocketConnection.java
===================================================================
--- iOSME/src/javax/microedition/io/SocketConnection.java	                        (rev 0)
+++ iOSME/src/javax/microedition/io/SocketConnection.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,55 @@
+/*
+ *  MicroEmulator
+ *  Copyright (C) 2006 Bartek Teodorczyk <ba...@ba...>
+ *
+ *  It is licensed under the following two licenses as alternatives:
+ *    1. GNU Lesser General Public License (the "LGPL") version 2.1 or any newer version
+ *    2. Apache License (the "AL") Version 2.0
+ *
+ *  You may not use this file except in compliance with at least one of
+ *  the above two licenses.
+ *
+ *  You may obtain a copy of the LGPL at
+ *      http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ *
+ *  You may obtain a copy of the AL at
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the LGPL or the AL for the specific language governing permissions and
+ *  limitations.
+ */
+
+package javax.microedition.io;
+
+import java.io.IOException;
+
+public interface SocketConnection extends StreamConnection {
+
+	public static final byte DELAY = 0;
+
+	public static final byte LINGER = 1;
+
+	public static final byte KEEPALIVE = 2;
+
+	public static final byte RCVBUF = 3;
+
+	public static final byte SNDBUF = 4;
+
+	public void setSocketOption(byte option, int value)
+			throws IllegalArgumentException, IOException;
+
+	public int getSocketOption(byte option) throws IllegalArgumentException,
+			IOException;
+
+	public String getLocalAddress() throws IOException;
+
+	public int getLocalPort() throws IOException;
+
+	public String getAddress() throws IOException;
+
+	public int getPort() throws IOException;
+
+}


Property changes on: iOSME/src/javax/microedition/io/SocketConnection.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/io/StreamConnection.java
===================================================================
--- iOSME/src/javax/microedition/io/StreamConnection.java	                        (rev 0)
+++ iOSME/src/javax/microedition/io/StreamConnection.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,6 @@
+package javax.microedition.io;
+
+public interface StreamConnection extends InputConnection, OutputConnection
+{
+
+}


Property changes on: iOSME/src/javax/microedition/io/StreamConnection.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/io/StreamConnectionNotifier.java
===================================================================
--- iOSME/src/javax/microedition/io/StreamConnectionNotifier.java	                        (rev 0)
+++ iOSME/src/javax/microedition/io/StreamConnectionNotifier.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,35 @@
+/**
+ *  MicroEmulator
+ *  Copyright (C) 2001 Bartek Teodorczyk <ba...@ba...>
+ *
+ *  It is licensed under the following two licenses as alternatives:
+ *    1. GNU Lesser General Public License (the "LGPL") version 2.1 or any newer version
+ *    2. Apache License (the "AL") Version 2.0
+ *
+ *  You may not use this file except in compliance with at least one of
+ *  the above two licenses.
+ *
+ *  You may obtain a copy of the LGPL at
+ *      http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+ *
+ *  You may obtain a copy of the AL at
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the LGPL or the AL for the specific language governing permissions and
+ *  limitations.
+ *  
+ *  @version $Id: StreamConnectionNotifier.java 1605 2008-02-25 21:07:14Z barteo $  
+ */
+
+package javax.microedition.io;
+
+import java.io.IOException;
+
+public interface StreamConnectionNotifier extends Connection {
+
+	StreamConnection acceptAndOpen() throws IOException;
+
+}


Property changes on: iOSME/src/javax/microedition/io/StreamConnectionNotifier.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/io/file/FileConnection.java
===================================================================
--- iOSME/src/javax/microedition/io/file/FileConnection.java	                        (rev 0)
+++ iOSME/src/javax/microedition/io/file/FileConnection.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,43 @@
+package javax.microedition.io.file;
+
+import java.io.IOException;
+
+import javax.microedition.io.InputConnection;
+import javax.microedition.io.OutputConnection;
+import javax.microedition.io.StreamConnection;
+
+public interface FileConnection extends javax.microedition.io.Connection, InputConnection,
+		OutputConnection, StreamConnection {
+	
+	 long availableSize(); 
+	 boolean canRead(); 
+	 boolean canWrite(); 
+	 void create() throws IOException; 
+	 void delete()  throws IOException;
+	 long directorySize(boolean includeSubDirs) throws IOException; 
+	 boolean exists(); 
+	 long fileSize() throws IOException; 
+	 java.lang.String getName(); 
+	 java.lang.String getPath();
+	 java.lang.String getURL();
+	 boolean isDirectory();
+	 boolean isHidden();
+	 boolean isOpen();
+	 long lastModified();
+	 java.util.Enumeration list() throws IOException; 
+	 java.util.Enumeration list(java.lang.String filter, boolean includeHidden) throws IOException; 
+	 void mkdir() throws IOException; 
+	 java.io.DataInputStream openDataInputStream() throws IOException; 
+	 java.io.DataOutputStream openDataOutputStream() throws IOException; 
+	 java.io.InputStream openInputStream() throws IOException;
+	 java.io.OutputStream openOutputStream() throws IOException;  
+	 java.io.OutputStream openOutputStream(long byteOffset) throws IOException; 
+	 void rename(java.lang.String newName) throws IOException; 
+	 void setFileConnection(java.lang.String fileName) throws IOException; 
+	 void setHidden(boolean hidden) throws IOException; 
+	 void setReadable(boolean readable)  throws IOException;
+	 void setWritable(boolean writable)  throws IOException;
+	 long totalSize();
+	 void truncate(long byteOffset) throws IOException; 
+	 long usedSize();
+}


Property changes on: iOSME/src/javax/microedition/io/file/FileConnection.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/io/file/FileSystemListener.java
===================================================================
--- iOSME/src/javax/microedition/io/file/FileSystemListener.java	                        (rev 0)
+++ iOSME/src/javax/microedition/io/file/FileSystemListener.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,8 @@
+package javax.microedition.io.file;
+
+public interface FileSystemListener {
+	public static final int ROOT_ADDED 		= 0;
+	public static final int ROOT_REMOVED 	= 1;
+	
+	void rootChanged( int state, String rootName );
+}


Property changes on: iOSME/src/javax/microedition/io/file/FileSystemListener.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/io/file/FileSystemRegistry.java
===================================================================
--- iOSME/src/javax/microedition/io/file/FileSystemRegistry.java	                        (rev 0)
+++ iOSME/src/javax/microedition/io/file/FileSystemRegistry.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,32 @@
+package javax.microedition.io.file;
+
+import java.io.File;
+import java.util.Enumeration;
+import java.util.Vector;
+
+public class FileSystemRegistry {
+
+    public static boolean addFileSystemListener(FileSystemListener listener) {
+        return false;
+    }
+
+    public static boolean removeFileSystemListener(FileSystemListener listener) {
+        return false;
+    }
+
+    public static Enumeration listRoots() {
+        File[] roots = File.listRoots();
+        Vector<String> rootsArray = new Vector<String>(roots.length);
+        for (File root : roots) {
+            try {
+                String path = root.getCanonicalPath();
+                rootsArray.add(path);
+            }
+            catch (Exception e) {
+                //Logger.warn("error with " + root, e);
+                e.printStackTrace(); // TODO
+            }
+        }
+        return rootsArray.elements();
+    }
+}


Property changes on: iOSME/src/javax/microedition/io/file/FileSystemRegistry.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/lcdui/AlertType.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/AlertType.java	                        (rev 0)
+++ iOSME/src/javax/microedition/lcdui/AlertType.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,67 @@
+// ME4SE - A MicroEdition Emulation for J2SE
+//
+// Copyright (C) 2001 Stefan Haustein, Oberhausen (Rhld.), Germany
+//
+// Contributors:
+//
+// STATUS: API complete
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version. This program is
+// distributed in the hope that it will be useful, but WITHOUT ANY
+// WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+// License for more details. You should have received a copy of the
+// GNU General Public License along with this program; if not, write
+// to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+package javax.microedition.lcdui;
+
+/**
+ * @API MIDP-1.0
+ */
+public class AlertType {
+
+	/**
+	 * @API MIDP-1.0
+	 */
+	public static final AlertType INFO = new AlertType();
+
+	/**
+	 * @API MIDP-1.0
+	 */
+	public static final AlertType WARNING = new AlertType();
+
+	/**
+	 * @API MIDP-1.0
+	 */
+	public static final AlertType ERROR = new AlertType();
+
+	/**
+	 * @API MIDP-1.0
+ 	 */
+	public static final AlertType ALARM = new AlertType();
+
+	/**
+	 * @API MIDP-1.0
+	 */
+	public static final AlertType CONFIRMATION = new AlertType();
+
+	/**
+	 * @API MIDP-1.0
+	 */
+	protected AlertType() {
+	}
+
+	/**
+	 * @API MIDP-1.0
+	 */
+	public boolean playSound(Display display) {
+		// TODO
+		return true;
+	}
+
+}


Property changes on: iOSME/src/javax/microedition/lcdui/AlertType.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/lcdui/Canvas.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Canvas.java	                        (rev 0)
+++ iOSME/src/javax/microedition/lcdui/Canvas.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,215 @@
+package javax.microedition.lcdui;
+
+import net.yura.ios.AppController;
+import net.yura.ios.CanvasView;
+import apple.coregraphics.struct.CGPoint;
+import apple.coregraphics.struct.CGRect;
+import apple.coregraphics.struct.CGSize;
+import apple.uikit.UIView;
+
+public abstract class Canvas extends Displayable {
+
+    public static final int UP = 1;
+    public static final int DOWN = 6;
+    public static final int LEFT = 2;
+    public static final int RIGHT = 5;
+    public static final int FIRE = 8;
+
+    public static final int GAME_A = 9;
+    public static final int GAME_B = 10;
+    public static final int GAME_C = 11;
+    public static final int GAME_D = 12;
+
+    public static final int KEY_NUM0 = 48;
+    public static final int KEY_NUM1 = 49;
+    public static final int KEY_NUM2 = 50;
+    public static final int KEY_NUM3 = 51;
+    public static final int KEY_NUM4 = 52;
+    public static final int KEY_NUM5 = 53;
+    public static final int KEY_NUM6 = 54;
+    public static final int KEY_NUM7 = 55;
+    public static final int KEY_NUM8 = 56;
+    public static final int KEY_NUM9 = 57;
+    public static final int KEY_STAR = 42;
+    public static final int KEY_POUND = 35;
+
+    private int usedWidth,usedHeight;
+
+    CanvasView canvasView;
+
+    protected Canvas() {
+
+    }
+
+    public void setFullScreenMode(boolean fullScreen) {
+        // do nothing, is this possible on android?
+    }
+
+    public int getGameAction(int keyCode) {
+        int res;
+        switch (keyCode) {
+            case -5:
+            case -10:
+                res = Canvas.FIRE;
+                break;
+            case -1:
+                res = Canvas.UP;
+                break;
+            case -2:
+            case '\t': // this is the tab key, and same as code = 9
+                res = Canvas.DOWN;
+                break;
+            case -3:
+                res = Canvas.LEFT;
+                break;
+            case -4:
+                res = Canvas.RIGHT;
+                break;
+            case '7':
+                res = Canvas.GAME_A;
+                break;
+            case '9':
+                res = Canvas.GAME_B;
+                break;
+            case '*':
+                res = Canvas.GAME_C;
+                break;
+            case '#':
+                res = Canvas.GAME_D;
+                break;
+            default:
+                res = 0;
+                break;
+        }
+        return res;
+    }
+
+    public int getKeyCode(int gameAction) {
+        int res;
+        switch (gameAction) {
+            case Canvas.FIRE:
+                res = -5;
+                break;
+            case Canvas.UP:
+                res = -1;
+                break;
+            case Canvas.DOWN:
+                res = -2;
+                break;
+            case Canvas.LEFT:
+                res = -3;
+                break;
+            case Canvas.RIGHT:
+                res = -4;
+                break;
+            case Canvas.GAME_A:
+                res = '7';
+                break;
+            case Canvas.GAME_B:
+                res = '9';
+                break;
+            case Canvas.GAME_C:
+                res = '*';
+                break;
+            case Canvas.GAME_D:
+                res = '#';
+                break;
+            default:
+                res = 0;
+                break;
+        }
+        return res;
+    }
+
+    public void repaint(int x, int y, int w, int h) {
+        CGRect rect = new CGRect(new CGPoint(x, y), new CGSize(w, h));
+        canvasView.setNeedsDisplayInRect(rect);
+    }
+
+    public void repaint() {
+        if (canvasView != null) {
+            canvasView.setNeedsDisplay();
+        }
+    }
+
+    protected void keyPressed(int keyCode) {
+    }
+
+    protected void keyReleased(int keyCode) {
+
+    }
+
+    protected void keyRepeated(int keyCode) {
+
+    }
+
+    protected abstract void paint(Graphics g);
+
+    public final void doPaint(Graphics g) {
+        paint(g);
+    }
+
+    public boolean hasPointerEvents() {
+        return true;
+    }
+
+    protected void pointerPressed(int x, int y) {
+
+    }
+
+    protected void pointerReleased(int x, int y) {
+
+    }
+
+    protected void pointerDragged(int x, int y) {
+
+    }
+
+    // Multi-touch. Not available in MIDP
+    public void multitouchEvent(int[] type, int[] x, int[] y) {
+
+    }
+
+    protected void sizeChanged(int w, int h) {
+
+    }
+
+    public final void fireSizeChanged(int w, int h) {
+        sizeChanged(w, h);
+    }
+
+    @Override
+    public void initDisplayable(AppController controller) {
+        if (canvasView == null) {
+            canvasView = CanvasView.alloc().initWithFrame(controller.view().bounds());
+            canvasView.setCanvas(this);
+            controller.setRendererView(canvasView);
+        }
+    }
+
+    @Override
+    public UIView getView() {
+        return canvasView;
+    }
+
+    protected void hideNotify() {}
+
+    protected void showNotify() {}
+
+    public final void fireHideNotify() {
+        hideNotify();
+    }
+
+    public final void fireShowNotify() {
+        showNotify();
+    }
+
+    public void serviceRepaints() {
+        throw new RuntimeException("not implemented");
+        //AndroidMeApp.getIntance().invokeAndWait(new Thread());
+    }
+
+    public String getKeyName(int keyCode) {
+        return null;
+    }
+}


Property changes on: iOSME/src/javax/microedition/lcdui/Canvas.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/lcdui/Command.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Command.java	                        (rev 0)
+++ iOSME/src/javax/microedition/lcdui/Command.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,46 @@
+package javax.microedition.lcdui;
+
+
+public class Command
+{  
+    public static final int BACK    = 1;
+    public static final int CANCEL  = 2;
+    public static final int EXIT    = 3;
+    public static final int HELP    = 4;
+    public static final int ITEM    = 5;
+    public static final int OK      = 6;
+    public static final int SCREEN  = 7;
+    public static final int STOP    = 8;
+    
+    private int priority;
+    private int commandType;
+    private String label;
+    private String longLabel;
+
+    public Command( String label, int commandType, int priority ) {
+    	this( label, null, commandType, priority );
+    }
+    
+    public Command( String label, String longLabel, int commandType, int priority )
+    {
+        this.label = label;
+        this.longLabel = longLabel;
+        this.commandType = commandType;
+        this.priority = priority;
+    }
+    
+    public int getCommandType()
+    {
+        return this.commandType;
+    }
+    
+    public String getLabel()
+    {
+        return this.label;
+    }
+    
+    public int getPriority()
+    {
+        return this.priority;
+    }
+}


Property changes on: iOSME/src/javax/microedition/lcdui/Command.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/lcdui/CommandListener.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/CommandListener.java	                        (rev 0)
+++ iOSME/src/javax/microedition/lcdui/CommandListener.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,6 @@
+package javax.microedition.lcdui;
+
+public interface CommandListener
+{
+    void commandAction( Command c, Displayable d );
+}


Property changes on: iOSME/src/javax/microedition/lcdui/CommandListener.java
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: iOSME/src/javax/microedition/lcdui/Display.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Display.java	                        (rev 0)
+++ iOSME/src/javax/microedition/lcdui/Display.java	2021-06-11 12:20:55 UTC (rev 2448)
@@ -0,0 +1,220 @@
+package javax.microedition.lcdui;
+
+import net.yura.ios.AppController;
+import java.util.Hashtable;
+import javax.microedition.midlet.MIDlet;
+import apple.foundation.NSOperationQueue;
+
+public class Display {
+
+    public static final int COLOR_BACKGROUND = 0;
+    public static final int COLOR_FOREGROUND = 1;
+    public static final int COLOR_BORDER     = 2;
+    public static final int COLOR_HIGHLIGHTED_BACKGROUND     = 3;
+    public static final int COLOR_HIGHLIGHTED_FOREGROUND     = 4;
+    public static final int COLOR_HIGHLIGHTED_BORDER         = 5;
+
+
+    public static final int LIST_ELEMENT             = 0;
+    public static final int ALERT                    = 1;
+    public static final int CHOICE_GROUP_ELEMENT     = 2;
+
+    private static final Hashtable<MIDlet, Display> DISPLAYS = new Hashtable<MIDlet, Display>( 1 );
+
+    public static Display getDisplay(MIDlet midlet) {
+        Display display = DISPLAYS.get(midlet);
+        if( display == null )
+        {
+            display = new Display(midlet);
+            DISPLAYS.put(midlet, display);
+        }
+        return display;
+    }
+
+    private AppController appController;
+
+    private Displayable current;
+    //TODO: Create accessor
+    public Displayable hiddenDisplay;
+    private MIDlet midlet;
+
+    private Display(MIDlet midlet) {
+        this.midlet = midlet;
+    }
+
+    public Displayable getCurrent() {
+        return this.current;
+    }
+
+    public int getColor( int colorSpecifier ) {
+        // TODO :is there any way to look this up
+        int color;
+        switch( colorSpecifier ) {
+        case COLOR_BACKGROUND:
+            color = 0x000000;
+            break;
+        case COLOR_FOREGROUND:
+            color = 0xFFFFFF;
+            break;
+        case COLOR_BORDER:
+            color = 0x888888;
+            break;
+        case COLOR_HIGHLIGHTED_BACKGROUND:
+            color = 0xff8600;
+            break;
+        case COLOR_HIGHLIGHTED_FOREGROUND:
+            color = 0x000000;
+            break;
+        case COLOR_HIGHLIGHTED_BORDER:
+            color = 0xAAAAAA;
+            break;
+        default:
+            color = 0xFF0000;
+            break;
+        }
+        return color;
+    }
+
+    public int getBestImageWidth( int imageType ) {
+        return 48;
+    }
+
+    public int getBestImageHeight( int imageType ) {
+        return 48;
+    }
+
+    public MIDlet getMIDlet()
+    {
+        return this.midlet;
+    }
+
+    public void setController(AppController appController) {
+        this.appController = appController;
+
+        if (current instanceof Canvas) {
+            current.initDisplayable(appController);
+        }
+    }
+
+    public void setCurrent(final Displayable newCurrent) {
+
+        if (newCurrent == null) {
+            // TODO hide app, then return
+            throw new UnsupportedOperationException();
+        }
+
+        // Hide Keyboard, any time a new Displayable is set
+        if (!(newCurrent instanceof TextBox) && current instanceof Canvas) {
+            //((Canvas) current).hideSoftKeyboard();
+        }
+
+        //if (activity == null) {
+        //    hiddenDisplay = newCurrent;
+        //    return;
+        //}
+        hiddenDisplay = null;
+
+        if (newCurrent != current) {
+
+            newCurrent.setCurrentDisplay(Display.this);
+
+            if (appController != null) {
+                newCurrent.initDisplayable(appController);
+            }
+
+            current = newCurrent;
+            /*
+            AndroidMeApp.getIntance().invokeAndWait(new Runnable() {
+                public void run() {
+
+                    // TextBox is special... we don't really have any UI
+                    if (newCurrent instanceof TextBox) {
+                        newCurrent.initDisplayable(null);
+                        return;
+                   ...
 
[truncated message content]