swingme-svn — subversion diffs

[Swingme-svn] SF.net SVN: swingme:[2397] AndroidME/build.gradle

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

Revision: 2397
          http://sourceforge.net/p/swingme/code/2397
Author:   yuranet
Date:     2021-02-24 11:18:41 +0000 (Wed, 24 Feb 2021)
Log Message:
-----------
compile fix

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

Modified: AndroidME/build.gradle
===================================================================
--- AndroidME/build.gradle	2020-11-19 17:43:26 UTC (rev 2396)
+++ AndroidME/build.gradle	2021-02-24 11:18:41 UTC (rev 2397)
@@ -1,9 +1,13 @@
 buildscript {
     repositories {
         mavenCentral()
+        jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.14.2'
+        // 3.3.3 is the last version that will load in Android Studio 3.2.1
+        // AS 3.2.1 is the last version that will support the theme editor
+        classpath 'com.android.tools.build:gradle:3.3.3'
     }
 }
 
@@ -11,8 +15,8 @@
 
 android {
     compileOptions.encoding = 'cp1252'
-    compileSdkVersion 18
-    buildToolsVersion '19.1.0'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     sourceSets {
         main {

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

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

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

Revision: 2396
          http://sourceforge.net/p/swingme/code/2396
Author:   yuranet
Date:     2020-11-19 17:43:26 +0000 (Thu, 19 Nov 2020)
Log Message:
-----------
handle bad UI threading a bit better

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/components/ScrollPane.java
    SwingME/src/net/yura/mobile/gui/components/Slider.java
    SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java

Modified: SwingME/src/net/yura/mobile/gui/components/ScrollPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/ScrollPane.java	2020-08-11 21:23:26 UTC (rev 2395)
+++ SwingME/src/net/yura/mobile/gui/components/ScrollPane.java	2020-11-19 17:43:26 UTC (rev 2396)
@@ -1094,6 +1094,7 @@
         int diffBottomY = viewPortHeight - cY - cH;
 
         // How far are we from the desire position?
+        // (difference in scrollarea pixels of the move) - (amount already moved since start of interaction)
         int jumpY = (dragStartY - dragLastY) - (dragStartViewY - cY);
 
         if (jumpY != 0 || bound) {

Modified: SwingME/src/net/yura/mobile/gui/components/Slider.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Slider.java	2020-08-11 21:23:26 UTC (rev 2395)
+++ SwingME/src/net/yura/mobile/gui/components/Slider.java	2020-11-19 17:43:26 UTC (rev 2396)
@@ -670,10 +670,20 @@
 
     /**
      * this method is used by the ScrollPane
+     * @return the end value after adding scrollbarPixelsMoved in scrollArea coordinates
      */
-    public int getNewValue(int x,int y,int w,int h,int value,int extent, int max,int pixels) {
+    public int getNewValue(int x, int y, int w, int h, int value, int extent, int max, int scrollbarPixelsMoved) {
         int[] offsets = getOffsets(x, y, w, h, 0, extent, max);
-        return value + ((max-extent)*  pixels)/ (w - offsets[0]*2 - offsets[2]);
+        int scrollAreaHiddenSize = max - extent;
+        int scrollbarAvailableSpacePixels = w - offsets[0]*2 - offsets[2];
+        // if something has changed in the layout while we are trying to scroll
+        if (scrollbarAvailableSpacePixels == 0) {
+            //#debug info
+            Logger.info("scrollbarAvailableSpacePixels is zero, UI has been changed from non UI-Thread");
+            // no change in value
+            return value;
+        }        
+        // start value + scrollAreaPixelsMoved
+        return value + (scrollAreaHiddenSize * scrollbarPixelsMoved) / scrollbarAvailableSpacePixels;
     }
-
 }

Modified: SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java	2020-08-11 21:23:26 UTC (rev 2395)
+++ SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java	2020-11-19 17:43:26 UTC (rev 2396)
@@ -57,7 +57,11 @@
         }
         return null;
     }
-    
+
+    /**
+     * The system or custom midlet may return a higher-resolution image
+     * @see Image#createImage(String)
+     */
     protected Image createImage(String path) {
         Image in = Midlet.createImage(path);
         if (in==null) {
@@ -323,6 +327,7 @@
                                     }
                                 }
                                 else {
+                                    // TODO: the image may come back as xhdpi and have a higher resolution, but the x,y,w,h are not being scaled
                                     newImage = getIcon( path,x==null?0:Integer.parseInt(x),y==null?0:Integer.parseInt(y),width==null?0:Integer.parseInt(width),height==null?0:Integer.parseInt(height) );
                                 }
                                 if (newImage!=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:[2395] me4se/src/javax/microedition/midlet/ ApplicationManager.java

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

Revision: 2395
          http://sourceforge.net/p/swingme/code/2395
Author:   yuranet
Date:     2020-08-11 21:23:26 +0000 (Tue, 11 Aug 2020)
Log Message:
-----------
fix for display density be correct on Linux jdk11

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

Modified: me4se/src/javax/microedition/midlet/ApplicationManager.java
===================================================================
--- me4se/src/javax/microedition/midlet/ApplicationManager.java	2020-06-26 20:42:48 UTC (rev 2394)
+++ me4se/src/javax/microedition/midlet/ApplicationManager.java	2020-08-11 21:23:26 UTC (rev 2395)
@@ -1331,7 +1331,11 @@
    */
   public static double getDisplayDensity() {
       String osNameLowerCase = java.lang.System.getProperty("os.name").toLowerCase();
-      if (!osNameLowerCase.startsWith("mac") && java.lang.System.getProperty("java.specification.version").startsWith("1.")) {
+      double scale = getScale();
+      // macs always handle things through scale
+      // but on other platforms, if scale is not used, we fall back to display density instead
+      // jdk version from 1.X to 11 and maybe even newer can require this
+      if (!osNameLowerCase.startsWith("mac") && scale == 1.0) {
 
           // on hi res linux value = 196608
           Object gnomeDpi = Toolkit.getDefaultToolkit().getDesktopProperty("gnome.Xft/DPI");
@@ -1355,7 +1359,7 @@
           // between 1 and 3, rounded to the closest 0.25 (from JBUI.discreteScale)
           return Math.min(3, Math.max(1, Math.round(((dpi / 96.0) - 0.01) / 0.25f) * 0.25f));
       }
-      return getScale();
+      return scale;
   }
   
   /**
@@ -1388,7 +1392,7 @@
       catch (Throwable th) {}
 
       // default
-      return 1;
+      return 1.0;
   }
 
 }

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

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

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

Revision: 2394
          http://sourceforge.net/p/swingme/code/2394
Author:   yuranet
Date:     2020-06-26 20:42:48 +0000 (Fri, 26 Jun 2020)
Log Message:
-----------
permission check

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	2020-06-26 14:58:19 UTC (rev 2393)
+++ AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java	2020-06-26 20:42:48 UTC (rev 2394)
@@ -11,6 +11,8 @@
 import net.yura.android.WebViewActivity;
 import net.yura.mobile.logging.Logger;
 import net.yura.mobile.util.Url;
+
+import android.Manifest;
 import android.app.Activity;
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -18,6 +20,7 @@
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.net.MailTo;
 import android.net.Uri;
 import android.os.Build;
@@ -433,7 +436,6 @@
         });
     }
 
-
     private static class PhoneListener extends PhoneStateListener {
 
         private static PhoneListener instance;
@@ -492,7 +494,9 @@
                 TelephonyManager tm = getTelephonyManager();
                 setProperty("CMCC", tm.getNetworkCountryIso());
                 setProperty("MCC", tm.getSimCountryIso());
-                setProperty("IMSI", tm.getSubscriberId());
+                if (AndroidMeActivity.DEFAULT_ACTIVITY.checkCallingOrSelfPermission(Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) {
+                    setProperty("IMSI", tm.getSubscriberId());
+                }
 
                 // Network Operator = MMC + MNC
                 String op = tm.getNetworkOperator();

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

[Swingme-svn] SF.net SVN: swingme:[2393] me4se/opt/swingme/src/net/yura/me4se/ ME4SEPanel.java

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

Revision: 2393
          http://sourceforge.net/p/swingme/code/2393
Author:   yuranet
Date:     2020-06-26 14:58:19 +0000 (Fri, 26 Jun 2020)
Log Message:
-----------
use correct language in swingme dialogs

Modified Paths:
--------------
    me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java

Modified: me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java
===================================================================
--- me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java	2020-06-25 11:56:21 UTC (rev 2392)
+++ me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java	2020-06-26 14:58:19 UTC (rev 2393)
@@ -10,6 +10,7 @@
 import javax.microedition.midlet.ApplicationManager;
 import javax.swing.JDialog;
 import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 import net.yura.mobile.gui.DesktopPane;
 import net.yura.mobile.gui.KeyEvent;
 import net.yura.mobile.gui.components.Component;
@@ -53,6 +54,12 @@
         desktop.setLookAndFeel( new NimbusLookAndFeel() );
         desktop.defaultSpace = XULLoader.adjustSizeToDensity(5);
 
+        // set defaults in SwingME if system locale is not english
+        DesktopPane.put("okText", UIManager.getString("OptionPane.okButtonText"));
+        DesktopPane.put("cancelText", UIManager.getString("OptionPane.cancelButtonText"));
+        DesktopPane.put("yesText", UIManager.getString("OptionPane.yesButtonText"));
+        DesktopPane.put("noText", UIManager.getString("OptionPane.noButtonText"));
+
         //setPreferredSize(new Dimension(320,480)); // default same as Jesus Piece
     }
 

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

[Swingme-svn] SF.net SVN: swingme:[2392] SwingMETest/build.gradle

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

Revision: 2392
          http://sourceforge.net/p/swingme/code/2392
Author:   yuranet
Date:     2020-06-25 11:56:21 +0000 (Thu, 25 Jun 2020)
Log Message:
-----------
android tests work

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

Modified: SwingMETest/build.gradle
===================================================================
--- SwingMETest/build.gradle	2020-06-25 11:31:07 UTC (rev 2391)
+++ SwingMETest/build.gradle	2020-06-25 11:56:21 UTC (rev 2392)
@@ -32,7 +32,7 @@
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
+            java.srcDirs = ['src', '../AndroidME/src_Test', 'test']
             resources.srcDirs = ['resources']
             res.srcDirs = ['res']
             assets.srcDirs = ['assets']

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

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

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

Revision: 2391
          http://sourceforge.net/p/swingme/code/2391
Author:   yuranet
Date:     2020-06-25 11:31:07 +0000 (Thu, 25 Jun 2020)
Log Message:
-----------
test update

Modified Paths:
--------------
    SwingMETest/AndroidManifest.xml

Added Paths:
-----------
    SwingMETest/build.gradle
    SwingMETest/settings.gradle
    SwingMETest/test/
    SwingMETest/test/net/
    SwingMETest/test/net/yura/
    SwingMETest/test/net/yura/mobile/
    SwingMETest/test/net/yura/mobile/junit/
    SwingMETest/test/net/yura/mobile/junit/JMUnitTest.java

Removed Paths:
-------------
    SwingMETest/local.properties
    SwingMETest/src/net/yura/mobile/junit/

Modified: SwingMETest/AndroidManifest.xml
===================================================================
--- SwingMETest/AndroidManifest.xml	2020-06-21 14:32:52 UTC (rev 2390)
+++ SwingMETest/AndroidManifest.xml	2020-06-25 11:31:07 UTC (rev 2391)
@@ -4,7 +4,7 @@
       android:versionCode="1"
       android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="14" />
+    <uses-sdk android:targetSdkVersion="14" />
 
     <uses-feature android:name="android.hardware.camera" android:required="false" />
 

Added: SwingMETest/build.gradle
===================================================================
--- SwingMETest/build.gradle	                        (rev 0)
+++ SwingMETest/build.gradle	2020-06-25 11:31:07 UTC (rev 2391)
@@ -0,0 +1,50 @@
+allprojects {
+    repositories {
+        mavenCentral()
+        jcenter()
+        google()
+    }
+}
+
+buildscript {
+    repositories {
+        mavenCentral()
+        jcenter()
+        google()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:4.0.0'
+    }
+}
+
+apply plugin: 'com.android.application'
+
+dependencies {
+    implementation project(':AndroidME')
+}
+
+android {
+    compileOptions.encoding = 'cp1252'
+    compileSdkVersion 23
+    buildToolsVersion '27.0.3'
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['resources']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
+    }
+    // this is to avoid the @TargetApi missing on methods giving errors.
+    lintOptions {
+        abortOnError false
+    }
+    defaultConfig {
+        minSdkVersion 4
+    }
+}
+
+

Deleted: SwingMETest/local.properties
===================================================================
--- SwingMETest/local.properties	2020-06-21 14:32:52 UTC (rev 2390)
+++ SwingMETest/local.properties	2020-06-25 11:31:07 UTC (rev 2391)
@@ -1,10 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked in Version Control Systems,
-# as it contains information specific to your local configuration.
-
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk.dir=/Users/yuramamyrin/dev/android-sdk-mac_x86

Added: SwingMETest/settings.gradle
===================================================================
--- SwingMETest/settings.gradle	                        (rev 0)
+++ SwingMETest/settings.gradle	2020-06-25 11:31:07 UTC (rev 2391)
@@ -0,0 +1,10 @@
+//include ':..:AndroidME'
+// can not do as above as does not build on Windows http://b.android.com/79505
+// example: https://android.googlesource.com/platform/tools/buildSrc/+/master/base/settings.gradle
+
+include ':AndroidME'
+project(':AndroidME').projectDir = new File(rootDir.getParentFile(), 'AndroidME')
+
+
+// this will only be supported when Android Studio adds support for gradle 3
+//includeBuild '../AndroidME'

Added: SwingMETest/test/net/yura/mobile/junit/JMUnitTest.java
===================================================================
--- SwingMETest/test/net/yura/mobile/junit/JMUnitTest.java	                        (rev 0)
+++ SwingMETest/test/net/yura/mobile/junit/JMUnitTest.java	2020-06-25 11:31:07 UTC (rev 2391)
@@ -0,0 +1,172 @@
+package net.yura.mobile.junit;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Hashtable;
+import java.util.Vector;
+import javax.microedition.io.Connector;
+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;
+import net.yura.mobile.gui.layout.XULLoader;
+import net.yura.mobile.gui.plaf.MetalLookAndFeel;
+import net.yura.mobile.gui.plaf.nimbus.NimbusLookAndFeel;
+import net.yura.mobile.io.RMSUtil;
+import net.yura.mobile.util.SystemUtil;
+
+/**
+ * ALL test methods need to start with the word "test" and be public to work with android
+ * @author Yura Mamyrin
+ */
+public class JMUnitTest extends TestCase {
+    
+    public JMUnitTest() {
+        //The first parameter of inherited constructor is the number of test cases
+        super(4, "JMUnitTest");
+    }    
+    
+    public void test(int testNumber) throws Throwable {
+        
+        switch(testNumber) {
+            //case 0: testXULLoaderAdjustSizeToDensity(); break;
+            case 1: testRMSUtil(); break;
+            case 2: testSocketGet(); break;
+            case 3: testShowing(); break;
+        }
+        
+    }
+/*
+    public void testXULLoaderAdjustSizeToDensity() {
+
+        //    36x36 for low-density
+        //    48x48 for medium-density
+        //    72x72 for high-density
+        //    96x96 for extra high-density
+
+        int source = 36;
+
+        XULLoader.setDPI("ldpi");
+        assertEquals(36, XULLoader.adjustSizeToDensity(source) );
+
+        XULLoader.setDPI("mdpi");
+        assertEquals(48, XULLoader.adjustSizeToDensity(source) );
+
+        XULLoader.setDPI("hdpi");
+        assertEquals(72, XULLoader.adjustSizeToDensity(source) );
+
+        XULLoader.setDPI("xhdpi");
+        assertEquals(96, XULLoader.adjustSizeToDensity(source) );
+
+        XULLoader.setDPI("tvdpi");
+        assertEquals(64, XULLoader.adjustSizeToDensity(source) );
+
+        XULLoader.setDPI(null); // should default to mdpi size
+        assertEquals(48, XULLoader.adjustSizeToDensity(source) );
+    }
+*/
+    public void testRMSUtil() throws Exception {
+        
+            Hashtable obj = new Hashtable();
+            obj.put("tests", new Vector());
+            obj.put(new Integer(5), new Double(5.5));
+            obj.put(new Object[] {"String",new Integer(666)}, new Hashtable());
+
+
+            RMSUtil.save("Test1", obj);
+
+            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 );
+        //Socket socket = SocketFactory.getDefault().createSocket("google.com", 80 );
+
+        String post = "GET / HTTP/1.0\r\n" + // 1.1 does not close the InputStream
+        "Host: google.com\r\n" +
+        "User-Agent: Mozilla/5.0 (Windows NT 5.2; WOW64; rv:10.0.2) Gecko/20100101 Firefox/10.0.2\r\n" +
+        "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*\x80/*;q=0.8\r\n" +
+        // "Accept-Language: en-us,en;q=0.5\r\n" +
+        // "Accept-Encoding: gzip, deflate\r\n" +
+        // "Connection: keep-alive\r\n" +
+        // "Referer: http://yura.net/\r\n" +
+        "\r\n";
+
+        OutputStream out = socket.openOutputStream();
+        InputStream in = socket.openInputStream();
+
+        out.write( post.getBytes("ISO-8859-1") );
+        out.flush();
+
+        byte[] bytes = SystemUtil.getData(in, -1);
+
+        String result = new String(bytes,"ISO-8859-1");
+        System.out.println( result );
+*/
+        
+    }
+    
+    public void testShowing() {
+        System.out.println("testShowing start");
+
+        DesktopPane dp = new DesktopPane(null, -1, null);
+
+        dp.setLookAndFeel( new NimbusLookAndFeel() );
+
+        Button button = new Button();
+
+        assertFalse( button.isShowing() );
+
+        Panel panel = new Panel();
+        panel.add(button);
+
+        assertFalse( button.isShowing() );
+        assertFalse( panel.isShowing() );
+
+        Frame frame = new Frame();
+        frame.getContentPane().add(panel);
+
+        assertFalse( button.isShowing() );
+        assertFalse( panel.isShowing() );
+        assertFalse( frame.isShowing() );
+
+        frame.setVisible(true);
+
+        assertTrue( button.isShowing() );
+        assertTrue( panel.isShowing() );
+        assertTrue( frame.isShowing() );
+
+        panel.setVisible(false);
+
+        assertFalse( button.isShowing() );
+        assertFalse( panel.isShowing() );
+        assertTrue( frame.isShowing() );
+
+        panel.setVisible(true);
+        button.setVisible(false);
+
+        assertFalse( button.isShowing() );
+        assertTrue( panel.isShowing() );
+        assertTrue( frame.isShowing() );
+
+        button.setVisible(true);
+        frame.setVisible(false);
+
+        assertFalse( button.isShowing() );
+        assertFalse( panel.isShowing() );
+        assertFalse( frame.isShowing() );
+
+        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:[2390] me4se/src/javax/microedition/lcdui/ ScmCanvas.java

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

Revision: 2390
          http://sourceforge.net/p/swingme/code/2390
Author:   yuranet
Date:     2020-06-21 14:32:52 +0000 (Sun, 21 Jun 2020)
Log Message:
-----------
AA for fonts

Modified Paths:
--------------
    me4se/src/javax/microedition/lcdui/ScmCanvas.java

Modified: me4se/src/javax/microedition/lcdui/ScmCanvas.java
===================================================================
--- me4se/src/javax/microedition/lcdui/ScmCanvas.java	2020-06-04 17:15:33 UTC (rev 2389)
+++ me4se/src/javax/microedition/lcdui/ScmCanvas.java	2020-06-21 14:32:52 UTC (rev 2390)
@@ -8,7 +8,9 @@
  */
 
 import java.awt.Color;
+import java.awt.Graphics2D;
 import java.awt.Rectangle;
+import java.awt.RenderingHints;
 import java.awt.event.InputEvent;
 import java.awt.image.BufferedImage;
 
@@ -55,7 +57,12 @@
 				//			getHeight(), BufferedImage.TYPE_INT_RGB);
 				//}
 
-                                // YURA basically we can noy have this check here
+                                // YURA FIX make fonts look nicer
+                                if (g instanceof Graphics2D) {
+                                      ((Graphics2D)g).setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+                                }
+
+                                // YURA we can not have this check here
                                 // as what happens is there is 1 request for 1 sq and a 2nd request for a second sq to paint
                                 // but after the first paint, this flag is set to flase, and the second paint does not happen
                                 // this can leave areas that should have been painted, not being painted

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

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

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

Revision: 2389
          http://sourceforge.net/p/swingme/code/2389
Author:   yuranet
Date:     2020-06-04 17:15:33 +0000 (Thu, 04 Jun 2020)
Log Message:
-----------
javadoc update

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/components/Component.java
    SwingME/src/net/yura/mobile/gui/components/TextComponent.java

Modified: SwingME/src/net/yura/mobile/gui/components/Component.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Component.java	2020-05-19 21:52:55 UTC (rev 2388)
+++ SwingME/src/net/yura/mobile/gui/components/Component.java	2020-06-04 17:15:33 UTC (rev 2389)
@@ -180,6 +180,7 @@
     /**
      * @return The name of the panel
      * @see java.awt.Component#getName() Component.getName
+     * @see javax.swing.JComponent#getUIClassID()
      * @see TabbedPane#add(net.yura.mobile.gui.components.Component)
      */
     public String getName() {

Modified: SwingME/src/net/yura/mobile/gui/components/TextComponent.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TextComponent.java	2020-05-19 21:52:55 UTC (rev 2388)
+++ SwingME/src/net/yura/mobile/gui/components/TextComponent.java	2020-06-04 17:15:33 UTC (rev 2389)
@@ -264,11 +264,14 @@
             }
         }
 
+        /**
+         * @see javax.microedition.lcdui.Display#setCurrent(javax.microedition.lcdui.Displayable) 
+         */
         public void processMouseEvent(int type, int x, int y, KeyEvent keys) {
             boolean focusOwner = isFocusOwner();
             super.processMouseEvent(type, x, y, keys);
             if (focusOwner && type==DesktopPane.PRESSED
-                //   && Midlet.getPlatform() != Midlet.PLATFORM_ME4SE) { // hacked me4se so this would not be needed
+                //   && Midlet.getPlatform() != Midlet.PLATFORM_ME4SE) { // hacked me4se so this would not be needed (see javadoc)
                     ) {
                 // TODO check if we have a qwerty keyboard
                 openNativeEditor();

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

[Swingme-svn] SF.net SVN: swingme:[2388] me4se/opt/swingme/src/net/yura/me4se/ ME4SEPanel.java

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

Revision: 2388
          http://sourceforge.net/p/swingme/code/2388
Author:   yuranet
Date:     2020-05-19 21:52:55 +0000 (Tue, 19 May 2020)
Log Message:
-----------
padding in optionPane fix

Modified Paths:
--------------
    me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java

Modified: me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java
===================================================================
--- me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java	2020-04-23 13:32:27 UTC (rev 2387)
+++ me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java	2020-05-19 21:52:55 UTC (rev 2388)
@@ -14,6 +14,7 @@
 import net.yura.mobile.gui.KeyEvent;
 import net.yura.mobile.gui.components.Component;
 import net.yura.mobile.gui.components.Frame;
+import net.yura.mobile.gui.layout.XULLoader;
 import net.yura.mobile.gui.plaf.nimbus.NimbusLookAndFeel;
 import org.me4se.JadFile;
 
@@ -50,6 +51,7 @@
 
         // todo find this from a better place
         desktop.setLookAndFeel( new NimbusLookAndFeel() );
+        desktop.defaultSpace = XULLoader.adjustSizeToDensity(5);
 
         //setPreferredSize(new Dimension(320,480)); // default same as Jesus Piece
     }

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

[Swingme-svn] SF.net SVN: swingme:[2387] ToolsME/src/net/yura/tools/mobilegen/ MobileProtoGen.java

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

Revision: 2387
          http://sourceforge.net/p/swingme/code/2387
Author:   yuranet
Date:     2020-04-23 13:32:27 +0000 (Thu, 23 Apr 2020)
Log Message:
-----------
sort enums by value

Modified Paths:
--------------
    ToolsME/src/net/yura/tools/mobilegen/MobileProtoGen.java

Modified: ToolsME/src/net/yura/tools/mobilegen/MobileProtoGen.java
===================================================================
--- ToolsME/src/net/yura/tools/mobilegen/MobileProtoGen.java	2020-04-18 18:44:04 UTC (rev 2386)
+++ ToolsME/src/net/yura/tools/mobilegen/MobileProtoGen.java	2020-04-23 13:32:27 UTC (rev 2387)
@@ -11,6 +11,7 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.Vector;
+import java.util.stream.Collectors;
 import net.yura.tools.mobilegen.ProtoLoader.EnumDefinition;
 import net.yura.tools.mobilegen.ProtoLoader.FieldDefinition;
 import net.yura.tools.mobilegen.ProtoLoader.MessageDefinition;
@@ -252,10 +253,11 @@
             if ( use(edef) ) {
 
                 Set<Map.Entry<String,Integer>> set = edef.getValues().entrySet();
+                List<Map.Entry<String,Integer>> sortedList = set.stream().sorted((entry1, entry2) -> Integer.compare(entry1.getValue(), entry2.getValue())).collect(Collectors.toList());
 
 ps.println("    public static int get"+name+"Enum(String enu) {");
 
-for (Map.Entry<String,Integer> enu:set) {
+for (Map.Entry<String,Integer> enu:sortedList) {
     ps.println("    if ("+quote+enu.getKey()+quote+".equals(enu)) return "+enu.getValue()+";");
 }
 
@@ -264,7 +266,7 @@
 ps.println("    public static String get"+name+"String(int i) {");
 ps.println("        switch (i) {");
 
-for (Map.Entry<String,Integer> enu:set) {
+for (Map.Entry<String,Integer> enu:sortedList) {
     ps.println("        case "+enu.getValue()+": return "+quote+enu.getKey()+quote+";");
 }
 

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

[Swingme-svn] SF.net SVN: swingme:[2386] me4se/src/javax/microedition/lcdui/Image.java

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

Revision: 2386
          http://sourceforge.net/p/swingme/code/2386
Author:   yuranet
Date:     2020-04-18 18:44:04 +0000 (Sat, 18 Apr 2020)
Log Message:
-----------
density higher then 2 works correctly

Modified Paths:
--------------
    me4se/src/javax/microedition/lcdui/Image.java

Modified: me4se/src/javax/microedition/lcdui/Image.java
===================================================================
--- me4se/src/javax/microedition/lcdui/Image.java	2020-04-17 23:53:56 UTC (rev 2385)
+++ me4se/src/javax/microedition/lcdui/Image.java	2020-04-18 18:44:04 UTC (rev 2386)
@@ -154,17 +154,30 @@
 	 * @API MIDP-1.0 
 	 */
 	public static Image createImage(String name) throws IOException {
-            double density = ApplicationManager.getDisplayDensity();
-            if (density >= 2 && name.startsWith("/")) {
+            double multiplier = ApplicationManager.getDisplayDensity();
+            BufferedImage img = null;
+
+            if (multiplier > 1.1 && name.startsWith("/")) {
                 try {
-                    String name2 = "/drawable-xhdpi"+name;
-                    return new Image(ApplicationManager.getInstance().getImage(name2), false, true, name2);
+                    String name2 = "/drawable-xhdpi" + name;
+                    // try and load an image that is double resolution
+                    img = ApplicationManager.getInstance().getImage(name2);
+                    if (multiplier == 2) {
+                        return new Image(img, false, true, name2);
+                    }
+                    if (img != null) {
+                        // we have found an image for double resolution, but the resulution is even more then double
+                        name = name2;
+                        multiplier = multiplier / 2;
+                    }
                 }
                 catch (Throwable th) {}
             }
 
-            BufferedImage img = ApplicationManager.getInstance().getImage(name);
-            if (density != 1) {
+            if (img == null) {
+                img = ApplicationManager.getInstance().getImage(name);
+            }
+            if (multiplier != 1) {
                 int type = img.getType();
                 // We can't create images of TYPE_CUSTOM
                 if (type == BufferedImage.TYPE_CUSTOM) {
@@ -171,7 +184,7 @@
                     type = BufferedImage.TYPE_INT_ARGB;
                 }
                 if (name.endsWith(".9.png")) {
-                    BufferedImage newImg = new BufferedImage((int)(density*(img.getWidth()-2))+2, (int)(density*(img.getHeight()-2))+2, type);
+                    BufferedImage newImg = new BufferedImage((int)(multiplier*(img.getWidth()-2))+2, (int)(multiplier*(img.getHeight()-2))+2, type);
                     java.awt.Graphics g = newImg.getGraphics();
                     g.drawImage(img, 1, 1, newImg.getWidth()-1, newImg.getHeight()-1, 1, 1, img.getWidth()-1, img.getHeight()-1, null); // center
                     g.drawImage(img, 1, 0, newImg.getWidth()-1, 1, 1, 0, img.getWidth()-1, 1, null); // top
@@ -182,7 +195,7 @@
                     img=newImg;
                 }
                 else {
-                    BufferedImage newImg = new BufferedImage((int)(density*img.getWidth()), (int)(density*img.getHeight()), type);
+                    BufferedImage newImg = new BufferedImage((int)(multiplier*img.getWidth()), (int)(multiplier*img.getHeight()), type);
                     java.awt.Graphics g = newImg.getGraphics();
                     g.drawImage(img, 0, 0, newImg.getWidth(), newImg.getHeight(), 0, 0, img.getWidth(), img.getHeight(), null);
                     g.dispose();

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

[Swingme-svn] SF.net SVN: swingme:[2385] me4se/src/javax/microedition/lcdui/Image.java

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

Revision: 2385
          http://sourceforge.net/p/swingme/code/2385
Author:   yuranet
Date:     2020-04-17 23:53:56 +0000 (Fri, 17 Apr 2020)
Log Message:
-----------
use hi-res images for any density over 2

Modified Paths:
--------------
    me4se/src/javax/microedition/lcdui/Image.java

Modified: me4se/src/javax/microedition/lcdui/Image.java
===================================================================
--- me4se/src/javax/microedition/lcdui/Image.java	2019-12-06 21:47:50 UTC (rev 2384)
+++ me4se/src/javax/microedition/lcdui/Image.java	2020-04-17 23:53:56 UTC (rev 2385)
@@ -155,7 +155,7 @@
 	 */
 	public static Image createImage(String name) throws IOException {
             double density = ApplicationManager.getDisplayDensity();
-            if (density == 2 && name.startsWith("/")) {
+            if (density >= 2 && name.startsWith("/")) {
                 try {
                     String name2 = "/drawable-xhdpi"+name;
                     return new Image(ApplicationManager.getInstance().getImage(name2), false, true, name2);

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

[Swingme-svn] SF.net SVN: swingme:[2384] me4se/opt/swingme/src/net/yura/me4se/ ME4SEPanel.java

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

Revision: 2384
          http://sourceforge.net/p/swingme/code/2384
Author:   yuranet
Date:     2019-12-06 21:47:50 +0000 (Fri, 06 Dec 2019)
Log Message:
-----------
simpler api for using me4se panel

Modified Paths:
--------------
    me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java

Modified: me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java
===================================================================
--- me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java	2019-12-06 21:39:56 UTC (rev 2383)
+++ me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java	2019-12-06 21:47:50 UTC (rev 2384)
@@ -3,6 +3,7 @@
 import java.awt.BorderLayout;
 import java.awt.Container;
 import java.awt.Dimension;
+import java.awt.Window;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.lang.reflect.Field;
@@ -116,9 +117,9 @@
         desktop.add(swingMEFrame);
     }
 
-    public void showDialog(java.awt.Frame parent, String title) {
+    public void showDialog(Window parent, String title) {
 
-        JDialog dialog = new JDialog(parent, title , true);
+        JDialog dialog = parent instanceof java.awt.Frame ? new JDialog((java.awt.Frame)parent, title , true) : new JDialog((java.awt.Dialog)parent, title , true);
         dialog.setDefaultCloseOperation( JDialog.DO_NOTHING_ON_CLOSE );
 
         dialog.addWindowListener(new WindowAdapter() {

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

[Swingme-svn] SF.net SVN: swingme:[2383] me4se/opt/m3g_basic/src/javax/microedition/amms /AwtJpegEncoder.java

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

Revision: 2383
          http://sourceforge.net/p/swingme/code/2383
Author:   yuranet
Date:     2019-12-06 21:39:56 +0000 (Fri, 06 Dec 2019)
Log Message:
-----------
revert removing fallback for save jpeg

Modified Paths:
--------------
    me4se/opt/m3g_basic/src/javax/microedition/amms/AwtJpegEncoder.java

Modified: me4se/opt/m3g_basic/src/javax/microedition/amms/AwtJpegEncoder.java
===================================================================
--- me4se/opt/m3g_basic/src/javax/microedition/amms/AwtJpegEncoder.java	2019-12-06 21:35:29 UTC (rev 2382)
+++ me4se/opt/m3g_basic/src/javax/microedition/amms/AwtJpegEncoder.java	2019-12-06 21:39:56 UTC (rev 2383)
@@ -23,7 +23,7 @@
              }
         }
         catch(Throwable th) {
-            /*
+
             if ("jpeg".equals(imageIOformat) || "jpg".equals(imageIOformat)) {
                 try {
                     System.out.println("failed to save with ImageIO, falling back to com.sun.image.codec.jpeg");
@@ -38,7 +38,7 @@
                 }
                 catch (Throwable ex) { } // anything really can go wrong here, but we do not really care
             }
-*/
+
             javax.microedition.media.MediaException mex = new javax.microedition.media.MediaException();
             mex.initCause(th);
             throw mex;

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

[Swingme-svn] SF.net SVN: swingme:[2382] me4se/opt

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

Revision: 2382
          http://sourceforge.net/p/swingme/code/2382
Author:   yuranet
Date:     2019-12-06 21:35:29 +0000 (Fri, 06 Dec 2019)
Log Message:
-----------
get rid of random default that didnt work on hi-res screens and broke the min size logic

Modified Paths:
--------------
    me4se/opt/m3g_basic/src/javax/microedition/amms/AwtJpegEncoder.java
    me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java

Modified: me4se/opt/m3g_basic/src/javax/microedition/amms/AwtJpegEncoder.java
===================================================================
--- me4se/opt/m3g_basic/src/javax/microedition/amms/AwtJpegEncoder.java	2019-12-06 20:21:20 UTC (rev 2381)
+++ me4se/opt/m3g_basic/src/javax/microedition/amms/AwtJpegEncoder.java	2019-12-06 21:35:29 UTC (rev 2382)
@@ -23,7 +23,7 @@
              }
         }
         catch(Throwable th) {
-            
+            /*
             if ("jpeg".equals(imageIOformat) || "jpg".equals(imageIOformat)) {
                 try {
                     System.out.println("failed to save with ImageIO, falling back to com.sun.image.codec.jpeg");
@@ -38,7 +38,7 @@
                 }
                 catch (Throwable ex) { } // anything really can go wrong here, but we do not really care
             }
-
+*/
             javax.microedition.media.MediaException mex = new javax.microedition.media.MediaException();
             mex.initCause(th);
             throw mex;

Modified: me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java
===================================================================
--- me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java	2019-12-06 20:21:20 UTC (rev 2381)
+++ me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java	2019-12-06 21:35:29 UTC (rev 2382)
@@ -50,7 +50,7 @@
         // todo find this from a better place
         desktop.setLookAndFeel( new NimbusLookAndFeel() );
 
-        setPreferredSize(new Dimension(320,480)); // default same as Jesus Piece
+        //setPreferredSize(new Dimension(320,480)); // default same as Jesus Piece
     }
 
     public ApplicationManager getApplicationManager() {

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

[Swingme-svn] SF.net SVN: swingme:[2381] me4se

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

Revision: 2381
          http://sourceforge.net/p/swingme/code/2381
Author:   yuranet
Date:     2019-12-06 20:21:20 +0000 (Fri, 06 Dec 2019)
Log Message:
-----------
fix random window opening

Modified Paths:
--------------
    me4se/build.xml
    me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java
    me4se/src/javax/microedition/lcdui/Image.java
    me4se/src/javax/microedition/midlet/ApplicationManager.java

Modified: me4se/build.xml
===================================================================
--- me4se/build.xml	2019-09-26 23:56:53 UTC (rev 2380)
+++ me4se/build.xml	2019-12-06 20:21:20 UTC (rev 2381)
@@ -89,7 +89,7 @@
 			</patternset>
 		</unzip>
 
-		<javac srcdir="src;opt/pim/src;opt/m3g/src;opt/contactless/src;opt/location/src;opt/bluetooth/src;opt/bluetooth/src_gcfimpl_avetanabt;opt/swingme/src" source="1.4" classpath="lib/emptycommapi.jar;opt/m3g/lib/jogl.jar;opt/contactless/lib/Phidget21.jar;opt/bluetooth/lib/avetanaBluetooth.jar;lib/Grasshopper.jar;opt/swingme/lib/SwingME.jar" destdir="tmpclasses" debug="on" target="1.4">
+		<javac srcdir="src;opt/pim/src;opt/m3g/src;opt/contactless/src;opt/location/src;opt/bluetooth/src;opt/bluetooth/src_gcfimpl_avetanabt;opt/swingme/src" source="1.4" classpath="lib/emptycommapi.jar;opt/m3g/lib/jogl.jar;opt/contactless/lib/Phidget21.jar;opt/bluetooth/lib/avetanaBluetooth.jar;lib/Grasshopper.jar;opt/swingme/lib/SwingME.jar" destdir="tmpclasses" debug="on" target="1.4" encoding="Cp1252">
 
 		</javac>
 

Modified: me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java
===================================================================
--- me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java	2019-09-26 23:56:53 UTC (rev 2380)
+++ me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java	2019-12-06 20:21:20 UTC (rev 2381)
@@ -21,9 +21,9 @@
  */
 public class ME4SEPanel extends Container {
 
-    private ApplicationManager manager;
-    private DesktopPane desktop,old;
-    private Frame frame1;
+    private ApplicationManager manager, oldManager;
+    private DesktopPane desktop, oldDesktop;
+    private Frame swingMEFrame;
 
     public DesktopPane getDesktopPane() {
         return desktop;
@@ -34,7 +34,8 @@
 
         // this can only be happening in 1 thread at a time
 
-        old = DesktopPane.getDesktopPane();
+        oldManager = ApplicationManager.isInitialized() ? ApplicationManager.getInstance() : null;
+        oldDesktop = DesktopPane.getDesktopPane();
 
         manager = ApplicationManager.createInstance(this, null );
 
@@ -65,21 +66,24 @@
             Field man = ApplicationManager.class.getDeclaredField("manager");
             man.setAccessible(true);
             if (man.get(null) == manager) {
-                System.out.println("[ME4SEPanel] setting manager to null");
-                man.set(null, null);
+                // we want to set it back to the old 1 or it will end up trying to
+                // create a new manager, and a new frame, then it may set that frame to visible
+                // e.g. make me4sePanel1, make me4sePanel2, close me4sePanel2, goto me4sePanel1, click into textbox
+                System.out.println("[ME4SEPanel] setting manager to old manager " + oldManager);
+                man.set(null, oldManager);
+                oldManager = null;
             }
 
             ((EmptyMidlet)manager.active).destroyApp(true); // this will set desktop to null
 
-            if (old!=null) {
-                old.showNotify();
-                old=null;
+            if (oldDesktop != null) {
+                oldDesktop.showNotify();
+                oldDesktop = null;
             }
         }
         catch(Exception ex) {
             throw new RuntimeException(ex);
         }
-            
     }
 
     public java.awt.Component getComponent() {
@@ -88,11 +92,11 @@
 
     public void add(Component panel) {
 
-        if (frame1!=null) {
-            desktop.remove(frame1);
+        if (swingMEFrame!=null) {
+            desktop.remove(swingMEFrame);
         }
-        
-        frame1 = new Frame() {
+
+        swingMEFrame = new Frame() {
             // do not allow anyone to close this window
             // if anyone tries, close the Swing Window instead
             public void setVisible(boolean b) {
@@ -104,12 +108,12 @@
                 }
             }
         };
-        frame1.setUndecorated(true);
-        frame1.getContentPane().add(panel);
-        frame1.setMaximum(true);
+        swingMEFrame.setUndecorated(true);
+        swingMEFrame.getContentPane().add(panel);
+        swingMEFrame.setMaximum(true);
         //frame1.addWindowListener(this);   // this is not good enough as does not catch someone
                                             // calling "frame1.setVisible(false);" directly
-        desktop.add(frame1);
+        desktop.add(swingMEFrame);
     }
 
     public void showDialog(java.awt.Frame parent, String title) {
@@ -138,18 +142,17 @@
         
         // TODO can only show once per instance of a ME4SEPanel ?!
         destroy();
-
     }
     
     public Dimension getMinimumSize() {
         Dimension d = super.getPreferredSize();
 
-        if (frame1!=null) {
-            Dimension a = new Dimension( frame1.getWidth(), frame1.getHeight());
-            frame1.pack(); // TODO: does this really set the height right away to the min???
-            Dimension b = new Dimension( frame1.getWidth(), frame1.getHeight());
+        if (swingMEFrame!=null) {
+            Dimension a = new Dimension( swingMEFrame.getWidth(), swingMEFrame.getHeight());
+            swingMEFrame.pack(); // TODO: does this really set the height right away to the min???
+            Dimension b = new Dimension( swingMEFrame.getWidth(), swingMEFrame.getHeight());
             //System.out.println("d="+d);
-            frame1.setSize(a.width, a.height);
+            swingMEFrame.setSize(a.width, a.height);
             return b;
         }
 

Modified: me4se/src/javax/microedition/lcdui/Image.java
===================================================================
--- me4se/src/javax/microedition/lcdui/Image.java	2019-09-26 23:56:53 UTC (rev 2380)
+++ me4se/src/javax/microedition/lcdui/Image.java	2019-12-06 20:21:20 UTC (rev 2381)
@@ -84,6 +84,9 @@
 	 * @ME4SE INTERNAL 
 	 */
 	protected Image(BufferedImage image, boolean mutable, boolean toGray, String name) {
+            if (image == null) {
+                throw new NullPointerException("img can not be null");
+            }
 		//Display.check();
         
         // Give VM some time to cleanup every n images... 

Modified: me4se/src/javax/microedition/midlet/ApplicationManager.java
===================================================================
--- me4se/src/javax/microedition/midlet/ApplicationManager.java	2019-09-26 23:56:53 UTC (rev 2380)
+++ me4se/src/javax/microedition/midlet/ApplicationManager.java	2019-12-06 20:21:20 UTC (rev 2381)
@@ -1319,6 +1319,10 @@
     return menuBar;
   }
 
+  public String toString() {
+    return "ApplicationManager {awtContainer=" + awtContainer + "}";
+  }
+
   /**
    * tell us what assets to load and display:
    * 1 is mdpi normal,

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

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

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

Revision: 2380
          http://sourceforge.net/p/swingme/code/2380
Author:   yuranet
Date:     2019-09-26 23:56:53 +0000 (Thu, 26 Sep 2019)
Log Message:
-----------
compile on new android

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

Modified: AndroidME/src_MIDP/javax/microedition/lcdui/TextBox.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/TextBox.java	2019-09-19 12:14:10 UTC (rev 2379)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/TextBox.java	2019-09-26 23:56:53 UTC (rev 2380)
@@ -7,8 +7,10 @@
 
 import net.yura.android.AndroidMeActivity;
 import net.yura.android.AndroidMeApp;
+
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.CompletionInfo;
@@ -197,6 +199,10 @@
 
     private static CharSequence composingText = "";
 
+    /**
+     * This class is NOT used when NativeAndroidTextField is enabled.
+     * @see net.yura.android.NativeAndroidTextField#init()
+     */
     public static class TextBoxView implements InputHelper,InputConnection {
         private CharSequence textBeforeCursor = " ";
 
@@ -203,6 +209,11 @@
         private TextBox textBox;
 
         public TextBoxView() {
+            //#mdebug debug
+            if (debug) {
+                System.out.println("[TextBoxView private] new");
+            }
+            //#enddebug
         }
 
         public void start(TextBox tb) {
@@ -345,7 +356,6 @@
             return true;
         }
 
-
         //Override
         public boolean finishComposingText() {
 
@@ -584,5 +594,24 @@
         public boolean requestCursorUpdates(int cursorUpdateMode) {
             return false;
         }
+
+        //Override API 24
+        public boolean deleteSurroundingTextInCodePoints(int beforeLength, int afterLength) {
+            return false;
+        }
+
+        //Override API 24
+        public Handler getHandler() {
+            return null;
+        }
+
+        //Override API 24
+        public void closeConnection() {
+        }
+
+        //Override API 25
+        public boolean commitContent(android.view.inputmethod.InputContentInfo inputContentInfo, int flags, Bundle opts) {
+            return false;
+        }
     }
 }

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

[Swingme-svn] SF.net SVN: swingme:[2379] UtilME/src_se/net/yura/io/JSONUtil.java

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

Revision: 2379
          http://sourceforge.net/p/swingme/code/2379
Author:   yuranet
Date:     2019-09-19 12:14:10 +0000 (Thu, 19 Sep 2019)
Log Message:
-----------
1.5 java fix

Modified Paths:
--------------
    UtilME/src_se/net/yura/io/JSONUtil.java

Modified: UtilME/src_se/net/yura/io/JSONUtil.java
===================================================================
--- UtilME/src_se/net/yura/io/JSONUtil.java	2019-09-19 12:12:33 UTC (rev 2378)
+++ UtilME/src_se/net/yura/io/JSONUtil.java	2019-09-19 12:14:10 UTC (rev 2379)
@@ -25,7 +25,7 @@
                 return Collections.emptyMap();
             } else {
                 x.back();
-                Map<String, Object> map = new HashMap<>(); // we HAVE to use HashMap, as Hashtable does not allow null values
+                Map<String, Object> map = new HashMap(); // we HAVE to use HashMap, as Hashtable does not allow null values
                 for (boolean end = false; !end; end = x.endObject()) {
                     String key = x.nextKey();
                     Object obj = this.readObject(x);

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

[Swingme-svn] SF.net SVN: swingme:[2378] UtilME

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

Revision: 2378
          http://sourceforge.net/p/swingme/code/2378
Author:   yuranet
Date:     2019-09-19 12:12:33 +0000 (Thu, 19 Sep 2019)
Log Message:
-----------
se json parser

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

Added Paths:
-----------
    UtilME/src_se/
    UtilME/src_se/net/
    UtilME/src_se/net/yura/
    UtilME/src_se/net/yura/io/
    UtilME/src_se/net/yura/io/JSONUtil.java

Modified: UtilME/build.xml
===================================================================
--- UtilME/build.xml	2019-06-20 11:27:02 UTC (rev 2377)
+++ UtilME/build.xml	2019-09-19 12:12:33 UTC (rev 2378)
@@ -18,7 +18,7 @@
             <mkdir dir="build"/>
             <mkdir dir="dist"/>
 
-            <javac debug="on" srcdir="src" destdir="build" source="1.4" target="1.4" classpath="lib/xmlpull_1_1_3_1.jar"/>
+            <javac debug="on" srcdir="src:src_se" destdir="build" source="1.5" target="1.5" classpath="lib/xmlpull_1_1_3_1.jar"/>
 
             <unzip src="lib/xmlpull_1_1_3_1.jar" dest="build"/>
 

Added: UtilME/src_se/net/yura/io/JSONUtil.java
===================================================================
--- UtilME/src_se/net/yura/io/JSONUtil.java	                        (rev 0)
+++ UtilME/src_se/net/yura/io/JSONUtil.java	2019-09-19 12:12:33 UTC (rev 2378)
@@ -0,0 +1,64 @@
+package net.yura.io;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import net.yura.mobile.io.json.JSONTokener;
+import net.yura.mobile.io.json.JSONWriter;
+
+// use maps, to allow for null values
+public class JSONUtil extends net.yura.mobile.io.JSONUtil {
+
+    public JSONUtil() {
+        useListForArray = true;
+    }
+
+    protected Object readObject(JSONTokener x) throws IOException {
+        char c = x.nextClean();
+        x.back();
+        if (c == '{') {
+            x.startObject();
+            if (x.nextClean() == '}') {
+                return Collections.emptyMap();
+            } else {
+                x.back();
+                Map<String, Object> map = new HashMap<>(); // we HAVE to use HashMap, as Hashtable does not allow null values
+                for (boolean end = false; !end; end = x.endObject()) {
+                    String key = x.nextKey();
+                    Object obj = this.readObject(x);
+                    map.put(key, obj);
+                }
+                return map;
+            }
+        }
+        return super.readObject(x);
+    }
+
+    @Override
+    protected void saveObject(JSONWriter serializer, Object object) throws IOException {
+        if (object instanceof List && !(object instanceof java.util.Vector)) {
+            List list = (List) object;
+            serializer.array();
+            for (Object obj : list) {
+                saveObject(serializer, obj);
+            }
+            serializer.endArray();
+        }
+        else if (object instanceof Map && !(object instanceof java.util.Hashtable)) {
+            Map<String, Object> map = (Map<String, Object>) object;
+            serializer.object();
+            for (String key : map.keySet()) {
+                Object value = map.get(key);
+                serializer.key(key);
+                saveObject(serializer, value);
+            }
+            serializer.endObject();
+        }
+        else {
+            super.saveObject(serializer, object);
+        }
+    }
+}

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

[Swingme-svn] SF.net SVN: swingme:[2377] UtilME/src/net/yura/mobile/io

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

Revision: 2377
          http://sourceforge.net/p/swingme/code/2377
Author:   yuranet
Date:     2019-06-20 11:27:02 +0000 (Thu, 20 Jun 2019)
Log Message:
-----------
allow writers/readers for csv loader

Modified Paths:
--------------
    UtilME/src/net/yura/mobile/io/CSVUtil.java
    UtilME/src/net/yura/mobile/io/JSONUtil.java

Modified: UtilME/src/net/yura/mobile/io/CSVUtil.java
===================================================================
--- UtilME/src/net/yura/mobile/io/CSVUtil.java	2019-05-28 11:03:08 UTC (rev 2376)
+++ UtilME/src/net/yura/mobile/io/CSVUtil.java	2019-06-20 11:27:02 UTC (rev 2377)
@@ -5,6 +5,7 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
+import java.io.Reader;
 import java.io.Writer;
 import java.util.Vector;
 import net.yura.mobile.logging.Logger;
@@ -25,12 +26,14 @@
 
 	public abstract String getValueAt(Object obj, int c);
 
+	public void load(InputStream inputStream) throws IOException {
+		load(new InputStreamReader(inputStream));
+	}
+
 	// i took something when i wrote this, it was shiny and a powder
 	// makes for some crazy code, but at least it works
-	public void load(InputStream inputStream) throws IOException {
+	public void load(Reader inputStreamTxt) throws IOException {
 
-                InputStreamReader inputStreamTxt = new InputStreamReader(inputStream);
-
 		boolean inside=false;
 		char how=0;
 		int count=0;
@@ -102,24 +105,19 @@
 			//buf.append(ex.toString());
 		//}
 		finally {
-
 			try { if (inputStreamTxt!=null) inputStreamTxt.close(); }
 			catch(IOException ex) { Logger.info(null, ex); }
-
-			try {if (inputStream!=null)  inputStream.close(); }
-			catch(IOException ex) { Logger.info(null, ex); }
 		}
 	}
 
-
 	public void store(OutputStream out, Vector objects,int count) throws IOException {
+		store(new OutputStreamWriter(out), objects, count);
+	}
 
-            Writer writer = null;
+	public void store(Writer writer, Vector objects,int count) throws IOException {
 
             try {
 
-                writer = new OutputStreamWriter(out);
-
 		for (int a=0;a<objects.size();a++) {
                         Object obj = objects.elementAt(a);
 
@@ -161,12 +159,8 @@
                 }
             }
             finally {
-
                 try { if (writer!=null) writer.close(); }
                 catch(IOException ex) { Logger.info(null, ex); }
-
-                try { if (out!=null) out.close(); }
-                catch(IOException ex) { Logger.info(null, ex); }
 	    }
 	}
 }

Modified: UtilME/src/net/yura/mobile/io/JSONUtil.java
===================================================================
--- UtilME/src/net/yura/mobile/io/JSONUtil.java	2019-05-28 11:03:08 UTC (rev 2376)
+++ UtilME/src/net/yura/mobile/io/JSONUtil.java	2019-06-20 11:27:02 UTC (rev 2377)
@@ -18,6 +18,7 @@
 
 /**
  * @author Yura Mamyrin
+ * WARNING: this file uses Hashtable, that does NOT allow null values!
  */
 public class JSONUtil {
 

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

[Swingme-svn] SF.net SVN: swingme:[2376] UtilME/src/net/yura/mobile/io/JSONUtil.java

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

Revision: 2376
          http://sourceforge.net/p/swingme/code/2376
Author:   yuranet
Date:     2019-05-28 11:03:08 +0000 (Tue, 28 May 2019)
Log Message:
-----------
json helper methods

Modified Paths:
--------------
    UtilME/src/net/yura/mobile/io/JSONUtil.java

Modified: UtilME/src/net/yura/mobile/io/JSONUtil.java
===================================================================
--- UtilME/src/net/yura/mobile/io/JSONUtil.java	2019-05-01 15:05:18 UTC (rev 2375)
+++ UtilME/src/net/yura/mobile/io/JSONUtil.java	2019-05-28 11:03:08 UTC (rev 2376)
@@ -1,9 +1,14 @@
 package net.yura.mobile.io;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.Writer;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Vector;
@@ -23,13 +28,40 @@
         return readObject(tokener);
     }
 
-    public void save(OutputStream out, Object obj) throws IOException {
-        OutputStreamWriter w = new OutputStreamWriter(out);
+    public void save(Writer w, Object obj) throws IOException {
         JSONWriter writer = new JSONWriter(w);
         saveObject(writer,obj);
         w.flush();
     }
 
+    public Object load(InputStream in) throws IOException {
+        return load(new InputStreamReader(in, "UTF-8"));
+    }
+
+    public void save(OutputStream out, Object obj) throws IOException {
+        save(new OutputStreamWriter(out, "UTF-8"), obj);
+    }
+
+    public Object load(String text) {
+        try {
+            return load(new StringReader(text));
+        }
+        catch (IOException ex) {
+            throw new IllegalArgumentException("bad json " + text);
+        }
+    }
+
+    public String save(Object obj) {
+        StringWriter writer = new StringWriter();
+        try {
+            save(writer, obj);
+        }
+        catch (IOException ex) {
+            throw new IllegalArgumentException("bad object " + obj);
+        }
+        return writer.toString();
+    }
+
     protected void saveObject(JSONWriter serializer, Object object) throws IOException {
 
         if (object == 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:[2375] UtilME/src/net/yura/mobile/io

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

Revision: 2375
          http://sourceforge.net/p/swingme/code/2375
Author:   yuranet
Date:     2019-05-01 15:05:18 +0000 (Wed, 01 May 2019)
Log Message:
-----------
loading tensorflow TSV support

Modified Paths:
--------------
    UtilME/src/net/yura/mobile/io/CSVUtil.java
    UtilME/src/net/yura/mobile/io/JSONUtil.java
    UtilME/src/net/yura/mobile/io/json/JSONTokener.java

Modified: UtilME/src/net/yura/mobile/io/CSVUtil.java
===================================================================
--- UtilME/src/net/yura/mobile/io/CSVUtil.java	2019-04-19 17:13:35 UTC (rev 2374)
+++ UtilME/src/net/yura/mobile/io/CSVUtil.java	2019-05-01 15:05:18 UTC (rev 2375)
@@ -13,16 +13,21 @@
 /**
  * @author Yura Mamyrin
  */
-public class CSVUtil {
+public abstract class CSVUtil {
 
-    public interface CSV {
-        public void newLine();
-        public void newValue(int count,String value);
-        public String getValueAt(Object obj, int c);
-    }
+	public char separator = ',';
+
+	// new Object
+	public abstract void newLine();
+
+	// set value on object
+	public abstract void newValue(int count,String value);
+
+	public abstract String getValueAt(Object obj, int c);
+
 	// i took something when i wrote this, it was shiny and a powder
 	// makes for some crazy code, but at least it works
-	public static void load(InputStream inputStream,CSV io) throws IOException {
+	public void load(InputStream inputStream) throws IOException {
 
                 InputStreamReader inputStreamTxt = new InputStreamReader(inputStream);
 
@@ -30,7 +35,7 @@
 		char how=0;
 		int count=0;
 		StringBuffer buf = new StringBuffer();
-		io.newLine();
+		newLine();
 
 		try {
 			int c;
@@ -43,24 +48,29 @@
 
 						inside = true;
 						how = (char)c;
+
+						// quotes are escaped as 2 quotes inside a quoted string
+						if (buf.length() > 0) {
+							buf.append((char)c);
+						}
 					}
 					else if (c=='\n') {
 
 						// ignore the \r char
 						//if ( !"\r".equals(buf.toString()) ) { // buf.length()>0 &&
-                                                io.newValue(count,buf.toString().trim());
+                                                newValue(count,buf.toString().trim());
                                                 buf = new StringBuffer();
 						//}
 
 						count = 0;
 
-						io.newLine();
+						newLine();
 
 					}
-					else if (c==',') {
+					else if (c==separator) {
 
 						//if (buf.length()>0) {
-							io.newValue(count,buf.toString().trim());
+							newValue(count,buf.toString().trim());
 							buf = new StringBuffer();
 						//}
 
@@ -99,11 +109,10 @@
 			try {if (inputStream!=null)  inputStream.close(); }
 			catch(IOException ex) { Logger.info(null, ex); }
 		}
-
 	}
 
 
-	public static void store(OutputStream out, CSV io,Vector objects,int count) throws IOException {
+	public void store(OutputStream out, Vector objects,int count) throws IOException {
 
             Writer writer = null;
 
@@ -118,7 +127,7 @@
 
                         for (int c=0;c<count;c++) {
 
-                                String newString=io.getValueAt(obj,c);
+                                String newString=getValueAt(obj,c);
 
                                 if (newString!=null && newString.indexOf('"')>=0) {
 
@@ -160,6 +169,4 @@
                 catch(IOException ex) { Logger.info(null, ex); }
 	    }
 	}
-
-
 }

Modified: UtilME/src/net/yura/mobile/io/JSONUtil.java
===================================================================
--- UtilME/src/net/yura/mobile/io/JSONUtil.java	2019-04-19 17:13:35 UTC (rev 2374)
+++ UtilME/src/net/yura/mobile/io/JSONUtil.java	2019-05-01 15:05:18 UTC (rev 2375)
@@ -16,6 +16,8 @@
  */
 public class JSONUtil {
 
+    public boolean useListForArray;
+
     public Object load(Reader in) throws IOException {
         JSONTokener tokener = new JSONTokener(in);
         return readObject(tokener);
@@ -54,6 +56,9 @@
         else if (object instanceof Character) {
             serializer.value( ((Character)object).charValue() );
         }
+        else if (useListForArray && object instanceof Vector) {
+            saveVector(serializer, (Vector)object);
+        }
         else {
             serializer.object();
             serializer.key("class");
@@ -115,10 +120,15 @@
         	}
                 break;
             case '[':
-        	Vector vector = readVector(x);
-        	Object[] array = new Object[vector.size()];
-        	vector.copyInto(array);
-                result = array;
+                Vector vector = readVector(x);
+                if (useListForArray) {
+                    result = vector;
+                }
+                else {
+                    Object[] array = new Object[vector.size()];
+                    vector.copyInto(array);
+                    result = array;
+                }
                 break;
             case '(':
                 // TODO not currently supported as does not recognise close ')'
@@ -132,7 +142,7 @@
                 else if (s.equalsIgnoreCase("false")) {
                     result =  Boolean.FALSE;
                 }
-                else if (s.equalsIgnoreCase("null")) {
+                else if (s.equalsIgnoreCase("null") || s.equalsIgnoreCase("None")) {
                     result = null;
                 }
                 else if (s.indexOf('.') >= 0) {

Modified: UtilME/src/net/yura/mobile/io/json/JSONTokener.java
===================================================================
--- UtilME/src/net/yura/mobile/io/json/JSONTokener.java	2019-04-19 17:13:35 UTC (rev 2374)
+++ UtilME/src/net/yura/mobile/io/json/JSONTokener.java	2019-05-01 15:05:18 UTC (rev 2375)
@@ -387,6 +387,9 @@
                 case 'u':
                     sb.append((char)Integer.parseInt(next(4), 16));
                     break;
+                case 'x': // python
+                    sb.append((char)Integer.parseInt(next(2), 16));
+                    break;
                 case '"':
                 case '\'':
                 case '\\':
@@ -394,7 +397,7 @@
                 	sb.append(c);
                 	break;
                 default:
-                    throw syntaxError("Illegal escape.");
+                    throw syntaxError("Illegal escape. " + c);
                 }
                 break;
             default:

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

[Swingme-svn] SF.net SVN: swingme:[2374] AndroidME/src_Android/net/yura/android/ AndroidPreferences.java

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

Revision: 2374
          http://sourceforge.net/p/swingme/code/2374
Author:   yuranet
Date:     2019-04-19 17:13:35 +0000 (Fri, 19 Apr 2019)
Log Message:
-----------
remove pref added

Modified Paths:
--------------
    AndroidME/src_Android/net/yura/android/AndroidPreferences.java

Modified: AndroidME/src_Android/net/yura/android/AndroidPreferences.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidPreferences.java	2019-04-19 16:40:36 UTC (rev 2373)
+++ AndroidME/src_Android/net/yura/android/AndroidPreferences.java	2019-04-19 17:13:35 UTC (rev 2374)
@@ -94,6 +94,11 @@
     }
 
     @Override
+    public void remove(String key) {
+        getEditor().remove(key);
+    }
+
+    @Override
     public void flush() throws BackingStoreException {
         if (editor != null) {
             SharedPreferences.Editor theEditor = editor;
@@ -190,11 +195,6 @@
     }
 
     @Override
-    public void remove(String key) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
     public void removeNode() throws BackingStoreException {
         throw new UnsupportedOperationException();
     }

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

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

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

Revision: 2373
          http://sourceforge.net/p/swingme/code/2373
Author:   yuranet
Date:     2019-04-19 16:40:36 +0000 (Fri, 19 Apr 2019)
Log Message:
-----------
warning on size mismatch

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

Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java	2019-04-19 14:16:09 UTC (rev 2372)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java	2019-04-19 16:40:36 UTC (rev 2373)
@@ -8,6 +8,7 @@
 import javax.microedition.lcdui.game.Sprite;
 
 import net.yura.android.AndroidMeApp;
+import net.yura.mobile.logging.Logger;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -275,7 +276,7 @@
         int id = res.getIdentifier(name, "drawable", AndroidMeApp.getContext().getPackageName() );
 
         if (id > 0) {
-            return new ResourceInputStream(res, id);
+            return new ResourceInputStream(res, id, name);
         }
         return null;
     }
@@ -283,10 +284,12 @@
     public static class ResourceInputStream extends InputStream {
         private Resources res;
         private int resId;
+        String name;
 
-        public ResourceInputStream(Resources res, int resId) {
+        public ResourceInputStream(Resources res, int resId, String name) {
             this.res = res;
             this.resId = resId;
+            this.name = name;
         }
 
         @Override
@@ -299,12 +302,18 @@
         }
 
         public Bitmap getBitmap() {
-            return ((BitmapDrawable)getDrawable()).getBitmap();
+            Drawable drawable = getDrawable();
+            Bitmap bitmap = ((BitmapDrawable)drawable).getBitmap();
+            if (bitmap.getWidth() != drawable.getIntrinsicWidth()) {
+                // TODO in target api 28 this will start happening
+                Logger.warn("size does not match " + this);
+            }
+            return bitmap;
         }
 
         @Override
         public String toString() {
-            return "RIS{res="+res+",id="+resId+"}";
+            return "RIS{name="+name+",res="+res+",id="+resId+"}";
         }
     }
 }

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