swingme-svn — subversion diffs

[Swingme-svn] SF.net SVN: swingme:[2685] iOSME/src/javax/microedition/midlet/MIDlet.java

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

Revision: 2685
          http://sourceforge.net/p/swingme/code/2685
Author:   yuranet
Date:     2023-01-25 20:42:04 +0000 (Wed, 25 Jan 2023)
Log Message:
-----------
allow setting params on new controllers

Modified Paths:
--------------
    iOSME/src/javax/microedition/midlet/MIDlet.java

Modified: iOSME/src/javax/microedition/midlet/MIDlet.java
===================================================================
--- iOSME/src/javax/microedition/midlet/MIDlet.java	2023-01-25 17:36:49 UTC (rev 2684)
+++ iOSME/src/javax/microedition/midlet/MIDlet.java	2023-01-25 20:42:04 UTC (rev 2685)
@@ -5,6 +5,7 @@
 import net.yura.ios.iOSUtil;
 import net.yura.mobile.util.Url;
 import java.io.File;
+import java.lang.reflect.Method;
 import java.net.URLConnection;
 import java.util.Map;
 import javax.microedition.io.ConnectionNotFoundException;
@@ -122,6 +123,14 @@
             if (isProtoNative) {
                 Class<?> myClass = Class.forName(nsUrl.host());
                 UIViewController viewController = ((UIViewController)myClass.getMethod("alloc").invoke(null)).init();
+
+                if (nsUrl.query() != null) {
+                    Map<String, String> options = Url.toHashtable(nsUrl.query());
+                    for (Map.Entry<String, String> entry : options.entrySet()) {
+                        setProperty(viewController, entry.getKey(), entry.getValue());
+                    }
+                }
+
                 UINavigationController rootViewController = (UINavigationController) UIApplication.sharedApplication().keyWindow().rootViewController();
                 rootViewController.pushViewControllerAnimated(viewController, true);
             }
@@ -297,6 +306,12 @@
         return false;
     }
 
+    private static void setProperty(Object viewController, String key, String value) throws Exception {
+        Class<?> objClass = viewController.getClass();
+        Method setter = objClass.getMethod("set" + key.substring(0, 1).toUpperCase() + key.substring(1), String.class);
+        setter.invoke(viewController, value);
+    }
+
     private static boolean canSendMail() {
         try {
             return MFMailComposeViewController.canSendMail();

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

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

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

Revision: 2684
          http://sourceforge.net/p/swingme/code/2684
Author:   yuranet
Date:     2023-01-25 17:36:49 +0000 (Wed, 25 Jan 2023)
Log Message:
-----------
SwingMETest update to latest SwingME

Modified Paths:
--------------
    SwingMETest/test/net/yura/mobile/junit/JMUnitTest.java

Property Changed:
----------------
    SwingMETest/gradlew

Index: SwingMETest/gradlew
===================================================================
--- SwingMETest/gradlew	2023-01-25 17:35:33 UTC (rev 2683)
+++ SwingMETest/gradlew	2023-01-25 17:36:49 UTC (rev 2684)

Property changes on: SwingMETest/gradlew
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: SwingMETest/test/net/yura/mobile/junit/JMUnitTest.java
===================================================================
--- SwingMETest/test/net/yura/mobile/junit/JMUnitTest.java	2023-01-25 17:35:33 UTC (rev 2683)
+++ SwingMETest/test/net/yura/mobile/junit/JMUnitTest.java	2023-01-25 17:36:49 UTC (rev 2684)
@@ -8,7 +8,6 @@
 import javax.microedition.io.StreamConnection;
 import jmunit.framework.cldc11.*;
 import net.yura.mobile.gui.DesktopPane;
-import net.yura.mobile.gui.Midlet;
 import net.yura.mobile.gui.components.Button;
 import net.yura.mobile.gui.components.Frame;
 import net.yura.mobile.gui.components.Panel;
@@ -81,12 +80,10 @@
             Object obj2 = RMSUtil.load("Test1");
 
             assertTrue( SystemUtil.equals(obj, obj2) );
-
     }
     
     
     public void testSocketGet() throws Exception {
-        
 /*
         StreamConnection socket = (StreamConnection)Connector.open("socket://google.com:80");
         //Socket socket = SSLSocketFactory.getDefault().createSocket("google.com", 443 );
@@ -113,7 +110,6 @@
         String result = new String(bytes,"ISO-8859-1");
         System.out.println( result );
 */
-        
     }
     
     public void testShowing() {
@@ -168,5 +164,4 @@
 
         System.out.println("testShowing done");
     }
-    
 }

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

[Swingme-svn] SF.net SVN: swingme:[2683] AndroidME/src_Test

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

Revision: 2683
          http://sourceforge.net/p/swingme/code/2683
Author:   yuranet
Date:     2023-01-25 17:35:33 +0000 (Wed, 25 Jan 2023)
Log Message:
-----------
AndroidME tests update

Modified Paths:
--------------
    AndroidME/src_Test/jmunit/framework/cldc11/TestCase.java
    AndroidME/src_Test/net/yura/android/MainTest.java
    AndroidME/src_Test/net/yura/android/TestMIDlet.java

Modified: AndroidME/src_Test/jmunit/framework/cldc11/TestCase.java
===================================================================
--- AndroidME/src_Test/jmunit/framework/cldc11/TestCase.java	2023-01-24 15:50:05 UTC (rev 2682)
+++ AndroidME/src_Test/jmunit/framework/cldc11/TestCase.java	2023-01-25 17:35:33 UTC (rev 2683)
@@ -7,5 +7,4 @@
     public TestCase(int num,String name) {
         
     }
-    
 }

Modified: AndroidME/src_Test/net/yura/android/MainTest.java
===================================================================
--- AndroidME/src_Test/net/yura/android/MainTest.java	2023-01-24 15:50:05 UTC (rev 2682)
+++ AndroidME/src_Test/net/yura/android/MainTest.java	2023-01-25 17:35:33 UTC (rev 2683)
@@ -8,7 +8,7 @@
 import javax.wireless.messaging.TextMessage;
 
 import net.yura.mobile.gui.KeyEvent;
-import net.yura.mobile.gui.Midlet;
+import net.yura.mobile.gui.Application;
 import net.yura.mobile.gui.components.Button;
 import net.yura.mobile.gui.components.ComboBox;
 import net.yura.mobile.gui.components.Label;
