You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(54) |
Aug
(33) |
Sep
(27) |
Oct
(10) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(7) |
Feb
(5) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(1) |
Jul
(25) |
Aug
(41) |
Sep
(89) |
Oct
(99) |
Nov
(161) |
Dec
(85) |
| 2010 |
Jan
(10) |
Feb
(35) |
Mar
(44) |
Apr
(115) |
May
(98) |
Jun
(87) |
Jul
(23) |
Aug
(27) |
Sep
(63) |
Oct
(57) |
Nov
(97) |
Dec
(62) |
| 2011 |
Jan
(67) |
Feb
(83) |
Mar
(43) |
Apr
(14) |
May
(43) |
Jun
(52) |
Jul
(55) |
Aug
(97) |
Sep
(65) |
Oct
(36) |
Nov
(67) |
Dec
(46) |
| 2012 |
Jan
(29) |
Feb
(24) |
Mar
(10) |
Apr
(2) |
May
(10) |
Jun
(34) |
Jul
(31) |
Aug
(9) |
Sep
(10) |
Oct
(10) |
Nov
(6) |
Dec
(7) |
| 2013 |
Jan
(1) |
Feb
(1) |
Mar
(5) |
Apr
(2) |
May
(17) |
Jun
(10) |
Jul
(8) |
Aug
(17) |
Sep
|
Oct
(3) |
Nov
(4) |
Dec
(1) |
| 2014 |
Jan
(2) |
Feb
(8) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(5) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
(5) |
Dec
(8) |
| 2015 |
Jan
(1) |
Feb
|
Mar
(4) |
Apr
|
May
(2) |
Jun
(1) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
(1) |
Dec
|
| 2016 |
Jan
|
Feb
(1) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(2) |
| 2018 |
Jan
|
Feb
(2) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2019 |
Jan
(2) |
Feb
|
Mar
(4) |
Apr
(4) |
May
(2) |
Jun
(1) |
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
(4) |
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(1) |
Jun
(6) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2021 |
Jan
|
Feb
(7) |
Mar
(29) |
Apr
(8) |
May
(7) |
Jun
(45) |
Jul
(66) |
Aug
|
Sep
|
Oct
(2) |
Nov
(37) |
Dec
(34) |
| 2022 |
Jan
(15) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(10) |
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
(1) |
Dec
(7) |
| 2023 |
Jan
(23) |
Feb
(18) |
Mar
(18) |
Apr
(6) |
May
(10) |
Jun
(7) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2024 |
Jan
(11) |
Feb
(3) |
Mar
|
Apr
(6) |
May
(3) |
Jun
|
Jul
|
Aug
(2) |
Sep
(16) |
Oct
(6) |
Nov
(7) |
Dec
(6) |
| 2025 |
Jan
(8) |
Feb
(3) |
Mar
(7) |
Apr
(5) |
May
(21) |
Jun
(10) |
Jul
(16) |
Aug
(5) |
Sep
(19) |
Oct
(2) |
Nov
|
Dec
|
|
From: <yu...@us...> - 2022-01-08 13:46:56
|
Revision: 2635
http://sourceforge.net/p/swingme/code/2635
Author: yuranet
Date: 2022-01-08 13:46:53 +0000 (Sat, 08 Jan 2022)
Log Message:
-----------
identifierForVendor added to system properties
Modified Paths:
--------------
iOSME/src/net/yura/ios/SwingMEiOSApplication.java
Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2022-01-07 22:47:25 UTC (rev 2634)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2022-01-08 13:46:53 UTC (rev 2635)
@@ -23,6 +23,7 @@
import apple.foundation.enums.NSSearchPathDirectory;
import apple.foundation.enums.NSSearchPathDomainMask;
import apple.uikit.UIApplication;
+import apple.uikit.UIDevice;
import apple.uikit.UINavigationController;
import apple.uikit.UIScreen;
import apple.uikit.UIViewController;
@@ -126,7 +127,10 @@
String userAgent = webView.stringByEvaluatingJavaScriptFromString("navigator.userAgent");
System.setProperty("http.agent", userAgent);
- //UIDevice device = UIDevice.currentDevice();
+ UIDevice device = UIDevice.currentDevice();
+ // this will change if the app is deleted and reinstalled, it can also change for other reasons
+ System.setProperty("identifierForVendor", device.identifierForVendor().UUIDString());
+
// this is the name the user gives to the device
//String name = device.name(); // e.g "Yura's iPhone"
//String model = device.model(); // this will just return "iPhone"
@@ -160,6 +164,11 @@
// NSArray<String> preferredLanguages = NSLocale.preferredLanguages();// xx-XX
// NSArray<String> allLanguages = NSUserDefaults.standardUserDefaults().objectForKey("NSLanguages"); // xx-XX
+ // to change the locale of system alerts from the default:
+ //NSUserDefaults.standardUserDefaults().setObjectForKey(NSArray.arrayWithObject("en"),"AppleLanguages");
+ //NSUserDefaults.standardUserDefaults().synchronize()
+ // sometimes a restart of the app is needed!
+
// workaround for bug: https://github.com/multi-os-engine/multi-os-engine/issues/82
// this can be removed when we switch to MOE 1.9
Locale.setDefault(iOSUtil.toLocale(NSLocale.currentLocale()));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2022-01-07 22:47:27
|
Revision: 2634
http://sourceforge.net/p/swingme/code/2634
Author: yuranet
Date: 2022-01-07 22:47:25 +0000 (Fri, 07 Jan 2022)
Log Message:
-----------
swingme text translation
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Image.java
iOSME/src/net/yura/ios/SwingMEiOSApplication.java
iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2022-01-04 21:32:06 UTC (rev 2633)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2022-01-07 22:47:25 UTC (rev 2634)
@@ -9,7 +9,6 @@
import org.moe.natj.general.ptr.BytePtr;
import org.moe.natj.general.ptr.IntPtr;
import org.moe.natj.general.ptr.impl.PtrFactory;
-import apple.corefoundation.c.CoreFoundation;
import apple.coregraphics.enums.CGBitmapInfo;
import apple.coregraphics.enums.CGImageAlphaInfo;
import apple.coregraphics.enums.CGInterpolationQuality;
@@ -352,6 +351,7 @@
// we want to clear the uiImage from the apple side too so we avoid the copy-on-write being called
//System.gc();
+ //org.moe.GCUtil.gc(); // force anything still around to be GCed
}
@Override
Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2022-01-04 21:32:06 UTC (rev 2633)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2022-01-07 22:47:25 UTC (rev 2634)
@@ -155,6 +155,11 @@
System.out.println("App data folder " + System.getProperty("user.home"));
System.out.println("App temp folder " + System.getProperty("java.io.tmpdir"));
+ // String locale = NSUserDefaults.standardUserDefaults().stringForKey("AppleLocale"); // xx_XX
+ // NSArray<String> preferredLanguages = NSUserDefaults.standardUserDefaults().objectForKey("AppleLanguages"); // xx-XX
+ // NSArray<String> preferredLanguages = NSLocale.preferredLanguages();// xx-XX
+ // NSArray<String> allLanguages = NSUserDefaults.standardUserDefaults().objectForKey("NSLanguages"); // xx-XX
+
// workaround for bug: https://github.com/multi-os-engine/multi-os-engine/issues/82
// this can be removed when we switch to MOE 1.9
Locale.setDefault(iOSUtil.toLocale(NSLocale.currentLocale()));
Modified: iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java
===================================================================
--- iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java 2022-01-04 21:32:06 UTC (rev 2633)
+++ iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java 2022-01-07 22:47:25 UTC (rev 2634)
@@ -1,5 +1,6 @@
package net.yura.ios.plaf;
+import net.yura.mobile.gui.DesktopPane;
import net.yura.mobile.gui.Icon;
import net.yura.mobile.gui.border.Border;
import net.yura.mobile.gui.border.EmptyBorder;
@@ -8,6 +9,8 @@
import net.yura.mobile.gui.plaf.SynthLookAndFeel;
import java.io.InputStream;
import javax.microedition.lcdui.Image;
+import apple.foundation.NSBundle;
+import apple.uikit.UIButton;
import apple.uikit.UIColor;
import apple.uikit.UIImage;
import apple.uikit.enums.UIImageResizingMode;
@@ -98,10 +101,37 @@
setStyleFor("Spinner", spinner);
+ //NSBundle bundle = NSBundle.bundleWithIdentifier("com.apple.UIKit");
+ NSBundle bundle = NSBundle.bundleForClass(org.moe.natj.objc.Class.fromJavaClass(UIButton.class));
+ // bundle.preferredLocalizations(); // "English" on old devices and "en" on new devices
+ if (NSBundle.mainBundle().localizations().size() <= 1) {
+ // for this to work, you need to create a folder xx.lproj for each locale in the project and add a empty Localizable.strings
+ System.out.println("WARN SwingME L&F iOS localized text only works if you add a xx.lproj with a empty Localizable.strings for each language");
+ }
- // TODO make sure list items are big enough to press with finger
- // not working checkBoxRenderer.addBorder(new EmptyBorder(20,10,20,10), Style.ALL);
+ setLocalizedString(bundle, "cancelText", "Cancel");
+ setLocalizedString(bundle, "okText", "OK");
+ setLocalizedString(bundle, "clearText", "Clear");
+ setLocalizedString(bundle, "selectText", "Select");
+ //setLocalizedString(bundle, "menuText", "Menu");
+ //setLocalizedString(bundle, "showText", "Show");
+ //setLocalizedString(bundle, "allText", "All");
+ //setLocalizedString(bundle, "newText", "New");
+ //setLocalizedString(bundle, "viewText", "View");
+ //setLocalizedString(bundle, "listText", "List");
+ //setLocalizedString(bundle, "gridText", "Grid");
+ setLocalizedString(bundle, "backText", "Back");
+ //setLocalizedString(bundle, "closeText", "Close");
+ //setLocalizedString(bundle, "exitText", "Exit");
+ //setLocalizedString(bundle, "yesText", "Yes");
+ setLocalizedString(bundle, "noText", "No");
+ // the clipboard
+ setLocalizedString(bundle, "cutText", "Cut");
+ setLocalizedString(bundle, "copyText", "Copy");
+ setLocalizedString(bundle, "pasteText", "Paste");
+ setLocalizedString(bundle, "deleteText", "Delete");
+ setLocalizedString(bundle, "selectAllText", "Select All");
}
/**
@@ -130,4 +160,13 @@
}
return new Icon(new Image(image));
}
+
+ private void setLocalizedString(NSBundle bundle, String swingMeKey, String iosKey) {
+ if (bundle != null) {
+ String text = bundle.localizedStringForKeyValueTable(iosKey, null, null);
+ if (text != null) {
+ DesktopPane.put(swingMeKey, text);
+ }
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2022-01-04 21:32:08
|
Revision: 2633
http://sourceforge.net/p/swingme/code/2633
Author: yuranet
Date: 2022-01-04 21:32:06 +0000 (Tue, 04 Jan 2022)
Log Message:
-----------
fix for long button text
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/OptionPane.java
Modified: SwingME/src/net/yura/mobile/gui/components/OptionPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/OptionPane.java 2022-01-01 17:27:10 UTC (rev 2632)
+++ SwingME/src/net/yura/mobile/gui/components/OptionPane.java 2022-01-04 21:32:06 UTC (rev 2633)
@@ -143,8 +143,8 @@
scroll = new ScrollPane(c);
panel.add( scroll );
- cmdPanel = new Panel( new FlowLayout() );
- panel.add( cmdPanel ,Graphics.BOTTOM);
+ cmdPanel = new Panel();
+ panel.add(cmdPanel, Graphics.BOTTOM);
}
private ActionListener actionListener;
@@ -202,7 +202,6 @@
else {
content.add(getComponentFromObject(newMessage),constraints);
}
-
}
/**
@@ -308,6 +307,8 @@
*/
public void setOptions(Button[] options) {
cmdPanel.removeAll();
+ cmdPanel.setLayout(new FlowLayout());
+
for (int c=0;c<options.length;c++) {
Button button = options[c];
ActionListener[] actionListeners = button.getActionListeners();
@@ -322,6 +323,12 @@
// this should be removed one day
autoMnemonic( cmdPanel.getComponents() );
}
+
+ // check all the buttons fit on the screen, if no, make then arrange vertically
+ cmdPanel.workoutMinimumSize();
+ if (cmdPanel.getWidth() > getDesktopPane().getWidth()) {
+ cmdPanel.setLayout(new BoxLayout(Graphics.VCENTER));
+ }
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2022-01-01 17:27:12
|
Revision: 2632
http://sourceforge.net/p/swingme/code/2632
Author: yuranet
Date: 2022-01-01 17:27:10 +0000 (Sat, 01 Jan 2022)
Log Message:
-----------
update to moe 1.8
Modified Paths:
--------------
iOSME/build.gradle
Modified: iOSME/build.gradle
===================================================================
--- iOSME/build.gradle 2021-12-31 02:04:26 UTC (rev 2631)
+++ iOSME/build.gradle 2022-01-01 17:27:10 UTC (rev 2632)
@@ -5,7 +5,7 @@
mavenLocal()
}
dependencies {
- classpath group: 'org.multi-os-engine', name: 'moe-gradle', version: '1.7.+'
+ classpath group: 'org.multi-os-engine', name: 'moe-gradle', version: '1.8.+'
}
// this is here to tell gradle to refresh the moe dependency in the event i am trying a snapshot
// but this does not seem to work instead if the snapshot is sticky i need to go into Intelij/Android Studio
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-31 02:04:28
|
Revision: 2631
http://sourceforge.net/p/swingme/code/2631
Author: yuranet
Date: 2021-12-31 02:04:26 +0000 (Fri, 31 Dec 2021)
Log Message:
-----------
do not use old style ios dialog
Modified Paths:
--------------
iOSME/iosmeimg/dialog.png
iOSME/res/iOS_theme.xml
Modified: iOSME/iosmeimg/dialog.png
===================================================================
(Binary files differ)
Modified: iOSME/res/iOS_theme.xml
===================================================================
--- iOSME/res/iOS_theme.xml 2021-12-30 02:15:08 UTC (rev 2630)
+++ iOSME/res/iOS_theme.xml 2021-12-31 02:04:26 UTC (rev 2631)
@@ -72,10 +72,10 @@
<bind style="window" key="Window"/>
<style id="dialog">
- <insets top="15" left="15" bottom="20" right="20"/>
+ <insets top="5" left="15" bottom="5" right="15"/>
<state>
- <imagePainter path="/iosmeimg/dialog.png" sourceInsets="40 80 25 85" paintCenter="true"/>
- <color type="FOREGROUND" value="#FFFFFF"/>
+ <imagePainter path="/iosmeimg/dialog.png" sourceInsets="10 10 10 10" paintCenter="true"/>
+ <color type="FOREGROUND" value="#000000"/>
</state>
</style>
<bind style="dialog" key="Dialog"/>
@@ -88,6 +88,7 @@
<bind style="dialogTitle" key="InternalFrameTitlePane"/>
<style id="titleLabel">
+ <insets top="10" left="0" bottom="0" right="0"/>
<state>
<font name="PROPORTIONAL" size="MEDIUM" style="BOLD"/>
</state>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-30 02:15:11
|
Revision: 2630
http://sourceforge.net/p/swingme/code/2630
Author: yuranet
Date: 2021-12-30 02:15:08 +0000 (Thu, 30 Dec 2021)
Log Message:
-----------
ignore sim error
Modified Paths:
--------------
iOSME/build.gradle
iOSME/src/javax/microedition/midlet/MIDlet.java
iOSME/src/net/yura/ios/CanvasView.java
iOSME/src/net/yura/ios/SwingMEiOSApplication.java
Modified: iOSME/build.gradle
===================================================================
--- iOSME/build.gradle 2021-12-29 01:07:41 UTC (rev 2629)
+++ iOSME/build.gradle 2021-12-30 02:15:08 UTC (rev 2630)
@@ -1,10 +1,18 @@
buildscript {
repositories {
jcenter()
+ maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+ mavenLocal()
}
dependencies {
classpath group: 'org.multi-os-engine', name: 'moe-gradle', version: '1.7.+'
}
+ // this is here to tell gradle to refresh the moe dependency in the event i am trying a snapshot
+ // but this does not seem to work instead if the snapshot is sticky i need to go into Intelij/Android Studio
+ // right-click on the project name in the Gradle Tool Window and select Refresh dependencies from the context menu.
+ //configurations.all {
+ // resolutionStrategy.cacheChangingModulesFor 60, 'seconds'
+ //}
}
apply plugin: 'moe-sdk'
Modified: iOSME/src/javax/microedition/midlet/MIDlet.java
===================================================================
--- iOSME/src/javax/microedition/midlet/MIDlet.java 2021-12-29 01:07:41 UTC (rev 2629)
+++ iOSME/src/javax/microedition/midlet/MIDlet.java 2021-12-30 02:15:08 UTC (rev 2630)
@@ -296,7 +296,7 @@
catch (Throwable e) {
// /Users/noisyfox/Documents/project/moe/moe/natj/natj/src/main/native/natj/ObjCRuntime.mm:1480 WARNING: Binding class refers to class MFMailComposeViewController, but it can not be found. Fallback to indirect super class.
// https://github.com/multi-os-engine/multi-os-engine/issues/153
- // Make sure you have MessageUI.framework added
+ // Make sure you have MessageUI.framework added or switch to MOE 1.9 as this is fixed there
System.err.println("Make sure you have MessageUI.framework added to your xcode project! " + e);
return false;
}
Modified: iOSME/src/net/yura/ios/CanvasView.java
===================================================================
--- iOSME/src/net/yura/ios/CanvasView.java 2021-12-29 01:07:41 UTC (rev 2629)
+++ iOSME/src/net/yura/ios/CanvasView.java 2021-12-30 02:15:08 UTC (rev 2630)
@@ -37,6 +37,10 @@
//setContentMode(UIViewContentMode.Redraw); // does not work here for some reason
//setFocusable(true);
//setFocusableInTouchMode(true);
+
+ //UITextInteraction textInteraction = UITextInteraction.alloc().init();
+ //textInteraction.setTextInput(this);
+ //addInteraction(textInteraction);
}
private Canvas canvas;
@@ -167,9 +171,16 @@
private TextComponent textField;
+ /**
+ * this method is called when we try and set a TextBox as current
+ * @see javax.microedition.lcdui.TextBox#initDisplayable(AppController)
+ */
public void openTextEntry() {
Window window = DesktopPane.getDesktopPane().getSelectedFrame();
textField = (TextComponent)window.getFocusOwner();
+ if (textField == null) {
+ throw new IllegalStateException("no focused textbox in window " + window);
+ }
becomeFirstResponder();
}
Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-12-29 01:07:41 UTC (rev 2629)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-12-30 02:15:08 UTC (rev 2630)
@@ -156,6 +156,7 @@
System.out.println("App temp folder " + System.getProperty("java.io.tmpdir"));
// workaround for bug: https://github.com/multi-os-engine/multi-os-engine/issues/82
+ // this can be removed when we switch to MOE 1.9
Locale.setDefault(iOSUtil.toLocale(NSLocale.currentLocale()));
}
@@ -231,6 +232,11 @@
@Override
public void applicationDidFailToRegisterForRemoteNotificationsWithError(UIApplication application, NSError error) {
+ if (error != null && "remote notifications are not supported in the simulator".equals(error.localizedDescription())) {
+ // ignore error
+ return;
+ }
+
System.err.println("applicationDidFailToRegisterForRemoteNotificationsWithError " + error);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-29 01:07:45
|
Revision: 2629
http://sourceforge.net/p/swingme/code/2629
Author: yuranet
Date: 2021-12-29 01:07:41 +0000 (Wed, 29 Dec 2021)
Log Message:
-----------
swingme midlet rename
Modified Paths:
--------------
me4se/opt/swingme/lib/SwingME.jar
me4se/opt/swingme/src/net/yura/me4se/SingleFrameApplication.java
Modified: me4se/opt/swingme/lib/SwingME.jar
===================================================================
(Binary files differ)
Modified: me4se/opt/swingme/src/net/yura/me4se/SingleFrameApplication.java
===================================================================
--- me4se/opt/swingme/src/net/yura/me4se/SingleFrameApplication.java 2021-12-29 00:24:44 UTC (rev 2628)
+++ me4se/opt/swingme/src/net/yura/me4se/SingleFrameApplication.java 2021-12-29 01:07:41 UTC (rev 2629)
@@ -2,13 +2,13 @@
import javax.microedition.midlet.MIDletStateChangeException;
import net.yura.mobile.gui.DesktopPane;
-import net.yura.mobile.gui.Midlet;
+import net.yura.mobile.gui.Application;
/**
* @author Yura Mamyrin
* @see org.jdesktop.application.SingleFrameApplication
*/
-public class SingleFrameApplication extends Midlet {
+public class SingleFrameApplication extends Application {
// ME4SEPanel parent;
// public ME4SEPanel getParent() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-29 00:24:47
|
Revision: 2628
http://sourceforge.net/p/swingme/code/2628
Author: yuranet
Date: 2021-12-29 00:24:44 +0000 (Wed, 29 Dec 2021)
Log Message:
-----------
main class rename to Application
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/DesktopPane.java
SwingME/src/net/yura/mobile/gui/Font.java
SwingME/src/net/yura/mobile/gui/Graphics2D.java
SwingME/src/net/yura/mobile/gui/Icon.java
SwingME/src/net/yura/mobile/gui/KeyEvent.java
SwingME/src/net/yura/mobile/gui/border/MatteBorder.java
SwingME/src/net/yura/mobile/gui/components/Camera.java
SwingME/src/net/yura/mobile/gui/components/FileChooser.java
SwingME/src/net/yura/mobile/gui/components/Menu.java
SwingME/src/net/yura/mobile/gui/components/TextComponent.java
SwingME/src/net/yura/mobile/gui/components/Window.java
SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java
SwingME/src/net/yura/mobile/io/ClipboardManager.java
SwingME/src/net/yura/mobile/util/RemoteTest.java
Added Paths:
-----------
SwingME/src/net/yura/mobile/gui/Application.java
Removed Paths:
-------------
SwingME/src/net/yura/mobile/gui/Midlet.java
Copied: SwingME/src/net/yura/mobile/gui/Application.java (from rev 2627, SwingME/src/net/yura/mobile/gui/Midlet.java)
===================================================================
--- SwingME/src/net/yura/mobile/gui/Application.java (rev 0)
+++ SwingME/src/net/yura/mobile/gui/Application.java 2021-12-29 00:24:44 UTC (rev 2628)
@@ -0,0 +1,403 @@
+/*
+ * This file is part of 'yura.net Swing ME'.
+ *
+ * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 'yura.net Swing ME' is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.yura.mobile.gui;
+
+import java.io.InputStream;
+import java.util.Hashtable;
+import javax.microedition.lcdui.Display;
+import javax.microedition.lcdui.Image;
+import javax.microedition.midlet.MIDlet;
+import javax.microedition.midlet.MIDletStateChangeException;
+import net.yura.mobile.logging.DesktopLogger;
+import net.yura.mobile.logging.Logger;
+import net.yura.mobile.util.QueueProcessorThread;
+import net.yura.mobile.util.Url;
+
+/**
+ * @author Yura Mamyrin
+ * @see org.jdesktop.application.Application
+ */
+public abstract class Application extends MIDlet {
+
+ public static final int PLATFORM_NOT_DEFINED = 0;
+ public static final int PLATFORM_NOKIA_S40 = 1;
+ public static final int PLATFORM_NOKIA_S60 = 2;
+ public static final int PLATFORM_SONY_ERICSSON = 3;
+ public static final int PLATFORM_SAMSUNG = 4;
+ public static final int PLATFORM_MOTOROLA = 5;
+ public static final int PLATFORM_SIEMENS = 6;
+ public static final int PLATFORM_LG = 7;
+ public static final int PLATFORM_ME4SE = 8;
+ public static final int PLATFORM_WTK = 9;
+ public static final int PLATFORM_ANDROID = 10;
+ public static final int PLATFORM_BLACKBERRY = 11;
+ public static final int PLATFORM_IOS = 12;
+
+ private static int platform = detectPlatform();
+
+ //#mdebug info
+ static {
+ // on me4se we do not care about the popup as we have the console anyway
+ if (getPlatform() != PLATFORM_ME4SE) {
+ Logger.setLogger( new DesktopLogger(Logger.WARN) );
+ }
+ }
+ //#enddebug
+
+ private DesktopPane rootpane;
+ private Hashtable platformReqParams;
+
+ public Application() {
+
+ // Changing thread priority should only be done in platforms
+ // were actually improve performance.
+ QueueProcessorThread.CHANGE_PRIORITY =
+ Application.getPlatform() != Application.PLATFORM_IOS &&
+ Application.getPlatform() != Application.PLATFORM_ME4SE &&
+ Application.getPlatform() != Application.PLATFORM_ANDROID &&
+ Application.getPlatform() != Application.PLATFORM_BLACKBERRY;
+
+ rootpane = makeNewRootPane();
+
+ // now we set this as the main display
+ Display.getDisplay(this).setCurrent(rootpane);
+
+ // this repaint will mean the paint will be called
+ // this will then kick of the run method of this class
+ // and that will in tern call initialise of the midlet
+ rootpane.repaint();
+ }
+
+ /**
+ * @see org.jdesktop.application.Application#getInstance()
+ */
+ public static Application getInstance() {
+ DesktopPane dp = DesktopPane.getDesktopPane();
+ // dp can be null if the app is in the process of shutting down.
+ return dp == null ? null : dp.application;
+ }
+
+ /**
+ * This method should only be used to config the splash screen
+ * nothing else can be set up here as things like getHeight wont work
+ *
+ * Responsible for initializations that must occur before the GUI is constructed by {@link #initialize(DesktopPane)}.
+ *
+ * @see org.jdesktop.application.Application#initialize(java.lang.String[])
+ *
+ * @return THIS METHOD WILL MAKE A NEW ROOTPANE
+ */
+ protected DesktopPane makeNewRootPane() {
+ return new DesktopPane(this, 0xFF000000, null);
+ }
+
+ /**
+ * this will set up everything needed to start the app like the size and stuff
+ *
+ * Responsible for starting the application; for creating and showing the initial GUI.
+ *
+ * @see org.jdesktop.application.Application#startup()
+ */
+ protected abstract void initialize(DesktopPane rootpane);
+
+ /**
+ * @see org.jdesktop.application.Application#exit(java.util.EventObject)
+ * @see org.jdesktop.application.Application#shutdown()
+ * @param unconditional - If true when this method is called, the MIDlet must cleanup and release all resources. If false the MIDlet may throw
+ */
+ protected void destroyApp(boolean unconditional) throws MIDletStateChangeException {
+ rootpane.kill();
+ }
+
+ /**
+ * Gracefully shutdown the application, calls destroyApp(true)
+ *
+ * @see java.lang.System#exit(int) System.exit
+ * @see org.jdesktop.application.Application#exit()
+ */
+ public static void exit() {
+ try {
+ Application application = getInstance();
+ application.destroyApp(false);
+ application.notifyDestroyed();
+ }
+ catch (Exception ex) {
+ // as you called this yourself, you should not be throwing here
+ Logger.warn(null, ex);
+ throw new RuntimeException();
+ }
+ }
+
+ /**
+ * frame.setState(Frame.ICONIFIED);
+ * frame.setExtendedState(JFrame.ICONIFIED);
+ * @see java.awt.Frame#ICONIFIED
+ */
+ public static void hide() {
+ Display.getDisplay(getInstance()).setCurrent(null);
+ }
+
+ /**
+ * called when app is paused
+ */
+ protected void pauseApp() {
+ //Logger.debug("pauseApp");
+ }
+
+ /**
+ * called when comes out of pause
+ */
+ protected void startApp() {
+ //Logger.debug("startApp");
+ }
+
+ public static void call(String number) {
+ try {
+ // TODO remove spaces from number
+ getInstance().platformRequest("tel:" + number);
+ }
+ catch (Exception e) {
+ //#debug warn
+ Logger.warn("can not call: " + number, e);
+ }
+ }
+
+ public static void openURL(String url) {
+ try {
+ Application application = getInstance();
+ // midlet is null if the app is shutting down
+ if (application != null) {
+ application.platformRequest(url);
+ }
+ }
+ catch (Exception e) {
+ //#debug warn
+ Logger.warn("can not open url: " + url, e);
+ }
+ }
+
+ public static void vibration(int duration) {
+ try {
+ Display.getDisplay(getInstance()).vibrate(duration);
+ }
+ catch (Exception e) {
+ //#debug warn
+ Logger.warn("can not vibration", e);
+ }
+ }
+
+ /**
+ * @see org.jdesktop.application.Application#isMacOSX()
+ */
+ public static int getPlatform() {
+ return platform;
+ }
+
+ private static int detectPlatform() {
+
+ // detecting BLACKBERRY
+ if (hasClass("net.rim.device.api.ui.UiApplication")) {
+ return PLATFORM_BLACKBERRY;
+ }
+
+ // detecting ME4SE
+ if (hasClass("org.me4se.MIDletRunner")) {
+ return PLATFORM_ME4SE;
+ }
+
+ // detect ios before android as it has a few android classes in it
+ if (hasClass("apple.uikit.UIView")) {
+ return PLATFORM_IOS;
+ }
+
+ // detecting Android BEFORE Nokia platform as Nokia X is both android+nokia
+ if (hasClass("android.app.Activity")) { // or android.content.Context ?
+ return PLATFORM_ANDROID;
+ }
+
+ String currentPlatform = System.getProperty("microedition.platform");
+ if (currentPlatform == null) {
+ currentPlatform = ""; // Avoid null pointer exceptions
+ }
+
+ // detecting NOKIA
+ if (currentPlatform.indexOf("Nokia") >= 0) {
+ // detecting S40 vs S60
+ if (hasClass("com.nokia.mid.impl.isa.ui.gdi.Pixmap")) {
+ return PLATFORM_NOKIA_S40;
+ }
+ return PLATFORM_NOKIA_S60;
+ }
+
+ // detecting SONY ERICSSON
+ if (currentPlatform.indexOf("SonyEricsson") >= 0 ||
+ System.getProperty("com.sonyericsson.java.platform") != null) {
+ return PLATFORM_SONY_ERICSSON;
+ }
+
+ // detecting SAMSUNG
+ if (hasClass("com.samsung.util.Vibration")) {
+ return PLATFORM_SAMSUNG;
+ }
+
+ // detecting MOTOROLA
+ if (hasClass("com.motorola.multimedia.Vibrator") ||
+ hasClass("com.motorola.graphics.j3d.Effect3D") ||
+ hasClass("com.motorola.multimedia.Lighting") ||
+ hasClass("com.motorola.multimedia.FunLight") ||
+ hasClass("com.motorola.phonebook.PhoneBookRecord")) {
+ return PLATFORM_MOTOROLA;
+ }
+
+ // detecting SIEMENS
+ if (hasClass("com.siemens.mp.io.File")) {
+ return PLATFORM_SIEMENS;
+ }
+
+ // detecting LG
+ if (hasClass("mmpp.media.MediaPlayer") ||
+ hasClass("mmpp.phone.Phone") ||
+ hasClass("mmpp.lang.MathFP") ||
+ hasClass("mmpp.media.BackLight")) {
+ return PLATFORM_LG;
+ }
+
+ // detecting WTK
+ if (currentPlatform.indexOf("wtk") >= 0) {
+ return PLATFORM_WTK;
+ }
+
+ return PLATFORM_NOT_DEFINED;
+ }
+
+ // Utility method. Finds if a class is available to the class Loader
+ private static boolean hasClass(String className) {
+ try {
+ Class.forName(className);
+ return true;
+ }
+ catch (Throwable ex) {
+ return false;
+ }
+ }
+
+ //,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,
+ //==== Resources ===========================================================
+ //\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0
+
+ /**
+ * name MUST start with a "/"
+ * @see java.lang.Class#getResourceAsStream(java.lang.String) Class.getResourceAsStream
+ */
+ public static Image createImage(String name) {
+ try {
+ InputStream is = getInstance().getResourceAsStreamImpl(name);
+ if (is != null) {
+ return Image.createImage(is);
+ }
+ }
+ catch (Throwable th) {
+ //#debug warn
+ Logger.warn("cant createImage " + name, th);
+ }
+
+ try {
+ return Image.createImage(name);
+ }
+ catch (Exception ex) {
+ return null;
+ }
+ }
+
+ /**
+ * name MUST start with a "/"
+ * @see java.lang.Class#getResourceAsStream(java.lang.String) Class.getResourceAsStream
+ */
+ public static InputStream getResourceAsStream(String name) {
+ InputStream is = getInstance().getResourceAsStreamImpl(name);
+ if (is != null) {
+ return is;
+ }
+ return Application.class.getResourceAsStream(name);
+ }
+
+ public static String resdir;
+ static {
+ try {
+ // when running as a me4se applet, this can throw a SecurityException
+ String rd = System.getProperty("resdir");
+ if (rd != null) {
+ resdir = rd;
+ }
+ }
+ catch (Throwable th) { }
+ }
+
+ /**
+ * To be overwritten by sub-classes for specific implementation.
+ * This default implementation looks for a system property "resdir"
+ * and if it finds it, tries to load the resource from that folder
+ */
+ protected InputStream getResourceAsStreamImpl(String name) {
+ if (resdir != null) {
+ InputStream is = Application.class.getResourceAsStream(resdir + name);
+ if (is != null) {
+ return is;
+ }
+ }
+ return null;
+ }
+
+ //,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,
+ //==== platform Requests ===================================================
+ //\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0
+
+ // This will only be called on Android.
+ public void platformRequestForResult(String url, Object arg, int requestCode) {
+ Url u = new Url(url);
+ u.addQueryParameter("requestCode", String.valueOf(requestCode));
+ platformRequest(u.toString(), arg);
+ }
+
+ // This will only be called on Android.
+ public void platformRequest(String url, Object arg) {
+ try {
+ if (platformReqParams == null) {
+ platformReqParams = new Hashtable();
+ }
+
+ if (arg != null) {
+ platformReqParams.put(url, arg);
+ }
+
+ platformRequest(url);
+ }
+ catch (Exception e) {
+ Logger.warn("cant make request " + url + " " + arg, e);
+ throw new RuntimeException(e.toString());
+ }
+ }
+
+ // This will only be called on Android. By the "Android" side
+ public Object retrievePlatformRequestParam(String url) {
+ Object res = platformReqParams.remove(url);
+ return res;
+ }
+
+ public void onResult(int requestCode, int resultCode, Object obj) { }
+
+}
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2021-12-28 22:36:45 UTC (rev 2627)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2021-12-29 00:24:44 UTC (rev 2628)
@@ -88,7 +88,7 @@
* @see javax.swing.SwingUtilities#invokeLater(java.lang.Runnable) SwingUtilities.invokeLater
*/
public static void invokeLater(Runnable runner) {
- Display.getDisplay(Midlet.getMidlet()).callSerially(runner);
+ Display.getDisplay(Application.getInstance()).callSerially(runner);
}
/**
@@ -151,7 +151,7 @@
private int menuHeight; // (soft key area) comes from the renderer, so depends on the theme
// object variables
- protected Midlet midlet;
+ protected Application application;
private LookAndFeel theme;
final private Vector windows = new Vector();
@@ -192,22 +192,22 @@
* @param back the background color
* @param sph the splash screen image
*/
- public DesktopPane(Midlet m, int back, Image sph) {
+ public DesktopPane(Application m, int back, Image sph) {
- int platform = Midlet.getPlatform();
+ int platform = Application.getPlatform();
- SOFT_KEYS = platform != Midlet.PLATFORM_ME4SE && platform != Midlet.PLATFORM_ANDROID && platform != Midlet.PLATFORM_IOS && platform != Midlet.PLATFORM_BLACKBERRY;
- HIDDEN_MENU = platform == Midlet.PLATFORM_BLACKBERRY;
- HIDDEN_BACK = platform == Midlet.PLATFORM_BLACKBERRY;
+ SOFT_KEYS = platform != Application.PLATFORM_ME4SE && platform != Application.PLATFORM_ANDROID && platform != Application.PLATFORM_IOS && platform != Application.PLATFORM_BLACKBERRY;
+ HIDDEN_MENU = platform == Application.PLATFORM_BLACKBERRY;
+ HIDDEN_BACK = platform == Application.PLATFORM_BLACKBERRY;
- VERY_BIG_SCREEN = platform == Midlet.PLATFORM_ME4SE;
- MAX_CLOSE_BUTTONS = platform == Midlet.PLATFORM_ME4SE;
- IPHONE_SCROLL = platform != Midlet.PLATFORM_ME4SE;
- DEFAULT_NO_FOCUS = platform == Midlet.PLATFORM_ANDROID || platform == Midlet.PLATFORM_IOS;
+ VERY_BIG_SCREEN = platform == Application.PLATFORM_ME4SE;
+ MAX_CLOSE_BUTTONS = platform == Application.PLATFORM_ME4SE;
+ IPHONE_SCROLL = platform != Application.PLATFORM_ME4SE;
+ DEFAULT_NO_FOCUS = platform == Application.PLATFORM_ANDROID || platform == Application.PLATFORM_IOS;
- QWERTY_KAYPAD = platform == Midlet.PLATFORM_ME4SE || platform == Midlet.PLATFORM_ANDROID || platform == Midlet.PLATFORM_IOS || (platform == Midlet.PLATFORM_BLACKBERRY && !KeyEvent.BLACKBERRY_ITUT);
+ QWERTY_KAYPAD = platform == Application.PLATFORM_ME4SE || platform == Application.PLATFORM_ANDROID || platform == Application.PLATFORM_IOS || (platform == Application.PLATFORM_BLACKBERRY && !KeyEvent.BLACKBERRY_ITUT);
- USE_SOFT_KEY_CLEAR = platform == Midlet.PLATFORM_NOKIA_S40;
+ USE_SOFT_KEY_CLEAR = platform == Application.PLATFORM_NOKIA_S40;
desktop = this;
@@ -216,7 +216,7 @@
setFullScreenMode(true);
- midlet = m;
+ application = m;
keypad = new KeyEvent(this);
@@ -253,7 +253,7 @@
public final void run() {
try {
- midlet.initialize(this);
+ application.initialize(this);
}
catch (Throwable th) {
//#debug warn
@@ -393,7 +393,7 @@
defaultSpace = (maxSize <= 128) ? 3 : (maxSize <= 208) ? 5 : 7;
}
- minimumTouchTarget = (Midlet.getPlatform() == Midlet.PLATFORM_IOS || Midlet.getPlatform() == Midlet.PLATFORM_ANDROID) ? XULLoader.adjustSizeToDensity(44) : 0;
+ minimumTouchTarget = (Application.getPlatform() == Application.PLATFORM_IOS || Application.getPlatform() == Application.PLATFORM_ANDROID) ? XULLoader.adjustSizeToDensity(44) : 0;
// this is only needed for if SOFT_KEYS is true,
// but we may wish to set it to true after we set the look and feel
@@ -756,7 +756,7 @@
}
static Thread dummyThread;
static {
- if (Midlet.getPlatform()==Midlet.PLATFORM_BLACKBERRY) {
+ if (Application.getPlatform() == Application.PLATFORM_BLACKBERRY) {
dummyThread=new Thread();
}
}
@@ -764,7 +764,7 @@
// there is a bug on blackberry that if it is processing a repaint and it is the last thing on the event queue
// and in that repaint we call repaint again, the 2nd repaint will never get called, even though it does get put on the queue
// we want the queue to have something more on it, so we put a empty task if we know we need another repaint
- if (Midlet.getPlatform()==Midlet.PLATFORM_BLACKBERRY && (fullrepaint || !repaintComponent.isEmpty())) {
+ if (Application.getPlatform() == Application.PLATFORM_BLACKBERRY && (fullrepaint || !repaintComponent.isEmpty())) {
invokeLater(dummyThread);
}
}
@@ -1260,7 +1260,7 @@
int key = keyevent.getJustPressedKey();
if (key != 0) {
if ( key==KeyEvent.KEY_MENU || key==KeyEvent.KEY_END ) {
- if (Midlet.getPlatform() != Midlet.PLATFORM_NOKIA_S60) {
+ if (Application.getPlatform() != Application.PLATFORM_NOKIA_S60) {
mneonicButton = currentWindow.findMnemonicButton(key);
if ( mneonicButton==null ) {
if ( key==KeyEvent.KEY_MENU ) {
@@ -1338,7 +1338,6 @@
//#debug warn
Logger.warn("Error in KeyEvent: " + keyevent, th);
}
-
}
// if no command listener is used key events fall though to this method
@@ -1597,7 +1596,7 @@
indicator.setBounds(0, getHeight() - h, w, h);
}
else {
- indicator.setBounds( (Midlet.getPlatform() == Midlet.PLATFORM_SONY_ERICSSON) ?0:(getWidth()-w), 0, w, h);
+ indicator.setBounds( (Application.getPlatform() == Application.PLATFORM_SONY_ERICSSON) ?0:(getWidth()-w), 0, w, h);
}
}
}
Modified: SwingME/src/net/yura/mobile/gui/Font.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/Font.java 2021-12-28 22:36:45 UTC (rev 2627)
+++ SwingME/src/net/yura/mobile/gui/Font.java 2021-12-29 00:24:44 UTC (rev 2628)
@@ -109,12 +109,12 @@
try {
- InputStream is = Midlet.getResourceAsStream(descriptor);
+ InputStream is = Application.getResourceAsStream(descriptor);
Image[] characterImage = new Image[imagePaths.length];
for (int c=0;c<imagePaths.length;c++) {
- Image image = Midlet.createImage( imagePaths[c] );
+ Image image = Application.createImage( imagePaths[c] );
// Set loaded character set images as default
characterImage[c] = image;
@@ -277,7 +277,7 @@
Properties newfont = new Properties();
- newfont.load( Midlet.getResourceAsStream(name) );
+ newfont.load( Application.getResourceAsStream(name) );
String baseDir = name.substring(0, name.lastIndexOf('/') + 1);
String[] offsetsText = StringUtil.split(newfont.getProperty("offsets"), ',');
@@ -322,7 +322,7 @@
imageName = "/"+imageName;
}
- Image fontimage = Midlet.createImage(imageName);
+ Image fontimage = Application.createImage(imageName);
f.colors[c] = Integer.parseInt(colorsText[c],16) | 0xFF000000;
Modified: SwingME/src/net/yura/mobile/gui/Graphics2D.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/Graphics2D.java 2021-12-28 22:36:45 UTC (rev 2627)
+++ SwingME/src/net/yura/mobile/gui/Graphics2D.java 2021-12-29 00:24:44 UTC (rev 2628)
@@ -174,7 +174,7 @@
setClip(c);
//#mdebug info
- if (Midlet.getPlatform() != Midlet.PLATFORM_ME4SE) {
+ if (Application.getPlatform() != Application.PLATFORM_ME4SE) {
int tile = (( (end_x-start_x) /src_w)*( (end_y-start_y) /src_h));
if ( tile>15 ) {
Logger.info("going to tile a very small image "+tile+" times: src_w=" +src_w+" src_h="+src_h+" dest_w="+ dest_w +" dest_h="+dest_h );
Modified: SwingME/src/net/yura/mobile/gui/Icon.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/Icon.java 2021-12-28 22:36:45 UTC (rev 2627)
+++ SwingME/src/net/yura/mobile/gui/Icon.java 2021-12-29 00:24:44 UTC (rev 2628)
@@ -49,7 +49,7 @@
* @see java.lang.Class#getResourceAsStream(java.lang.String) Class.getResourceAsStream
*/
public Icon(String imageName) {
- initImage( Midlet.createImage( imageName ) );
+ initImage( Application.createImage( imageName ) );
}
private void initImage(Image img) {
Modified: SwingME/src/net/yura/mobile/gui/KeyEvent.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/KeyEvent.java 2021-12-28 22:36:45 UTC (rev 2627)
+++ SwingME/src/net/yura/mobile/gui/KeyEvent.java 2021-12-29 00:24:44 UTC (rev 2628)
@@ -140,7 +140,7 @@
return 0;
}
- if (code == '0' && Midlet.getPlatform() == Midlet.PLATFORM_SONY_ERICSSON) {
+ if (code == '0' && Application.getPlatform() == Application.PLATFORM_SONY_ERICSSON) {
// Hack: Jane - For SE, the "+" is entered on "0", using a long key press...
acc = (pos == -1);
old = (pos >= 0);
@@ -197,7 +197,7 @@
private static final String CHARS_57 = "wxyz9";
static {
- if (Midlet.getPlatform() == Midlet.PLATFORM_SONY_ERICSSON) {
+ if (Application.getPlatform() == Application.PLATFORM_SONY_ERICSSON) {
CHARS_48 = "0+";
}
else {
@@ -452,7 +452,7 @@
private int check(int keyCode) {
- if (Midlet.getPlatform()==Midlet.PLATFORM_BLACKBERRY) {
+ if (Application.getPlatform()== Application.PLATFORM_BLACKBERRY) {
if (keyCode==-8) return KEY_SOFTKEY3;
}
@@ -472,7 +472,7 @@
}
private int checkBack(int code) {
- if (Midlet.getPlatform()==Midlet.PLATFORM_BLACKBERRY) {
+ if (Application.getPlatform() == Application.PLATFORM_BLACKBERRY) {
switch (code) {
case KEY_SOFTKEY3: code=-8; break;
case KEY_CLEAR: code=8; break;
@@ -502,5 +502,4 @@
return string.toString();
}
//#enddebug
-
}
Deleted: SwingME/src/net/yura/mobile/gui/Midlet.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/Midlet.java 2021-12-28 22:36:45 UTC (rev 2627)
+++ SwingME/src/net/yura/mobile/gui/Midlet.java 2021-12-29 00:24:44 UTC (rev 2628)
@@ -1,403 +0,0 @@
-/*
- * This file is part of 'yura.net Swing ME'.
- *
- * 'yura.net Swing ME' is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 'yura.net Swing ME' is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
- */
-package net.yura.mobile.gui;
-
-import java.io.InputStream;
-import java.util.Hashtable;
-import javax.microedition.lcdui.Display;
-import javax.microedition.lcdui.Image;
-import javax.microedition.midlet.MIDlet;
-import javax.microedition.midlet.MIDletStateChangeException;
-import net.yura.mobile.logging.DesktopLogger;
-import net.yura.mobile.logging.Logger;
-import net.yura.mobile.util.QueueProcessorThread;
-import net.yura.mobile.util.Url;
-
-/**
- * @author Yura Mamyrin
- * @see org.jdesktop.application.Application
- */
-public abstract class Midlet extends MIDlet {
-
- public static final int PLATFORM_NOT_DEFINED = 0;
- public static final int PLATFORM_NOKIA_S40 = 1;
- public static final int PLATFORM_NOKIA_S60 = 2;
- public static final int PLATFORM_SONY_ERICSSON = 3;
- public static final int PLATFORM_SAMSUNG = 4;
- public static final int PLATFORM_MOTOROLA = 5;
- public static final int PLATFORM_SIEMENS = 6;
- public static final int PLATFORM_LG = 7;
- public static final int PLATFORM_ME4SE = 8;
- public static final int PLATFORM_WTK = 9;
- public static final int PLATFORM_ANDROID = 10;
- public static final int PLATFORM_BLACKBERRY = 11;
- public static final int PLATFORM_IOS = 12;
-
- private static int platform = detectPlatform();
-
- //#mdebug info
- static {
- // on me4se we do not care about the popup as we have the console anyway
- if (getPlatform() != PLATFORM_ME4SE) {
- Logger.setLogger( new DesktopLogger(Logger.WARN) );
- }
- }
- //#enddebug
-
- private DesktopPane rootpane;
- private Hashtable platformReqParams;
-
- public Midlet() {
-
- // Changing thread priority should only be done in platforms
- // were actually improve performance.
- QueueProcessorThread.CHANGE_PRIORITY =
- Midlet.getPlatform() != Midlet.PLATFORM_IOS &&
- Midlet.getPlatform() != Midlet.PLATFORM_ME4SE &&
- Midlet.getPlatform() != Midlet.PLATFORM_ANDROID &&
- Midlet.getPlatform() != Midlet.PLATFORM_BLACKBERRY;
-
- rootpane = makeNewRootPane();
-
- // now we set this as the main display
- Display.getDisplay(this).setCurrent(rootpane);
-
- // this repaint will mean the paint will be called
- // this will then kick of the run method of this class
- // and that will in tern call initialise of the midlet
- rootpane.repaint();
- }
-
- /**
- * @see org.jdesktop.application.Application#getInstance()
- */
- public static Midlet getMidlet() {
- DesktopPane dp = DesktopPane.getDesktopPane();
- // dp can be null if the app is in the process of shutting down.
- return dp == null ? null : dp.midlet;
- }
-
- /**
- * This method should only be used to config the splash screen
- * nothing else can be set up here as things like getHeight wont work
- *
- * Responsible for initializations that must occur before the GUI is constructed by {@link #initialize(DesktopPane)}.
- *
- * @see org.jdesktop.application.Application#initialize(java.lang.String[])
- *
- * @return THIS METHOD WILL MAKE A NEW ROOTPANE
- */
- protected DesktopPane makeNewRootPane() {
- return new DesktopPane(this, 0xFF000000, null);
- }
-
- /**
- * this will set up everything needed to start the app like the size and stuff
- *
- * Responsible for starting the application; for creating and showing the initial GUI.
- *
- * @see org.jdesktop.application.Application#startup()
- */
- protected abstract void initialize(DesktopPane rootpane);
-
- /**
- * @see org.jdesktop.application.Application#exit(java.util.EventObject)
- * @see org.jdesktop.application.Application#shutdown()
- * @param unconditional - If true when this method is called, the MIDlet must cleanup and release all resources. If false the MIDlet may throw
- */
- protected void destroyApp(boolean unconditional) throws MIDletStateChangeException {
- rootpane.kill();
- }
-
- /**
- * Gracefully shutdown the application, calls destroyApp(true)
- *
- * @see java.lang.System#exit(int) System.exit
- * @see org.jdesktop.application.Application#exit()
- */
- public static void exit() {
- try {
- Midlet midlet = getMidlet();
- midlet.destroyApp(false);
- midlet.notifyDestroyed();
- }
- catch (Exception ex) {
- // as you called this yourself, you should not be throwing here
- Logger.warn(null, ex);
- throw new RuntimeException();
- }
- }
-
- /**
- * frame.setState(Frame.ICONIFIED);
- * frame.setExtendedState(JFrame.ICONIFIED);
- * @see java.awt.Frame#ICONIFIED
- */
- public static void hide() {
- Display.getDisplay(getMidlet()).setCurrent(null);
- }
-
- /**
- * called when app is paused
- */
- protected void pauseApp() {
- //Logger.debug("pauseApp");
- }
-
- /**
- * called when comes out of pause
- */
- protected void startApp() {
- //Logger.debug("startApp");
- }
-
- public static void call(String number) {
- try {
- // TODO remove spaces from number
- getMidlet().platformRequest("tel:" + number);
- }
- catch (Exception e) {
- //#debug warn
- Logger.warn("can not call: " + number, e);
- }
- }
-
- public static void openURL(String url) {
- try {
- Midlet midlet = getMidlet();
- // midlet is null if the app is shutting down
- if (midlet != null) {
- midlet.platformRequest(url);
- }
- }
- catch (Exception e) {
- //#debug warn
- Logger.warn("can not open url: " + url, e);
- }
- }
-
- public static void vibration(int duration) {
- try {
- Display.getDisplay(getMidlet()).vibrate(duration);
- }
- catch (Exception e) {
- //#debug warn
- Logger.warn("can not vibration", e);
- }
- }
-
- /**
- * @see org.jdesktop.application.Application#isMacOSX()
- */
- public static int getPlatform() {
- return platform;
- }
-
- private static int detectPlatform() {
-
- // detecting BLACKBERRY
- if (hasClass("net.rim.device.api.ui.UiApplication")) {
- return PLATFORM_BLACKBERRY;
- }
-
- // detecting ME4SE
- if (hasClass("org.me4se.MIDletRunner")) {
- return PLATFORM_ME4SE;
- }
-
- // detect ios before android as it has a few android classes in it
- if (hasClass("apple.uikit.UIView")) {
- return PLATFORM_IOS;
- }
-
- // detecting Android BEFORE Nokia platform as Nokia X is both android+nokia
- if (hasClass("android.app.Activity")) { // or android.content.Context ?
- return PLATFORM_ANDROID;
- }
-
- String currentPlatform = System.getProperty("microedition.platform");
- if (currentPlatform == null) {
- currentPlatform = ""; // Avoid null pointer exceptions
- }
-
- // detecting NOKIA
- if (currentPlatform.indexOf("Nokia") >= 0) {
- // detecting S40 vs S60
- if (hasClass("com.nokia.mid.impl.isa.ui.gdi.Pixmap")) {
- return PLATFORM_NOKIA_S40;
- }
- return PLATFORM_NOKIA_S60;
- }
-
- // detecting SONY ERICSSON
- if (currentPlatform.indexOf("SonyEricsson") >= 0 ||
- System.getProperty("com.sonyericsson.java.platform") != null) {
- return PLATFORM_SONY_ERICSSON;
- }
-
- // detecting SAMSUNG
- if (hasClass("com.samsung.util.Vibration")) {
- return PLATFORM_SAMSUNG;
- }
-
- // detecting MOTOROLA
- if (hasClass("com.motorola.multimedia.Vibrator") ||
- hasClass("com.motorola.graphics.j3d.Effect3D") ||
- hasClass("com.motorola.multimedia.Lighting") ||
- hasClass("com.motorola.multimedia.FunLight") ||
- hasClass("com.motorola.phonebook.PhoneBookRecord")) {
- return PLATFORM_MOTOROLA;
- }
-
- // detecting SIEMENS
- if (hasClass("com.siemens.mp.io.File")) {
- return PLATFORM_SIEMENS;
- }
-
- // detecting LG
- if (hasClass("mmpp.media.MediaPlayer") ||
- hasClass("mmpp.phone.Phone") ||
- hasClass("mmpp.lang.MathFP") ||
- hasClass("mmpp.media.BackLight")) {
- return PLATFORM_LG;
- }
-
- // detecting WTK
- if (currentPlatform.indexOf("wtk") >= 0) {
- return PLATFORM_WTK;
- }
-
- return PLATFORM_NOT_DEFINED;
- }
-
- // Utility method. Finds if a class is available to the class Loader
- private static boolean hasClass(String className) {
- try {
- Class.forName(className);
- return true;
- }
- catch (Throwable ex) {
- return false;
- }
- }
-
- //,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,
- //==== Resources ===========================================================
- //\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0
-
- /**
- * name MUST start with a "/"
- * @see java.lang.Class#getResourceAsStream(java.lang.String) Class.getResourceAsStream
- */
- public static Image createImage(String name) {
- try {
- InputStream is = getMidlet().getResourceAsStreamImpl(name);
- if (is != null) {
- return Image.createImage(is);
- }
- }
- catch (Throwable th) {
- //#debug warn
- Logger.warn("cant createImage " + name, th);
- }
-
- try {
- return Image.createImage(name);
- }
- catch (Exception ex) {
- return null;
- }
- }
-
- /**
- * name MUST start with a "/"
- * @see java.lang.Class#getResourceAsStream(java.lang.String) Class.getResourceAsStream
- */
- public static InputStream getResourceAsStream(String name) {
- InputStream is = getMidlet().getResourceAsStreamImpl(name);
- if (is != null) {
- return is;
- }
- return Midlet.class.getResourceAsStream(name);
- }
-
- public static String resdir;
- static {
- try {
- // when running as a me4se applet, this can throw a SecurityException
- String rd = System.getProperty("resdir");
- if (rd != null) {
- resdir = rd;
- }
- }
- catch (Throwable th) { }
- }
-
- /**
- * To be overwritten by sub-classes for specific implementation.
- * This default implementation looks for a system property "resdir"
- * and if it finds it, tries to load the resource from that folder
- */
- protected InputStream getResourceAsStreamImpl(String name) {
- if (resdir != null) {
- InputStream is = Midlet.class.getResourceAsStream(resdir + name);
- if (is != null) {
- return is;
- }
- }
- return null;
- }
-
- //,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,
- //==== platform Requests ===================================================
- //\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0
-
- // This will only be called on Android.
- public void platformRequestForResult(String url, Object arg, int requestCode) {
- Url u = new Url(url);
- u.addQueryParameter("requestCode", String.valueOf(requestCode));
- platformRequest(u.toString(), arg);
- }
-
- // This will only be called on Android.
- public void platformRequest(String url, Object arg) {
- try {
- if (platformReqParams == null) {
- platformReqParams = new Hashtable();
- }
-
- if (arg != null) {
- platformReqParams.put(url, arg);
- }
-
- platformRequest(url);
- }
- catch (Exception e) {
- Logger.warn("cant make request " + url + " " + arg, e);
- throw new RuntimeException(e.toString());
- }
- }
-
- // This will only be called on Android. By the "Android" side
- public Object retrievePlatformRequestParam(String url) {
- Object res = platformReqParams.remove(url);
- return res;
- }
-
- public void onResult(int requestCode, int resultCode, Object obj) { }
-
-}
Modified: SwingME/src/net/yura/mobile/gui/border/MatteBorder.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/border/MatteBorder.java 2021-12-28 22:36:45 UTC (rev 2627)
+++ SwingME/src/net/yura/mobile/gui/border/MatteBorder.java 2021-12-29 00:24:44 UTC (rev 2628)
@@ -22,7 +22,7 @@
import net.yura.mobile.gui.DesktopPane;
import net.yura.mobile.gui.Graphics2D;
import net.yura.mobile.gui.Icon;
-import net.yura.mobile.gui.Midlet;
+import net.yura.mobile.gui.Application;
import net.yura.mobile.gui.components.Component;
import net.yura.mobile.gui.plaf.Style;
import net.yura.mobile.logging.Logger;
@@ -172,7 +172,7 @@
Properties newborder = new Properties();
- newborder.load( Midlet.getResourceAsStream(name) );
+ newborder.load( Application.getResourceAsStream(name) );
String imageName = newborder.getProperty("active");
Modified: SwingME/src/net/yura/mobile/gui/components/Camera.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Camera.java 2021-12-28 22:36:45 UTC (rev 2627)
+++ SwingME/src/net/yura/mobile/gui/components/Camera.java 2021-12-29 00:24:44 UTC (rev 2628)
@@ -30,11 +30,11 @@
import javax.microedition.rms.RecordStore;
import javax.microedition.rms.RecordStoreException;
import net.yura.mobile.gui.ActionListener;
+import net.yura.mobile.gui.Application;
import net.yura.mobile.gui.DesktopPane;
import net.yura.mobile.gui.Font;
import net.yura.mobile.gui.Graphics2D;
import net.yura.mobile.gui.KeyEvent;
-import net.yura.mobile.gui.Midlet;
import net.yura.mobile.gui.plaf.Style;
import net.yura.mobile.logging.Logger;
import net.yura.mobile.util.StringUtil;
@@ -259,8 +259,8 @@
// WORK-AROUND: WTK don't display the view
// finder, if there is no "Canvas transition"
- if (Midlet.getPlatform() == Midlet.PLATFORM_WTK) {
- Display.getDisplay(Midlet.getMidlet()).setCurrent(new DummyCanvas());
+ if (Application.getPlatform() == Application.PLATFORM_WTK) {
+ Display.getDisplay(Application.getInstance()).setCurrent(new DummyCanvas());
}
}
@@ -345,7 +345,7 @@
private int getCameraPermission() {
- MIDlet midlet = Midlet.getMidlet();
+ MIDlet midlet = Application.getInstance();
int perm = midlet.checkPermission("javax.microedition.media.control.VideoControl.getSnapshot");
return perm;
@@ -599,7 +599,7 @@
protected void paint(Graphics arg0) {
Canvas playerCanvas = DesktopPane.getDesktopPane();
- Display.getDisplay(Midlet.getMidlet()).setCurrent(playerCanvas);
+ Display.getDisplay(Application.getInstance()).setCurrent(playerCanvas);
}
}
Modified: SwingME/src/net/yura/mobile/gui/components/FileChooser.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/FileChooser.java 2021-12-28 22:36:45 UTC (rev 2627)
+++ SwingME/src/net/yura/mobile/gui/components/FileChooser.java 2021-12-29 00:24:44 UTC (rev 2628)
@@ -27,7 +27,7 @@
import net.yura.mobile.gui.Graphics2D;
import net.yura.mobile.gui.Icon;
import net.yura.mobile.gui.KeyEvent;
-import net.yura.mobile.gui.Midlet;
+import net.yura.mobile.gui.Application;
import net.yura.mobile.gui.celleditor.TableCellEditor;
import net.yura.mobile.gui.cellrenderer.ListCellRenderer;
import net.yura.mobile.gui.layout.BorderLayout;
@@ -137,7 +137,7 @@
// we need to add it to the window before we add the buttons so they get
// auto softkey assigned
- if (Midlet.getPlatform() == Midlet.PLATFORM_IOS || Midlet.getPlatform() == Midlet.PLATFORM_ANDROID) {
+ if (Application.getPlatform() == Application.PLATFORM_IOS || Application.getPlatform() == Application.PLATFORM_ANDROID) {
bar.add(close);
bar.addGlue();
bar.add(popupMenu);
@@ -301,7 +301,7 @@
fileList.setCellRenderer(thumbOptionRenderer);
fileList.setActionCommand("listSelect");
fileList.addActionListener(this);
- if (Midlet.getPlatform()==Midlet.PLATFORM_ME4SE) {
+ if (Application.getPlatform() == Application.PLATFORM_ME4SE) {
fileList.setDoubleClick(true);
}
}
Modified: SwingME/src/net/yura/mobile/gui/components/Menu.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Menu.java 2021-12-28 22:36:45 UTC (rev 2627)
+++ SwingME/src/net/yura/mobile/gui/components/Menu.java 2021-12-29 00:24:44 UTC (rev 2628)
@@ -19,11 +19,11 @@
import java.util.Vector;
import javax.microedition.lcdui.Graphics;
+import net.yura.mobile.gui.Application;
import net.yura.mobile.gui.DesktopPane;
import net.yura.mobile.gui.Graphics2D;
import net.yura.mobile.gui.Icon;
import net.yura.mobile.gui.KeyEvent;
-import net.yura.mobile.gui.Midlet;
import net.yura.mobile.gui.border.Border;
import net.yura.mobile.gui.cellrenderer.ListCellRenderer;
import net.yura.mobile.gui.plaf.Style;
@@ -197,7 +197,7 @@
// SETUP LEFT/MENU SOFT KEY
- if (Midlet.getPlatform()==Midlet.PLATFORM_ANDROID) {
+ if (Application.getPlatform()== Application.PLATFORM_ANDROID) {
Button cancel2 = new Button( (String)DesktopPane.get("menuText") );
cancel2.setActionCommand(Frame.CMD_CLOSE);
cancel2.addActionListener(menuItems);
@@ -275,7 +275,6 @@
Border insets=window.getInsets();
window.setSize(w-insets.getLeft()-insets.getRight(), h-insets.getTop()-insets.getBottom() );
-
}
public static void positionMenuRelativeTo(Window window,int x, int y, int width, int height,int direction) {
@@ -316,7 +315,6 @@
// will adjust the location to make sure it is on screen
window.makeVisible();
-
}
private static int extraWidth(Panel p) {
@@ -347,7 +345,6 @@
//System.out.println("left="+left+" top="+top+" right="+right+" bottom="+bottom);
popup.snap = (left?Graphics.LEFT:0) | (top?Graphics.TOP:0) | (right?Graphics.RIGHT:0) | (bottom?Graphics.BOTTOM:0);
-
}
/**
@@ -467,15 +464,10 @@
if(pY==destY && pX == destX) {
break;
}
-
-
-
}
wait(50);
-
}
-
}
finally {
if(open) {
@@ -493,7 +485,5 @@
popup.repaint();
}
}
-
}
-
}
Modified: SwingME/src/net/yura/mobile/gui/components/TextComponent.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TextComponent.java 2021-12-28 22:36:45 UTC (rev 2627)
+++ SwingME/src/net/yura/mobile/gui/components/TextComponent.java 2021-12-29 00:24:44 UTC (rev 2628)
@@ -25,12 +25,12 @@
import javax.microedition.lcdui.TextBox;
import net.yura.mobile.gui.ActionListener;
+import net.yura.mobile.gui.Application;
import net.yura.mobile.gui.ChangeListener;
import net.yura.mobile.gui.DesktopPane;
import net.yura.mobile.gui.Font;
import net.yura.mobile.gui.Graphics2D;
import net.yura.mobile.gui.KeyEvent;
-import net.yura.mobile.gui.Midlet;
import net.yura.mobile.gui.plaf.Style;
import net.yura.mobile.io.ClipboardManager;
import net.yura.mobile.logging.Logger;
@@ -81,7 +81,7 @@
// }
private static final int cursorBlinkWait = 500;
- private static final int changeModeChar = (Midlet.getPlatform() == Midlet.PLATFORM_SONY_ERICSSON) ? '*' : '#';
+ private static final int changeModeChar = (Application.getPlatform() == Application.PLATFORM_SONY_ERICSSON) ? '*' : '#';
private static int autoAcceptTimeout = 1000; // MUST be more then blink time
protected int padding = 2;
@@ -148,7 +148,7 @@
public boolean allowChar(char ch) {
// TODO somehow open the blackberry symbol dialog
- if (Midlet.getPlatform()==Midlet.PLATFORM_BLACKBERRY && ch==128) {
+ if (Application.getPlatform() == Application.PLATFORM_BLACKBERRY && ch==128) {
openNativeEditor();
return false;
}
@@ -461,7 +461,7 @@
textbox.setCommandListener(this); // replaces old one
- Display.getDisplay(Midlet.getMidlet()).setCurrent(textbox);
+ Display.getDisplay(Application.getInstance()).setCurrent(textbox);
}
public static void closeNativeEditor() {
@@ -468,7 +468,7 @@
// go back to normal
if (textbox!=null) {
DesktopPane rp = DesktopPane.getDesktopPane(); // will this always be the correct DesktopPane??
- Display.getDisplay(Midlet.getMidlet()).setCurrent(rp);
+ Display.getDisplay(Application.getInstance()).setCurrent(rp);
rp.setFullScreenMode(true);
textbox = null;
}
@@ -914,7 +914,7 @@
Window popup = Menu.makePopup();
MenuBar menu = Menu.getPopupMenu(popup);
- if (Midlet.getPlatform() == Midlet.PLATFORM_IOS || Midlet.getPlatform() == Midlet.PLATFORM_ANDROID) {
+ if (Application.getPlatform() == Application.PLATFORM_IOS || Application.getPlatform() == Application.PLATFORM_ANDROID) {
menu.setLayoutOrientation(List.HORIZONTAL);
}
Modified: SwingME/src/net/yura/mobile/gui/components/Window.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Window.java 2021-12-28 22:36:45 UTC (rev 2627)
+++ SwingME/src/net/yura/mobile/gui/components/Window.java 2021-12-29 00:24:44 UTC (rev 2628)
@@ -23,7 +23,6 @@
import net.yura.mobile.gui.DesktopPane;
import net.yura.mobile.gui.Graphics2D;
import net.yura.mobile.gui.KeyEvent;
-import net.yura.mobile.gui.Midlet;
import net.yura.mobile.gui.border.Border;
import net.yura.mobile.gui.layout.BorderLayout;
import net.yura.mobile.logging.Logger;
Modified: SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java 2021-12-28 22:36:45 UTC (rev 2627)
+++ SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java 2021-12-29 00:24:44 UTC (rev 2628)
@@ -22,10 +22,10 @@
import java.util.Vector;
import javax.microedition.lcdui.Image;
import javax.microedition.lcdui.game.Sprite;
+import net.yura.mobile.gui.Application;
import net.yura.mobile.gui.Font;
import net.yura.mobile.gui.Graphics2D;
import net.yura.mobile.gui.Icon;
-import net.yura.mobile.gui.Midlet;
import net.yura.mobile.gui.border.Border;
import net.yura.mobile.gui.border.EmptyBorder;
import net.yura.mobile.gui.border.MatteBorder;
@@ -75,7 +75,7 @@
* @see Image#createImage(String)
*/
protected Image createImage(String path) {
- Image in = Midlet.createImage(path);
+ Image in = Application.createImage(path);
if (in==null) {
//#debug warn
Logger.warn("can not load image: "+path);
@@ -84,7 +84,7 @@
}
protected InputStream getResourceAsStream(String path) {
- InputStream in = Midlet.getResourceAsStream(path);
+ InputStream in = Application.getResourceAsStream(path);
if (in==null) {
//#debug warn
Logger.warn("can not load resource: "+path);
Modified: SwingME/src/net/yura/mobile/io/ClipboardManager.java
===================================================================
--- SwingME/src/net/yura/mobile/io/ClipboardManager.java 2021-12-28 22:36:45 UTC (rev 2627)
+++ SwingME/src/net/yura/mobile/io/ClipboardManager.java 2021-12-29 00:24:44 UTC (rev 2628)
@@ -1,21 +1,16 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
package net.yura.mobile.io;
-import net.yura.mobile.gui.Midlet;
+import net.yura.mobile.gui.Application;
import net.yura.mobile.io.ServiceLink.Task;
import net.yura.mobile.logging.Logger;
/**
- *
* @author AP
*/
public class ClipboardManager implements ServiceLink.TaskHandler {
/** Creates a new instance of LocationMonitor */
private ClipboardManager() {
- if (Midlet.getPlatform()==Midlet.PLATFORM_NOKIA_S60) {
+ if (Application.getPlatform() == Application.PLATFORM_NOKIA_S60) {
ServiceLink link = ServiceLink.getInstance();
link.registerForTask("GetClipboardTextError", this);
link.registerForTask("PutClipboardText", this);
@@ -44,7 +39,7 @@
public String getText() {
- if (Midlet.getPlatform()==Midlet.PLATFORM_NOKIA_S60) {
+ if (Application.getPlatform() == Application.PLATFORM_NOKIA_S60) {
ServiceLink link = ServiceLink.getInstance();
if (link.isConnected()) {
link.sendTask(new ServiceLink.Task("GetClipboardText", null));
@@ -53,9 +48,9 @@
}
}
else { // for me4se and will be for android
- Midlet midlet = Midlet.getMidlet();
+ Application application = Application.getInstance();
- midlet.platformRequest("clipboard://get",null);
+ application.platformRequest("clipboard://get",null);
return System.getProperty("clipboard.text");
}
@@ -65,7 +60,7 @@
public void setText(String text) {
- if (Midlet.getPlatform()==Midlet.PLATFORM_NOKIA_S60) {
+ if (Application.getPlatform() == Application.PLATFORM_NOKIA_S60) {
ServiceLink link = ServiceLink.getInstance();
if (link.isConnected()) {
link.sendTask(new ServiceLink.Task("PutClipboardText", text));
@@ -72,10 +67,10 @@
}
}
else {
- Midlet midlet = Midlet.getMidlet();
+ Application application = Application.getInstance();
//midlet.platformRequest("clipboard://put",text);
try {
- midlet.platformRequest("clipboard://put/"+text);
+ application.platformRequest("clipboard://put/"+text);
}
catch(Exception ex) {
Logger.warn("cant put " + text, ex);
@@ -82,5 +77,4 @@
}
}
}
-
}
Modified: SwingME/src/net/yura/mobile/util/RemoteTest.java
===================================================================
--- SwingME/src/net/yura/mobile/util/RemoteTest.java 2021-12-28 22:36:45 UTC (rev 2627)
+++ SwingME/src/net/yura/mobile/util/RemoteTest.java 2021-12-29 00:24:44 UTC (rev 2628)
@@ -7,13 +7,11 @@
import java.io.Reader;
import java.io.Writer;
import java.util.Vector;
-
import javax.microedition.io.Connector;
import javax.microedition.io.ServerSocketConnection;
import javax.microedition.io.StreamConnection;
-
+import net.yura.mobile.gui.Application;
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.Component;
import net.yura.mobile.gui.components.List;
@@ -32,7 +30,7 @@
public static void open() {
try {
- if (Midlet.getPlatform() == Midlet.PLATFORM_ANDROID) {
+ if (Application.getPlatform() == Application.PLATFORM_ANDROID) {
RemoteTest remoteTest = (RemoteTest)Class.forName("net.yura.android.AndroidRemoteTest").newInstance();
remoteTest.start();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-28 22:36:48
|
Revision: 2627
http://sourceforge.net/p/swingme/code/2627
Author: yuranet
Date: 2021-12-28 22:36:45 +0000 (Tue, 28 Dec 2021)
Log Message:
-----------
add address bar first
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/FileChooser.java
Modified: SwingME/src/net/yura/mobile/gui/components/FileChooser.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/FileChooser.java 2021-12-28 20:08:00 UTC (rev 2626)
+++ SwingME/src/net/yura/mobile/gui/components/FileChooser.java 2021-12-28 22:36:45 UTC (rev 2627)
@@ -95,10 +95,10 @@
addressBar = new Label(dir);
scroll = new ScrollPane();
Panel mainPanel = new Panel(new BorderLayout());
+ mainPanel.add(addressBar, Graphics.TOP);
mainPanel.add(scroll);
- mainPanel.add(addressBar, Graphics.TOP);
- add(mainPanel);
+ setContentPane(mainPanel);
Menu popupMenu = new Menu( (String)DesktopPane.get("menuText") );
popupMenu.setActionCommand("mainMenu");
@@ -151,7 +151,6 @@
files = new Vector(0);
lastFewImages = new Vector();
thumbOptionRenderer = new SelectableFileRenderer();
-
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-28 20:08:08
|
Revision: 2626
http://sourceforge.net/p/swingme/code/2626
Author: yuranet
Date: 2021-12-28 20:08:00 +0000 (Tue, 28 Dec 2021)
Log Message:
-----------
little name change
Modified Paths:
--------------
me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java
Added Paths:
-----------
me4se/opt/swingme/src/net/yura/me4se/SingleFrameApplication.java
Removed Paths:
-------------
me4se/opt/swingme/src/net/yura/me4se/EmptyMidlet.java
Deleted: me4se/opt/swingme/src/net/yura/me4se/EmptyMidlet.java
===================================================================
--- me4se/opt/swingme/src/net/yura/me4se/EmptyMidlet.java 2021-12-28 19:55:55 UTC (rev 2625)
+++ me4se/opt/swingme/src/net/yura/me4se/EmptyMidlet.java 2021-12-28 20:08:00 UTC (rev 2626)
@@ -1,22 +0,0 @@
-package net.yura.me4se;
-
-import javax.microedition.midlet.MIDletStateChangeException;
-import net.yura.mobile.gui.DesktopPane;
-import net.yura.mobile.gui.Midlet;
-
-/**
- * @author Yura Mamyrin
- */
-public class EmptyMidlet extends Midlet {
-
-// ME4SEPanel parent;
-// public ME4SEPanel getParent() {
-// return parent;
-// }
-
- protected void initialize(DesktopPane dp) { }
-
- public void destroyApp(boolean arg0) throws MIDletStateChangeException {
- super.destroyApp(arg0);
- }
-}
Modified: me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java
===================================================================
--- me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java 2021-12-28 19:55:55 UTC (rev 2625)
+++ me4se/opt/swingme/src/net/yura/me4se/ME4SEPanel.java 2021-12-28 20:08:00 UTC (rev 2626)
@@ -43,7 +43,7 @@
manager = ApplicationManager.createInstance(this, null );
JadFile jad = new JadFile();
- jad.setValue("MIDlet-1", ",," + EmptyMidlet.class.getName());
+ jad.setValue("MIDlet-1", ",," + SingleFrameApplication.class.getName());
manager.launch(jad, 0);
desktop = DesktopPane.getDesktopPane();
@@ -68,11 +68,11 @@
}
public void destroy() {
- // can not use this as causes System.exit in all events
- // manager.destroy(true, false); // true will cause System.exit
-
+ // can not use this as causes System.exit in all events
+ // manager.destroy(true, false); // true will cause System.exit
+
+ // TODO: in case we are still processing an event in swingme world, we want to let that finish before we kill everything
try {
-
Field man = ApplicationManager.class.getDeclaredField("manager");
man.setAccessible(true);
if (man.get(null) == manager) {
@@ -84,7 +84,7 @@
oldManager = null;
}
- ((EmptyMidlet)manager.active).destroyApp(true); // this will set desktop to null
+ ((SingleFrameApplication)manager.active).destroyApp(true); // this will set desktop to null
if (oldDesktop != null) {
oldDesktop.showNotify();
Copied: me4se/opt/swingme/src/net/yura/me4se/SingleFrameApplication.java (from rev 2625, me4se/opt/swingme/src/net/yura/me4se/EmptyMidlet.java)
===================================================================
--- me4se/opt/swingme/src/net/yura/me4se/SingleFrameApplication.java (rev 0)
+++ me4se/opt/swingme/src/net/yura/me4se/SingleFrameApplication.java 2021-12-28 20:08:00 UTC (rev 2626)
@@ -0,0 +1,23 @@
+package net.yura.me4se;
+
+import javax.microedition.midlet.MIDletStateChangeException;
+import net.yura.mobile.gui.DesktopPane;
+import net.yura.mobile.gui.Midlet;
+
+/**
+ * @author Yura Mamyrin
+ * @see org.jdesktop.application.SingleFrameApplication
+ */
+public class SingleFrameApplication extends Midlet {
+
+// ME4SEPanel parent;
+// public ME4SEPanel getParent() {
+// return parent;
+// }
+
+ protected void initialize(DesktopPane dp) { }
+
+ public void destroyApp(boolean arg0) throws MIDletStateChangeException {
+ super.destroyApp(arg0);
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-28 19:55:58
|
Revision: 2625
http://sourceforge.net/p/swingme/code/2625
Author: yuranet
Date: 2021-12-28 19:55:55 +0000 (Tue, 28 Dec 2021)
Log Message:
-----------
fileSystemView class added
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/FileChooser.java
SwingME/src/net/yura/mobile/io/FileUtil.java
Modified: SwingME/src/net/yura/mobile/gui/components/FileChooser.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/FileChooser.java 2021-12-26 18:07:35 UTC (rev 2624)
+++ SwingME/src/net/yura/mobile/gui/components/FileChooser.java 2021-12-28 19:55:55 UTC (rev 2625)
@@ -19,10 +19,8 @@
import java.lang.ref.WeakReference;
import java.util.Enumeration;
import java.util.Vector;
-
import javax.microedition.lcdui.Graphics;
import javax.microedition.lcdui.Image;
-
import net.yura.mobile.gui.ActionListener;
import net.yura.mobile.gui.ButtonGroup;
import net.yura.mobile.gui.DesktopPane;
@@ -49,12 +47,17 @@
*/
public static final String NO_FILE_SELECTED = "no_file_selected";
+ /**
+ * @see javax.swing.JFileChooser#getFileSystemView()
+ */
+ private FileUtil fileSystemView;
+
private SelectableFileRenderer thumbOptionRenderer;
private List fileList;
private GridList fileTable;
private ActionListener actionListener;
private String action;
- private String dir = FileUtil.ROOT_PREX;
+ private String dir;
private int filter = FileUtil.TYPE_ALL;
private boolean multiSelect;
// private boolean useGridView;
@@ -73,7 +76,16 @@
* @see javax.swing.JFileChooser#JFileChooser() JFileChooser.JFileChooser
*/
public FileChooser() {
+ this(new FileUtil());
+ }
+ /**
+ * @see javax.swing.JFileChooser#JFileChooser(javax.swing.filechooser.FileSystemView fsv)
+ */
+ public FileChooser(FileUtil fileSystemView) {
+ this.fileSystemView = fileSystemView;
+ dir = fileSystemView.getRoots();
+
//setActionListener(this);
setName("Dialog");
@@ -340,7 +352,7 @@
if (files.isEmpty()) {
requestImage.removeAllElements();
- Vector fileNames = FileUtil.listFiles(dir, filter, showNew.isSelected());
+ Vector fileNames = fileSystemView.listFiles(dir, filter, showNew.isSelected());
for (int c = 0; c < fileNames.size(); c++) {
Modified: SwingME/src/net/yura/mobile/io/FileUtil.java
===================================================================
--- SwingME/src/net/yura/mobile/io/FileUtil.java 2021-12-26 18:07:35 UTC (rev 2624)
+++ SwingME/src/net/yura/mobile/io/FileUtil.java 2021-12-28 19:55:55 UTC (rev 2625)
@@ -1,7 +1,5 @@
package net.yura.mobile.io;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -13,6 +11,9 @@
import javax.microedition.io.file.FileSystemRegistry;
import net.yura.mobile.logging.Logger;
+/**
+ * @see javax.swing.filechooser.FileSystemView
+ */
public class FileUtil {
// TODO why would we care about files made in the last 30 seconds???
@@ -32,32 +33,22 @@
{"AMR","MP3","MP4","AAC","WMA","WAV","MID","MIDI","M4A"},
{"3GP"},};
-
- public static void close(Object fc) {
- if( fc != null ) {
- try {
- if (fc instanceof Connection) {
- ((Connection)fc).close();
- }
- else if (fc instanceof InputStream) {
- ((InputStream)fc).close();
- }
- else if (fc instanceof OutputStream) {
- ((OutputStream)fc).close();
- }
- else {
- throw new RuntimeException();
- }
- }
- catch(IOException ioe) {
- //#debug info
- Logger.info("cant close " + fc, ioe);
- }
- }
+ /**
+ * @return {@link #ROOT_PREX}
+ * @see javax.swing.filechooser.FileSystemView#getRoots()
+ */
+ public String getRoots() {
+ return FileUtil.ROOT_PREX;
}
- public static Vector listFiles(String dir,int filter,boolean recent) {
-
+ /**
+ * @param dir the folder6
+ * @param filter can be any of {@link #TYPE_ALL} {@link #TYPE_FOLDER} {@link #TYPE_PICTURE} etc
+ * @param recent files made in the last {@link #RECENT_PICTURE_TIME_INTERVAL} milliseconds
+ * @return Vector of Strings
+ * @see javax.swing.filechooser.FileSystemView#getFiles(java.io.File, boolean)
+ */
+ public Vector listFiles(String dir, int filter, boolean recent) {
Vector files = new Vector();
try {
@@ -80,7 +71,7 @@
for (Enumeration enu = fc.list(
//#debug debug
"*",true
- ); enu.hasMoreElements();) {
+ ); enu.hasMoreElements();) {
String fname = (String) enu.nextElement();
//filter item from file type
if ( isFileType(fname, TYPE_FOLDER) ) {
@@ -98,15 +89,36 @@
}
}
}
-
}
catch(Exception ex) {
- //#debug debug
- Logger.warn("error moving dir", ex);
+ //#debug debug
+ Logger.warn("error moving dir", ex);
}
return files;
+ }
+ public static void close(Object fc) {
+ if( fc != null ) {
+ try {
+ if (fc instanceof Connection) {
+ ((Connection)fc).close();
+ }
+ else if (fc instanceof InputStream) {
+ ((InputStream)fc).close();
+ }
+ else if (fc instanceof OutputStream) {
+ ((OutputStream)fc).close();
+ }
+ else {
+ throw new RuntimeException();
+ }
+ }
+ catch(IOException ioe) {
+ //#debug info
+ Logger.info("cant close " + fc, ioe);
+ }
+ }
}
public static int getFileType(String fname) {
@@ -555,5 +567,4 @@
Logger.warn("copy error " + source + " " + destination, e);
}
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-26 18:07:38
|
Revision: 2624
http://sourceforge.net/p/swingme/code/2624
Author: yuranet
Date: 2021-12-26 18:07:35 +0000 (Sun, 26 Dec 2021)
Log Message:
-----------
pulled out toLocale to its own method
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 2021-12-26 03:40:18 UTC (rev 2623)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-12-26 18:07:35 UTC (rev 2624)
@@ -156,10 +156,7 @@
System.out.println("App temp folder " + System.getProperty("java.io.tmpdir"));
// workaround for bug: https://github.com/multi-os-engine/multi-os-engine/issues/82
- NSLocale iOSlocale = NSLocale.currentLocale();
- String locale = iOSlocale.localeIdentifier();
- Locale javaLocale = Locale.forLanguageTag(locale.replace('_','-'));
- Locale.setDefault(javaLocale);
+ Locale.setDefault(iOSUtil.toLocale(NSLocale.currentLocale()));
}
private void startSwingMEApp(String className) {
Modified: iOSME/src/net/yura/ios/iOSUtil.java
===================================================================
--- iOSME/src/net/yura/ios/iOSUtil.java 2021-12-26 03:40:18 UTC (rev 2623)
+++ iOSME/src/net/yura/ios/iOSUtil.java 2021-12-26 18:07:35 UTC (rev 2624)
@@ -1,10 +1,12 @@
package net.yura.ios;
import java.util.Arrays;
+import java.util.Locale;
import java.util.Map;
import apple.foundation.NSArray;
import apple.foundation.NSData;
import apple.foundation.NSDictionary;
+import apple.foundation.NSLocale;
import apple.foundation.NSMutableDictionary;
public class iOSUtil {
@@ -39,4 +41,19 @@
return (NSArray<T>)NSArray.arrayWithObjects(items[0], (Object[]) others);
}
}
+
+ public static Locale toLocale(NSLocale iOSlocale) {
+/* test locale conversion method is actually correct
+ java.util.List<String> iosLocales = NSLocale.availableLocaleIdentifiers();
+ java.util.List<Locale> javaLocales = Arrays.asList(Locale.getAvailableLocales());
+ for (String locale : iosLocales) {
+ Locale test = Locale.forLanguageTag(locale.replace('_','-'));
+ if (!javaLocales.contains(test)) {
+ throw new RuntimeException("fail for " + locale);
+ }
+ }
+*/
+ String locale = iOSlocale.localeIdentifier();
+ return Locale.forLanguageTag(locale.replace('_','-'));
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-26 03:40:20
|
Revision: 2623
http://sourceforge.net/p/swingme/code/2623
Author: yuranet
Date: 2021-12-26 03:40:18 +0000 (Sun, 26 Dec 2021)
Log Message:
-----------
workaround for locale not working
Modified Paths:
--------------
iOSME/src/net/yura/ios/SwingMEiOSApplication.java
Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-12-26 02:52:13 UTC (rev 2622)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-12-26 03:40:18 UTC (rev 2623)
@@ -8,6 +8,7 @@
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;
import apple.foundation.NSArray;
@@ -16,6 +17,7 @@
import apple.foundation.NSData;
import apple.foundation.NSDictionary;
import apple.foundation.NSError;
+import apple.foundation.NSLocale;
import apple.foundation.NSProcessInfo;
import apple.foundation.c.Foundation;
import apple.foundation.enums.NSSearchPathDirectory;
@@ -152,6 +154,12 @@
System.out.println("Running app from " + mainBundle.resourcePath());
System.out.println("App data folder " + System.getProperty("user.home"));
System.out.println("App temp folder " + System.getProperty("java.io.tmpdir"));
+
+ // workaround for bug: https://github.com/multi-os-engine/multi-os-engine/issues/82
+ NSLocale iOSlocale = NSLocale.currentLocale();
+ String locale = iOSlocale.localeIdentifier();
+ Locale javaLocale = Locale.forLanguageTag(locale.replace('_','-'));
+ Locale.setDefault(javaLocale);
}
private void startSwingMEApp(String className) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-26 02:52:15
|
Revision: 2622
http://sourceforge.net/p/swingme/code/2622
Author: yuranet
Date: 2021-12-26 02:52:13 +0000 (Sun, 26 Dec 2021)
Log Message:
-----------
fix buttons not working when textbox is focused
Modified Paths:
--------------
iOSME/src/net/yura/ios/AppController.java
iOSME/src/net/yura/ios/CanvasView.java
iOSME/src/net/yura/ios/NativeTextEntry.java
Modified: iOSME/src/net/yura/ios/AppController.java
===================================================================
--- iOSME/src/net/yura/ios/AppController.java 2021-12-26 02:34:15 UTC (rev 2621)
+++ iOSME/src/net/yura/ios/AppController.java 2021-12-26 02:52:13 UTC (rev 2622)
@@ -7,15 +7,11 @@
import javax.microedition.lcdui.Display;
import javax.microedition.lcdui.Displayable;
import javax.microedition.midlet.MIDlet;
-import apple.foundation.NSArray;
import apple.foundation.NSCoder;
-import apple.foundation.NSDictionary;
import apple.foundation.NSNotification;
import apple.foundation.NSNotificationCenter;
import apple.foundation.NSValue;
-import apple.uikit.NSLayoutConstraint;
import apple.uikit.UIApplication;
-import apple.uikit.UIColor;
import apple.uikit.UIView;
import apple.uikit.UIViewController;
import apple.uikit.c.UIKit;
Modified: iOSME/src/net/yura/ios/CanvasView.java
===================================================================
--- iOSME/src/net/yura/ios/CanvasView.java 2021-12-26 02:34:15 UTC (rev 2621)
+++ iOSME/src/net/yura/ios/CanvasView.java 2021-12-26 02:52:13 UTC (rev 2622)
@@ -158,6 +158,11 @@
//System.out.println("firePointerReleased(2) " + (int) point.x() + " " + (int) point.y());
canvas.firePointerReleased((int) point.x(), (int) point.y());
+
+ // we only want to hide the keyboard if the user has clicked on something that is not a text field
+ if (textField != null && !textField.isFocusOwner()) {
+ TextComponent.closeNativeEditor();
+ }
}
private TextComponent textField;
Modified: iOSME/src/net/yura/ios/NativeTextEntry.java
===================================================================
--- iOSME/src/net/yura/ios/NativeTextEntry.java 2021-12-26 02:34:15 UTC (rev 2621)
+++ iOSME/src/net/yura/ios/NativeTextEntry.java 2021-12-26 02:52:13 UTC (rev 2622)
@@ -3,7 +3,6 @@
import net.yura.mobile.gui.ChangeListener;
import net.yura.mobile.gui.components.Component;
import net.yura.mobile.gui.components.TextComponent;
-import javax.microedition.lcdui.TextBox;
import javax.microedition.lcdui.TextField;
import apple.uikit.enums.UIKeyboardType;
import apple.uikit.enums.UITextAutocapitalizationType;
@@ -10,6 +9,10 @@
public class NativeTextEntry {
+ /**
+ * @see net.yura.android.NativeAndroidTextField#starter
+ * @see net.yura.android.NativeAndroidTextField#init()
+ */
public static void init() {
TextComponent.STAR = '\u2022'; // Bullet
@@ -19,9 +22,14 @@
if (num == Component.FOCUS_GAINED) {
((TextComponent)source).openNativeEditor();
}
- else if (num == Component.FOCUS_LOST) {
- TextComponent.closeNativeEditor();
- }
+ // on android when focus is lost is ONLY removes the native component overlay, and does NOT hide the keyboard, back button is used for hiding the keyboard
+ //else if (num == Component.FOCUS_LOST) {
+ // this is too early to hide the keyboard, there may we more events to process and we may have clicked a new text component anyway
+ // instead we do a check in the pointer released after the event has been handled to check if a text component is focused
+ // if we try and hide the keyboard while the user is trying to click a button,
+ // the resize will happen in the middle of the click clearing the pointerComponent component, and the release event will never arrive to it
+ //TextComponent.closeNativeEditor();
+ //}
}
};
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-26 02:34:17
|
Revision: 2621
http://sourceforge.net/p/swingme/code/2621
Author: yuranet
Date: 2021-12-26 02:34:15 +0000 (Sun, 26 Dec 2021)
Log Message:
-----------
text popup menu is horizontal
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/List.java
SwingME/src/net/yura/mobile/gui/components/TextComponent.java
Modified: SwingME/src/net/yura/mobile/gui/components/List.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/List.java 2021-12-25 01:00:52 UTC (rev 2620)
+++ SwingME/src/net/yura/mobile/gui/components/List.java 2021-12-26 02:34:15 UTC (rev 2621)
@@ -232,6 +232,7 @@
}
/**
+ * @param layoutOrientation can be {@link #VERTICAL} or {@link #HORIZONTAL}
* @see javax.swing.JList#setLayoutOrientation(int) JList.setLayoutOrientation
*/
public void setLayoutOrientation(int layoutOrientation) {
Modified: SwingME/src/net/yura/mobile/gui/components/TextComponent.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TextComponent.java 2021-12-25 01:00:52 UTC (rev 2620)
+++ SwingME/src/net/yura/mobile/gui/components/TextComponent.java 2021-12-26 02:34:15 UTC (rev 2621)
@@ -913,6 +913,11 @@
Window popup = Menu.makePopup();
MenuBar menu = Menu.getPopupMenu(popup);
+
+ if (Midlet.getPlatform() == Midlet.PLATFORM_IOS || Midlet.getPlatform() == Midlet.PLATFORM_ANDROID) {
+ menu.setLayoutOrientation(List.HORIZONTAL);
+ }
+
menu.add(cut);
menu.add(copy);
menu.add(paste);
@@ -940,5 +945,4 @@
return super.toString()+"["+text+"]";
}
//#enddebug
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-25 01:00:56
|
Revision: 2620
http://sourceforge.net/p/swingme/code/2620
Author: yuranet
Date: 2021-12-25 01:00:52 +0000 (Sat, 25 Dec 2021)
Log Message:
-----------
call destroyApp when we should
Modified Paths:
--------------
iOSME/src/net/yura/ios/SwingMEiOSApplication.java
Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-12-25 00:51:29 UTC (rev 2619)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-12-25 01:00:52 UTC (rev 2620)
@@ -193,6 +193,19 @@
}
@Override
+ public void applicationWillTerminate(UIApplication application) {
+ MIDlet midlet = MIDlet.DEFAULT_MIDLET;
+ if (midlet != null) {
+ try {
+ midlet.doDestroyApp(true);
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
+
+ @Override
public boolean applicationShouldSaveSecureApplicationState(UIApplication application, NSCoder coder) {
return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-25 00:51:31
|
Revision: 2619
http://sourceforge.net/p/swingme/code/2619
Author: yuranet
Date: 2021-12-25 00:51:29 +0000 (Sat, 25 Dec 2021)
Log Message:
-----------
more correct method call sequence
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/Midlet.java
Modified: SwingME/src/net/yura/mobile/gui/Midlet.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/Midlet.java 2021-12-25 00:25:40 UTC (rev 2618)
+++ SwingME/src/net/yura/mobile/gui/Midlet.java 2021-12-25 00:51:29 UTC (rev 2619)
@@ -120,13 +120,7 @@
* @param unconditional - If true when this method is called, the MIDlet must cleanup and release all resources. If false the MIDlet may throw
*/
protected void destroyApp(boolean unconditional) throws MIDletStateChangeException {
-
rootpane.kill();
-
- // YURA: this means send app to background, we do not want to do this here
- //Display.getDisplay(this).setCurrent((Displayable)null);
-
- notifyDestroyed();
}
/**
@@ -137,7 +131,9 @@
*/
public static void exit() {
try {
- getMidlet().destroyApp(false);
+ Midlet midlet = getMidlet();
+ midlet.destroyApp(false);
+ midlet.notifyDestroyed();
}
catch (Exception ex) {
// as you called this yourself, you should not be throwing here
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-25 00:25:42
|
Revision: 2618
http://sourceforge.net/p/swingme/code/2618
Author: yuranet
Date: 2021-12-25 00:25:40 +0000 (Sat, 25 Dec 2021)
Log Message:
-----------
javadoc update
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/DesktopPane.java
SwingME/src/net/yura/mobile/gui/Midlet.java
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2021-12-25 00:11:10 UTC (rev 2617)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2021-12-25 00:25:40 UTC (rev 2618)
@@ -357,7 +357,6 @@
if (desktop==this) {
desktop = null;
}
-
}
/**
Modified: SwingME/src/net/yura/mobile/gui/Midlet.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/Midlet.java 2021-12-25 00:11:10 UTC (rev 2617)
+++ SwingME/src/net/yura/mobile/gui/Midlet.java 2021-12-25 00:25:40 UTC (rev 2618)
@@ -116,6 +116,8 @@
/**
* @see org.jdesktop.application.Application#exit(java.util.EventObject)
+ * @see org.jdesktop.application.Application#shutdown()
+ * @param unconditional - If true when this method is called, the MIDlet must cleanup and release all resources. If false the MIDlet may throw
*/
protected void destroyApp(boolean unconditional) throws MIDletStateChangeException {
@@ -131,11 +133,11 @@
* Gracefully shutdown the application, calls destroyApp(true)
*
* @see java.lang.System#exit(int) System.exit
- * @see org/.desktop.application.Application#end()
+ * @see org.jdesktop.application.Application#exit()
*/
public static void exit() {
try {
- getMidlet().destroyApp(true);
+ getMidlet().destroyApp(false);
}
catch (Exception ex) {
// as you called this yourself, you should not be throwing here
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-25 00:11:12
|
Revision: 2617
http://sourceforge.net/p/swingme/code/2617
Author: yuranet
Date: 2021-12-25 00:11:10 +0000 (Sat, 25 Dec 2021)
Log Message:
-----------
do not CHANGE_PRIORITY on ios
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/Midlet.java
Modified: SwingME/src/net/yura/mobile/gui/Midlet.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/Midlet.java 2021-12-23 16:35:23 UTC (rev 2616)
+++ SwingME/src/net/yura/mobile/gui/Midlet.java 2021-12-25 00:11:10 UTC (rev 2617)
@@ -14,17 +14,14 @@
* You should have received a copy of the GNU Lesser General Public License
* along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
*/
-
package net.yura.mobile.gui;
import java.io.InputStream;
import java.util.Hashtable;
-
import javax.microedition.lcdui.Display;
import javax.microedition.lcdui.Image;
import javax.microedition.midlet.MIDlet;
import javax.microedition.midlet.MIDletStateChangeException;
-
import net.yura.mobile.logging.DesktopLogger;
import net.yura.mobile.logging.Logger;
import net.yura.mobile.util.QueueProcessorThread;
@@ -32,6 +29,7 @@
/**
* @author Yura Mamyrin
+ * @see org.jdesktop.application.Application
*/
public abstract class Midlet extends MIDlet {
@@ -54,7 +52,7 @@
//#mdebug info
static {
// on me4se we do not care about the popup as we have the console anyway
- if (getPlatform()!=PLATFORM_ME4SE) {
+ if (getPlatform() != PLATFORM_ME4SE) {
Logger.setLogger( new DesktopLogger(Logger.WARN) );
}
}
@@ -67,10 +65,14 @@
// Changing thread priority should only be done in platforms
// were actually improve performance.
- QueueProcessorThread.CHANGE_PRIORITY = !((Midlet.getPlatform() == Midlet.PLATFORM_ANDROID || Midlet.getPlatform() == Midlet.PLATFORM_BLACKBERRY));
+ QueueProcessorThread.CHANGE_PRIORITY =
+ Midlet.getPlatform() != Midlet.PLATFORM_IOS &&
+ Midlet.getPlatform() != Midlet.PLATFORM_ME4SE &&
+ Midlet.getPlatform() != Midlet.PLATFORM_ANDROID &&
+ Midlet.getPlatform() != Midlet.PLATFORM_BLACKBERRY;
rootpane = makeNewRootPane();
-
+
// now we set this as the main display
Display.getDisplay(this).setCurrent(rootpane);
@@ -78,11 +80,26 @@
// this will then kick of the run method of this class
// and that will in tern call initialise of the midlet
rootpane.repaint();
+ }
+ /**
+ * @see org.jdesktop.application.Application#getInstance()
+ */
+ public static Midlet getMidlet() {
+ DesktopPane dp = DesktopPane.getDesktopPane();
+ // dp can be null if the app is in the process of shutting down.
+ return dp == null ? null : dp.midlet;
}
+
/**
- * THIS METHOD WILL MAKE A NEW ROOTPANE
- * but nothing can be set up here as things like getHeight wont work
+ * This method should only be used to config the splash screen
+ * nothing else can be set up here as things like getHeight wont work
+ *
+ * Responsible for initializations that must occur before the GUI is constructed by {@link #initialize(DesktopPane)}.
+ *
+ * @see org.jdesktop.application.Application#initialize(java.lang.String[])
+ *
+ * @return THIS METHOD WILL MAKE A NEW ROOTPANE
*/
protected DesktopPane makeNewRootPane() {
return new DesktopPane(this, 0xFF000000, null);
@@ -89,12 +106,18 @@
}
/**
- * this will set up everything needed to start the
- * app like the size and stuff
+ * this will set up everything needed to start the app like the size and stuff
+ *
+ * Responsible for starting the application; for creating and showing the initial GUI.
+ *
+ * @see org.jdesktop.application.Application#startup()
*/
protected abstract void initialize(DesktopPane rootpane);
- protected void destroyApp(boolean arg0) throws MIDletStateChangeException {
+ /**
+ * @see org.jdesktop.application.Application#exit(java.util.EventObject)
+ */
+ protected void destroyApp(boolean unconditional) throws MIDletStateChangeException {
rootpane.kill();
@@ -102,20 +125,86 @@
//Display.getDisplay(this).setCurrent((Displayable)null);
notifyDestroyed();
+ }
+ /**
+ * Gracefully shutdown the application, calls destroyApp(true)
+ *
+ * @see java.lang.System#exit(int) System.exit
+ * @see org/.desktop.application.Application#end()
+ */
+ public static void exit() {
+ try {
+ getMidlet().destroyApp(true);
+ }
+ catch (Exception ex) {
+ // as you called this yourself, you should not be throwing here
+ Logger.warn(null, ex);
+ throw new RuntimeException();
+ }
}
+ /**
+ * frame.setState(Frame.ICONIFIED);
+ * frame.setExtendedState(JFrame.ICONIFIED);
+ * @see java.awt.Frame#ICONIFIED
+ */
+ public static void hide() {
+ Display.getDisplay(getMidlet()).setCurrent(null);
+ }
+ /**
+ * called when app is paused
+ */
protected void pauseApp() {
- // TODO
//Logger.debug("pauseApp");
}
+ /**
+ * called when comes out of pause
+ */
protected void startApp() {
- // TODO come out of pause
//Logger.debug("startApp");
}
+ public static void call(String number) {
+ try {
+ // TODO remove spaces from number
+ getMidlet().platformRequest("tel:" + number);
+ }
+ catch (Exception e) {
+ //#debug warn
+ Logger.warn("can not call: " + number, e);
+ }
+ }
+
+ public static void openURL(String url) {
+ try {
+ Midlet midlet = getMidlet();
+ // midlet is null if the app is shutting down
+ if (midlet != null) {
+ midlet.platformRequest(url);
+ }
+ }
+ catch (Exception e) {
+ //#debug warn
+ Logger.warn("can not open url: " + url, e);
+ }
+ }
+
+ public static void vibration(int duration) {
+ try {
+ Display.getDisplay(getMidlet()).vibrate(duration);
+ }
+ catch (Exception e) {
+ //#debug warn
+ Logger.warn("can not vibration", e);
+ }
+ }
+
+ /**
+ * @see org.jdesktop.application.Application#isMacOSX()
+ */
public static int getPlatform() {
return platform;
}
@@ -132,11 +221,6 @@
return PLATFORM_ME4SE;
}
- String currentPlatform = System.getProperty("microedition.platform");
- if (currentPlatform == null) {
- currentPlatform = ""; // Avoid null pointer exceptions
- }
-
// detect ios before android as it has a few android classes in it
if (hasClass("apple.uikit.UIView")) {
return PLATFORM_IOS;
@@ -147,6 +231,11 @@
return PLATFORM_ANDROID;
}
+ String currentPlatform = System.getProperty("microedition.platform");
+ if (currentPlatform == null) {
+ currentPlatform = ""; // Avoid null pointer exceptions
+ }
+
// detecting NOKIA
if (currentPlatform.indexOf("Nokia") >= 0) {
// detecting S40 vs S60
@@ -208,105 +297,11 @@
}
}
-
//,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,
- //==== platform Requests ===================================================
+ //==== Resources ===========================================================
//\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0
- public static Midlet getMidlet() {
- DesktopPane dp = DesktopPane.getDesktopPane();
- // dp can be null if the app is in the process of shutting down.
- return dp == null ? null : dp.midlet;
- }
-
- // This will only be called on Android.
- public void platformRequestForResult(String url, Object arg, int requestCode) {
- Url u = new Url(url);
- u.addQueryParameter("requestCode", String.valueOf(requestCode));
- platformRequest(u.toString(), arg);
- }
-
- // This will only be called on Android.
- public void platformRequest(String url, Object arg) {
- try {
- if (platformReqParams == null) {
- platformReqParams = new Hashtable();
- }
-
- if (arg != null) {
- platformReqParams.put(url, arg);
- }
-
- platformRequest(url);
- }
- catch (Exception e) {
- Logger.warn("cant make request " + url + " " + arg, e);
- throw new RuntimeException(e.toString());
- }
- }
-
- // This will only be called on Android. By the "Android" side
- public Object retrievePlatformRequestParam(String url) {
- Object res = platformReqParams.remove(url);
- return res;
- }
-
- public static void call(String number) {
- try {
- // TODO remove spaces from number
- getMidlet().platformRequest("tel:" + number);
- }
- catch (Exception e) {
- //#debug warn
- Logger.warn("can not call: " + number, e);
- }
-
- }
-
- public static void openURL(String url) {
- try {
- Midlet midlet = getMidlet();
- // midlet is null if the app is shutting down
- if (midlet != null) {
- midlet.platformRequest(url);
- }
- }
- catch (Exception e) {
- //#debug warn
- Logger.warn("can not open url: " + url, e);
- }
-
- }
-
- public static void vibration(int duration) {
- try {
- Display.getDisplay(getMidlet()).vibrate(duration);
- }
- catch (Exception e) {
- //#debug warn
- Logger.warn("can not vibration", e);
- }
- }
-
/**
- * @see java.lang.System#exit(int) System.exit
- */
- public static void exit() {
- try {
- getMidlet().destroyApp(true);
- }
- catch (Exception ex) {
- // as you called this yourself, you should not be throwing here
- Logger.warn(null, ex);
- throw new RuntimeException();
- }
- }
-
- public static void hide() {
- Display.getDisplay(getMidlet()).setCurrent(null);
- }
-
- /**
* name MUST start with a "/"
* @see java.lang.Class#getResourceAsStream(java.lang.String) Class.getResourceAsStream
*/
@@ -360,9 +355,9 @@
* and if it finds it, tries to load the resource from that folder
*/
protected InputStream getResourceAsStreamImpl(String name) {
- if (resdir!=null) {
- InputStream is = Midlet.class.getResourceAsStream(resdir+name);
- if (is!=null) {
+ if (resdir != null) {
+ InputStream is = Midlet.class.getResourceAsStream(resdir + name);
+ if (is != null) {
return is;
}
}
@@ -369,6 +364,42 @@
return null;
}
+ //,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,
+ //==== platform Requests ===================================================
+ //\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0
+
+ // This will only be called on Android.
+ public void platformRequestForResult(String url, Object arg, int requestCode) {
+ Url u = new Url(url);
+ u.addQueryParameter("requestCode", String.valueOf(requestCode));
+ platformRequest(u.toString(), arg);
+ }
+
+ // This will only be called on Android.
+ public void platformRequest(String url, Object arg) {
+ try {
+ if (platformReqParams == null) {
+ platformReqParams = new Hashtable();
+ }
+
+ if (arg != null) {
+ platformReqParams.put(url, arg);
+ }
+
+ platformRequest(url);
+ }
+ catch (Exception e) {
+ Logger.warn("cant make request " + url + " " + arg, e);
+ throw new RuntimeException(e.toString());
+ }
+ }
+
+ // This will only be called on Android. By the "Android" side
+ public Object retrievePlatformRequestParam(String url) {
+ Object res = platformReqParams.remove(url);
+ return res;
+ }
+
public void onResult(int requestCode, int resultCode, Object obj) { }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-23 16:35:25
|
Revision: 2616
http://sourceforge.net/p/swingme/code/2616
Author: yuranet
Date: 2021-12-23 16:35:23 +0000 (Thu, 23 Dec 2021)
Log Message:
-----------
javadoc update
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Canvas.java
Modified: iOSME/src/javax/microedition/lcdui/Canvas.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Canvas.java 2021-12-23 14:29:26 UTC (rev 2615)
+++ iOSME/src/javax/microedition/lcdui/Canvas.java 2021-12-23 16:35:23 UTC (rev 2616)
@@ -44,9 +44,12 @@
}
- public void setFullScreenMode(boolean fullScreen) {
- // do nothing, is this possible on ios?
- }
+ /**
+ * This is always called in SwimgME apps with true
+ * on old devices this used to hide the system soft keys
+ * but now this method will always do nothing as soft keys are never used
+ */
+ public void setFullScreenMode(boolean ignored) { }
public int getGameAction(int keyCode) {
int res;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-23 14:29:28
|
Revision: 2615
http://sourceforge.net/p/swingme/code/2615
Author: yuranet
Date: 2021-12-23 14:29:26 +0000 (Thu, 23 Dec 2021)
Log Message:
-----------
fix for status bar color on new devices
Modified Paths:
--------------
iOSME/src/net/yura/ios/AppController.java
Modified: iOSME/src/net/yura/ios/AppController.java
===================================================================
--- iOSME/src/net/yura/ios/AppController.java 2021-12-23 12:56:38 UTC (rev 2614)
+++ iOSME/src/net/yura/ios/AppController.java 2021-12-23 14:29:26 UTC (rev 2615)
@@ -71,7 +71,8 @@
@Override
public long preferredStatusBarStyle() {
- return UIStatusBarStyle.BlackOpaque;
+ // BlackOpaque is Deprecated and does not work on new devices
+ return UIStatusBarStyle.LightContent;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-23 12:56:41
|
Revision: 2614
http://sourceforge.net/p/swingme/code/2614
Author: yuranet
Date: 2021-12-23 12:56:38 +0000 (Thu, 23 Dec 2021)
Log Message:
-----------
better error message for framework missing
Modified Paths:
--------------
iOSME/src/javax/microedition/midlet/MIDlet.java
Modified: iOSME/src/javax/microedition/midlet/MIDlet.java
===================================================================
--- iOSME/src/javax/microedition/midlet/MIDlet.java 2021-12-22 23:16:22 UTC (rev 2613)
+++ iOSME/src/javax/microedition/midlet/MIDlet.java 2021-12-23 12:56:38 UTC (rev 2614)
@@ -295,7 +295,9 @@
}
catch (Throwable e) {
// /Users/noisyfox/Documents/project/moe/moe/natj/natj/src/main/native/natj/ObjCRuntime.mm:1480 WARNING: Binding class refers to class MFMailComposeViewController, but it can not be found. Fallback to indirect super class.
- System.out.println("canSendMail fail: " + e);
+ // https://github.com/multi-os-engine/multi-os-engine/issues/153
+ // Make sure you have MessageUI.framework added
+ System.err.println("Make sure you have MessageUI.framework added to your xcode project! " + e);
return false;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-22 23:16:25
|
Revision: 2613
http://sourceforge.net/p/swingme/code/2613
Author: yuranet
Date: 2021-12-22 23:16:22 +0000 (Wed, 22 Dec 2021)
Log Message:
-----------
can also try other method for sending file
Modified Paths:
--------------
iOSME/src/javax/microedition/midlet/MIDlet.java
Modified: iOSME/src/javax/microedition/midlet/MIDlet.java
===================================================================
--- iOSME/src/javax/microedition/midlet/MIDlet.java 2021-12-22 20:13:35 UTC (rev 2612)
+++ iOSME/src/javax/microedition/midlet/MIDlet.java 2021-12-22 23:16:22 UTC (rev 2613)
@@ -19,6 +19,7 @@
import apple.foundation.NSURLComponents;
import apple.messageui.MFMailComposeViewController;
import apple.messageui.protocol.MFMailComposeViewControllerDelegate;
+import apple.uikit.UIActivityViewController;
import apple.uikit.UIApplication;
import apple.uikit.UINavigationController;
import apple.uikit.UIPasteboard;
@@ -193,71 +194,82 @@
}
else if (url.startsWith("mailto:") && containsQueryParameter(url, "attachment")) {
- if (!MFMailComposeViewController.canSendMail()) {
- throw new IllegalStateException("can not send mail");
- }
-
- MFMailComposeViewController mailViewController = MFMailComposeViewController.alloc().init();
-
- mailViewController.setMailComposeDelegate(new MFMailComposeViewControllerDelegate() {
- @Override
- public void mailComposeControllerDidFinishWithResultError(MFMailComposeViewController controller, long result, NSError error) {
- controller.dismissViewControllerAnimatedCompletion(true, null);
- }
- });
-
// swingme Url does not support mailto
NSURLComponents urlComponents = NSURLComponents.componentsWithString(url);
String email = urlComponents.path();
- if (email != null && !"".equals(email)) {
- mailViewController.setToRecipients(iOSUtil.arrayWithObjects(email));
- }
-
// we do not use NSURLComponents.queryItems here as that will not decode + and " "
// https://www.djackson.org/why-we-do-not-use-urlcomponents/
Map<String, String> query = Url.toHashtable(urlComponents.query());
- for (Map.Entry<String, String> queryItem : query.entrySet()) {
- String key = queryItem.getKey();
- String value = queryItem.getValue();
- if ("subject".equals(key)) {
- mailViewController.setSubject(value);
+
+ UINavigationController rootViewController = (UINavigationController) UIApplication.sharedApplication().keyWindow().rootViewController();
+
+ // TODO this is not good enough, sometimes it returns true even when the apple Mail app is not installed and can not send this way (e.g. iPhone mini)
+ if (canSendMail()) {
+ MFMailComposeViewController mailViewController = MFMailComposeViewController.alloc().init();
+
+ mailViewController.setMailComposeDelegate(new MFMailComposeViewControllerDelegate() {
+ @Override
+ public void mailComposeControllerDidFinishWithResultError(MFMailComposeViewController controller, long result, NSError error) {
+ controller.dismissViewControllerAnimatedCompletion(true, null);
+ }
+ });
+
+ if (email != null && !"".equals(email)) {
+ mailViewController.setToRecipients(iOSUtil.arrayWithObjects(email));
}
- else if ("body".equals(key)) {
- mailViewController.setMessageBodyIsHTML(value, false);
- }
- else if ("to".equals(key)) {
- String[] tos = value.split(",");
- if (email != null && !"".equals(email)) {
- mailViewController.setToRecipients((NSArray<String>)NSArray.arrayWithObjects(email, (Object[]) tos));
+
+ for (Map.Entry<String, String> queryItem : query.entrySet()) {
+ String key = queryItem.getKey();
+ String value = queryItem.getValue();
+ if ("subject".equals(key)) {
+ mailViewController.setSubject(value);
}
+ else if ("body".equals(key)) {
+ mailViewController.setMessageBodyIsHTML(value, false);
+ }
+ else if ("to".equals(key)) {
+ String[] tos = value.split(",");
+ if (email != null && !"".equals(email)) {
+ mailViewController.setToRecipients((NSArray<String>)NSArray.arrayWithObjects(email, (Object[]) tos));
+ }
+ else {
+ mailViewController.setToRecipients(iOSUtil.arrayWithObjects(tos));
+ }
+ }
+ else if ("cc".equals(key)) {
+ String[] ccs = value.split(",");
+ mailViewController.setCcRecipients(iOSUtil.arrayWithObjects(ccs));
+ }
+ else if ("bcc".equals(key)) {
+ String[] bccs = value.split(",");
+ mailViewController.setBccRecipients(iOSUtil.arrayWithObjects(bccs));
+ }
+ else if ("attachment".equals(key)) {
+ File file = new File(value);
+ String mimeType = URLConnection.guessContentTypeFromName(file.getName());
+ if (mimeType == null) {
+ mimeType = "application/octet-stream";
+ }
+ NSData data = NSData.dataWithContentsOfFile(value);
+ mailViewController.addAttachmentDataMimeTypeFileName(data, mimeType, file.getName());
+ }
else {
- mailViewController.setToRecipients(iOSUtil.arrayWithObjects(tos));
+ System.out.println("WARN unknown mailto component: " + queryItem);
}
}
- else if ("cc".equals(key)) {
- String[] ccs = value.split(",");
- mailViewController.setCcRecipients(iOSUtil.arrayWithObjects(ccs));
- }
- else if ("bcc".equals(key)) {
- String[] bccs = value.split(",");
- mailViewController.setBccRecipients(iOSUtil.arrayWithObjects(bccs));
- }
- else if ("attachment".equals(key)) {
- File file = new File(value);
- String mimeType = URLConnection.guessContentTypeFromName(file.getName());
- if (mimeType == null) {
- mimeType = "application/octet-stream";
- }
- NSData data = NSData.dataWithContentsOfFile(value);
- mailViewController.addAttachmentDataMimeTypeFileName(data, mimeType, file.getName());
- }
- else {
- System.out.println("WARN unknown mailto component: " + queryItem);
- }
+
+ rootViewController.presentViewControllerAnimatedCompletion(mailViewController, true, null);
}
+ else {
+ // no idea how to make this work
+ //UIDocumentInteractionController docController = UIDocumentInteractionController.interactionControllerWithURL(attachment);
+ //boolean worked = docController.presentOptionsMenuFromRectInViewAnimated(new CGRect(new CGPoint(150,150), new CGSize(320, 568)), UIApplication.sharedApplication().keyWindow(), true);
- UINavigationController rootViewController = (UINavigationController) UIApplication.sharedApplication().keyWindow().rootViewController();
- rootViewController.presentViewControllerAnimatedCompletion(mailViewController, true, null);
+ // TODO this works well, but we can also add other info into it like subject, etc.
+ NSURL attachment = NSURL.fileURLWithPath(query.get("attachment"));
+ UIActivityViewController activityViewController = UIActivityViewController.alloc().initWithActivityItemsApplicationActivities(NSArray.arrayWithObject(attachment), null);
+ rootViewController.presentViewControllerAnimatedCompletion(activityViewController, true, null);
+ }
}
else {
UIApplication.sharedApplication().openURL(nsUrl);
@@ -277,6 +289,17 @@
return false;
}
+ private static boolean canSendMail() {
+ try {
+ return MFMailComposeViewController.canSendMail();
+ }
+ catch (Throwable e) {
+ // /Users/noisyfox/Documents/project/moe/moe/natj/natj/src/main/native/natj/ObjCRuntime.mm:1480 WARNING: Binding class refers to class MFMailComposeViewController, but it can not be found. Fallback to indirect super class.
+ System.out.println("canSendMail fail: " + e);
+ return false;
+ }
+ }
+
private boolean containsQueryParameter(String urlString, String param) {
Url url = new Url(urlString);
return !"".equals(url.getQueryParameter(param));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-22 20:13:38
|
Revision: 2612
http://sourceforge.net/p/swingme/code/2612
Author: yuranet
Date: 2021-12-22 20:13:35 +0000 (Wed, 22 Dec 2021)
Log Message:
-----------
can email attachments
Modified Paths:
--------------
iOSME/src/javax/microedition/midlet/MIDlet.java
iOSME/src/net/yura/ios/iOSUtil.java
Modified: iOSME/src/javax/microedition/midlet/MIDlet.java
===================================================================
--- iOSME/src/javax/microedition/midlet/MIDlet.java 2021-12-20 22:42:12 UTC (rev 2611)
+++ iOSME/src/javax/microedition/midlet/MIDlet.java 2021-12-22 20:13:35 UTC (rev 2612)
@@ -2,14 +2,23 @@
import net.yura.ios.iOSNotifications;
import net.yura.ios.WebViewControllear;
+import net.yura.ios.iOSUtil;
import net.yura.mobile.util.Url;
+import java.io.File;
+import java.net.URLConnection;
import java.util.Map;
import javax.microedition.io.ConnectionNotFoundException;
import javax.microedition.lcdui.Display;
import apple.c.Globals;
+import apple.foundation.NSArray;
import apple.foundation.NSBundle;
+import apple.foundation.NSData;
+import apple.foundation.NSError;
import apple.foundation.NSThread;
import apple.foundation.NSURL;
+import apple.foundation.NSURLComponents;
+import apple.messageui.MFMailComposeViewController;
+import apple.messageui.protocol.MFMailComposeViewControllerDelegate;
import apple.uikit.UIApplication;
import apple.uikit.UINavigationController;
import apple.uikit.UIPasteboard;
@@ -182,10 +191,74 @@
//presentViewControllerAnimatedCompletion
rootViewController.pushViewControllerAnimated(webViewControllear, true);
}
- //else if (url.startsWith("mailto:") && containsQueryParameter(url, "attachment")) {
- // throw new UnsupportedOperationException();
- // // TODO send email with attachment
- //}
+ else if (url.startsWith("mailto:") && containsQueryParameter(url, "attachment")) {
+
+ if (!MFMailComposeViewController.canSendMail()) {
+ throw new IllegalStateException("can not send mail");
+ }
+
+ MFMailComposeViewController mailViewController = MFMailComposeViewController.alloc().init();
+
+ mailViewController.setMailComposeDelegate(new MFMailComposeViewControllerDelegate() {
+ @Override
+ public void mailComposeControllerDidFinishWithResultError(MFMailComposeViewController controller, long result, NSError error) {
+ controller.dismissViewControllerAnimatedCompletion(true, null);
+ }
+ });
+
+ // swingme Url does not support mailto
+ NSURLComponents urlComponents = NSURLComponents.componentsWithString(url);
+ String email = urlComponents.path();
+ if (email != null && !"".equals(email)) {
+ mailViewController.setToRecipients(iOSUtil.arrayWithObjects(email));
+ }
+
+ // we do not use NSURLComponents.queryItems here as that will not decode + and " "
+ // https://www.djackson.org/why-we-do-not-use-urlcomponents/
+ Map<String, String> query = Url.toHashtable(urlComponents.query());
+ for (Map.Entry<String, String> queryItem : query.entrySet()) {
+ String key = queryItem.getKey();
+ String value = queryItem.getValue();
+ if ("subject".equals(key)) {
+ mailViewController.setSubject(value);
+ }
+ else if ("body".equals(key)) {
+ mailViewController.setMessageBodyIsHTML(value, false);
+ }
+ else if ("to".equals(key)) {
+ String[] tos = value.split(",");
+ if (email != null && !"".equals(email)) {
+ mailViewController.setToRecipients((NSArray<String>)NSArray.arrayWithObjects(email, (Object[]) tos));
+ }
+ else {
+ mailViewController.setToRecipients(iOSUtil.arrayWithObjects(tos));
+ }
+ }
+ else if ("cc".equals(key)) {
+ String[] ccs = value.split(",");
+ mailViewController.setCcRecipients(iOSUtil.arrayWithObjects(ccs));
+ }
+ else if ("bcc".equals(key)) {
+ String[] bccs = value.split(",");
+ mailViewController.setBccRecipients(iOSUtil.arrayWithObjects(bccs));
+ }
+ else if ("attachment".equals(key)) {
+ File file = new File(value);
+ String mimeType = URLConnection.guessContentTypeFromName(file.getName());
+ if (mimeType == null) {
+ mimeType = "application/octet-stream";
+ }
+ NSData data = NSData.dataWithContentsOfFile(value);
+ mailViewController.addAttachmentDataMimeTypeFileName(data, mimeType, file.getName());
+ }
+ else {
+ System.out.println("WARN unknown mailto component: " + queryItem);
+ }
+ }
+
+ UINavigationController rootViewController = (UINavigationController) UIApplication.sharedApplication().keyWindow().rootViewController();
+ rootViewController.presentViewControllerAnimatedCompletion(mailViewController, true, null);
+ }
else {
UIApplication.sharedApplication().openURL(nsUrl);
}
@@ -204,6 +277,11 @@
return false;
}
+ private boolean containsQueryParameter(String urlString, String param) {
+ Url url = new Url(urlString);
+ return !"".equals(url.getQueryParameter(param));
+ }
+
private void callOnMainThread(Runnable thing) {
if (NSThread.isMainThread_static()) {
thing.run();
Modified: iOSME/src/net/yura/ios/iOSUtil.java
===================================================================
--- iOSME/src/net/yura/ios/iOSUtil.java 2021-12-20 22:42:12 UTC (rev 2611)
+++ iOSME/src/net/yura/ios/iOSUtil.java 2021-12-22 20:13:35 UTC (rev 2612)
@@ -1,6 +1,8 @@
package net.yura.ios;
+import java.util.Arrays;
import java.util.Map;
+import apple.foundation.NSArray;
import apple.foundation.NSData;
import apple.foundation.NSDictionary;
import apple.foundation.NSMutableDictionary;
@@ -24,4 +26,17 @@
public static byte[] toBytes(NSData data) {
return data.bytes().getBytePtr().toByteArray((int)data.length());
}
+
+ public static <T> NSArray<T> arrayWithObjects(T... items) {
+ if (items.length == 0) {
+ return (NSArray<T>)NSArray.array();
+ }
+ else if (items.length == 1) {
+ return (NSArray<T>)NSArray.arrayWithObject(items[0]);
+ }
+ else {
+ T[] others = Arrays.copyOfRange(items, 1, items.length);
+ return (NSArray<T>)NSArray.arrayWithObjects(items[0], (Object[]) others);
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-12-20 22:42:14
|
Revision: 2611
http://sourceforge.net/p/swingme/code/2611
Author: yuranet
Date: 2021-12-20 22:42:12 +0000 (Mon, 20 Dec 2021)
Log Message:
-----------
hack to fix not building on some computers
Modified Paths:
--------------
iOSME/proguard.append.cfg
iOSME/src/javax/microedition/lcdui/Canvas.java
Modified: iOSME/proguard.append.cfg
===================================================================
--- iOSME/proguard.append.cfg 2021-12-15 12:57:11 UTC (rev 2610)
+++ iOSME/proguard.append.cfg 2021-12-20 22:42:12 UTC (rev 2611)
@@ -1,3 +1,10 @@
+# keep MIDlets as they are the apps entry points and are loaded with reflection
+-keep public class * extends javax.microedition.midlet.MIDlet
--keep public class * extends javax.microedition.midlet.MIDlet
+# keep UI framework as it is components are loaded with reflection when loading thinlet xml files
-keep public class net.yura.** { *; }
+
+# no idea why this is needed, but SOMETIMES on SOME computers the app does not build without this
+-keep public class org.xmlpull.v1.XmlPullParser { *; }
+-keep public class org.xmlpull.v1.XmlSerializer { *; }
+-keep public class org.xmlpull.v1.XmlPullParserException { *; }
Modified: iOSME/src/javax/microedition/lcdui/Canvas.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Canvas.java 2021-12-15 12:57:11 UTC (rev 2610)
+++ iOSME/src/javax/microedition/lcdui/Canvas.java 2021-12-20 22:42:12 UTC (rev 2611)
@@ -38,6 +38,7 @@
public static final int KEY_POUND = 35;
CanvasView canvasView;
+ boolean showFPS = "true".equals(System.getProperty("debug"));
protected Canvas() {
@@ -223,7 +224,9 @@
paint(g);
//#mdebug debug
- showFramesPerSec(g);
+ if (showFPS) {
+ showFramesPerSec(g);
+ }
//#enddebug
}
finally {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