@@ -72,7 +72,7 @@
             addToScrollPane(this, null, exit);
         }
         else if ("exit".equals(actionCommand)) {
-            Midlet.exit();
+            Application.exit();
         }
         else if ("sms".equals(actionCommand)) {
 
@@ -102,7 +102,7 @@
         else if ("notification".equals(actionCommand)) {
             String url = "notify://dummyServer?title=test&num=4&message=Some Message&icon=notify_new_msgs";
             try {
-                Midlet.getMidlet().platformRequest(url);
+                Application.getInstance().platformRequest(url);
             } catch (Throwable e) {
                 // TODO Auto-generated catch block
                 e.printStackTrace();
@@ -111,7 +111,7 @@
         else if ("nativePopup".equals(actionCommand)) {
             String url = "native://net.yura.android.TestTimePickerActivity";
             try {
-                Midlet.getMidlet().platformRequest(url);
+                Application.getInstance().platformRequest(url);
             }
             catch (Throwable e) {
                 e.printStackTrace();
@@ -120,12 +120,11 @@
         else if ("datepicker".equals(actionCommand)) {
 
             try {
-                Midlet.getMidlet().platformRequest("native://net.yura.android.datepicker.CalendarPickerActivity/1984-04-12");
+                Application.getInstance().platformRequest("native://net.yura.android.datepicker.CalendarPickerActivity/1984-04-12");
             }
             catch (Throwable e) {
                 e.printStackTrace();
             }
-
         }
         else {
             throw new RuntimeException("unknown command: "+actionCommand);

Modified: AndroidME/src_Test/net/yura/android/TestMIDlet.java
===================================================================
--- AndroidME/src_Test/net/yura/android/TestMIDlet.java	2023-01-24 15:50:05 UTC (rev 2682)
+++ AndroidME/src_Test/net/yura/android/TestMIDlet.java	2023-01-25 17:35:33 UTC (rev 2683)
@@ -1,6 +1,6 @@
 package net.yura.android;
 
-import net.yura.mobile.gui.Midlet;
+import net.yura.mobile.gui.Application;
 import net.yura.mobile.gui.DesktopPane;
 import net.yura.mobile.gui.components.OptionPane;
 import net.yura.mobile.test.MainPane;
@@ -8,7 +8,7 @@
 /**
  * @author Yura Mamyrin
  */
-public class TestMIDlet extends Midlet {
+public class TestMIDlet extends Application {
 
 	protected DesktopPane makeNewRootPane() {
 		return new MainPane(this);

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

[Swingme-svn] SF.net SVN: swingme:[2682] iOSME/src/net/yura/ios/WebViewController.java

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

Revision: 2682
          http://sourceforge.net/p/swingme/code/2682
Author:   yuranet
Date:     2023-01-24 15:50:05 +0000 (Tue, 24 Jan 2023)
Log Message:
-----------
fix title color when white page is opened in dark theme

Modified Paths:
--------------
    iOSME/src/net/yura/ios/WebViewController.java

Modified: iOSME/src/net/yura/ios/WebViewController.java
===================================================================
--- iOSME/src/net/yura/ios/WebViewController.java	2023-01-24 14:56:43 UTC (rev 2681)
+++ iOSME/src/net/yura/ios/WebViewController.java	2023-01-24 15:50:05 UTC (rev 2682)
@@ -5,8 +5,10 @@
 import apple.foundation.NSData;
 import apple.foundation.NSError;
 import apple.foundation.NSURL;
+import apple.uikit.UINavigationBarAppearance;
 import apple.uikit.UIScreen;
 import apple.uikit.UIViewController;
+import apple.uikit.enums.UIUserInterfaceStyle;
 import apple.uikit.enums.UIViewAutoresizing;
 import apple.webkit.WKNavigation;
 import apple.webkit.WKUserContentController;
@@ -104,6 +106,7 @@
                 // we want to load text as UTF-8, as by default iOS seems to use some other encoding
                 NSData data = NSData.dataWithContentsOfURL(htmlFileUrl);
                 myWebView.loadDataMIMETypeCharacterEncodingNameBaseURL(data, "text/plain", "UTF-8", mainBundle.resourceURL());
+                setTitle(name);
             }
             else {
                 myWebView.loadFileURLAllowingReadAccessToURL(htmlFileUrl, mainBundle.resourceURL());
@@ -129,7 +132,10 @@
                 @Override
                 public void call_evaluateJavaScriptCompletionHandler(Object title, NSError error) {
                     if (error == null) {
-                        setTitle(String.valueOf(title));
+                        String titleString = String.valueOf(title);
+                        if (!"".equals(titleString)) {
+                            setTitle(titleString);
+                        }
                     }
                     else {
                         System.err.println("Error getting title: " + error);
@@ -137,5 +143,22 @@
                 }
             });
         }
+
+        // if we are in dark mode, check if page is white, as we may get white title on white background
+        if (traitCollection().userInterfaceStyle() == UIUserInterfaceStyle.Dark) {
+            myWebView.evaluateJavaScriptCompletionHandler("window.getComputedStyle(document.body, null).getPropertyValue('background-color')", new WKWebView.Block_evaluateJavaScriptCompletionHandler() {
+                @Override
+                public void call_evaluateJavaScriptCompletionHandler(Object color, NSError error) {
+                    // if the background is hard coded to white
+                    if ("rgb(255, 255, 255)".equals(color)) {
+                        // we do NOT want the 'TransparentBackground' as then we will get white title on white background
+                        UINavigationBarAppearance appearance = UINavigationBarAppearance.alloc().init();
+                        appearance.configureWithOpaqueBackground();
+                        //appearance.setTitleTextAttributes((NSDictionary<String, ?>) NSDictionary.dictionaryWithObjectForKey(UIColor.blackColor(), UIKit.NSForegroundColorAttributeName()));
+                        navigationItem().setScrollEdgeAppearance(appearance);
+                    }
+                }
+            });
+        }
     }
 }

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

[Swingme-svn] SF.net SVN: swingme:[2681] iOSME/src/net/yura/ios

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

Revision: 2681
          http://sourceforge.net/p/swingme/code/2681
Author:   yuranet
Date:     2023-01-24 14:56:43 +0000 (Tue, 24 Jan 2023)
Log Message:
-----------
docs update

Modified Paths:
--------------
    iOSME/src/net/yura/ios/AppController.java
    iOSME/src/net/yura/ios/SwingMEiOSApplication.java
    iOSME/src/net/yura/ios/WebViewController.java

Modified: iOSME/src/net/yura/ios/AppController.java
===================================================================
--- iOSME/src/net/yura/ios/AppController.java	2023-01-18 17:55:40 UTC (rev 2680)
+++ iOSME/src/net/yura/ios/AppController.java	2023-01-24 14:56:43 UTC (rev 2681)
@@ -87,6 +87,10 @@
         return keyboardHeight - bottomPadding;
     }
 
+    /**
+     * Note that preferredStatusBarStyle will in fact get called on the child view controller if
+     * you hide the navigation bar (set navigationBarHidden to YES), exactly as appropriate.
+     */
     @Override
     public long preferredStatusBarStyle() {
         // BlackOpaque is Deprecated and does not work on new devices
@@ -127,6 +131,7 @@
         view().addConstraints(constrs);
 */
 
+        // TODO when running on M1 mac there is a bug: https://github.com/th3rdwave/react-native-safe-area-context/issues/210
         renderer.bottomAnchor().constraintEqualToAnchor(view().safeAreaLayoutGuide().bottomAnchor()).setActive(true);
         renderer.topAnchor().constraintEqualToAnchor(view().safeAreaLayoutGuide().topAnchor()).setActive(true);
         renderer.rightAnchor().constraintEqualToAnchor(view().safeAreaLayoutGuide().rightAnchor()).setActive(true);

Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java	2023-01-18 17:55:40 UTC (rev 2680)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java	2023-01-24 14:56:43 UTC (rev 2681)
@@ -170,6 +170,10 @@
         }
     }
 
+    /**
+     * currently it looks like MOE does not support building a Mac Catalyst App
+     * https://github.com/multi-os-engine/moe-plugin-gradle/blob/master/src/main/java/org/moe/gradle/MoePlatform.java
+     */
     private static boolean isMacCatalystApp() {
         try {
             return NSProcessInfo.processInfo().isMacCatalystApp();

Modified: iOSME/src/net/yura/ios/WebViewController.java
===================================================================
--- iOSME/src/net/yura/ios/WebViewController.java	2023-01-18 17:55:40 UTC (rev 2680)
+++ iOSME/src/net/yura/ios/WebViewController.java	2023-01-24 14:56:43 UTC (rev 2681)
@@ -42,13 +42,6 @@
     }
 
     @Override
-    public void viewWillAppear(boolean animated) {
-        super.viewWillAppear(animated);
-
-        navigationController().setNavigationBarHidden(false);
-    }
-
-    @Override
     public void viewDidLoad() {
         super.viewDidLoad();
 
@@ -77,6 +70,13 @@
         openURL(url);
     }
 
+    @Override
+    public void viewWillAppear(boolean animated) {
+        super.viewWillAppear(animated);
+
+        navigationController().setNavigationBarHidden(false);
+    }
+
     private void openURL(String url) {
 
         if (url.startsWith(PROTOCOL_ASSET)) {

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

[Swingme-svn] SF.net SVN: swingme:[2680] iOSME/src/net/yura/ios

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

Revision: 2680
          http://sourceforge.net/p/swingme/code/2680
Author:   yuranet
Date:     2023-01-18 17:55:40 +0000 (Wed, 18 Jan 2023)
Log Message:
-----------
support dark theme started for WebViewController

Modified Paths:
--------------
    iOSME/src/net/yura/ios/AppController.java
    iOSME/src/net/yura/ios/WebViewController.java

Modified: iOSME/src/net/yura/ios/AppController.java
===================================================================
--- iOSME/src/net/yura/ios/AppController.java	2023-01-16 13:01:55 UTC (rev 2679)
+++ iOSME/src/net/yura/ios/AppController.java	2023-01-18 17:55:40 UTC (rev 2680)
@@ -2,6 +2,7 @@
 
 import org.moe.GCUtil;
 import org.moe.natj.general.Pointer;
+import org.moe.natj.general.ann.RegisterOnStartup;
 import org.moe.natj.objc.SEL;
 import org.moe.natj.objc.ann.Selector;
 import javax.microedition.lcdui.Canvas;
@@ -19,6 +20,7 @@
 import apple.uikit.enums.UIStatusBarStyle;
 import apple.uikit.struct.UIEdgeInsets;
 
+@RegisterOnStartup
 public class AppController extends UIViewController {
 
     private UIView renderer;

Modified: iOSME/src/net/yura/ios/WebViewController.java
===================================================================
--- iOSME/src/net/yura/ios/WebViewController.java	2023-01-16 13:01:55 UTC (rev 2679)
+++ iOSME/src/net/yura/ios/WebViewController.java	2023-01-18 17:55:40 UTC (rev 2680)
@@ -17,6 +17,10 @@
 import apple.webkit.protocol.WKNavigationDelegate;
 import apple.webkit.protocol.WKUIDelegate;
 
+/**
+ * WARNING!! this ViewController needs to work in Light and Dark theme on iOS!
+ * All changes must be tested in both Light and Dark!
+ */
 public class WebViewController extends UIViewController implements WKUIDelegate, WKNavigationDelegate {
 
     public static final String PROTOCOL_ASSET = "file:///android_asset/";
@@ -38,12 +42,21 @@
     }
 
     @Override
+    public void viewWillAppear(boolean animated) {
+        super.viewWillAppear(animated);
+
+        navigationController().setNavigationBarHidden(false);
+    }
+
+    @Override
     public void viewDidLoad() {
         super.viewDidLoad();
 
         // this UserScript is needed as otherwise the font is teeny tiny when the page opens, and zooming only causes side scrolling.
         // https://stackoverflow.com/questions/26295277/wkwebview-equivalent-for-uiwebviews-scalespagetofit
-        String jScript = "var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width'); document.getElementsByTagName('head')[0].appendChild(meta);";
+        String jScript = "var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width'); document.getElementsByTagName('head')[0].appendChild(meta);\n" +
+                // support light and dark theme in standard pages and text files.
+                "var style = document.createElement('style'); style.innerHTML = ':root {color-scheme: light dark;}'; document.head.appendChild(style);";
         WKUserScript wkUScript = WKUserScript.alloc().initWithSourceInjectionTimeForMainFrameOnly(jScript, WKUserScriptInjectionTime.End, true);
 
         WKUserContentController wkUController = WKUserContentController.alloc().init();
@@ -64,13 +77,6 @@
         openURL(url);
     }
 
-    @Override
-    public void viewWillAppear(boolean animated) {
-        super.viewWillAppear(animated);
-
-        navigationController().setNavigationBarHidden(false);
-    }
-
     private void openURL(String url) {
 
         if (url.startsWith(PROTOCOL_ASSET)) {

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

[Swingme-svn] SF.net SVN: swingme:[2679] iOSME/src/net/yura/ios

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

Revision: 2679
          http://sourceforge.net/p/swingme/code/2679
Author:   yuranet
Date:     2023-01-16 13:01:55 +0000 (Mon, 16 Jan 2023)
Log Message:
-----------
code cleanup

Modified Paths:
--------------
    iOSME/src/net/yura/ios/SwingMEiOSApplication.java
    iOSME/src/net/yura/ios/iOSUtil.java

Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java	2023-01-07 22:18:02 UTC (rev 2678)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java	2023-01-16 13:01:55 UTC (rev 2679)
@@ -3,11 +3,7 @@
 import org.moe.GCUtil;
 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 java.util.Locale;
 import javax.microedition.midlet.MIDlet;
 import apple.NSObject;
@@ -41,25 +37,8 @@
         /*
          * 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());
+        UIKit.UIApplicationMain(args.length, iOSUtil.toPtr(args), null, SwingMEiOSApplication.class.getName());
     }
 
     @Selector("alloc")

Modified: iOSME/src/net/yura/ios/iOSUtil.java
===================================================================
--- iOSME/src/net/yura/ios/iOSUtil.java	2023-01-07 22:18:02 UTC (rev 2678)
+++ iOSME/src/net/yura/ios/iOSUtil.java	2023-01-16 13:01:55 UTC (rev 2679)
@@ -1,7 +1,9 @@
 package net.yura.ios;
 
 import org.moe.natj.general.ptr.BytePtr;
+import org.moe.natj.general.ptr.Ptr;
 import org.moe.natj.general.ptr.impl.PtrFactory;
+import java.io.UnsupportedEncodingException;
 import java.util.Arrays;
 import java.util.Locale;
 import java.util.Map;
@@ -70,37 +72,28 @@
     }
 
     /**
-     * @deprecated this method causes crash because of MOE bug: https://github.com/multi-os-engine/multi-os-engine/issues/189
+     * The code below will convert the Java String array to native pointers.
+     * from: https://github.com/multi-os-engine/moe-samples-java/blob/moe-master/LocalizedString/src/main/java/org/moe/samples/localizedstring/Main.java
      */
-    @Deprecated
-    public static NSString toNSString(String str) {
-        if (str.isEmpty()) {
-            return NSString.string();
+    public static Ptr<BytePtr> toPtr(String[] args) {
+        @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);
         }
-
-        try {
-            // these methods will return either a NSString, or if it is 10 chars or longer then NSMutableString
-            // NSString.alloc().initWithString(str)
-            return NSString.stringWithString(str);
-        }
-        catch (RuntimeException ex) {
-            // ios does not like (throws exception on some devices) strings with misplaced HighSurrogate
-            // org.moe.natj.objc.ObjCException: *** -[NSPlaceholderString initWithString:]: nil argument
-            // this can happen when we are inserting text and we send the high surrogate first as a key event.
-            System.err.println("error in toNSString >" + str + "< length=" + str.length() + " chars=" + escapeUnicode(str));
-            throw ex;
-        }
+        return argsPtr;
     }
 
-    private static String escapeUnicode(String text) {
-        final StringBuilder out = new StringBuilder();
-        for (int i = 0; i < text.length(); i++) {
-            char ch = text.charAt(i);
-            out.append("\\u").append(String.format("%04x", (int)ch));
-        }
-        return out.toString();
-    }
-
     public static Locale toLocale(NSLocale iOSlocale) {
 /* test locale conversion method is actually correct
         java.util.List<String> iosLocales = NSLocale.availableLocaleIdentifiers();
@@ -137,4 +130,36 @@
             });
         }
     }
+
+    /**
+     * @deprecated this method causes crash because of MOE bug: https://github.com/multi-os-engine/multi-os-engine/issues/189
+     */
+    @Deprecated
+    public static NSString toNSString(String str) {
+        if (str.isEmpty()) {
+            return NSString.string();
+        }
+
+        try {
+            // these methods will return either a NSString, or if it is 10 chars or longer then NSMutableString
+            // NSString.alloc().initWithString(str)
+            return NSString.stringWithString(str);
+        }
+        catch (RuntimeException ex) {
+            // ios does not like (throws exception on some devices) strings with misplaced HighSurrogate
+            // org.moe.natj.objc.ObjCException: *** -[NSPlaceholderString initWithString:]: nil argument
+            // this can happen when we are inserting text and we send the high surrogate first as a key event.
+            System.err.println("error in toNSString >" + str + "< length=" + str.length() + " chars=" + escapeUnicode(str));
+            throw ex;
+        }
+    }
+
+    private static String escapeUnicode(String text) {
+        final StringBuilder out = new StringBuilder();
+        for (int i = 0; i < text.length(); i++) {
+            char ch = text.charAt(i);
+            out.append("\\u").append(String.format("%04x", (int)ch));
+        }
+        return out.toString();
+    }
 }

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

[Swingme-svn] SF.net SVN: swingme:[2678] iOSME/src/net/yura/ios/ SwingMEiOSApplication.java

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

Revision: 2678
          http://sourceforge.net/p/swingme/code/2678
Author:   yuranet
Date:     2023-01-07 22:18:02 +0000 (Sat, 07 Jan 2023)
Log Message:
-----------
report model correctly when xcode is on M1 mac

Modified Paths:
--------------
    iOSME/src/net/yura/ios/SwingMEiOSApplication.java

Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java	2023-01-07 21:51:46 UTC (rev 2677)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java	2023-01-07 22:18:02 UTC (rev 2678)
@@ -137,12 +137,14 @@
 
         NSProcessInfo processInfo = NSProcessInfo.processInfo();
 
-        String model = Libcore.os.uname().machine; // iPhone13,1
-        if ("x86_64".equals(model)) {
-            model = processInfo.environment().get("SIMULATOR_MODEL_IDENTIFIER");
+        String model = Libcore.os.uname().machine; // on real device "iPhone13,1", on macOS "iPad8,6" on simulator "x86_64" or "arm64"
+
+        //String currentDeviceModel = UIDevice.currentDevice().model(); // simulator returns just "iPhone"
+        String simulatorModelIdentifier = processInfo.environment().get("SIMULATOR_MODEL_IDENTIFIER");
+        if (simulatorModelIdentifier != null) {
+            model = simulatorModelIdentifier;
         }
 
-
         System.setProperty("isiOSAppOnMac", String.valueOf(isiOSAppOnMac()));
         System.setProperty("isMacCatalystApp", String.valueOf(isMacCatalystApp()));
 

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

[Swingme-svn] SF.net SVN: swingme:[2677] me4se/src/javax/microedition/midlet/MIDlet.java

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

Revision: 2677
          http://sourceforge.net/p/swingme/code/2677
Author:   yuranet
Date:     2023-01-07 21:51:46 +0000 (Sat, 07 Jan 2023)
Log Message:
-----------
fallback for opening urls

Modified Paths:
--------------
    me4se/src/javax/microedition/midlet/MIDlet.java

Modified: me4se/src/javax/microedition/midlet/MIDlet.java
===================================================================
--- me4se/src/javax/microedition/midlet/MIDlet.java	2023-01-06 19:18:13 UTC (rev 2676)
+++ me4se/src/javax/microedition/midlet/MIDlet.java	2023-01-07 21:51:46 UTC (rev 2677)
@@ -406,7 +406,7 @@
    * Internal message to open a webbrowser if platformRequest with an http url is called.
    * @param url The url to be opened in the browser.
    */
-  private void openURL(String url) {
+  private void openURL(String url) throws Exception {
     String osName = System.getProperty("os.name");
     try {
       if (osName.startsWith("Mac OS")) {
@@ -430,6 +430,11 @@
       }
     } catch (Exception e) {
       System.out.println("Error attempting to launch web browser\n" + e.toString());
+      
+      // java.awt.Desktop added in 1.6
+      if (java.awt.Desktop.isDesktopSupported() && java.awt.Desktop.getDesktop().isSupported(java.awt.Desktop.Action.BROWSE)) {
+        java.awt.Desktop.getDesktop().browse(new java.net.URI(url));
+      }
     }
   }
 

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

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

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

Revision: 2676
          http://sourceforge.net/p/swingme/code/2676
Author:   yuranet
Date:     2023-01-06 19:18:13 +0000 (Fri, 06 Jan 2023)
Log Message:
-----------
a workaround to get less weakRef crashes

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

Modified: iOSME/src/javax/microedition/lcdui/Font.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Font.java	2023-01-05 19:42:53 UTC (rev 2675)
+++ iOSME/src/javax/microedition/lcdui/Font.java	2023-01-06 19:18:13 UTC (rev 2676)
@@ -1,11 +1,10 @@
 package javax.microedition.lcdui;
 
-import net.yura.ios.iOSUtil;
 import java.util.Hashtable;
 import java.util.Map;
 import apple.coregraphics.struct.CGSize;
 import apple.foundation.NSDictionary;
-import apple.foundation.NSString;
+import apple.foundation.NSMutableString;
 import apple.uikit.UIFont;
 import apple.uikit.UIFontDescriptor;
 import apple.uikit.c.UIKit;
@@ -195,6 +194,13 @@
 		return stringWidth(new String(ch, offset, length));
 	}
 
+	private static final ThreadLocal<NSMutableString> nsStrings = new ThreadLocal<NSMutableString>() {
+		@Override
+		protected NSMutableString initialValue() {
+			return NSMutableString.string();
+		}
+	};
+
 	public int stringWidth(String str) {
 		if (str == null) {
 			throw new NullPointerException();
@@ -203,13 +209,19 @@
 			return 0;
 		}
 
-                NSString string = iOSUtil.toNSString(str);
-                CGSize size = string.sizeWithAttributes(getAsNSDictionary());
+		//apple.foundation.NSString nsString = net.yura.ios.iOSUtil.toNSString(str);
+		NSMutableString nsString = nsStrings.get();
+		nsString.setString(str);
+		CGSize size = nsString.sizeWithAttributes(getAsNSDictionary()); // sizeWithFont is deprecated
                 return (int) size.width();
 	}
 
+	private NSDictionary<String, ?> nsDictionary;
 	public NSDictionary<String, ?> getAsNSDictionary() {
-		return (NSDictionary<String, ?>)NSDictionary.dictionaryWithObjectForKey(font, UIKit.NSFontAttributeName());
+		if (nsDictionary == null) {
+		    nsDictionary = (NSDictionary<String, ?>)NSDictionary.dictionaryWithObjectForKey(font, UIKit.NSFontAttributeName());
+		}
+		return nsDictionary;
 	}
 
 	public int substringWidth(String str, int offset, int len) {

Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java	2023-01-05 19:42:53 UTC (rev 2675)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java	2023-01-06 19:18:13 UTC (rev 2676)
@@ -14,8 +14,8 @@
 import apple.coreimage.CIImage;
 import apple.coreimage.c.CoreImage;
 import apple.foundation.NSMutableDictionary;
+import apple.foundation.NSMutableString;
 import apple.foundation.NSNumber;
-import apple.foundation.NSString;
 import apple.imageio.enums.CGImagePropertyOrientation;
 import apple.uikit.UIBezierPath;
 import apple.uikit.UIColor;
@@ -26,7 +26,6 @@
 import apple.uikit.enums.UIRectCorner;
 import javax.microedition.lcdui.game.Sprite;
 import android.graphics.ColorMatrix;
-import net.yura.ios.iOSUtil;
 import org.moe.natj.general.ptr.NFloatPtr;
 import org.moe.natj.general.ptr.impl.PtrFactory;
 import org.moe.natj.objc.ObjCRuntime;
@@ -53,6 +52,8 @@
     private CGRect clipBounds = new CGRect();
     private boolean dirtyClip = true;
 
+    private final NSMutableString nsString = NSMutableString.string();
+
     public Graphics() {
 
     }
@@ -326,11 +327,13 @@
             attributes.put(UIKit.NSUnderlineStyleAttributeName(), NSNumber.numberWithInteger(NSUnderlineStyle.Single));
         }
 
-        NSString string = iOSUtil.toNSString(str);
+        //apple.foundation.NSString nsString = net.yura.ios.iOSUtil.toNSString(str);
+        nsString.setString(str);
+
         boolean same = isCurrentContext();
 
         if (!same) UIKit.UIGraphicsPushContext(context);
-        string.drawAtPointWithAttributes(new CGPoint(tx + newx, ty + newy), attributes); // this method handles new lines in the text
+        nsString.drawAtPointWithAttributes(new CGPoint(tx + newx, ty + newy), attributes); // this method handles new lines in the text
         if (!same) UIKit.UIGraphicsPopContext();
 
         //if (str.indexOf('\n')<0) {

Modified: iOSME/src/net/yura/ios/CanvasView.java
===================================================================
--- iOSME/src/net/yura/ios/CanvasView.java	2023-01-05 19:42:53 UTC (rev 2675)
+++ iOSME/src/net/yura/ios/CanvasView.java	2023-01-06 19:18:13 UTC (rev 2676)
@@ -44,7 +44,7 @@
     }
 
     private Canvas canvas;
-    private Graphics graphics = new Graphics();
+    private final Graphics graphics = new Graphics();
 
     public void setCanvas(Canvas canvas) {
         this.canvas = canvas;

Modified: iOSME/src/net/yura/ios/iOSUtil.java
===================================================================
--- iOSME/src/net/yura/ios/iOSUtil.java	2023-01-05 19:42:53 UTC (rev 2675)
+++ iOSME/src/net/yura/ios/iOSUtil.java	2023-01-06 19:18:13 UTC (rev 2676)
@@ -69,6 +69,10 @@
         }
     }
 
+    /**
+     * @deprecated this method causes crash because of MOE bug: https://github.com/multi-os-engine/multi-os-engine/issues/189
+     */
+    @Deprecated
     public static NSString toNSString(String str) {
         if (str.isEmpty()) {
             return NSString.string();
@@ -75,6 +79,8 @@
         }
 
         try {
+            // these methods will return either a NSString, or if it is 10 chars or longer then NSMutableString
+            // NSString.alloc().initWithString(str)
             return NSString.stringWithString(str);
         }
         catch (RuntimeException ex) {

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

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

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

Revision: 2675
          http://sourceforge.net/p/swingme/code/2675
Author:   yuranet
Date:     2023-01-05 19:42:53 +0000 (Thu, 05 Jan 2023)
Log Message:
-----------
only call NSOperationQueue.mainQueue once

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

Modified: iOSME/src/javax/microedition/lcdui/Canvas.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Canvas.java	2023-01-05 17:23:44 UTC (rev 2674)
+++ iOSME/src/javax/microedition/lcdui/Canvas.java	2023-01-05 19:42:53 UTC (rev 2675)
@@ -2,6 +2,7 @@
 
 import net.yura.ios.AppController;
 import net.yura.ios.CanvasView;
+import net.yura.ios.iOSUtil;
 import java.util.ArrayList;
 import java.util.List;
 import apple.coregraphics.struct.CGPoint;
@@ -171,7 +172,7 @@
 
                 if (repaintsQueue.isEmpty()) {
                     repaintsQueue.add(rect);
-                    NSOperationQueue.mainQueue().addOperationWithBlock(backgroundRepaint);
+                    iOSUtil.MAIN_QUEUE.addOperationWithBlock(backgroundRepaint);
                 }
                 else {
                     repaintsQueue.add(rect);
@@ -192,7 +193,7 @@
 
                     fullRepaint = true;
                     if (repaintsQueue.isEmpty()) {
-                        NSOperationQueue.mainQueue().addOperationWithBlock(backgroundRepaint);
+                        iOSUtil.MAIN_QUEUE.addOperationWithBlock(backgroundRepaint);
                     }
                 }
             }
@@ -334,7 +335,7 @@
     }
 
     public void serviceRepaints() {
-        NSOperationQueue.mainQueue().waitUntilAllOperationsAreFinished();
+        iOSUtil.MAIN_QUEUE.waitUntilAllOperationsAreFinished();
         //CoreGraphics.CGContextFlush(canvasView.graphics.getContext());
     }
 

Modified: iOSME/src/javax/microedition/lcdui/Display.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Display.java	2023-01-05 17:23:44 UTC (rev 2674)
+++ iOSME/src/javax/microedition/lcdui/Display.java	2023-01-05 19:42:53 UTC (rev 2675)
@@ -1,6 +1,7 @@
 package javax.microedition.lcdui;
 
 import net.yura.ios.AppController;
+import net.yura.ios.iOSUtil;
 import org.moe.natj.objc.SEL;
 import java.util.Hashtable;
 import java.util.logging.Level;
@@ -144,7 +145,7 @@
         //});
 
         // do not use lambda "Runnable::run" that gives the "Lookup not found error"
-        NSOperationQueue.mainQueue().addOperationWithBlock(new NSOperationQueue.Block_addOperationWithBlock() {
+        iOSUtil.MAIN_QUEUE.addOperationWithBlock(new NSOperationQueue.Block_addOperationWithBlock() {
             @Override
             public void call_addOperationWithBlock() {
                 // we do not want to throw into the iOS main thread as that will crash the whole app

Modified: iOSME/src/net/yura/ios/AppController.java
===================================================================
--- iOSME/src/net/yura/ios/AppController.java	2023-01-05 17:23:44 UTC (rev 2674)
+++ iOSME/src/net/yura/ios/AppController.java	2023-01-05 19:42:53 UTC (rev 2675)
@@ -1,5 +1,6 @@
 package net.yura.ios;
 
+import org.moe.GCUtil;
 import org.moe.natj.general.Pointer;
 import org.moe.natj.objc.SEL;
 import org.moe.natj.objc.ann.Selector;
@@ -163,7 +164,7 @@
 
         System.gc();
         Thread.yield();
-        System.gc();
+        GCUtil.gc();
     }
 
     @Override

Modified: iOSME/src/net/yura/ios/iOSUtil.java
===================================================================
--- iOSME/src/net/yura/ios/iOSUtil.java	2023-01-05 17:23:44 UTC (rev 2674)
+++ iOSME/src/net/yura/ios/iOSUtil.java	2023-01-05 19:42:53 UTC (rev 2675)
@@ -16,6 +16,8 @@
 
 public class iOSUtil {
 
+    public static final NSOperationQueue MAIN_QUEUE = NSOperationQueue.mainQueue();
+
     /**
      *  Convert a Java [Map] to [NSDictionary].
      */
@@ -121,7 +123,7 @@
                 }
             });
 */
-            NSOperationQueue.mainQueue().addOperationWithBlock(new NSOperationQueue.Block_addOperationWithBlock() {
+            MAIN_QUEUE.addOperationWithBlock(new NSOperationQueue.Block_addOperationWithBlock() {
                 @Override
                 public void call_addOperationWithBlock() {
                     thing.run();

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

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

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

Revision: 2674
          http://sourceforge.net/p/swingme/code/2674
Author:   yuranet
Date:     2023-01-05 17:23:44 +0000 (Thu, 05 Jan 2023)
Log Message:
-----------
do not crash on exception in main thread block

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

Modified: iOSME/src/javax/microedition/lcdui/Display.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Display.java	2023-01-04 15:02:04 UTC (rev 2673)
+++ iOSME/src/javax/microedition/lcdui/Display.java	2023-01-05 17:23:44 UTC (rev 2674)
@@ -3,6 +3,8 @@
 import net.yura.ios.AppController;
 import org.moe.natj.objc.SEL;
 import java.util.Hashtable;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.microedition.midlet.MIDlet;
 import apple.audiotoolbox.c.AudioToolbox;
 import apple.audiotoolbox.enums.Enums;
@@ -128,6 +130,7 @@
     }
 
     /**
+     * This is a standard J2ME method
      * @see apple.c.Globals#dispatch_main()
      */
     public void callSerially(Runnable runner) {
@@ -144,7 +147,13 @@
         NSOperationQueue.mainQueue().addOperationWithBlock(new NSOperationQueue.Block_addOperationWithBlock() {
             @Override
             public void call_addOperationWithBlock() {
-                runner.run();
+                // we do not want to throw into the iOS main thread as that will crash the whole app
+                try {
+                    runner.run();
+                }
+                catch (Exception ex) {
+                    Logger.getLogger(Display.class.getName()).log(Level.WARNING, "Exception in iOS main thread!", ex);
+                }
             }
         });
     }

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

[Swingme-svn] SF.net SVN: swingme:[2673] iOSME/src/net/yura/ios/iOSUtil.java

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

Revision: 2673
          http://sourceforge.net/p/swingme/code/2673
Author:   yuranet
Date:     2023-01-04 15:02:04 +0000 (Wed, 04 Jan 2023)
Log Message:
-----------
extra docs

Modified Paths:
--------------
    iOSME/src/net/yura/ios/iOSUtil.java

Modified: iOSME/src/net/yura/ios/iOSUtil.java
===================================================================
--- iOSME/src/net/yura/ios/iOSUtil.java	2023-01-04 12:57:42 UTC (rev 2672)
+++ iOSME/src/net/yura/ios/iOSUtil.java	2023-01-04 15:02:04 UTC (rev 2673)
@@ -46,6 +46,14 @@
         return NSData.dataWithBytesLength(ptr, length);
     }
 
+    /**
+     * for converting a collection to a NSArray, just use:
+     * <code>
+     *     NSMutableArray<T> stuff = (NSMutableArray<T>)NSMutableArray.arrayWithCapacity(items.size());
+     *     stuff.addAll(items);
+     *     stuff.add(item);
+     * </code>
+     */
     public static <T> NSArray<T> arrayWithObjects(T... items) {
         if (items.length == 0) {
             return (NSArray<T>)NSArray.array();

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

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

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

Revision: 2672
          http://sourceforge.net/p/swingme/code/2672
Author:   yuranet
Date:     2023-01-04 12:57:42 +0000 (Wed, 04 Jan 2023)
Log Message:
-----------
spelling fix

Modified Paths:
--------------
    iOSME/src/javax/microedition/midlet/MIDlet.java

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

Removed Paths:
-------------
    iOSME/src/net/yura/ios/WebViewControllear.java

Modified: iOSME/src/javax/microedition/midlet/MIDlet.java
===================================================================
--- iOSME/src/javax/microedition/midlet/MIDlet.java	2023-01-04 12:53:07 UTC (rev 2671)
+++ iOSME/src/javax/microedition/midlet/MIDlet.java	2023-01-04 12:57:42 UTC (rev 2672)
@@ -1,7 +1,7 @@
 package javax.microedition.midlet;
 
 import net.yura.ios.iOSNotifications;
-import net.yura.ios.WebViewControllear;
+import net.yura.ios.WebViewController;
 import net.yura.ios.iOSUtil;
 import net.yura.mobile.util.Url;
 import java.io.File;
@@ -190,9 +190,9 @@
                     }
                 });
             }
-            else if (url.startsWith(WebViewControllear.PROTOCOL_ASSET)) {
+            else if (url.startsWith(WebViewController.PROTOCOL_ASSET)) {
 
-                WebViewControllear webViewController = WebViewControllear.alloc().init();
+                WebViewController webViewController = WebViewController.alloc().init();
                 webViewController.setURL(url);
 
                 UINavigationController rootViewController = (UINavigationController) UIApplication.sharedApplication().keyWindow().rootViewController();

Deleted: iOSME/src/net/yura/ios/WebViewControllear.java
===================================================================
--- iOSME/src/net/yura/ios/WebViewControllear.java	2023-01-04 12:53:07 UTC (rev 2671)
+++ iOSME/src/net/yura/ios/WebViewControllear.java	2023-01-04 12:57:42 UTC (rev 2672)
@@ -1,135 +0,0 @@
-package net.yura.ios;
-
-import org.moe.natj.general.Pointer;
-import apple.foundation.NSBundle;
-import apple.foundation.NSData;
-import apple.foundation.NSError;
-import apple.foundation.NSURL;
-import apple.uikit.UIScreen;
-import apple.uikit.UIViewController;
-import apple.uikit.enums.UIViewAutoresizing;
-import apple.webkit.WKNavigation;
-import apple.webkit.WKUserContentController;
-import apple.webkit.WKUserScript;
-import apple.webkit.WKWebView;
-import apple.webkit.WKWebViewConfiguration;
-import apple.webkit.enums.WKUserScriptInjectionTime;
-import apple.webkit.protocol.WKNavigationDelegate;
-import apple.webkit.protocol.WKUIDelegate;
-
-public class WebViewControllear extends UIViewController implements WKUIDelegate, WKNavigationDelegate {
-
-    public static final String PROTOCOL_ASSET = "file:///android_asset/";
-
-    private WKWebView myWebView;
-    private String url;
-
-    public static native WebViewControllear alloc();
-
-    @Override
-    public native WebViewControllear init();
-
-    protected WebViewControllear(Pointer peer) {
-        super(peer);
-    }
-
-    public void setURL(String url) {
-        this.url = url;
-    }
-
-    @Override
-    public void viewDidLoad() {
-        super.viewDidLoad();
-
-        // this UserScript is needed as otherwise the font is teeny tiny when the page opens, and zooming only causes side scrolling.
-        // https://stackoverflow.com/questions/26295277/wkwebview-equivalent-for-uiwebviews-scalespagetofit
-        String jScript = "var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width'); document.getElementsByTagName('head')[0].appendChild(meta);";
-        WKUserScript wkUScript = WKUserScript.alloc().initWithSourceInjectionTimeForMainFrameOnly(jScript, WKUserScriptInjectionTime.End, true);
-
-        WKUserContentController wkUController = WKUserContentController.alloc().init();
-        wkUController.addUserScript(wkUScript);
-
-        WKWebViewConfiguration wkWebConfig = WKWebViewConfiguration.alloc().init();
-        wkWebConfig.setUserContentController(wkUController);
-
-        myWebView = WKWebView.alloc().initWithFrameConfiguration(UIScreen.mainScreen().bounds(), wkWebConfig);
-        myWebView.setUIDelegate(this);
-        myWebView.setNavigationDelegate(this);
-
-        // support screen rotation
-        myWebView.setAutoresizingMask(UIViewAutoresizing.FlexibleWidth | UIViewAutoresizing.FlexibleHeight);
-
-        view().addSubview(myWebView);
-
-        openURL(url);
-    }
-
-    @Override
-    public void viewWillAppear(boolean animated) {
-        super.viewWillAppear(animated);
-
-        navigationController().setNavigationBarHidden(false);
-    }
-
-    private void openURL(String url) {
-
-        if (url.startsWith(PROTOCOL_ASSET)) {
-            int dot = url.lastIndexOf('.');
-            int slash = url.lastIndexOf('/');
-            String ext = url.substring(dot + 1);
-            String name = url.substring(slash + 1, dot);
-
-            NSBundle mainBundle = NSBundle.mainBundle();
-            NSURL htmlFileUrl;
-
-            if (slash > PROTOCOL_ASSET.length()) {
-                String path = url.substring(PROTOCOL_ASSET.length(), slash);
-                htmlFileUrl = mainBundle.URLForResourceWithExtensionSubdirectory(name, ext, path);
-            }
-            else {
-                htmlFileUrl = mainBundle.URLForResourceWithExtension(name, ext);
-            }
-
-            if (htmlFileUrl == null) {
-                throw new IllegalArgumentException("can not find resource for " + url);
-            }
-
-            if ("txt".equalsIgnoreCase(ext)) {
-                // we want to load text as UTF-8, as by default iOS seems to use some other encoding
-                NSData data = NSData.dataWithContentsOfURL(htmlFileUrl);
-                myWebView.loadDataMIMETypeCharacterEncodingNameBaseURL(data, "text/plain", "UTF-8", mainBundle.resourceURL());
-            }
-            else {
-                myWebView.loadFileURLAllowingReadAccessToURL(htmlFileUrl, mainBundle.resourceURL());
-            }
-        }
-
-
-        //let documentDirUrl = try! FileManager.default.url(for: .documentDirectory, in: .userDomainMask, appropriateFor: nil, create: false)
-        //let indexFileUrl = documentDirUrl.appendingPathComponent("index.html")
-        //webView.loadFileURL(indexFileUrl, allowingReadAccessTo: documentDirUrl)
-    }
-
-    @Override
-    public void webViewDidFinishNavigation(WKWebView webView, WKNavigation navigation) {
-        String title = myWebView.title();
-
-        if (!"".equals(title)) {
-            setTitle(title);
-        }
-        else {
-            // for some unknown reason the normal method does not work on iPhone mini, so we just JS method instead.
-            myWebView.evaluateJavaScriptCompletionHandler("document.title", new WKWebView.Block_evaluateJavaScriptCompletionHandler() {
-                @Override
-                public void call_evaluateJavaScriptCompletionHandler(Object title, NSError error) {
-                    if (error == null) {
-                        setTitle(String.valueOf(title));
-                    }
-                    else {
-                        System.err.println("Error getting title: " + error);
-                    }
-                }
-            });
-        }
-    }
-}

Copied: iOSME/src/net/yura/ios/WebViewController.java (from rev 2671, iOSME/src/net/yura/ios/WebViewControllear.java)
===================================================================
--- iOSME/src/net/yura/ios/WebViewController.java	                        (rev 0)
+++ iOSME/src/net/yura/ios/WebViewController.java	2023-01-04 12:57:42 UTC (rev 2672)
@@ -0,0 +1,135 @@
+package net.yura.ios;
+
+import org.moe.natj.general.Pointer;
+import apple.foundation.NSBundle;
+import apple.foundation.NSData;
+import apple.foundation.NSError;
+import apple.foundation.NSURL;
+import apple.uikit.UIScreen;
+import apple.uikit.UIViewController;
+import apple.uikit.enums.UIViewAutoresizing;
+import apple.webkit.WKNavigation;
+import apple.webkit.WKUserContentController;
+import apple.webkit.WKUserScript;
+import apple.webkit.WKWebView;
+import apple.webkit.WKWebViewConfiguration;
+import apple.webkit.enums.WKUserScriptInjectionTime;
+import apple.webkit.protocol.WKNavigationDelegate;
+import apple.webkit.protocol.WKUIDelegate;
+
+public class WebViewController extends UIViewController implements WKUIDelegate, WKNavigationDelegate {
+
+    public static final String PROTOCOL_ASSET = "file:///android_asset/";
+
+    private WKWebView myWebView;
+    private String url;
+
+    public static native WebViewController alloc();
+
+    @Override
+    public native WebViewController init();
+
+    protected WebViewController(Pointer peer) {
+        super(peer);
+    }
+
+    public void setURL(String url) {
+        this.url = url;
+    }
+
+    @Override
+    public void viewDidLoad() {
+        super.viewDidLoad();
+
+        // this UserScript is needed as otherwise the font is teeny tiny when the page opens, and zooming only causes side scrolling.
+        // https://stackoverflow.com/questions/26295277/wkwebview-equivalent-for-uiwebviews-scalespagetofit
+        String jScript = "var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width'); document.getElementsByTagName('head')[0].appendChild(meta);";
+        WKUserScript wkUScript = WKUserScript.alloc().initWithSourceInjectionTimeForMainFrameOnly(jScript, WKUserScriptInjectionTime.End, true);
+
+        WKUserContentController wkUController = WKUserContentController.alloc().init();
+        wkUController.addUserScript(wkUScript);
+
+        WKWebViewConfiguration wkWebConfig = WKWebViewConfiguration.alloc().init();
+        wkWebConfig.setUserContentController(wkUController);
+
+        myWebView = WKWebView.alloc().initWithFrameConfiguration(UIScreen.mainScreen().bounds(), wkWebConfig);
+        myWebView.setUIDelegate(this);
+        myWebView.setNavigationDelegate(this);
+
+        // support screen rotation
+        myWebView.setAutoresizingMask(UIViewAutoresizing.FlexibleWidth | UIViewAutoresizing.FlexibleHeight);
+
+        view().addSubview(myWebView);
+
+        openURL(url);
+    }
+
+    @Override
+    public void viewWillAppear(boolean animated) {
+        super.viewWillAppear(animated);
+
+        navigationController().setNavigationBarHidden(false);
+    }
+
+    private void openURL(String url) {
+
+        if (url.startsWith(PROTOCOL_ASSET)) {
+            int dot = url.lastIndexOf('.');
+            int slash = url.lastIndexOf('/');
+            String ext = url.substring(dot + 1);
+            String name = url.substring(slash + 1, dot);
+
+            NSBundle mainBundle = NSBundle.mainBundle();
+            NSURL htmlFileUrl;
+
+            if (slash > PROTOCOL_ASSET.length()) {
+                String path = url.substring(PROTOCOL_ASSET.length(), slash);
+                htmlFileUrl = mainBundle.URLForResourceWithExtensionSubdirectory(name, ext, path);
+            }
+            else {
+                htmlFileUrl = mainBundle.URLForResourceWithExtension(name, ext);
+            }
+
+            if (htmlFileUrl == null) {
+                throw new IllegalArgumentException("can not find resource for " + url);
+            }
+
+            if ("txt".equalsIgnoreCase(ext)) {
+                // we want to load text as UTF-8, as by default iOS seems to use some other encoding
+                NSData data = NSData.dataWithContentsOfURL(htmlFileUrl);
+                myWebView.loadDataMIMETypeCharacterEncodingNameBaseURL(data, "text/plain", "UTF-8", mainBundle.resourceURL());
+            }
+            else {
+                myWebView.loadFileURLAllowingReadAccessToURL(htmlFileUrl, mainBundle.resourceURL());
+            }
+        }
+
+
+        //let documentDirUrl = try! FileManager.default.url(for: .documentDirectory, in: .userDomainMask, appropriateFor: nil, create: false)
+        //let indexFileUrl = documentDirUrl.appendingPathComponent("index.html")
+        //webView.loadFileURL(indexFileUrl, allowingReadAccessTo: documentDirUrl)
+    }
+
+    @Override
+    public void webViewDidFinishNavigation(WKWebView webView, WKNavigation navigation) {
+        String title = myWebView.title();
+
+        if (!"".equals(title)) {
+            setTitle(title);
+        }
+        else {
+            // for some unknown reason the normal method does not work on iPhone mini, so we just JS method instead.
+            myWebView.evaluateJavaScriptCompletionHandler("document.title", new WKWebView.Block_evaluateJavaScriptCompletionHandler() {
+                @Override
+                public void call_evaluateJavaScriptCompletionHandler(Object title, NSError error) {
+                    if (error == null) {
+                        setTitle(String.valueOf(title));
+                    }
+                    else {
+                        System.err.println("Error getting title: " + error);
+                    }
+                }
+            });
+        }
+    }
+}

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

[Swingme-svn] SF.net SVN: swingme:[2671] iOSME/src/javax/microedition/midlet/MIDlet.java

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

Revision: 2671
          http://sourceforge.net/p/swingme/code/2671
Author:   yuranet
Date:     2023-01-04 12:53:07 +0000 (Wed, 04 Jan 2023)
Log Message:
-----------
can launch native view controller in ios

Modified Paths:
--------------
    iOSME/src/javax/microedition/midlet/MIDlet.java

Modified: iOSME/src/javax/microedition/midlet/MIDlet.java
===================================================================
--- iOSME/src/javax/microedition/midlet/MIDlet.java	2022-12-24 12:44:19 UTC (rev 2670)
+++ iOSME/src/javax/microedition/midlet/MIDlet.java	2023-01-04 12:53:07 UTC (rev 2671)
@@ -21,6 +21,7 @@
 import apple.uikit.UIApplication;
 import apple.uikit.UINavigationController;
 import apple.uikit.UIPasteboard;
+import apple.uikit.UIViewController;
 import apple.uikit.enums.UIApplicationState;
 
 public abstract class MIDlet {
@@ -118,8 +119,13 @@
             boolean isProtoNative = url.startsWith(PROTOCOL_NATIVE);
             boolean isProtoNativeForRes = url.startsWith(PROTOCOL_NATIVE_FOR_RESULT);
 
-            if (isProtoNative || isProtoNativeForRes) {
-
+            if (isProtoNative) {
+                Class<?> myClass = Class.forName(nsUrl.host());
+                UIViewController viewController = ((UIViewController)myClass.getMethod("alloc").invoke(null)).init();
+                UINavigationController rootViewController = (UINavigationController) UIApplication.sharedApplication().keyWindow().rootViewController();
+                rootViewController.pushViewControllerAnimated(viewController, true);
+            }
+            else if (isProtoNativeForRes) {
                 // TODO launch native stuff
                 throw new UnsupportedOperationException();
             }
@@ -186,12 +192,12 @@
             }
             else if (url.startsWith(WebViewControllear.PROTOCOL_ASSET)) {
 
-                WebViewControllear webViewControllear = WebViewControllear.alloc().init();
-                webViewControllear.setURL(url);
+                WebViewControllear webViewController = WebViewControllear.alloc().init();
+                webViewController.setURL(url);
 
                 UINavigationController rootViewController = (UINavigationController) UIApplication.sharedApplication().keyWindow().rootViewController();
                 //presentViewControllerAnimatedCompletion
-                rootViewController.pushViewControllerAnimated(webViewControllear, true);
+                rootViewController.pushViewControllerAnimated(webViewController, true);
             }
             else if (url.startsWith("mailto:") && containsQueryParameter(url, "attachment")) {
 

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

[Swingme-svn] SF.net SVN: swingme:[2670] AndroidME

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

Revision: 2670
          http://sourceforge.net/p/swingme/code/2670
Author:   yuranet
Date:     2022-12-24 12:44:19 +0000 (Sat, 24 Dec 2022)
Log Message:
-----------
do not auto create NotificationChannel as that causes a popup to he user at startup

Modified Paths:
--------------
    AndroidME/src_Android/net/yura/android/AndroidMeApp.java
    AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java

Modified: AndroidME/src_Android/net/yura/android/AndroidMeApp.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeApp.java	2022-12-23 23:46:15 UTC (rev 2669)
+++ AndroidME/src_Android/net/yura/android/AndroidMeApp.java	2022-12-24 12:44:19 UTC (rev 2670)
@@ -1,8 +1,6 @@
 package net.yura.android;
 
 import android.app.Application;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -100,7 +98,6 @@
 
         try {
             setSystemProperties();
-            createNotificationChannel();
             loadJadFile();
 
             Vector<String[]> jadMidlets = getJadMidlets();
@@ -113,32 +110,6 @@
         }
     }
 
-    /**
-     * @see NotificationChannel#DEFAULT_CHANNEL_ID
-     */
-    public static final String CHANNEL_ID = "default-notification-channel";
-
-    private void createNotificationChannel() {
-        try {
-            // Create the NotificationChannel, but only on API 26+ because
-            // the NotificationChannel class is new and not in the support library
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                CharSequence name = "Notification Channel";
-                String description = "Default Notification Channel";
-                int importance = NotificationManager.IMPORTANCE_DEFAULT;
-                NotificationChannel channel = new NotificationChannel(CHANNEL_ID, name, importance);
-                channel.setDescription(description);
-                // Register the channel with the system; you can't change the importance
-                // or other notification behaviors after this
-                NotificationManager notificationManager = getSystemService(NotificationManager.class);
-                notificationManager.createNotificationChannel(channel);
-            }
-        }
-        catch (Throwable th) {
-            Logger.warn("failed to create NotificationChannel: " + CHANNEL_ID, th);
-        }
-    }
-
     @Override
     public void onTerminate() {
         super.onTerminate();

Modified: AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java	2022-12-23 23:46:15 UTC (rev 2669)
+++ AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java	2022-12-24 12:44:19 UTC (rev 2670)
@@ -14,6 +14,7 @@
 import android.Manifest;
 import android.app.Activity;
 import android.app.Notification;
+import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.ActivityNotFoundException;
@@ -159,6 +160,9 @@
                     }
                 }
             }
+            else if (url.equals(PROTOCOL_NOTIFY + "//requestAuthorization")) {
+                createNotificationChannel();
+            }
             else if (url.startsWith(PROTOCOL_NOTIFY)) {
                 // there is a bug on android older versions so we use our Url to decode.
                 Map<String, String> options = Url.toHashtable(content.getEncodedQuery());
@@ -341,6 +345,35 @@
         return 0;
     }
 
+    /**
+     * @see NotificationChannel#DEFAULT_CHANNEL_ID
+     */
+    public static final String CHANNEL_ID = "default-notification-channel";
+
+    /**
+     * This triggers a popup that asks the user if they want to enable notifications
+     */
+    private void createNotificationChannel() {
+        try {
+            // Create the NotificationChannel, but only on API 26+ because
+            // the NotificationChannel class is new and not in the support library
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                CharSequence name = "Notification Channel";
+                String description = "Default Notification Channel";
+                int importance = NotificationManager.IMPORTANCE_DEFAULT;
+                NotificationChannel channel = new NotificationChannel(CHANNEL_ID, name, importance);
+                channel.setDescription(description);
+                // Register the channel with the system; you can't change the importance
+                // or other notification behaviors after this
+                NotificationManager notificationManager = AndroidMeApp.getContext().getSystemService(NotificationManager.class);
+                notificationManager.createNotificationChannel(channel);
+            }
+        }
+        catch (Throwable th) {
+            Logger.warn("failed to create NotificationChannel: " + CHANNEL_ID, th);
+        }
+    }
+
     private void showNotification(String title,String num,String message,String icon,String onlyBackground, Map<String, ? extends Object> options) {
         if (    onlyBackground==null ||
                 !onlyBackground.equals("true") ||
@@ -423,7 +456,7 @@
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
             Notification.Builder builder;
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                builder = new Notification.Builder(context, AndroidMeApp.CHANNEL_ID);
+                builder = new Notification.Builder(context, CHANNEL_ID);
             }
             else {
                 builder = new Notification.Builder(context);

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

[Swingme-svn] SF.net SVN: swingme:[2669] AndroidME/src_MIDP/javax/microedition/midlet/ MIDlet.java

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

Revision: 2669
          http://sourceforge.net/p/swingme/code/2669
Author:   yuranet
Date:     2022-12-23 23:46:15 +0000 (Fri, 23 Dec 2022)
Log Message:
-----------
fix for random android error

Modified Paths:
--------------
    AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java

Modified: AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java	2022-12-23 22:11:25 UTC (rev 2668)
+++ AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java	2022-12-23 23:46:15 UTC (rev 2669)
@@ -410,7 +410,13 @@
             }
         }
 
-        PendingIntent intent = PendingIntent.getActivity(context, 0, notifyIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+        PendingIntent intent;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+            intent = PendingIntent.getActivity(context, 0, notifyIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+        }
+        else {
+            intent = PendingIntent.getActivity(context, 0, notifyIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+        }
 
         Notification notification;
         // Use new API

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

[Swingme-svn] SF.net SVN: swingme:[2668] iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java

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

Revision: 2668
          http://sourceforge.net/p/swingme/code/2668
Author:   yuranet
Date:     2022-12-23 22:11:25 +0000 (Fri, 23 Dec 2022)
Log Message:
-----------
do not hide root exception

Modified Paths:
--------------
    iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java

Modified: iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java
===================================================================
--- iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java	2022-12-23 22:05:54 UTC (rev 2667)
+++ iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java	2022-12-23 22:11:25 UTC (rev 2668)
@@ -49,7 +49,7 @@
             data.close();
         }
         catch (Exception ex) {
-            throw new IllegalStateException("can't find synth file 'iOS_theme.xml' for ios theme");
+            throw new IllegalStateException("can't find synth file 'iOS_theme.xml' for ios theme", ex);
         }
 
         //UIImage info = UIImage.systemImageNamed("info"); // info.circle info.circle.fill

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

[Swingme-svn] SF.net SVN: swingme:[2667] iOSME/src/net/yura/ios/CanvasView.java

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

Revision: 2667
          http://sourceforge.net/p/swingme/code/2667
Author:   yuranet
Date:     2022-12-23 22:05:54 +0000 (Fri, 23 Dec 2022)
Log Message:
-----------
test entry fix

Modified Paths:
--------------
    iOSME/src/net/yura/ios/CanvasView.java

Modified: iOSME/src/net/yura/ios/CanvasView.java
===================================================================
--- iOSME/src/net/yura/ios/CanvasView.java	2022-12-23 21:58:24 UTC (rev 2666)
+++ iOSME/src/net/yura/ios/CanvasView.java	2022-12-23 22:05:54 UTC (rev 2667)
@@ -184,14 +184,17 @@
         becomeFirstResponder();
     }
 
+    /**
+     * @see #hasText()
+     */
     public void closeTextEntry() {
-        textField = null;
         iOSUtil.callOnMainThread(new Runnable() {
             @Override
             public void run() {
-                resignFirstResponder();
+                resignFirstResponder(); // this sometimes calls CanvasView.hasText
             }
         });
+        textField = null;
     }
 
     @Override

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

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

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

Revision: 2666
          http://sourceforge.net/p/swingme/code/2666
Author:   yuranet
Date:     2022-12-23 21:58:24 +0000 (Fri, 23 Dec 2022)
Log Message:
-----------
log image loading errors

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

Modified: SwingME/src/net/yura/mobile/gui/Application.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/Application.java	2022-12-22 17:15:27 UTC (rev 2665)
+++ SwingME/src/net/yura/mobile/gui/Application.java	2022-12-23 21:58:24 UTC (rev 2666)
@@ -324,6 +324,8 @@
             return Image.createImage(name);
         }
         catch (Exception ex) {
+            //#debug info
+            Logger.info("unable to createImage " + name, ex);
             return null;
         }
     }

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

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

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

Revision: 2665
          http://sourceforge.net/p/swingme/code/2665
Author:   yuranet
Date:     2022-12-22 17:15:27 +0000 (Thu, 22 Dec 2022)
Log Message:
-----------
fix crash in finalize when getRGB is called in background thread

Modified Paths:
--------------
    iOSME/src/javax/microedition/lcdui/Canvas.java
    iOSME/src/javax/microedition/lcdui/Display.java
    iOSME/src/javax/microedition/lcdui/Image.java
    iOSME/src/net/yura/ios/AppController.java
    iOSME/src/net/yura/ios/iOSUtil.java

Modified: iOSME/src/javax/microedition/lcdui/Canvas.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Canvas.java	2022-12-20 11:19:17 UTC (rev 2664)
+++ iOSME/src/javax/microedition/lcdui/Canvas.java	2022-12-22 17:15:27 UTC (rev 2665)
@@ -335,6 +335,7 @@
 
     public void serviceRepaints() {
         NSOperationQueue.mainQueue().waitUntilAllOperationsAreFinished();
+        //CoreGraphics.CGContextFlush(canvasView.graphics.getContext());
     }
 
     public String getKeyName(int keyCode) {

Modified: iOSME/src/javax/microedition/lcdui/Display.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Display.java	2022-12-20 11:19:17 UTC (rev 2664)
+++ iOSME/src/javax/microedition/lcdui/Display.java	2022-12-22 17:15:27 UTC (rev 2665)
@@ -150,6 +150,8 @@
     }
 
     /**
+     * https://stackoverflow.com/questions/26455880/how-to-make-iphone-vibrate-using-swift
+     *
      * @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) {

Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java	2022-12-20 11:19:17 UTC (rev 2664)
+++ iOSME/src/javax/microedition/lcdui/Image.java	2022-12-22 17:15:27 UTC (rev 2665)
@@ -199,13 +199,7 @@
         //UIKit.UIGraphicsBeginImageContext(new CGSize(width, height));
         //CGContextRef context = UIKit.UIGraphicsGetCurrentContext();
 
-        // we try and create a Context as close as we can to using UIKit.UIGraphicsBeginImageContext(new CGSize(width, height));
-        CGColorSpaceRef space = CoreGraphics.CGColorSpaceCreateDeviceRGB();
-        // min bytesPerRow is "width * (CoreGraphics.CGColorSpaceGetNumberOfComponents(space) + 1)" passing a value of 0 causes the value to be calculated automatically
-        CGContextRef context = CoreGraphics.CGBitmapContextCreate(null, width, height, 8, 0, space, CGBitmapInfo.ByteOrder32Little | CGImageAlphaInfo.PremultipliedFirst);
-        CoreGraphics.CGColorSpaceRelease(space);
-        CoreGraphics.CGContextTranslateCTM(context, 0, height);
-        CoreGraphics.CGContextScaleCTM(context, 1.0, -1.0);
+        CGContextRef context = threadsafeUIGraphicsBeginImageContext(width, height);
 
         //System.out.println("BitmapContext2 BitsPerPixel=" +CoreGraphics.CGBitmapContextGetBitsPerPixel(context) + " BitsPerComponent=" +CoreGraphics.CGBitmapContextGetBitsPerComponent(context) + " BytesPerRow=" +CoreGraphics.CGBitmapContextGetBytesPerRow(context) + " AlphaInfo=" +CoreGraphics.CGBitmapContextGetAlphaInfo(context) + " BitmapInfo=" +CoreGraphics.CGBitmapContextGetBitmapInfo(context));
 
@@ -217,6 +211,26 @@
         return new Image(context);
     }
 
+    /**
+     * we can NEVER use {@link UIKit#UIGraphicsBeginImageContext(CGSize)} as it does not seem to be truly thread safe in MOE
+     */
+    private static CGContextRef threadsafeUIGraphicsBeginImageContext(int width, int height) {
+/*      // this does not work in some situations
+        return iOSUtil.callOnMainThread(() -> {
+            UIKit.UIGraphicsBeginImageContext(new CGSize(width, height));
+            return UIKit.UIGraphicsGetCurrentContext();
+        });
+*/
+        // we try and create a Context as close as we can to using UIKit.UIGraphicsBeginImageContext(new CGSize(width, height));
+        CGColorSpaceRef space = CoreGraphics.CGColorSpaceCreateDeviceRGB();
+        // min bytesPerRow is "width * (CoreGraphics.CGColorSpaceGetNumberOfComponents(space) + 1)" passing a value of 0 causes the value to be calculated automatically
+        CGContextRef context = CoreGraphics.CGBitmapContextCreate(null, width, height, 8, 0, space, CGBitmapInfo.ByteOrder32Little | CGImageAlphaInfo.PremultipliedFirst);
+        CoreGraphics.CGColorSpaceRelease(space);
+        CoreGraphics.CGContextTranslateCTM(context, 0, height);
+        CoreGraphics.CGContextScaleCTM(context, 1.0, -1.0);
+        return context;
+    }
+
     public static final Image createRGBImage(int[] rgb, int width, int height, boolean processAlpha) {
         // TODO not optimum as we first create white image
         Image img = createImage(width, height);
@@ -319,14 +333,14 @@
     }
 
     private void releaseCGContext() {
-        CGContextRef current = UIKit.UIGraphicsGetCurrentContext();
-        if (current == null || !current.getPeer().equals(context.getPeer())) {
-            UIKit.UIGraphicsPushContext(context);
+        //CGContextRef current = UIKit.UIGraphicsGetCurrentContext();
+        //if (current == null || !current.getPeer().equals(context.getPeer())) {
+        //    UIKit.UIGraphicsPushContext(context);
+        //}
+        //UIKit.UIGraphicsEndImageContext(); // this seems to do the same as CGContextRelease, maybe it does something more
+        // has the same effect on memory, and causes a crash if we call CGContextRelease after UIGraphicsEndImageContext
 
-        }
-        UIKit.UIGraphicsEndImageContext(); // this seems to do the same as CGContextRelease, maybe it does something more
-        // has the same effect on memory, and causes a crash if we call CGContextRelease after UIGraphicsEndImageContext
-        //CoreGraphics.CGContextRelease(context);
+        CoreGraphics.CGContextRelease(context);
         context = null;
     }
 
@@ -345,6 +359,11 @@
         //org.moe.GCUtil.gc(); // force anything still around to be GCed
     }
 
+    /**
+     * WARNING! do NOT try to log {@link #uiImage} from this method, it will crash MOE!
+     * WARNING! do NOT call {@link #toString()} from this method as that toStrings uiImage
+     * WARNING! do NOT try and call {@link #getWidth()} or {@link #getHeight()} either
+     */
     @Override
     protected void finalize() throws Throwable {
         if (context != null) {
@@ -383,13 +402,18 @@
             // if the image has already been loaded into the context, do nothing
             if (context == null) {
                 // load the current image into the context
-                UIKit.UIGraphicsBeginImageContext(new CGSize(getWidth(), getHeight()));
-                context = UIKit.UIGraphicsGetCurrentContext();
 
+                // this causes crashes when called from background threads if that thread finishes while the image has still not been GCed
+                //UIKit.UIGraphicsBeginImageContext(new CGSize(getWidth(), getHeight()));
+                //context = UIKit.UIGraphicsGetCurrentContext();
+                context = threadsafeUIGraphicsBeginImageContext(getWidth(), getHeight());
+
                 // this is needed for 9-patches to load correctly
                 CoreGraphics.CGContextSetInterpolationQuality(context, CGInterpolationQuality.None);
 
+                UIKit.UIGraphicsPushContext(context);
                 uiImage.drawAtPoint(CoreGraphics.CGPointZero());
+                UIKit.UIGraphicsPopContext();
             }
         }
 

Modified: iOSME/src/net/yura/ios/AppController.java
===================================================================
--- iOSME/src/net/yura/ios/AppController.java	2022-12-20 11:19:17 UTC (rev 2664)
+++ iOSME/src/net/yura/ios/AppController.java	2022-12-22 17:15:27 UTC (rev 2665)
@@ -39,7 +39,19 @@
         notificationCenter.addObserverSelectorNameObject(this, new SEL("keyboardWillShow:"), UIKit.UIKeyboardWillShowNotification(), null);
         notificationCenter.addObserverSelectorNameObject(this, new SEL("keyboardWillHide:"), UIKit.UIKeyboardWillHideNotification(), null);
         notificationCenter.addObserverSelectorNameObject(this, new SEL("keyboardWillChange:"), UIKit.UIKeyboardWillChangeFrameNotification(), null);
-
+/*
+        // uncomment to enable force GC swipe from right to left along the top of the app gesture
+        UISwipeGestureRecognizer swipeLeft = UISwipeGestureRecognizer.alloc().initWithTargetAction(this, new SEL("respondToSwipeGesture:"));
+        swipeLeft.setDirection(UISwipeGestureRecognizerDirection.Left);
+        view().addGestureRecognizer(swipeLeft);
+        swipeLeft.setDelegate(new UIGestureRecognizerDelegate() {
+            @Override
+            public boolean gestureRecognizerShouldBegin(UIGestureRecognizer gestureRecognizer) {
+                CGPoint locationInView = gestureRecognizer.locationInView(view());
+                return locationInView.y() < 44; // DesktopPane.getDesktopPane().minimumTouchTarget
+            }
+        });
+*/
         Display display = Display.getDisplay(MIDlet.DEFAULT_MIDLET);
         display.setController(this);
     }
@@ -58,7 +70,14 @@
     public void keyboardWillChange(NSNotification notification) {
         setAdditionalSafeAreaInsets(new UIEdgeInsets(0, 0, getAdditionalSafeAreaBottom(notification), 0));
     }
-
+/*
+    @Selector("respondToSwipeGesture:")
+    public void respondToSwipeGesture(UIGestureRecognizer recognizer) {
+        System.out.println("########### Debug Swipe detected " + recognizer);
+        GCUtil.gc();
+        Display.getDisplay(MIDlet.DEFAULT_MIDLET).vibrate(1); // AudioToolbox.AudioServicesPlayAlertSound(Enums.kSystemSoundID_Vibrate);
+    }
+*/
     private double getAdditionalSafeAreaBottom(NSNotification notification) {
         double keyboardHeight = ((NSValue)notification.userInfo().get(UIKit.UIKeyboardFrameEndUserInfoKey())).CGRectValue().size().height();
         double bottomPadding = UIApplication.sharedApplication().keyWindow().safeAreaInsets().bottom();

Modified: iOSME/src/net/yura/ios/iOSUtil.java
===================================================================
--- iOSME/src/net/yura/ios/iOSUtil.java	2022-12-20 11:19:17 UTC (rev 2664)
+++ iOSME/src/net/yura/ios/iOSUtil.java	2022-12-22 17:15:27 UTC (rev 2665)
@@ -105,6 +105,14 @@
             thing.run();
         }
         else {
+/*
+            Globals.dispatch_async(Globals.dispatch_get_main_queue(), new Globals.Block_dispatch_async() {
+                @Override
+                public void call_dispatch_async() {
+                    thing.run();
+                }
+            });
+*/
             NSOperationQueue.mainQueue().addOperationWithBlock(new NSOperationQueue.Block_addOperationWithBlock() {
                 @Override
                 public void call_addOperationWithBlock() {

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

[Swingme-svn] SF.net SVN: swingme:[2664] me4se/src/org/me4se/scm/ScmWrapper.java

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

Revision: 2664
          http://sourceforge.net/p/swingme/code/2664
Author:   yuranet
Date:     2022-12-20 11:19:17 +0000 (Tue, 20 Dec 2022)
Log Message:
-----------
fix for panel not repainting when size has changed

Modified Paths:
--------------
    me4se/src/org/me4se/scm/ScmWrapper.java

Modified: me4se/src/org/me4se/scm/ScmWrapper.java
===================================================================
--- me4se/src/org/me4se/scm/ScmWrapper.java	2022-11-25 01:21:32 UTC (rev 2663)
+++ me4se/src/org/me4se/scm/ScmWrapper.java	2022-12-20 11:19:17 UTC (rev 2664)
@@ -254,7 +254,7 @@
   public void paint(java.awt.Graphics g) {
     Log.log(Log.DRAW_EVENTS, "AWT paint entered: " + g.getClipRect());
 
-      if (offScreenCache==null) {
+      if (offScreenCache == null || invalid) {
           update(g);
       }
       else {
@@ -263,7 +263,7 @@
         //    (int) (size.width / scale), (int) (size.height / scale), this)) {
 
         // YURA for some crazy reason that makes no sense, this is a LOT faster on JavaSE Windows then what is above!
-        // even though really it is doing the sxact same thing!
+        // even though really it is doing the exact same thing!
         g.getClipBounds(clip);
         
         Graphics2D g2 = ((Graphics2D)g);

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

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

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

Revision: 2663
          http://sourceforge.net/p/swingme/code/2663
Author:   yuranet
Date:     2022-11-25 01:21:32 +0000 (Fri, 25 Nov 2022)
Log Message:
-----------
fix for Spinner and ComboBox broken

Modified Paths:
--------------
    SwingME/build.xml
    SwingME/src/net/yura/mobile/gui/components/Button.java
    SwingME/src/net/yura/mobile/gui/components/ComboBox.java
    SwingME/src/net/yura/mobile/gui/components/Spinner.java

Modified: SwingME/build.xml
===================================================================
--- SwingME/build.xml	2022-10-09 23:12:09 UTC (rev 2662)
+++ SwingME/build.xml	2022-11-25 01:21:32 UTC (rev 2663)
@@ -2,7 +2,7 @@
 <!-- You may freely edit this file. See commented blocks below for -->
 <!-- some examples of how to customize the build. -->
 <!-- (If you delete it and reopen the project it will be recreated.) -->
-<project name="SwingME" default="jar" basedir=".">
+<project name="SwingME" default="demo" basedir=".">
     <description>Builds, tests, and runs the project .</description>
     <import file="nbproject/build-impl.xml"/>
 
@@ -12,6 +12,13 @@
     </target>
 
     <target name="demo" description="demo compile" depends="demo-setup">
+        <!--
+            if no special config is set, ant will try and use
+            /usr/local/opt/openjdk/bin/java
+        -->
+            <echo>Java/JVM version: ${ant.java.version}</echo>
+            <echo>Java/JVM detail version: ${java.version}</echo>
+
             <delete dir="build" includeemptydirs="true"/>
             <delete dir="dist" includeemptydirs="true"/>
 

Modified: SwingME/src/net/yura/mobile/gui/components/Button.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Button.java	2022-10-09 23:12:09 UTC (rev 2662)
+++ SwingME/src/net/yura/mobile/gui/components/Button.java	2022-11-25 01:21:32 UTC (rev 2663)
@@ -419,6 +419,7 @@
          * On Android and blackberry nothing special will be done with this button
          * </p>
          * @see javax.swing.AbstractButton#setMnemonic(int) AbstractButton.setMnemonic
+         * @see javax.swing.JLabel#setDisplayedMnemonic(int)
          *
          * @see net.yura.mobile.gui.KeyEvent#KEY_MENU
          * @see net.yura.mobile.gui.KeyEvent#KEY_END

Modified: SwingME/src/net/yura/mobile/gui/components/ComboBox.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ComboBox.java	2022-10-09 23:12:09 UTC (rev 2662)
+++ SwingME/src/net/yura/mobile/gui/components/ComboBox.java	2022-11-25 01:21:32 UTC (rev 2663)
@@ -30,6 +30,9 @@
 import net.yura.mobile.util.Option;
 
 /**
+ * Even though this class extends Button, do NOT use methods {@link #setText(String)} or {@link #setIcon(Icon)}
+ * use {@link #setSelectedItem(Object)} and {@link #setSelectedIndex(int)} instead
+ *
  * @author Yura Mamyrin
  * @see javax.swing.JComboBox
  */
@@ -353,14 +356,6 @@
             int index = getSelectedIndex();
             return index==-1?null:list.getElementAt(index);
 	}
-        
-	/**
-	 * This throws an IllegalArgumentException and you should use the
-	 * setIndex method instead
-	 */
-	public void setText(String a) {
-            throw new IllegalArgumentException();
-	}
 
 	public void setScrollMode(int m) {
             createScrollPane();

Modified: SwingME/src/net/yura/mobile/gui/components/Spinner.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Spinner.java	2022-10-09 23:12:09 UTC (rev 2662)
+++ SwingME/src/net/yura/mobile/gui/components/Spinner.java	2022-11-25 01:21:32 UTC (rev 2663)
@@ -33,6 +33,9 @@
 import net.yura.mobile.util.Option;
 
 /**
+ * Even though this class extends Button, do NOT use methods {@link #setText(String)} or {@link #setIcon(Icon)}
+ * use {@link #setValue(Object)} instead
+ *
  * @author Yura Mamyrin
  * @see javax.swing.JSpinner
  */
@@ -346,17 +349,6 @@
 	    repaint();
 	}
 */
-
-	//#mdebug debug
-	/**
-	 * This throws an IllegalArgumentException and you should use the
-	 * setIndex method instead
-	 */
-	public void setText(String a) {
-		throw new IllegalArgumentException();
-	}
-        //#enddebug
-
         public String getDefaultName() {
             return "Spinner";
         }
@@ -468,7 +460,6 @@
                 chl.changeEvent(this,index);
             }
             repaint();
-
         }
 
 	/**

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

[Swingme-svn] SF.net SVN: swingme:[2662] SwingME/src/net/yura/mobile/gui/layout/ XULLoader.java

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

Revision: 2662
          http://sourceforge.net/p/swingme/code/2662
Author:   yuranet
Date:     2022-10-09 23:12:09 +0000 (Sun, 09 Oct 2022)
Log Message:
-----------
simple setFont logic

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/layout/XULLoader.java

Modified: SwingME/src/net/yura/mobile/gui/layout/XULLoader.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/layout/XULLoader.java	2022-10-09 22:52:02 UTC (rev 2661)
+++ SwingME/src/net/yura/mobile/gui/layout/XULLoader.java	2022-10-09 23:12:09 UTC (rev 2662)
@@ -718,7 +718,6 @@
     public void readLabel(KXmlParser parser, Label label,Hashtable properties) {
             String labelText = null;
             boolean i18n = false;
-            Font font = null;
 
             int count = parser.getAttributeCount();
             for (int c=0;c<count;c++) {
@@ -736,11 +735,11 @@
                     label.setIcon( loadIcon(value) );
                 }
                 else if ("alignment".equals(key)) {
-                	int pos = position(value, true);
+                    int pos = position(value, true);
                     label.setHorizontalAlignment(pos);
                 }
                 else if ("font".equals(key)) {
-                    font = getFont(value);
+                    label.setFont(getFont(value));
                 }
             }
 
@@ -771,9 +770,6 @@
             if (labelText != null) {
                 label.setText( getPropertyText(labelText,i18n) );
             }
-            if (font != null) {
-                label.setFont(font);
-            }
     }
 
     public static int position(String pos,boolean horror) {

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

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

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

Revision: 2661
          http://sourceforge.net/p/swingme/code/2661
Author:   yuranet
Date:     2022-10-09 22:52:02 +0000 (Sun, 09 Oct 2022)
Log Message:
-----------
font support for labels in xul

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/components/Label.java
    SwingME/src/net/yura/mobile/gui/layout/XULLoader.java

Modified: SwingME/src/net/yura/mobile/gui/components/Label.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Label.java	2022-10-09 15:03:01 UTC (rev 2660)
+++ SwingME/src/net/yura/mobile/gui/components/Label.java	2022-10-09 22:52:02 UTC (rev 2661)
@@ -151,7 +151,7 @@
 //            }
 
             // calling setText causes thing like spinner that throw in the setText to stop working
-            string = drawString; // dont want to recalc everything twice
+            setText(drawString); // dont want to recalc everything twice
             setIcon(image);
             setToolTipText(tip);
         }
@@ -395,7 +395,6 @@
 			y = (height - combinedheight) -padding;
 		}
 
-
 		if (iconWidth>0) {
 
 			int ix=x;
@@ -404,23 +403,19 @@
 			if ((textPosition & Graphics.HCENTER) != 0) {
 
 				ix = x + (combinedwidth - iconWidth)/2;
-
 			}
 			else if ((textPosition & Graphics.LEFT) != 0 && font!=null && drawString!=null) {
 
 				ix = x + font.getWidth(drawString)+gap;
-
 			}
 
 			if ((textPosition & Graphics.VCENTER) != 0 || (textPosition & Graphics.RIGHT) != 0 || (textPosition & Graphics.LEFT) != 0 ) {
 
 				iy = y + (combinedheight - getIconHeight())/2;
-
 			}
 			else if ((textPosition & Graphics.TOP) != 0 && font!=null && drawString!=null) {
 
 				iy = y + font.getHeight()+gap;
-
 			}
 
 			paintIcon( g, ix, iy  );
@@ -434,31 +429,25 @@
 			if ((textPosition & Graphics.HCENTER) != 0) {
 
 				tx = x + (combinedwidth - font.getWidth(drawString))/2;
-
 			}
 			else if ((textPosition & Graphics.RIGHT) != 0 && iconWidth>0) {
 
 				tx = x + iconWidth+gap;
-
 			}
 
 			if ((textPosition & Graphics.VCENTER) != 0) {
 
 				ty = y + (combinedheight - font.getHeight())/2;
-
 			}
 			else if ((textPosition & Graphics.BOTTOM) != 0 && iconWidth>0) {
 
 				ty = y + getIconHeight()+gap;
-
 			}
 
-
 			g.setColor( getForeground() );
                         g.setFont(font);
 			g.drawString( drawString, tx,ty );
 		}
-
 	}
 
         protected void paintIcon(Graphics2D g, int x, int y) {
@@ -465,7 +454,6 @@
             getIcon().paintIcon(this, g, x, y);
         }
 
-
         public void updateUI() {
             super.updateUI();
             font = theme.getFont(Style.ALL);

Modified: SwingME/src/net/yura/mobile/gui/layout/XULLoader.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/layout/XULLoader.java	2022-10-09 15:03:01 UTC (rev 2660)
+++ SwingME/src/net/yura/mobile/gui/layout/XULLoader.java	2022-10-09 22:52:02 UTC (rev 2661)
@@ -397,6 +397,11 @@
         else if (name.equals("progressbar")) {
             ProgressBar progress = (ProgressBar)newComponent(ProgressBar.class,properties);
 
+            Object indeterminate = properties.get("indeterminate");
+            if (indeterminate != null) {
+                progress.setIndeterminate("true".equals(indeterminate));
+            }
+
             return readUIObject(parser, progress,listener,properties);
         }
         else if (name.equals("spinbox")) {
@@ -509,9 +514,9 @@
         else if (name.equals("label")) {
             Label label = (Label)newComponent(Label.class,properties);
 
-            readLabel(parser,label,properties);
+            readLabel(parser, label, properties);
 
-            return readUIObject(parser, label,listener,properties);
+            return readUIObject(parser, label, listener, properties);
         }
         else if (name.equals("menubar")) {
             MenuBar menubar = (MenuBar)newComponent(MenuBar.class,properties);
@@ -680,7 +685,7 @@
                 button.setRolloverIcon( loadIcon( rolloverIcon ) );
             }
 
-            readLabel(parser, button,properties);
+            readLabel(parser, button, properties);
     }
 
 
@@ -713,6 +718,7 @@
     public void readLabel(KXmlParser parser, Label label,Hashtable properties) {
             String labelText = null;
             boolean i18n = false;
+            Font font = null;
 
             int count = parser.getAttributeCount();
             for (int c=0;c<count;c++) {
@@ -733,6 +739,9 @@
                 	int pos = position(value, true);
                     label.setHorizontalAlignment(pos);
                 }
+                else if ("font".equals(key)) {
+                    font = getFont(value);
+                }
             }
 
             String gap = (String)properties.get("gap");
@@ -762,6 +771,9 @@
             if (labelText != null) {
                 label.setText( getPropertyText(labelText,i18n) );
             }
+            if (font != null) {
+                label.setFont(font);
+            }
     }
 
     public static int position(String pos,boolean horror) {
@@ -877,32 +889,7 @@
                     }
                 }
                 else if ("font".equals(key)) {
-
-                    String name = null;
-                    boolean bold = false; boolean italic = false;
-                    int size = 0;
-                    String[] st = StringUtil.split(value,' ');
-                    for (int i=0;i<st.length;i++) {
-                            String token = st[i];
-                            if ("bold".equalsIgnoreCase(token)) { bold = true; }
-                            else if ("italic".equalsIgnoreCase(token)) { italic = true; }
-                            else {
-                                    try {
-                                            size = -Integer.parseInt(token);
-                                    } catch (NumberFormatException nfe) {
-                                        if ("SMALL".equals(token) || "MEDIUM".equals(token) || "LARGE".equals(token)) {
-                                            size = SynthLookAndFeel.getFontSize(token);
-                                        }
-                                        else {
-                                            name = (name == null) ? token : (name + ' ' + token);
-                                        }
-                                    }
-                            }
-                    }
-
-                    font=new Font(SynthLookAndFeel.getFontName(name),
-                            (bold ? javax.microedition.lcdui.Font.STYLE_BOLD : 0) | (italic ? javax.microedition.lcdui.Font.STYLE_ITALIC : 0),
-                            size==0?javax.microedition.lcdui.Font.SIZE_MEDIUM:size);
+                    font = getFont(value);
                 }
             }
 
@@ -929,7 +916,7 @@
                 }
             }
             
-            if (font!=null) {
+            if (font != null) {
                 if (text instanceof TextComponent) {
                     ((TextComponent)text).setFont(font);
                 }
@@ -962,6 +949,34 @@
             }
     }
 
+    private static Font getFont(String value) {
+        String name = null;
+        boolean bold = false; boolean italic = false;
+        int size = 0;
+        String[] st = StringUtil.split(value,' ');
+        for (int i = 0; i < st.length; i++) {
+            String token = st[i];
+            if ("bold".equalsIgnoreCase(token)) { bold = true; }
+            else if ("italic".equalsIgnoreCase(token)) { italic = true; }
+            else {
+                try {
+                    size = -Integer.parseInt(token);
+                } catch (NumberFormatException nfe) {
+                    if ("SMALL".equals(token) || "MEDIUM".equals(token) || "LARGE".equals(token)) {
+                        size = SynthLookAndFeel.getFontSize(token);
+                    }
+                    else {
+                        name = (name == null) ? token : (name + ' ' + token);
+                    }
+                }
+            }
+        }
+
+        return new Font(SynthLookAndFeel.getFontName(name),
+                (bold ? javax.microedition.lcdui.Font.STYLE_BOLD : 0) | (italic ? javax.microedition.lcdui.Font.STYLE_ITALIC : 0),
+                size == 0 ? javax.microedition.lcdui.Font.SIZE_MEDIUM : size);
+    }
+
     private void readOption(KXmlParser parser, Option op) {
         String label = null;
         boolean i18n = false;

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