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...> - 2025-04-03 23:58:51
|
Revision: 2838
http://sourceforge.net/p/swingme/code/2838
Author: yuranet
Date: 2025-04-03 23:58:33 +0000 (Thu, 03 Apr 2025)
Log Message:
-----------
fix for corect error catching and set thread error handlers
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Canvas.java
iOSME/src/javax/microedition/media/AudioPlayer.java
iOSME/src/javax/microedition/midlet/MIDlet.java
iOSME/src/net/yura/ios/AppController.java
iOSME/src/net/yura/ios/CanvasView.java
iOSME/src/net/yura/ios/ScrollToTopGestureRecognizer.java
iOSME/src/net/yura/ios/SwingMEiOSApplication.java
iOSME/src/net/yura/ios/iOSNotifications.java
iOSME/src/net/yura/ios/iOSUtil.java
Modified: iOSME/src/javax/microedition/lcdui/Canvas.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Canvas.java 2025-04-03 23:18:13 UTC (rev 2837)
+++ iOSME/src/javax/microedition/lcdui/Canvas.java 2025-04-03 23:58:33 UTC (rev 2838)
@@ -3,6 +3,7 @@
import net.yura.ios.AppController;
import net.yura.ios.CanvasView;
import net.yura.ios.iOSUtil;
+import net.yura.mobile.logging.Logger;
import java.util.ArrayList;
import java.util.List;
import apple.coregraphics.c.CoreGraphics;
@@ -202,8 +203,18 @@
}
public void fireKeyPressedReleased(int code) {
- keyPressed(code);
- keyReleased(code);
+ try {
+ keyPressed(code);
+ }
+ catch (Throwable th) {
+ Logger.warn("error in keyPressed " + code, th);
+ }
+ try {
+ keyReleased(code);
+ }
+ catch (Throwable th) {
+ Logger.warn("error in keyReleased " +code, th);
+ }
}
protected void keyPressed(int keyCode) {
@@ -325,11 +336,21 @@
protected void showNotify() {}
public final void fireHideNotify() {
- hideNotify();
+ try {
+ hideNotify();
+ }
+ catch (Throwable th) {
+ Logger.warn("error in hideNotify", th);
+ }
}
public final void fireShowNotify() {
- showNotify();
+ try {
+ showNotify();
+ }
+ catch (Throwable th) {
+ Logger.warn("error in showNotify", th);
+ }
}
public void serviceRepaints() {
Modified: iOSME/src/javax/microedition/media/AudioPlayer.java
===================================================================
--- iOSME/src/javax/microedition/media/AudioPlayer.java 2025-04-03 23:18:13 UTC (rev 2837)
+++ iOSME/src/javax/microedition/media/AudioPlayer.java 2025-04-03 23:58:33 UTC (rev 2838)
@@ -9,6 +9,8 @@
import java.util.List;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import apple.avfaudio.AVAudioPlayer;
import apple.avfaudio.AVAudioSession;
import apple.avfaudio.protocol.AVAudioPlayerDelegate;
@@ -22,6 +24,13 @@
public static final AVAudioSession audioSession = AVAudioSession.sharedInstance();
+ /**
+ * we need to keep a reference to all players that are playing or iOS gets confused
+ * when the references of players still playing get collected and crashes
+ * https://stackoverflow.com/a/50530407
+ */
+ private static Set<AudioPlayer> allSounds = ConcurrentHashMap.newKeySet();
+
//AVPlayer player works equally well with local and remote media files
//AVAudioPlayer Apple recommends that you use this class for audio playback unless you are playing audio captured from a network stream
final AVAudioPlayer player;
@@ -28,7 +37,28 @@
final List<PlayerListener> listeners = new ArrayList<>();
private final static double SECONDS_MICROSECOND = 1_000_000D;
-
+/*
+ public static void configureAudioSession() {
+ try {
+ // Set the audio session category and mode.
+ // is "options: [.mixWithOthers]" needed??
+ boolean success = iOSUtil.doTry((err) -> audioSession.setCategoryError(AVFAudio.AVAudioSessionCategoryAmbient(), err));
+ if (!success) {
+ throw new Exception("result false, failed to set Category");
+ }
+ // WARNING! blocking operation, should be done in background thread
+ // active may only be needed for "Playback" Category, docs are not very clear
+ // if we do need to call this, do we need to call it when app comes back from background?
+ //boolean success2 = iOSUtil.doTry((err) -> audioSession.setActiveError(true, err));
+ //if (!success2) {
+ // throw new Exception("result false, failed to set Active");
+ //}
+ }
+ catch (Exception ex) {
+ System.out.println("Failed to set the audio session configuration: " + ex);
+ }
+ }
+*/
public AudioPlayer(InputStream ins, String mimeType) throws IOException, MediaException {
UTType type = UTType.typeWithMIMEType(mimeType);
@@ -71,8 +101,14 @@
*/
private void firePlayerUpdate(String event, Object eventData) {
// TODO on android this is run on UI thread, should we also do that here?
+ // TODO what if the listener calls removePlayerListener, we will get a ConcurrentModificationException
for (PlayerListener listener : listeners) {
- listener.playerUpdate(this, event, eventData);
+ try {
+ listener.playerUpdate(this, event, eventData);
+ }
+ catch (Exception ex) {
+ Logger.getLogger(AudioPlayer.class.getName()).log(Level.WARNING, "error firing PlayerListener " + listener, ex);
+ }
}
}
@@ -129,8 +165,8 @@
@Override
public void prefetch() throws MediaException {
- // not needed
- //player.prepareToPlay();
+ // this is not NEEDED, but in case we want to prefetch, we can give that option
+ player.prepareToPlay();
}
@Override
@@ -161,6 +197,7 @@
boolean success = player.play();
if (success) {
+ allSounds.add(this);
firePlayerUpdate(PlayerListener.STARTED, getMediaTime());
}
else {
@@ -178,6 +215,7 @@
public void close() {
// TODO some places say this needs to be called on iOSUtil.callOnMainThread
player.stop();
+ allSounds.remove(AudioPlayer.this);
firePlayerUpdate(PlayerListener.CLOSED, null);
}
Modified: iOSME/src/javax/microedition/midlet/MIDlet.java
===================================================================
--- iOSME/src/javax/microedition/midlet/MIDlet.java 2025-04-03 23:18:13 UTC (rev 2837)
+++ iOSME/src/javax/microedition/midlet/MIDlet.java 2025-04-03 23:58:33 UTC (rev 2838)
@@ -3,6 +3,7 @@
import net.yura.ios.iOSNotifications;
import net.yura.ios.WebViewController;
import net.yura.ios.iOSUtil;
+import net.yura.mobile.logging.Logger;
import net.yura.mobile.util.Url;
import java.io.File;
import java.lang.reflect.Method;
@@ -105,11 +106,21 @@
}
public final void doPauseApp() {
- this.pauseApp();
+ try {
+ this.pauseApp();
+ }
+ catch (Throwable ex) {
+ Logger.warn("error in pauseApp");
+ }
}
- public final void doDestroyApp(boolean unconditional) throws MIDletStateChangeException {
- this.destroyApp(unconditional);
+ public final void doDestroyApp() {
+ try {
+ this.destroyApp(true);
+ }
+ catch (Throwable th) {
+ Logger.warn("error in destroyApp(true)", th);
+ }
}
/**
Modified: iOSME/src/net/yura/ios/AppController.java
===================================================================
--- iOSME/src/net/yura/ios/AppController.java 2025-04-03 23:18:13 UTC (rev 2837)
+++ iOSME/src/net/yura/ios/AppController.java 2025-04-03 23:58:33 UTC (rev 2838)
@@ -1,5 +1,6 @@
package net.yura.ios;
+import net.yura.mobile.logging.Logger;
import org.moe.GCUtil;
import org.moe.natj.general.Pointer;
import org.moe.natj.general.ann.RegisterOnStartup;
@@ -254,8 +255,8 @@
try {
midlet.saveState();
}
- catch (Exception ex) {
- ex.printStackTrace();
+ catch (Throwable ex) {
+ Logger.warn("error in saveState", ex);
}
}
}
Modified: iOSME/src/net/yura/ios/CanvasView.java
===================================================================
--- iOSME/src/net/yura/ios/CanvasView.java 2025-04-03 23:18:13 UTC (rev 2837)
+++ iOSME/src/net/yura/ios/CanvasView.java 2025-04-03 23:58:33 UTC (rev 2838)
@@ -4,6 +4,7 @@
import net.yura.mobile.gui.KeyEvent;
import net.yura.mobile.gui.components.TextComponent;
import net.yura.mobile.gui.components.Window;
+import net.yura.mobile.logging.Logger;
import org.moe.natj.general.Pointer;
import javax.microedition.lcdui.Canvas;
import javax.microedition.lcdui.Graphics;
@@ -114,27 +115,32 @@
private static final int POINTER_RELEASED = 2;
private void fireMultitouchEvent(NSSet<? extends UITouch> touches, int type) {
- int count = (int)touches.count();
- int[] xs = new int[count];
- int[] ys = new int[count];
- int[] types = new int[count];
+ try {
+ int count = (int) touches.count();
+ int[] xs = new int[count];
+ int[] ys = new int[count];
+ int[] types = new int[count];
- int c=0;
- NSEnumerator<? extends UITouch> it = touches.objectEnumerator();
- UITouch touch = it.nextObject();
- while (touch != null) {
- CGPoint point = touch.locationInView(this);
- xs[c] = (int)point.x();
- ys[c] = (int)point.y();
- types[c] = type;
+ int c = 0;
+ NSEnumerator<? extends UITouch> it = touches.objectEnumerator();
+ UITouch touch = it.nextObject();
+ while (touch != null) {
+ CGPoint point = touch.locationInView(this);
+ xs[c] = (int) point.x();
+ ys[c] = (int) point.y();
+ types[c] = type;
- touch = it.nextObject();
- c++;
- }
+ touch = it.nextObject();
+ c++;
+ }
- //System.out.println("fireMultitouchEvent " + Arrays.toString(types) + " " + Arrays.toString(xs) + " " + Arrays.toString(ys));
+ //System.out.println("fireMultitouchEvent " + Arrays.toString(types) + " " + Arrays.toString(xs) + " " + Arrays.toString(ys));
- canvas.multitouchEvent(types, xs, ys);
+ canvas.multitouchEvent(types, xs, ys);
+ }
+ catch (Throwable th) {
+ Logger.warn("error in multitouchEvent", th);
+ }
}
@Override
Modified: iOSME/src/net/yura/ios/ScrollToTopGestureRecognizer.java
===================================================================
--- iOSME/src/net/yura/ios/ScrollToTopGestureRecognizer.java 2025-04-03 23:18:13 UTC (rev 2837)
+++ iOSME/src/net/yura/ios/ScrollToTopGestureRecognizer.java 2025-04-03 23:58:33 UTC (rev 2838)
@@ -42,7 +42,7 @@
}
} // we HAVE to catch errors here, if we allow them to throw into obj-c code, this will kill the app!
catch (Throwable th) {
- Logger.error("error in scrollViewShouldScrollToTop", th);
+ Logger.warn("error in scrollViewShouldScrollToTop", th);
}
return false;
}
Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2025-04-03 23:18:13 UTC (rev 2837)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2025-04-03 23:58:33 UTC (rev 2838)
@@ -1,6 +1,7 @@
package net.yura.ios;
import net.yura.mobile.logging.Logger;
+import org.jetbrains.annotations.NotNull;
import org.moe.GCUtil;
import org.moe.natj.general.Pointer;
import org.moe.natj.general.ann.RegisterOnStartup;
@@ -9,11 +10,11 @@
import javax.microedition.midlet.MIDlet;
import apple.NSObject;
import apple.foundation.NSArray;
-import apple.foundation.NSBundle;
import apple.foundation.NSCoder;
import apple.foundation.NSData;
import apple.foundation.NSDictionary;
import apple.foundation.NSError;
+import apple.foundation.NSException;
import apple.foundation.NSLocale;
import apple.foundation.NSProcessInfo;
import apple.foundation.c.Foundation;
@@ -67,6 +68,34 @@
window = UIWindow.alloc().initWithFrame(screen.bounds());
window.setRootViewController(navigationController);
+ final Foundation.Function_NSGetUncaughtExceptionHandler_ret iOSExceptionHandler = Foundation.NSGetUncaughtExceptionHandler();
+ Foundation.NSSetUncaughtExceptionHandler(new Foundation.Function_NSSetUncaughtExceptionHandler() {
+ @Override
+ public void call_NSSetUncaughtExceptionHandler(@NotNull NSException exception) {
+ Logger.error("iOS native UncaughtException in: " + Thread.currentThread() + " " + exception);
+ if (iOSExceptionHandler != null) {
+ iOSExceptionHandler.call_NSGetUncaughtExceptionHandler_ret(exception);
+ }
+ }
+ });
+
+ /**
+ * on iOS the main thread has a different UncaughtExceptionHandler to the rest
+ * we want to also intercept that and log at 'error' level to trigger immediate crash reporting
+ * @see org.moe.IOSLauncher#main(String[])
+ * @see org.moe.natj.objc.ObjCRuntime#crashAppWhenExceptionUncaught()
+ */
+ final Thread.UncaughtExceptionHandler mainThreadUncaughtExceptionHandler = Thread.currentThread().getUncaughtExceptionHandler();
+ if (mainThreadUncaughtExceptionHandler != null && !(mainThreadUncaughtExceptionHandler instanceof ThreadGroup)) {
+ Thread.currentThread().setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
+ @Override
+ public void uncaughtException(Thread thread, Throwable ex) {
+ Logger.error("Exception in main thread \""+thread+"\"", ex);
+ mainThreadUncaughtExceptionHandler.uncaughtException(thread, ex);
+ }
+ });
+ }
+
// will force gc each time the app is put into background
GCUtil.register();
@@ -231,12 +260,7 @@
MIDlet midlet = MIDlet.DEFAULT_MIDLET;
if (midlet != null) {
- try {
- midlet.doPauseApp();
- }
- catch (Exception ex) {
- ex.printStackTrace();
- }
+ midlet.doPauseApp();
}
}
@@ -246,12 +270,7 @@
MIDlet midlet = MIDlet.DEFAULT_MIDLET;
if (midlet != null) {
- try {
- midlet.doDestroyApp(true);
- }
- catch (Exception ex) {
- ex.printStackTrace();
- }
+ midlet.doDestroyApp();
}
}
@@ -267,22 +286,21 @@
@Override
public void applicationDidRegisterForRemoteNotificationsWithDeviceToken(UIApplication application, NSData deviceToken) {
+ try {
+ String apsEnvironment = iOSProvisioning.getApsEnvironment();
+ if (apsEnvironment != null) {
+ System.setProperty("aps-environment", apsEnvironment);
+ }
- String apsEnvironment = iOSProvisioning.getApsEnvironment();
- if (apsEnvironment != null) {
- System.setProperty("aps-environment", apsEnvironment);
- }
+ byte[] bytes = iOSUtil.toBytes(deviceToken);
+ // https://help.pushwoosh.com/hc/en-us/articles/360000364923-What-is-a-Device-token-
+ // says that the token should be lower case
+ String tokenString = IntegralToString.bytesToHexString(bytes, false);
- byte[] bytes = iOSUtil.toBytes(deviceToken);
- // https://help.pushwoosh.com/hc/en-us/articles/360000364923-What-is-a-Device-token-
- // says that the token should be lower case
- String tokenString = IntegralToString.bytesToHexString(bytes, false);
-
- try {
MIDlet.DEFAULT_MIDLET.pushNotificationsToken(tokenString);
}
- catch (Exception ex) {
- ex.printStackTrace();
+ catch (Throwable ex) {
+ Logger.warn("error in pushNotificationsToken", ex);
}
}
Modified: iOSME/src/net/yura/ios/iOSNotifications.java
===================================================================
--- iOSME/src/net/yura/ios/iOSNotifications.java 2025-04-03 23:18:13 UTC (rev 2837)
+++ iOSME/src/net/yura/ios/iOSNotifications.java 2025-04-03 23:58:33 UTC (rev 2838)
@@ -66,7 +66,12 @@
}
// user clicked on notification, we can clear the app icon badge
- UIApplication.sharedApplication().setApplicationIconBadgeNumber(0);
+ try {
+ UNUserNotificationCenter.currentNotificationCenter().setBadgeCountWithCompletionHandler(0, null);
+ }
+ catch (Throwable th) {
+ UIApplication.sharedApplication().setApplicationIconBadgeNumber(0);
+ }
}
/**
Modified: iOSME/src/net/yura/ios/iOSUtil.java
===================================================================
--- iOSME/src/net/yura/ios/iOSUtil.java 2025-04-03 23:18:13 UTC (rev 2837)
+++ iOSME/src/net/yura/ios/iOSUtil.java 2025-04-03 23:58:33 UTC (rev 2838)
@@ -1,5 +1,6 @@
package net.yura.ios;
+import net.yura.mobile.logging.Logger;
import org.moe.natj.general.ptr.BytePtr;
import org.moe.natj.general.ptr.Ptr;
import org.moe.natj.general.ptr.impl.PtrFactory;
@@ -7,10 +8,12 @@
import java.util.Arrays;
import java.util.Locale;
import java.util.Map;
+import java.util.function.Function;
import apple.foundation.NSArray;
import apple.foundation.NSBundle;
import apple.foundation.NSData;
import apple.foundation.NSDictionary;
+import apple.foundation.NSError;
import apple.foundation.NSLocale;
import apple.foundation.NSMutableDictionary;
import apple.foundation.NSOperationQueue;
@@ -129,7 +132,12 @@
MAIN_QUEUE.addOperationWithBlock(new NSOperationQueue.Block_addOperationWithBlock() {
@Override
public void call_addOperationWithBlock() {
- thing.run();
+ try {
+ thing.run();
+ }
+ catch (Throwable th) {
+ Logger.warn("error in callOnMainThread: " + thing, th);
+ }
}
});
}
@@ -194,4 +202,13 @@
return NSURL.URLWithString(url);
}
}
+
+ public static <R> R invokeChecked(Function<Ptr<NSError>, R> method) throws Exception {
+ Ptr<NSError> outError = PtrFactory.newObjectReference(NSError.class);
+ R result = method.apply(outError);
+ if (outError.get() != null) {
+ throw new Exception("Error: " + outError.get());
+ }
+ return result;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2025-04-03 23:18:34
|
Revision: 2837
http://sourceforge.net/p/swingme/code/2837
Author: yuranet
Date: 2025-04-03 23:18:13 +0000 (Thu, 03 Apr 2025)
Log Message:
-----------
only use error for really really bad things
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/Camera.java
SwingME/src/net/yura/mobile/gui/components/OptionPane.java
SwingME/src/net/yura/mobile/io/BTDiscovery.java
SwingME/src/net/yura/mobile/io/LocationMonitor.java
SwingME/src/net/yura/mobile/io/SocketClient.java
SwingME/src/net/yura/mobile/util/ImageUtil.java
Modified: SwingME/src/net/yura/mobile/gui/components/Camera.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Camera.java 2025-04-01 22:33:03 UTC (rev 2836)
+++ SwingME/src/net/yura/mobile/gui/components/Camera.java 2025-04-03 23:18:13 UTC (rev 2837)
@@ -317,7 +317,7 @@
}
}
catch (Throwable e) {
- Logger.error(null, e);
+ Logger.warn(null, e);
}
finally {
Modified: SwingME/src/net/yura/mobile/gui/components/OptionPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/OptionPane.java 2025-04-01 22:33:03 UTC (rev 2836)
+++ SwingME/src/net/yura/mobile/gui/components/OptionPane.java 2025-04-03 23:18:13 UTC (rev 2837)
@@ -413,7 +413,7 @@
}
}
catch(Throwable t) {
- Logger.error(null, t);
+ Logger.warn("unable to open OptionPane", t);
}
}
Modified: SwingME/src/net/yura/mobile/io/BTDiscovery.java
===================================================================
--- SwingME/src/net/yura/mobile/io/BTDiscovery.java 2025-04-01 22:33:03 UTC (rev 2836)
+++ SwingME/src/net/yura/mobile/io/BTDiscovery.java 2025-04-03 23:18:13 UTC (rev 2837)
@@ -43,7 +43,7 @@
}
}
catch (Throwable t) {
- Logger.error("error " + device + " " + deviceClass, t);
+ Logger.warn("error " + device + " " + deviceClass, t);
}
}
@@ -55,7 +55,7 @@
}
}
catch (Throwable t) {
- Logger.error("error" + transId, t);
+ Logger.warn("error" + transId, t);
}
}
public void inquiryCompleted(int discoveryType) {
@@ -63,7 +63,7 @@
handleInquiryCompleted();
}
catch (Throwable t) {
- Logger.error("error" + discoveryType, t);
+ Logger.warn("error" + discoveryType, t);
}
}
public void serviceSearchCompleted(int transId, int responseCode) {
Modified: SwingME/src/net/yura/mobile/io/LocationMonitor.java
===================================================================
--- SwingME/src/net/yura/mobile/io/LocationMonitor.java 2025-04-01 22:33:03 UTC (rev 2836)
+++ SwingME/src/net/yura/mobile/io/LocationMonitor.java 2025-04-03 23:18:13 UTC (rev 2837)
@@ -210,7 +210,7 @@
}
}
catch(Throwable t) {
- Logger.error(null, t);
+ Logger.warn(null, t);
}
}
Modified: SwingME/src/net/yura/mobile/io/SocketClient.java
===================================================================
--- SwingME/src/net/yura/mobile/io/SocketClient.java 2025-04-01 22:33:03 UTC (rev 2836)
+++ SwingME/src/net/yura/mobile/io/SocketClient.java 2025-04-03 23:18:13 UTC (rev 2837)
@@ -432,8 +432,8 @@
Logger.info("[SocketClient] ENDING "+ name +" "+id);
}
catch (Throwable t){
- //#debug error
- Logger.error(null, t);
+ //#debug warn
+ Logger.warn(null, t);
}
}
Modified: SwingME/src/net/yura/mobile/util/ImageUtil.java
===================================================================
--- SwingME/src/net/yura/mobile/util/ImageUtil.java 2025-04-01 22:33:03 UTC (rev 2836)
+++ SwingME/src/net/yura/mobile/util/ImageUtil.java 2025-04-03 23:18:13 UTC (rev 2837)
@@ -194,7 +194,7 @@
* @param fileBytes
* @return Image
*/
- public static Image getJPEGthumb (byte[] fileBytes ) {
+ public static Image getJPEGthumb(byte[] fileBytes) {
Image image = null;
try {
@@ -226,7 +226,7 @@
}
}
catch (Throwable e) {
- Logger.error(null, e);
+ Logger.warn("unable to getJPEGthumb", e);
}
return image;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2025-04-01 22:33:20
|
Revision: 2836
http://sourceforge.net/p/swingme/code/2836
Author: yuranet
Date: 2025-04-01 22:33:03 +0000 (Tue, 01 Apr 2025)
Log Message:
-----------
fix for app crash on error in scroll
Modified Paths:
--------------
iOSME/src/net/yura/ios/ScrollToTopGestureRecognizer.java
Modified: iOSME/src/net/yura/ios/ScrollToTopGestureRecognizer.java
===================================================================
--- iOSME/src/net/yura/ios/ScrollToTopGestureRecognizer.java 2025-03-22 16:18:03 UTC (rev 2835)
+++ iOSME/src/net/yura/ios/ScrollToTopGestureRecognizer.java 2025-04-01 22:33:03 UTC (rev 2836)
@@ -5,6 +5,7 @@
import net.yura.mobile.gui.components.Panel;
import net.yura.mobile.gui.components.ScrollPane;
import net.yura.mobile.gui.components.Window;
+import net.yura.mobile.logging.Logger;
import java.util.List;
import apple.coregraphics.c.CoreGraphics;
import apple.corefoundation.struct.CGPoint;
@@ -18,6 +19,7 @@
public class ScrollToTopGestureRecognizer implements UIScrollViewDelegate {
public static void init(UIViewController vc) {
+ // TODO get main screen another way, UIScreen screen = vc.view().window().windowScene().screen();
// for unknown reasons, the UIScrollView needs to have the width of the screen
UIScrollView scrollView = UIScrollView.alloc().initWithFrame(new CGRect(CoreGraphics.CGPointZero(),
@@ -31,11 +33,16 @@
@Override
public boolean scrollViewShouldScrollToTop(UIScrollView ignore) {
- Window window = DesktopPane.getDesktopPane().getSelectedFrame();
- ScrollPane scrollPane = findScrollPane(window);
- if (scrollPane != null) {
- scrollPane.getView().setLocation(scrollPane.getView().getX(), scrollPane.getViewPortY());
- scrollPane.repaint();
+ try {
+ Window window = DesktopPane.getDesktopPane().getSelectedFrame();
+ ScrollPane scrollPane = findScrollPane(window);
+ if (scrollPane != null) {
+ scrollPane.getView().setLocation(scrollPane.getView().getX(), scrollPane.getViewPortY());
+ scrollPane.repaint();
+ }
+ } // we HAVE to catch errors here, if we allow them to throw into obj-c code, this will kill the app!
+ catch (Throwable th) {
+ Logger.error("error in scrollViewShouldScrollToTop", th);
}
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2025-03-22 16:18:05
|
Revision: 2835
http://sourceforge.net/p/swingme/code/2835
Author: yuranet
Date: 2025-03-22 16:18:03 +0000 (Sat, 22 Mar 2025)
Log Message:
-----------
use correct method to pause audio
Modified Paths:
--------------
iOSME/src/javax/microedition/media/AudioPlayer.java
Modified: iOSME/src/javax/microedition/media/AudioPlayer.java
===================================================================
--- iOSME/src/javax/microedition/media/AudioPlayer.java 2025-03-04 21:55:50 UTC (rev 2834)
+++ iOSME/src/javax/microedition/media/AudioPlayer.java 2025-03-22 16:18:03 UTC (rev 2835)
@@ -5,8 +5,13 @@
import org.moe.natj.general.ptr.impl.PtrFactory;
import java.io.IOException;
import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
import apple.avfaudio.AVAudioPlayer;
import apple.avfaudio.AVAudioSession;
+import apple.avfaudio.protocol.AVAudioPlayerDelegate;
import apple.foundation.NSData;
import apple.foundation.NSError;
import apple.foundation.NSURL;
@@ -13,13 +18,14 @@
import apple.uniformtypeidentifiers.UTType;
import libcore.io.Streams;
-class AudioPlayer implements Player {
+class AudioPlayer implements Player, AVAudioPlayerDelegate {
- private static final AVAudioSession audioSession = AVAudioSession.sharedInstance();
+ public static final AVAudioSession audioSession = AVAudioSession.sharedInstance();
//AVPlayer player works equally well with local and remote media files
//AVAudioPlayer Apple recommends that you use this class for audio playback unless you are playing audio captured from a network stream
- AVAudioPlayer player;
+ final AVAudioPlayer player;
+ final List<PlayerListener> listeners = new ArrayList<>();
private final static double SECONDS_MICROSECOND = 1_000_000D;
@@ -38,6 +44,7 @@
if (outError.get() != null) {
throw new IOException("AVAudioPlayer Error: " + outError.get());
}
+ player.setDelegate(this);
}
public AudioPlayer(String locator) throws IOException {
@@ -48,8 +55,27 @@
if (outError.get() != null) {
throw new IOException("AVAudioPlayer Error: " + outError.get());
}
+ player.setDelegate(this);
}
+ public void audioPlayerDecodeErrorDidOccurError(AVAudioPlayer player, NSError error) {
+ firePlayerUpdate(PlayerListener.ERROR, error);
+ }
+
+ public void audioPlayerDidFinishPlayingSuccessfully(AVAudioPlayer player, boolean flag) {
+ firePlayerUpdate(PlayerListener.END_OF_MEDIA, null);
+ }
+
+ /**
+ * @see javax.microedition.media.player.AudioPlayer#sendListenerEvent(String, Object)
+ */
+ private void firePlayerUpdate(String event, Object eventData) {
+ // TODO on android this is run on UI thread, should we also do that here?
+ for (PlayerListener listener : listeners) {
+ listener.playerUpdate(this, event, eventData);
+ }
+ }
+
@Override
public Control getControl(String controlType) {
// TODO control things like volume
@@ -63,13 +89,12 @@
@Override
public void addPlayerListener(PlayerListener playerListener) {
- // TODO
- //player.setDelegate(new AVAudioPlayerDelegate() {...});
+ listeners.add(playerListener);
}
@Override
- public void close() {
- // does not seem to be needed
+ public void removePlayerListener(PlayerListener playerListener) {
+ listeners.remove(playerListener);
}
@Override
@@ -114,11 +139,6 @@
}
@Override
- public void removePlayerListener(PlayerListener playerListener) {
-
- }
-
- @Override
public void setLoopCount(int count) {
player.setNumberOfLoops(count);
}
@@ -134,18 +154,35 @@
//boolean isOtherAudioPlaying = AVAudioSession.sharedInstance().isOtherAudioPlaying();
// if user is watching video or playing music, then do not play sound
+ // tested with youtube video in browser and spotify music
if (audioSession.secondaryAudioShouldBeSilencedHint()) {
return;
}
boolean success = player.play();
- if (!success) {
- System.out.println("unable to start playback! " + this);
+ if (success) {
+ firePlayerUpdate(PlayerListener.STARTED, getMediaTime());
}
+ else {
+ throw new MediaException("unable to start playback! " + this);
+ }
}
@Override
public void stop() throws MediaException {
+ player.pause();
+ firePlayerUpdate(PlayerListener.STOPPED, getMediaTime());
+ }
+
+ @Override
+ public void close() {
+ // TODO some places say this needs to be called on iOSUtil.callOnMainThread
player.stop();
+ firePlayerUpdate(PlayerListener.CLOSED, null);
}
+
+ @Override
+ public String toString() {
+ return super.toString() + " " + player + " " + player.url();
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2025-03-04 21:55:53
|
Revision: 2834
http://sourceforge.net/p/swingme/code/2834
Author: yuranet
Date: 2025-03-04 21:55:50 +0000 (Tue, 04 Mar 2025)
Log Message:
-----------
fix for logging to always work
Modified Paths:
--------------
me4se/src/javax/microedition/midlet/ApplicationManager.java
me4se/src/org/me4se/JadFile.java
me4se/src/org/me4se/MIDletRunner.java
me4se/src/org/me4se/System.java
me4se/src/org/me4se/scm/ScmWrapper.java
Modified: me4se/src/javax/microedition/midlet/ApplicationManager.java
===================================================================
--- me4se/src/javax/microedition/midlet/ApplicationManager.java 2025-03-03 00:21:05 UTC (rev 2833)
+++ me4se/src/javax/microedition/midlet/ApplicationManager.java 2025-03-04 21:55:50 UTC (rev 2834)
@@ -76,6 +76,8 @@
public class ApplicationManager {
+ private static final Logger logger = Logger.getLogger(ApplicationManager.class.getName());
+
public static final String ME4SE_VERSION_NUMBER = "3.1.9";
static final int[] PNG_SIGNATURE = { 137, 80, 78, 71, 13, 10, 26, 10 };
@@ -263,7 +265,7 @@
String type = sb.toString();
- // System.out.println("PNG Chunk: "+len+" "+sb.toString());
+ // logger.info("PNG Chunk: "+len+" "+sb.toString());
if (sb.toString().equals("IHDR")) {
dos.writeInt(len);
@@ -324,7 +326,7 @@
public BufferedImage getImage(String fileName) throws IOException {
- // System.out.println(imageCache);
+ // logger.info(imageCache);
BufferedImage img = (BufferedImage) imageCache.get(fileName);
@@ -382,7 +384,7 @@
}
public static InputStream openInputStream(Class clazz, String name) {
- // System.out.println("*** openInputStream(" + clazz + ", " + name + ")");
+ // logger.info("*** openInputStream(" + clazz + ", " + name + ")");
if (name.startsWith("/")) {
try {
@@ -399,7 +401,7 @@
s = p.getName().replace('.', '/');
}
- // System.out.println(s);
+ // logger.info(s);
return ApplicationManager.manager.openInputStream(s + "/" + name);
} catch (IOException ex) {
@@ -440,10 +442,10 @@
fileName = concatPath(documentBase, fileName);
- // System.out.println ("concatenated: "+fileName);
+ // logger.info("concatenated: "+fileName);
if (isUrl(fileName)) {
- // System.out.println("opening url: " + fileName);
+ // logger.info("opening url: " + fileName);
return new URL(fileName).openStream();
}
// try resource
@@ -454,7 +456,7 @@
*/
InputStream result = null;
- // System.out.println("Try to use activeClass ...");
+ // logger.info("Try to use activeClass ...");
if (activeClass != null) {
result = activeClass.getResourceAsStream(fileName);
if (result != null)
@@ -461,7 +463,7 @@
return result;
}
- // System.out.println("Try to use classLoader ...");
+ // logger.info("Try to use classLoader ...");
if (classLoader != null) {
result = classLoader.getResourceAsStream(fileName);
if (result != null)
@@ -468,7 +470,7 @@
return result;
}
- // System.out.println("Try to use ApplicationManager ...");
+ // logger.info("Try to use ApplicationManager ...");
result = ApplicationManager.class.getResourceAsStream(fileName);
if (result != null)
return result;
@@ -477,12 +479,12 @@
}
// file otherwise
- // System.out.println("opening file: " + fileName);
+ // logger.info("opening file: " + fileName);
if (applet == null && new File(fileName).exists()) {
return new FileInputStream(fileName);
} else {
- System.out.println("WARNING: Resource not found: " + fileName);
+ logger.info("WARNING: Resource not found: " + fileName);
return null;
}
}
@@ -578,12 +580,12 @@
java.lang.System.setProperty("sun.awt.noerasebackground","true");
}
catch(Throwable th) { }
-// System.out.println("Container: " + container);
+// logger.info("Container: " + container);
this.properties = properties == null ? new Properties() : properties;
// TODO Version Number of ME4SE !
- System.out.println("---=== ME4SE Version " + ME4SE_VERSION_NUMBER + " ===---");
+ logger.info("---=== ME4SE Version " + ME4SE_VERSION_NUMBER + " ===---");
// if (manager != null)
// manager.destroy(true, true); // notify, may not exit, killall
@@ -658,24 +660,24 @@
destroy(true, true); // notify, mayExit, killAll
}
public void windowDeactivated(WindowEvent e) {
- //Logger.getLogger(ApplicationManager.class.getName()).info("STOPING " + activePlayers);
+ //logger.info("STOPING " + activePlayers);
pausedPlayers = (Player[])activePlayers.toArray(new Player[0]);
for (int i = 0; i < pausedPlayers.length; i++) {
try {
pausedPlayers[i].stop();
} catch (Exception ex) {
- Logger.getLogger(ApplicationManager.class.getName()).log(Level.SEVERE, "can not stop", ex);
+ logger.log(Level.SEVERE, "can not stop", ex);
}
}
}
public void windowActivated(WindowEvent e) {
- //Logger.getLogger(ApplicationManager.class.getName()).info("STARTING " + Arrays.asList(pausedPlayers));
+ //logger.info("STARTING " + Arrays.asList(pausedPlayers));
if (pausedPlayers != null) {
for (int i = 0; i < pausedPlayers.length; i++) {
try {
pausedPlayers[i].start();
} catch (Exception ex) {
- Logger.getLogger(ApplicationManager.class.getName()).log(Level.SEVERE, "can not start", ex);
+ logger.log(Level.SEVERE, "can not start", ex);
}
}
}
@@ -756,11 +758,11 @@
String name = tokens.nextToken();
try {
Initializer init = (Initializer) instantiate(name);
- System.out.println("initializer parameter found for " + name + ": "
+ logger.info("initializer parameter found for " + name + ": "
+ init.getClass());
init.initialize(this);
} catch (ClassNotFoundException e) {
- System.out.println("cannot initialize module: " + name);
+ logger.info("cannot initialize module: " + name);
} catch (Exception e) {
e.printStackTrace();
}
@@ -773,11 +775,11 @@
try {
Initializer init = (Initializer) instantiate(name);
- System.out.println("initializer found for " + name + ": "
+ logger.info("initializer found for " + name + ": "
+ init.getClass());
init.initialize(this);
} catch (ClassNotFoundException e) {
- System.out.println("cannot initialize module: " + name);
+ logger.info("cannot initialize module: " + name);
} catch (Exception e) {
e.printStackTrace();
}
@@ -807,7 +809,7 @@
try {
jadFile.load(jadUrl);
} catch (Exception e) {
- System.err.println("JAD access error: " + e
+ logger.warning("JAD access error: " + e
+ "; trying midlet/jam property");
}
}
@@ -830,15 +832,15 @@
} else {
Enumeration e = this.getClass().getClassLoader().getResources(
"META-INF/MANIFEST.MF");
- // System.out.println("Manifest Enumeration has elements:
+ // logger.info("Manifest Enumeration has elements:
// "+e.hasMoreElements());
while (e.hasMoreElements()) {
URL url = (URL) e.nextElement();
- // System.out.println("Examining Manifest: "+url);
+ // logger.info("Examining Manifest: "+url);
manifest.load(url.openStream());
// for(int i = 0; i < Math.min(15, manifest.size()); i++){
- // System.out.println(" - "+manifest.get(i));
+ // logger.info(" - "+manifest.get(i));
// }
//
if (manifest.getMIDletCount() != 0) {
@@ -847,7 +849,7 @@
}
}
} catch (Exception e) {
- System.out.println("Error while reading/searching MANIFEST.MF");
+ logger.info("Error while reading/searching MANIFEST.MF");
e.printStackTrace();
}
@@ -921,7 +923,7 @@
v = (int) ((steps - 1) * v + 0.5); // 0..step
v *= 255.0 / (steps - 1); // 0..255
- // System.out.println("discretize ("+value+","+steps+")="+(int)v);
+ // logger.info("discretize ("+value+","+steps+")="+(int)v);
return (int) v;
}
@@ -990,7 +992,7 @@
* @param killAll - true if the event comes from the [x] in the window, and signals Everything must be closed
*/
public void destroy(boolean notifyMIDlet, boolean killAll) {
- //System.out.println("[ME4SE] destroy(notifyMIDlet="+notifyMIDlet+",killAll="+killAll+")");
+ // logger.info("[ME4SE] destroy(notifyMIDlet="+notifyMIDlet+",killAll="+killAll+")");
// imageCache = new Hashtable();
//ApplicationManager manager = ApplicationManager.manager;
@@ -1215,7 +1217,7 @@
public int getDeviceKeyCode(String buttonName) {
- // System.out.println("getKeyCode: "+buttonName);
+ // logger.info("getKeyCode: "+buttonName);
int i = getIntProperty("keycode." + buttonName, -12345);
if (i != -12345)
return i;
Modified: me4se/src/org/me4se/JadFile.java
===================================================================
--- me4se/src/org/me4se/JadFile.java 2025-03-03 00:21:05 UTC (rev 2833)
+++ me4se/src/org/me4se/JadFile.java 2025-03-04 21:55:50 UTC (rev 2834)
@@ -188,7 +188,7 @@
load(new URL(url).openStream());
} else {
if (new File(url).exists()) {
- System.out.println("Loading JAD from file : " + url);
+ java.lang.System.out.println("Loading JAD from file : " + url);
FileInputStream fin = new FileInputStream(url);
try {
load(fin);
@@ -198,7 +198,7 @@
} else {
InputStream in = getClass().getResourceAsStream(url);
if (in != null) {
- System.out.println("Loading JAD from classpath : " + url);
+ java.lang.System.out.println("Loading JAD from classpath : " + url);
load(in);
} else {
throw new IOException("\"" + url
Modified: me4se/src/org/me4se/MIDletRunner.java
===================================================================
--- me4se/src/org/me4se/MIDletRunner.java 2025-03-03 00:21:05 UTC (rev 2833)
+++ me4se/src/org/me4se/MIDletRunner.java 2025-03-04 21:55:50 UTC (rev 2834)
@@ -38,7 +38,7 @@
*/
public void start() {
- System.out.println("Applet start was called.");
+ java.lang.System.out.println("Applet start was called.");
startCount++;
@@ -47,7 +47,7 @@
} else {
boolean restartable = ApplicationManager.getBooleanProperty("me4se.restartable", true);
- System.out
+ java.lang.System.out
.println("Calling ApplicationManager.manager.start(); restartable: "
+ restartable + " start count: " + startCount);
@@ -83,7 +83,7 @@
boolean restartable = ApplicationManager.getBooleanProperty("me4se.restartable", true);
- System.out.println("Applet stop() was called. Restartable: " + restartable);
+ java.lang.System.out.println("Applet stop() was called. Restartable: " + restartable);
if (restartable) {
ApplicationManager.getInstance().pause();
@@ -96,7 +96,7 @@
*/
public void destroy() {
- System.out.println("Applet destroy() was called.");
+ java.lang.System.out.println("Applet destroy() was called.");
ApplicationManager.getInstance().destroy(true, true);
}
Modified: me4se/src/org/me4se/System.java
===================================================================
--- me4se/src/org/me4se/System.java 2025-03-03 00:21:05 UTC (rev 2833)
+++ me4se/src/org/me4se/System.java 2025-03-04 21:55:50 UTC (rev 2834)
@@ -11,11 +11,17 @@
*/
public class System {
+ /**
+ * @deprecated do not use as not captured by grasshopper
+ */
public static PrintStream err = java.lang.System.err;
+ /**
+ * @deprecated do not use as not captured by grasshopper
+ */
public static PrintStream out = java.lang.System.out;
-
+
public static Properties properties = new Properties();
-
+
public static void arraycopy(Object src, int srcPos, Object dest, int destPos, int length) {
java.lang.System.arraycopy(src, srcPos, dest, destPos, length);
}
Modified: me4se/src/org/me4se/scm/ScmWrapper.java
===================================================================
--- me4se/src/org/me4se/scm/ScmWrapper.java 2025-03-03 00:21:05 UTC (rev 2833)
+++ me4se/src/org/me4se/scm/ScmWrapper.java 2025-03-04 21:55:50 UTC (rev 2834)
@@ -270,7 +270,7 @@
g2.scale(scale, scale); // we have to scale the graphics as a pixel location on the image may not align exactly with a dip location
int x1 = (int) (clip.x/scale),y1 = (int) (clip.y/scale),x2 = (int) ((clip.x+clip.width)/scale),y2 = (int) ((clip.y+clip.height)/scale);
if (!g.drawImage(offScreenCache, x1, y1, x2, y2, x1, y1, x2, y2, this)) {
- System.out.println("DRAWIMAGE WAS RETURNING FALSE!!!");
+ java.lang.System.out.println("DRAWIMAGE WAS RETURNING FALSE!!!");
}
g2.scale(1 / scale, 1 / scale);
// g.drawImage(offScreen, 0, 0, this);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2025-03-03 00:21:12
|
Revision: 2833
http://sourceforge.net/p/swingme/code/2833
Author: yuranet
Date: 2025-03-03 00:21:05 +0000 (Mon, 03 Mar 2025)
Log Message:
-----------
work on more java versions
Added Paths:
-----------
SwingMETest/gradle.properties
Added: SwingMETest/gradle.properties
===================================================================
--- SwingMETest/gradle.properties (rev 0)
+++ SwingMETest/gradle.properties 2025-03-03 00:21:05 UTC (rev 2833)
@@ -0,0 +1 @@
+org.gradle.jvmargs=-XX:+IgnoreUnrecognizedVMOptions --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2025-03-03 00:19:10
|
Revision: 2832
http://sourceforge.net/p/swingme/code/2832
Author: yuranet
Date: 2025-03-03 00:19:09 +0000 (Mon, 03 Mar 2025)
Log Message:
-----------
work on more java versions
Added Paths:
-----------
quickstart/gradle.properties
Added: quickstart/gradle.properties
===================================================================
--- quickstart/gradle.properties (rev 0)
+++ quickstart/gradle.properties 2025-03-03 00:19:09 UTC (rev 2832)
@@ -0,0 +1 @@
+org.gradle.jvmargs=-XX:+IgnoreUnrecognizedVMOptions --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2025-03-02 23:37:56
|
Revision: 2831
http://sourceforge.net/p/swingme/code/2831
Author: yuranet
Date: 2025-03-02 23:37:44 +0000 (Sun, 02 Mar 2025)
Log Message:
-----------
run on more versions of java
Modified Paths:
--------------
SwingME/build.gradle
Modified: SwingME/build.gradle
===================================================================
--- SwingME/build.gradle 2025-03-02 20:34:18 UTC (rev 2830)
+++ SwingME/build.gradle 2025-03-02 23:37:44 UTC (rev 2831)
@@ -1,8 +1,8 @@
apply plugin: 'java-library'
compileJava {
- targetCompatibility = 1.6
- sourceCompatibility = 1.6
+ targetCompatibility = 1.7
+ sourceCompatibility = 1.7
options.encoding = "cp1252"
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2025-03-02 20:14:56
|
Revision: 2829
http://sourceforge.net/p/swingme/code/2829
Author: yuranet
Date: 2025-03-02 20:14:53 +0000 (Sun, 02 Mar 2025)
Log Message:
-----------
close streams
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/Font.java
Modified: SwingME/src/net/yura/mobile/gui/Font.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/Font.java 2025-03-02 20:11:37 UTC (rev 2828)
+++ SwingME/src/net/yura/mobile/gui/Font.java 2025-03-02 20:14:53 UTC (rev 2829)
@@ -26,6 +26,7 @@
import javax.microedition.lcdui.Graphics;
import javax.microedition.lcdui.Image;
import javax.microedition.lcdui.game.Sprite;
+import net.yura.mobile.io.FileUtil;
import net.yura.mobile.logging.Logger;
import net.yura.mobile.util.ImageUtil;
import net.yura.mobile.util.Properties;
@@ -105,10 +106,9 @@
*/
public static Font getFont(String descriptor, String[] imagePaths, int[] colors) {
+ InputStream is = Application.getResourceAsStream(descriptor);
try {
- InputStream is = Application.getResourceAsStream(descriptor);
-
Image[] characterImage = new Image[imagePaths.length];
for (int c=0;c<imagePaths.length;c++) {
@@ -124,6 +124,9 @@
Logger.warn("cant get font " + descriptor, ex);
throw new RuntimeException("cant get font " + descriptor);
}
+ finally {
+ FileUtil.close(is);
+ }
}
public static Font getFont(InputStream is, Image[] imagesArray, int[] colorsArray) throws IOException {
@@ -227,7 +230,6 @@
integers = null;
return f;
-
}
public static int getShortUnsigned(DataInputStream dis) throws IOException {
@@ -270,12 +272,16 @@
public static Font getFont(String name) {
try {
-
Font f = new Font();
Properties newfont = new Properties();
-
- newfont.load( Application.getResourceAsStream(name) );
+ InputStream fontIs = Application.getResourceAsStream(name);
+ try {
+ newfont.load(fontIs);
+ }
+ finally {
+ FileUtil.close(fontIs);
+ }
String baseDir = name.substring(0, name.lastIndexOf('/') + 1);
String[] offsetsText = StringUtil.split(newfont.getProperty("offsets"), ',');
@@ -301,7 +307,6 @@
}
charCode++;
-
}
}
@@ -326,7 +331,6 @@
f.characterImage[c] = fontimage;
//imageTable.put( new Integer(colors[c]) , fontimage);
-
}
String numbermodeString = newfont.getProperty("numbermode");
@@ -410,7 +414,6 @@
Logger.warn("unable to load font: " + name, ex);
throw new RuntimeException("unable to load font: "+name);
}
-
}
// -----------------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2025-03-02 18:30:37
|
Revision: 2827
http://sourceforge.net/p/swingme/code/2827
Author: yuranet
Date: 2025-03-02 18:30:22 +0000 (Sun, 02 Mar 2025)
Log Message:
-----------
upgrade to MOE 1.10.1
Modified Paths:
--------------
iOSME/build.gradle
iOSME/src/javax/microedition/lcdui/Canvas.java
iOSME/src/javax/microedition/lcdui/Font.java
iOSME/src/javax/microedition/lcdui/Graphics.java
iOSME/src/javax/microedition/lcdui/Image.java
iOSME/src/javax/microedition/midlet/MIDlet.java
iOSME/src/net/yura/ios/CanvasView.java
iOSME/src/net/yura/ios/ScrollToTopGestureRecognizer.java
Modified: iOSME/build.gradle
===================================================================
--- iOSME/build.gradle 2025-02-09 16:01:14 UTC (rev 2826)
+++ iOSME/build.gradle 2025-03-02 18:30:22 UTC (rev 2827)
@@ -5,7 +5,7 @@
mavenLocal()
}
dependencies {
- classpath group: 'org.multi-os-engine', name: 'moe-gradle', version: '1.9.0'
+ classpath group: 'org.multi-os-engine', name: 'moe-gradle', version: '1.10.1'
}
// 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
Modified: iOSME/src/javax/microedition/lcdui/Canvas.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Canvas.java 2025-02-09 16:01:14 UTC (rev 2826)
+++ iOSME/src/javax/microedition/lcdui/Canvas.java 2025-03-02 18:30:22 UTC (rev 2827)
@@ -6,7 +6,7 @@
import java.util.ArrayList;
import java.util.List;
import apple.coregraphics.c.CoreGraphics;
-import apple.coregraphics.struct.CGRect;
+import apple.corefoundation.struct.CGRect;
import apple.foundation.NSOperationQueue;
import apple.foundation.NSThread;
Modified: iOSME/src/javax/microedition/lcdui/Font.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Font.java 2025-02-09 16:01:14 UTC (rev 2826)
+++ iOSME/src/javax/microedition/lcdui/Font.java 2025-03-02 18:30:22 UTC (rev 2827)
@@ -2,7 +2,7 @@
import java.util.Hashtable;
import java.util.Map;
-import apple.coregraphics.struct.CGSize;
+import apple.corefoundation.struct.CGSize;
import apple.foundation.NSDictionary;
import apple.foundation.NSMutableString;
import apple.uikit.UIFont;
Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java 2025-02-09 16:01:14 UTC (rev 2826)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java 2025-03-02 18:30:22 UTC (rev 2827)
@@ -4,10 +4,10 @@
import apple.coregraphics.opaque.CGColorRef;
import apple.coregraphics.opaque.CGContextRef;
import apple.coregraphics.opaque.CGImageRef;
-import apple.coregraphics.struct.CGAffineTransform;
-import apple.coregraphics.struct.CGPoint;
-import apple.coregraphics.struct.CGRect;
-import apple.coregraphics.struct.CGSize;
+import apple.corefoundation.struct.CGAffineTransform;
+import apple.corefoundation.struct.CGPoint;
+import apple.corefoundation.struct.CGRect;
+import apple.corefoundation.struct.CGSize;
import apple.coreimage.CIContext;
import apple.coreimage.CIFilter;
import apple.coreimage.CIImage;
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2025-02-09 16:01:14 UTC (rev 2826)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2025-03-02 18:30:22 UTC (rev 2827)
@@ -14,9 +14,9 @@
import apple.coregraphics.opaque.CGColorSpaceRef;
import apple.coregraphics.opaque.CGContextRef;
import apple.coregraphics.opaque.CGImageRef;
-import apple.coregraphics.struct.CGPoint;
-import apple.coregraphics.struct.CGRect;
-import apple.coregraphics.struct.CGSize;
+import apple.corefoundation.struct.CGPoint;
+import apple.corefoundation.struct.CGRect;
+import apple.corefoundation.struct.CGSize;
import apple.foundation.NSData;
import apple.uikit.UIGraphicsImageRenderer;
import apple.uikit.UIGraphicsImageRendererContext;
Modified: iOSME/src/javax/microedition/midlet/MIDlet.java
===================================================================
--- iOSME/src/javax/microedition/midlet/MIDlet.java 2025-02-09 16:01:14 UTC (rev 2826)
+++ iOSME/src/javax/microedition/midlet/MIDlet.java 2025-03-02 18:30:22 UTC (rev 2827)
@@ -13,8 +13,8 @@
import apple.c.Globals;
import apple.coregraphics.c.CoreGraphics;
import apple.foundation.NSArray;
-import apple.foundation.NSBundle;
import apple.foundation.NSData;
+import apple.foundation.NSDictionary;
import apple.foundation.NSError;
import apple.foundation.NSURL;
import apple.foundation.NSURLComponents;
@@ -304,13 +304,31 @@
}
}
else {
- UIApplication.sharedApplication().openURL(nsUrl);
+ // on emulator this returns false correctly, but on real device this can return true, but then fail when open is called.
+ // e.g. mailto: url returns false on emulator, but true on device with no Mail app installed, resulting in open failing.
+ if (!UIApplication.sharedApplication().canOpenURL(nsUrl)) {
+ throw new Exception("canOpenURL false for url: " + nsUrl);
+ }
+
+ try {
+ UIApplication.sharedApplication().openURLOptionsCompletionHandler(nsUrl, (NSDictionary<String, Object>) NSDictionary.dictionary(), new UIApplication.Block_openURLOptionsCompletionHandler() {
+ // called async!!! so only when the current event returns control of the event thread!
+ @Override
+ public void call_openURLOptionsCompletionHandler(boolean success) {
+ // TODO we want to make the platformRequest method throw an error if this returns false
+ System.out.println("openURLOptionsCompletionHandler " + success);
+ }
+ });
+ }
+ catch (Throwable ex) {
+ UIApplication.sharedApplication().openURL(nsUrl);
+ }
}
}
catch (Throwable e) {
//#debug debug
//Logger.warn("error handling " + url, e);
- e.printStackTrace(); // TODO
+ e.printStackTrace(System.out); // TODO
ConnectionNotFoundException connEx = new ConnectionNotFoundException(url);
connEx.initCause(e);
Modified: iOSME/src/net/yura/ios/CanvasView.java
===================================================================
--- iOSME/src/net/yura/ios/CanvasView.java 2025-02-09 16:01:14 UTC (rev 2826)
+++ iOSME/src/net/yura/ios/CanvasView.java 2025-03-02 18:30:22 UTC (rev 2827)
@@ -7,9 +7,9 @@
import org.moe.natj.general.Pointer;
import javax.microedition.lcdui.Canvas;
import javax.microedition.lcdui.Graphics;
-import apple.coregraphics.struct.CGPoint;
-import apple.coregraphics.struct.CGRect;
-import apple.coregraphics.struct.CGSize;
+import apple.corefoundation.struct.CGPoint;
+import apple.corefoundation.struct.CGRect;
+import apple.corefoundation.struct.CGSize;
import apple.foundation.NSEnumerator;
import apple.foundation.NSSet;
import apple.uikit.UIBezierPath;
Modified: iOSME/src/net/yura/ios/ScrollToTopGestureRecognizer.java
===================================================================
--- iOSME/src/net/yura/ios/ScrollToTopGestureRecognizer.java 2025-02-09 16:01:14 UTC (rev 2826)
+++ iOSME/src/net/yura/ios/ScrollToTopGestureRecognizer.java 2025-03-02 18:30:22 UTC (rev 2827)
@@ -7,9 +7,9 @@
import net.yura.mobile.gui.components.Window;
import java.util.List;
import apple.coregraphics.c.CoreGraphics;
-import apple.coregraphics.struct.CGPoint;
-import apple.coregraphics.struct.CGRect;
-import apple.coregraphics.struct.CGSize;
+import apple.corefoundation.struct.CGPoint;
+import apple.corefoundation.struct.CGRect;
+import apple.corefoundation.struct.CGSize;
import apple.uikit.UIScreen;
import apple.uikit.UIScrollView;
import apple.uikit.UIViewController;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2025-02-09 16:01:17
|
Revision: 2826
http://sourceforge.net/p/swingme/code/2826
Author: yuranet
Date: 2025-02-09 16:01:14 +0000 (Sun, 09 Feb 2025)
Log Message:
-----------
fix for loading dialog getting stuck in in android release build
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java
AndroidME/src_SwingME_plaf/net/yura/android/LoadingDialog.java
Modified: AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java 2025-02-09 13:03:58 UTC (rev 2825)
+++ AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java 2025-02-09 16:01:14 UTC (rev 2826)
@@ -9,6 +9,7 @@
import javax.microedition.lcdui.Display;
import net.yura.android.AndroidMeActivity;
import net.yura.android.AndroidMeApp;
+import net.yura.android.LoadingDialog;
import net.yura.android.WebViewActivity;
import net.yura.mobile.logging.Logger;
import net.yura.mobile.util.Url;
@@ -121,7 +122,20 @@
boolean isProtoNativeForResult = url.startsWith(PROTOCOL_NATIVE_FOR_RESULT);
Activity activity = AndroidMeActivity.DEFAULT_ACTIVITY;
- if (isProtoNative || isProtoNativeForResult) {
+ // we can NOT use real android Activity for this, as Android does not respect the order the activity is started
+ // so if we call show and then hide in quick succession, then it may end up calling hide first
+ if (url.startsWith("nativeNoResult://net.yura.android.LoadingDialog")) {
+ String loadingMessage = content.getQueryParameter(LoadingDialog.PARAM_MESSAGE);
+ boolean cancellable = Boolean.parseBoolean(content.getQueryParameter(LoadingDialog.PARAM_CANCELLABLE));
+ String command = content.getQueryParameter(LoadingDialog.PARAM_COMMAND);
+ if (command == null || "".equals(command) || "setup".equals(command)) {
+ LoadingDialog.setupAndShow(loadingMessage, cancellable);
+ }
+ else {
+ LoadingDialog.hide();
+ }
+ }
+ else if (isProtoNative || isProtoNativeForResult) {
if (isProtoNativeForResult) {
hideSoftKeyboard();
Modified: AndroidME/src_SwingME_plaf/net/yura/android/LoadingDialog.java
===================================================================
--- AndroidME/src_SwingME_plaf/net/yura/android/LoadingDialog.java 2025-02-09 13:03:58 UTC (rev 2825)
+++ AndroidME/src_SwingME_plaf/net/yura/android/LoadingDialog.java 2025-02-09 16:01:14 UTC (rev 2826)
@@ -1,17 +1,14 @@
package net.yura.android;
import net.yura.mobile.logging.Logger;
-import net.yura.mobile.util.Url;
-import android.app.Activity;
import android.app.ProgressDialog;
import android.content.DialogInterface;
-import android.os.Bundle;
import android.view.WindowManager;
/**
- * really simple Activity to show and hide a loading screen
+ * really simple util to show and hide a loading screen
*/
-public class LoadingDialog extends Activity implements Runnable {
+public class LoadingDialog implements Runnable {
public static final String PARAM_MESSAGE = "message";
public static final String PARAM_CANCELLABLE = "cancellable";
@@ -22,31 +19,21 @@
private String action;
private String loadingMessage;
private boolean cancellable;
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- String command;
- if (getIntent().getData() != null) {
- Url url = new Url( getIntent().getData().toString() );
- loadingMessage = url.getQueryParameter(PARAM_MESSAGE);
- cancellable = Boolean.parseBoolean(url.getQueryParameter(PARAM_CANCELLABLE));
- command = url.getQueryParameter(PARAM_COMMAND);
- } else {
- loadingMessage = getIntent().getStringExtra(PARAM_MESSAGE);
- cancellable = getIntent().getBooleanExtra(PARAM_CANCELLABLE, false);
- command = getIntent().getStringExtra(PARAM_COMMAND);
- }
- if (command == null || "".equals(command)) {
- command = "setup";
- }
- runAction(command,0);
-
- finish();
+ private LoadingDialog() {
}
-
+ public static void setupAndShow(String loadingMessage, boolean cancellable) {
+ LoadingDialog setupTask = new LoadingDialog();
+ setupTask.loadingMessage = loadingMessage;
+ setupTask.cancellable = cancellable;
+ setupTask.runAction("setup", 0);
+ }
+
+ public static void hide() {
+ new LoadingDialog().runAction("hide", 0);
+ }
+
// public void show(String loadingMessage) {
// this.loadingMessage = loadingMessage;
// runAction("setup", 0);
@@ -101,6 +88,9 @@
}
dialog = null;
}
+ else {
+ System.out.println("WARN!! [LoadingDialog] action called, but no dialog to do anything with!! " + action);
+ }
}
}
catch (Throwable e) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2025-02-09 13:04:01
|
Revision: 2825
http://sourceforge.net/p/swingme/code/2825
Author: yuranet
Date: 2025-02-09 13:03:58 +0000 (Sun, 09 Feb 2025)
Log Message:
-----------
better error for null value
Modified Paths:
--------------
UtilME/src/net/yura/mobile/io/ProtoUtil.java
Modified: UtilME/src/net/yura/mobile/io/ProtoUtil.java
===================================================================
--- UtilME/src/net/yura/mobile/io/ProtoUtil.java 2025-02-09 12:48:19 UTC (rev 2824)
+++ UtilME/src/net/yura/mobile/io/ProtoUtil.java 2025-02-09 13:03:58 UTC (rev 2825)
@@ -173,13 +173,14 @@
break;
}
}
+ }
+ if (value == null) {
+ throw new NullPointerException("value null for key: " + key);
}
-
hashtable.put(key, value);
in2.popLimit(lim);
-
}
else {
in2.skipField(tag);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2025-02-09 12:48:21
|
Revision: 2824
http://sourceforge.net/p/swingme/code/2824
Author: yuranet
Date: 2025-02-09 12:48:19 +0000 (Sun, 09 Feb 2025)
Log Message:
-----------
better logging
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2025-01-25 15:46:16 UTC (rev 2823)
+++ AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2025-02-09 12:48:19 UTC (rev 2824)
@@ -129,60 +129,7 @@
}
private boolean foreground;
- @Override
- protected void onResume() {
- super.onResume();
- // Eliminates colour banding
- Window window = getWindow();
-
- if (Build.VERSION.SDK_INT > 4) {
- window.setFormat(PixelFormat.RGBX_8888);
- }
- else {
- // on the 1.6 emulator if you use RGBX_8888 it gives a white blank screen when starting the app
- window.setFormat(PixelFormat.RGBA_8888);
- }
-
- Logger.info("[AndroidMeActivity] onResume");
- foreground = true;
-
- if (wl!=null) {
- wl.acquire();
- }
-
- AudioPlayer.onResume();
- }
-
- @Override
- protected void onPause() {
- super.onPause();
-
- Logger.info("[AndroidMeActivity] onPause");
- foreground = false;
-
- AudioPlayer.onPause();
-
- if (wl!=null) {
- try {
- wl.release();
- }
- catch (Exception ex) {
- Logger.warn("exception in WakeLock release", ex);
- }
- }
-
- MIDlet midlet = AndroidMeApp.getMIDlet();
- if (midlet != null) {
- try {
- midlet.doPauseApp();
- }
- catch (Exception ex) {
- Logger.warn("exception in pauseApp", ex);
- }
- }
- }
-
public boolean isForeground() {
return foreground;
}
@@ -205,21 +152,6 @@
});
}
- //Override
- protected void onStop() {
- super.onStop();
- backgroundTime = System.currentTimeMillis();
- }
-
- //Override
- protected void onStart() {
- super.onStart();
- backgroundTime = 0L;
-
- hardKeyboardHidden = getResources().getConfiguration().hardKeyboardHidden;
-
- }
-
public long getInBackgroundTime() {
return (backgroundTime <= 0) ? 0 : (System.currentTimeMillis() - backgroundTime);
}
@@ -296,7 +228,6 @@
}.start();
}
-
// private void closeMIDlet() {
// try {
// if (midlet != null) {
@@ -319,12 +250,80 @@
// }
// }
+ //Override
+ protected void onStart() {
+ super.onStart();
+ backgroundTime = 0L;
+ hardKeyboardHidden = getResources().getConfiguration().hardKeyboardHidden;
+
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+
+ // Eliminates colour banding
+ Window window = getWindow();
+
+ if (Build.VERSION.SDK_INT > 4) {
+ window.setFormat(PixelFormat.RGBX_8888);
+ }
+ else {
+ // on the 1.6 emulator if you use RGBX_8888 it gives a white blank screen when starting the app
+ window.setFormat(PixelFormat.RGBA_8888);
+ }
+
+ Logger.info("[AndroidMeActivity] onResume");
+ foreground = true;
+
+ if (wl!=null) {
+ wl.acquire();
+ }
+
+ AudioPlayer.onResume();
+ }
+
+ @Override
+ protected void onPause() {
+ super.onPause();
+
+ Logger.info("[AndroidMeActivity] onPause (isFinishing=" + isFinishing()+")");
+ foreground = false;
+
+ AudioPlayer.onPause();
+
+ if (wl!=null) {
+ try {
+ wl.release();
+ }
+ catch (Exception ex) {
+ Logger.warn("exception in WakeLock release", ex);
+ }
+ }
+
+ MIDlet midlet = AndroidMeApp.getMIDlet();
+ if (midlet != null) {
+ try {
+ midlet.doPauseApp();
+ }
+ catch (Exception ex) {
+ Logger.warn("exception in pauseApp", ex);
+ }
+ }
+ }
+
//Override
+ protected void onStop() {
+ super.onStop();
+ backgroundTime = System.currentTimeMillis();
+ }
+
+ //Override
protected void onDestroy() {
super.onDestroy();
- Logger.info("[AndroidMeActivity] onDestroy");
+ Logger.info("[AndroidMeActivity] onDestroy (isFinishing=" + isFinishing()+")");
if (DEFAULT_ACTIVITY == this) {
// closeMIDlet();
@@ -338,7 +337,6 @@
}
}
-
@Override
public boolean onCreateOptionsMenu(Menu menu) {
MIDlet midlet = AndroidMeApp.getMIDlet();
@@ -435,7 +433,6 @@
super.onConfigurationChanged(newConfig);
try {
-
// Checks the orientation of the screen
//if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {
//}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2025-01-25 15:46:17
|
Revision: 2823
http://sourceforge.net/p/swingme/code/2823
Author: yuranet
Date: 2025-01-25 15:46:16 +0000 (Sat, 25 Jan 2025)
Log Message:
-----------
better logging
Modified Paths:
--------------
me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
Modified: me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2025-01-25 03:25:45 UTC (rev 2822)
+++ me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2025-01-25 15:46:16 UTC (rev 2823)
@@ -45,7 +45,7 @@
audioInputStream = AudioSystem.getAudioInputStream(new URL(url));
}
catch (Exception ex) {
- LOGGER.log(Level.WARNING, "Failed to load with url: " + url, ex);
+ LOGGER.log(Level.INFO, "Failed to load with url: " + url, ex);
try {
// only for actual file urls, try to get with file API
if (url.startsWith("file:/")) {
@@ -57,7 +57,7 @@
}
}
catch (Exception ex2) {
- LOGGER.log(Level.WARNING, "Failed to load with url, falling back to loading all data.", ex2);
+ LOGGER.log(Level.WARNING, "Failed to load with file, falling back to loading all data.", ex2);
//audioInputStream = AudioSystem.getAudioInputStream(new BufferedInputStream(source.getInputStream(), 1024));
audioInputStream = AudioSystem.getAudioInputStream(dataSource.getInputStream());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2025-01-25 03:25:48
|
Revision: 2822
http://sourceforge.net/p/swingme/code/2822
Author: yuranet
Date: 2025-01-25 03:25:45 +0000 (Sat, 25 Jan 2025)
Log Message:
-----------
use getImageToDraw in Graphics3D
Modified Paths:
--------------
me4se/opt/m3g_basic/src/javax/microedition/m3g/Graphics3D.java
Modified: me4se/opt/m3g_basic/src/javax/microedition/m3g/Graphics3D.java
===================================================================
--- me4se/opt/m3g_basic/src/javax/microedition/m3g/Graphics3D.java 2025-01-23 03:45:10 UTC (rev 2821)
+++ me4se/opt/m3g_basic/src/javax/microedition/m3g/Graphics3D.java 2025-01-25 03:25:45 UTC (rev 2822)
@@ -42,7 +42,7 @@
targetGraphics.fillRect(vpX, vpY, vpW, vpH);
}
else {
- targetGraphics._getAwtGraphics().drawImage(background.getImage().getImage()._image, vpX, vpY, vpW, vpH, null);
+ targetGraphics._getAwtGraphics().drawImage(targetGraphics.getImageToDraw(background.getImage().getImage()), vpX, vpY, vpW, vpH, null);
}
}
@@ -56,5 +56,4 @@
public static Hashtable getProperties() {
return new Hashtable(0);
}
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2025-01-23 03:45:13
|
Revision: 2821
http://sourceforge.net/p/swingme/code/2821
Author: yuranet
Date: 2025-01-23 03:45:10 +0000 (Thu, 23 Jan 2025)
Log Message:
-----------
only use file fallback for file urls
Modified Paths:
--------------
me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
Modified: me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2025-01-23 03:13:10 UTC (rev 2820)
+++ me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2025-01-23 03:45:10 UTC (rev 2821)
@@ -1,5 +1,6 @@
package org.me4se.psi.java1.media.audio;
+import java.net.URI;
import java.net.URL;
import java.util.HashSet;
import java.util.Set;
@@ -46,12 +47,18 @@
catch (Exception ex) {
LOGGER.log(Level.WARNING, "Failed to load with url: " + url, ex);
try {
- //audioInputStream = AudioSystem.getAudioInputStream(new BufferedInputStream(source.getInputStream(), 1024));
- //audioInputStream = AudioSystem.getAudioInputStream(new File(new URL(dataSource.getLocator()).getPath()));
- audioInputStream = AudioSystem.getAudioInputStream(FileConnectionImpl.urlToFile(url));
+ // only for actual file urls, try to get with file API
+ if (url.startsWith("file:/")) {
+ //audioInputStream = AudioSystem.getAudioInputStream(new File(new URL(dataSource.getLocator()).getPath()));
+ audioInputStream = AudioSystem.getAudioInputStream(FileConnectionImpl.urlToFile(url));
+ }
+ else {
+ audioInputStream = AudioSystem.getAudioInputStream(new URI(url).toURL());
+ }
}
catch (Exception ex2) {
LOGGER.log(Level.WARNING, "Failed to load with url, falling back to loading all data.", ex2);
+ //audioInputStream = AudioSystem.getAudioInputStream(new BufferedInputStream(source.getInputStream(), 1024));
audioInputStream = AudioSystem.getAudioInputStream(dataSource.getInputStream());
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2025-01-23 03:13:12
|
Revision: 2820
http://sourceforge.net/p/swingme/code/2820
Author: yuranet
Date: 2025-01-23 03:13:10 +0000 (Thu, 23 Jan 2025)
Log Message:
-----------
rename check
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/FileChooser.java
SwingME/src_se/net/yura/midp/io/JavaFileConnection.java
me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java
Modified: SwingME/src/net/yura/mobile/gui/components/FileChooser.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/FileChooser.java 2025-01-23 01:08:48 UTC (rev 2819)
+++ SwingME/src/net/yura/mobile/gui/components/FileChooser.java 2025-01-23 03:13:10 UTC (rev 2820)
@@ -902,14 +902,23 @@
filename = name;
}
+ /**
+ * @see java.io.File#getAbsolutePath()
+ */
public String getAbsolutePath() {
return dir + filename;
}
+ /**
+ * @see javax.microedition.io.file.FileConnection#getName()
+ */
public String getName() {
return filename;
}
+ /**
+ * @see javax.microedition.io.file.FileConnection#getPath()
+ */
public String getPath() {
return dir;
}
Modified: SwingME/src_se/net/yura/midp/io/JavaFileConnection.java
===================================================================
--- SwingME/src_se/net/yura/midp/io/JavaFileConnection.java 2025-01-23 01:08:48 UTC (rev 2819)
+++ SwingME/src_se/net/yura/midp/io/JavaFileConnection.java 2025-01-23 03:13:10 UTC (rev 2820)
@@ -15,6 +15,12 @@
import java.util.regex.Pattern;
import javax.microedition.io.file.FileConnection;
+/**
+ * There are 2 implementations of FileConnection,
+ * this one is used on android and ios and another one that is used in j2se.
+ *
+ * @see org.me4se.psi.java1.gcf.file.FileConnectionImpl
+ */
public class JavaFileConnection implements FileConnection {
private static final String SPECIAL_CHARACTERS = "*.^?[]\\";
@@ -148,8 +154,22 @@
return this.file.getName();
}
+ /**
+ * Returns the path excluding the file or directory name and the "file" URL
+ * schema and host from where the file or directory specified in the
+ * Connector.open() method is opened. {@link #getName()} can be appended to
+ * this value to get a fully qualified path filename. The String resulting
+ * from this method looks as follows:
+ * <pre>
+ * /<root>/<directory>/
+ * </pre>
+ * @return The path of a file or directory in the format specified above.
+ *
+ * @see org.me4se.psi.java1.gcf.file.FileConnectionImpl#getPath()
+ */
// Override
public String getPath() {
+ // TODO is this correct? is MIDP API getPath same as J2SE API getPath??
return this.file.getPath();
}
@@ -159,6 +179,7 @@
*/
// Override
public String getURL() {
+ // TODO do we want to use toASCIIString() ?
return this.file.toURI().toString();
}
@@ -239,7 +260,6 @@
if (!this.file.mkdir()) {
throw new IOException("unable to create directory");
}
-
}
// Override
@@ -280,7 +300,9 @@
public void rename(String newName) throws IOException {
File directory = getParentDirectory(this.file);
File targetFile = new File(directory, newName);
- this.file.renameTo(targetFile);
+ if (!file.renameTo(targetFile)) {
+ throw new IOException("unable to rename to: " + newName);
+ }
}
// Override
@@ -298,6 +320,7 @@
// Override
public void setHidden(boolean hidden) throws IOException {
+ // does not exist as a concept on android and ios
throw new IOException("unsupported");
}
Modified: me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java 2025-01-23 01:08:48 UTC (rev 2819)
+++ me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java 2025-01-23 03:13:10 UTC (rev 2820)
@@ -79,15 +79,6 @@
this.mode = mode;
//url = url.substring(5);
-
- Enumeration keys = FileSystemRegistry.remap.keys();
- while (keys.hasMoreElements()) {
- String key = (String)keys.nextElement();
- if (url.startsWith(key)) {
- file = new File( (String)FileSystemRegistry.remap.get(key), url.substring(key.length()) );
- return;
- }
- }
file = urlToFile(url);
}
@@ -98,6 +89,15 @@
* so we will try to use java URI, but also fallback to doing it manually
*/
public static File urlToFile(String url) {
+
+ Enumeration keys = FileSystemRegistry.remap.keys();
+ while (keys.hasMoreElements()) {
+ String key = (String)keys.nextElement();
+ if (url.startsWith(key)) {
+ return new File( (String)FileSystemRegistry.remap.get(key), url.substring(key.length()));
+ }
+ }
+
try {
// supports url encoded spaces and other url encoded things
// a real space will cause a 'java.net.URISyntaxException: Illegal character in path'
@@ -143,6 +143,7 @@
}
public void create() throws IOException {
+ // TODO YURA maybe use file.createNewFile()
FileOutputStream fos = new FileOutputStream(file);
fos.close();
}
@@ -194,6 +195,19 @@
return file.isDirectory() ? file.getName()+ "/" : file.getName();
}
+ /**
+ * Returns the path excluding the file or directory name and the "file" URL
+ * schema and host from where the file or directory specified in the
+ * Connector.open() method is opened. {@link #getName()} can be appended to
+ * this value to get a fully qualified path filename. The String resulting
+ * from this method looks as follows:
+ * <pre>
+ * /<root>/<directory>/
+ * </pre>
+ * @return The path of a file or directory in the format specified above.
+ *
+ * @see net.yura.midp.io.JavaFileConnection#getPath()
+ */
public String getPath() {
// TODO YURA is this correct? should this return the full path or the parent?
return file.isDirectory()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2025-01-23 01:08:50
|
Revision: 2819
http://sourceforge.net/p/swingme/code/2819
Author: yuranet
Date: 2025-01-23 01:08:48 +0000 (Thu, 23 Jan 2025)
Log Message:
-----------
comment update
Modified Paths:
--------------
me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java
Modified: me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java 2025-01-22 23:56:40 UTC (rev 2818)
+++ me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java 2025-01-23 01:08:48 UTC (rev 2819)
@@ -92,10 +92,12 @@
file = urlToFile(url);
}
+ /**
+ * modern browsers will handle urls with both encoded and non-encoded chars
+ * but there is no single way in java that will handle this mix
+ * so we will try to use java URI, but also fallback to doing it manually
+ */
public static File urlToFile(String url) {
-// modern browsers will handle urls with both encoded and non-encoded chars
- // but there is no single way in java that will handle this mix
- // so we will try to use java URI, but also fallback to doing it manually
try {
// supports url encoded spaces and other url encoded things
// a real space will cause a 'java.net.URISyntaxException: Illegal character in path'
@@ -193,7 +195,7 @@
}
public String getPath() {
-
+ // TODO YURA is this correct? should this return the full path or the parent?
return file.isDirectory()
? file.getAbsolutePath() + "/"
: file.getAbsolutePath();
@@ -200,6 +202,7 @@
}
public String getURL() {
+ // TODO YURA is this correct? this will not do url encoding
return "file:///"+getPath();
}
@@ -211,7 +214,7 @@
* Will be left out. false is returned by default sind jdk1.1.8 does not support isHidden().
*/
public boolean isHidden() {
- throw new RuntimeException("FileConnection.isHidden() not yet implemented!");
+ return file.isHidden();
}
public long lastModified() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2025-01-22 23:56:42
|
Revision: 2818
http://sourceforge.net/p/swingme/code/2818
Author: yuranet
Date: 2025-01-22 23:56:40 +0000 (Wed, 22 Jan 2025)
Log Message:
-----------
MORE fallback for loading audio
Modified Paths:
--------------
me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java
me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
Modified: me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java 2025-01-22 16:33:18 UTC (rev 2817)
+++ me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java 2025-01-22 23:56:40 UTC (rev 2818)
@@ -89,7 +89,11 @@
}
}
- // modern browsers will handle urls with both encoded and non-encoded chars
+ file = urlToFile(url);
+ }
+
+ public static File urlToFile(String url) {
+// modern browsers will handle urls with both encoded and non-encoded chars
// but there is no single way in java that will handle this mix
// so we will try to use java URI, but also fallback to doing it manually
try {
@@ -96,7 +100,7 @@
// supports url encoded spaces and other url encoded things
// a real space will cause a 'java.net.URISyntaxException: Illegal character in path'
URI fileUrl = new URI(url.replaceAll(" ", "%20"));
- file = new File(fileUrl);
+ return new File(fileUrl);
}
catch(Exception ex) {
// on windows some network urls WILL fail, so we HAVE to have a fallback
@@ -114,9 +118,9 @@
//System.out.println("opening file: "+path+" URL="+url);
// can not have %20 in the name or it will not find it, needs to be " ".
- file = new File(path.replaceAll("\\%20"," "));
+ return new File(path.replaceAll("\\%20"," "));
}
- }
+ }
/*
* Will be left out !
Modified: me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2025-01-22 16:33:18 UTC (rev 2817)
+++ me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2025-01-22 23:56:40 UTC (rev 2818)
@@ -17,6 +17,7 @@
import javax.sound.sampled.LineUnavailableException;
import javax.sound.sampled.SourceDataLine;
import org.me4se.impl.BasicMMPlayer;
+import org.me4se.psi.java1.gcf.file.FileConnectionImpl;
public class WavePlayerImpl extends BasicMMPlayer implements LineListener {
@@ -37,14 +38,22 @@
private AudioInputStream getAudioInputStream() throws Exception {
if (audioInputStream == null) {
+ String url = dataSource.getLocator();
try {
- audioInputStream = AudioSystem.getAudioInputStream(new URL(dataSource.getLocator()));
+ // deprecated URL constructor has no validation, so will allow dubious urls with mixed encodings
+ audioInputStream = AudioSystem.getAudioInputStream(new URL(url));
}
catch (Exception ex) {
- LOGGER.warning("WARN! Failed to load with url, falling back to loading all data. " + ex);
- //audioInputStream = AudioSystem.getAudioInputStream(new BufferedInputStream(source.getInputStream(), 1024));
- //audioInputStream = AudioSystem.getAudioInputStream(new File(new URL(dataSource.getLocator()).getPath()));
- audioInputStream = AudioSystem.getAudioInputStream(dataSource.getInputStream());
+ LOGGER.log(Level.WARNING, "Failed to load with url: " + url, ex);
+ try {
+ //audioInputStream = AudioSystem.getAudioInputStream(new BufferedInputStream(source.getInputStream(), 1024));
+ //audioInputStream = AudioSystem.getAudioInputStream(new File(new URL(dataSource.getLocator()).getPath()));
+ audioInputStream = AudioSystem.getAudioInputStream(FileConnectionImpl.urlToFile(url));
+ }
+ catch (Exception ex2) {
+ LOGGER.log(Level.WARNING, "Failed to load with url, falling back to loading all data.", ex2);
+ audioInputStream = AudioSystem.getAudioInputStream(dataSource.getInputStream());
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2025-01-22 16:33:21
|
Revision: 2817
http://sourceforge.net/p/swingme/code/2817
Author: yuranet
Date: 2025-01-22 16:33:18 +0000 (Wed, 22 Jan 2025)
Log Message:
-----------
fallback handles spaces
Modified Paths:
--------------
me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java
Modified: me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java 2025-01-11 20:10:45 UTC (rev 2816)
+++ me4se/src/org/me4se/psi/java1/gcf/file/FileConnectionImpl.java 2025-01-22 16:33:18 UTC (rev 2817)
@@ -21,7 +21,7 @@
import java.io.DataOutputStream;
import java.io.DataInputStream;
import java.io.RandomAccessFile;
-
+import java.net.URI;
import java.util.Arrays;
import java.util.Properties;
import java.util.Enumeration;
@@ -88,17 +88,34 @@
return;
}
}
-
- int cut = 5; // file://
- while(cut < url.length() && url.charAt(cut)=='/')
- cut++;
-
- if(cut+1 >= url.length() || url.charAt(cut+1) != ':') // "/C:/" -> "C:/"
- cut--;
-
- String path = url.substring(cut);
- //System.out.println("opening file: "+path+" URL="+url);
- file = new File(path);
+
+ // modern browsers will handle urls with both encoded and non-encoded chars
+ // but there is no single way in java that will handle this mix
+ // so we will try to use java URI, but also fallback to doing it manually
+ try {
+ // supports url encoded spaces and other url encoded things
+ // a real space will cause a 'java.net.URISyntaxException: Illegal character in path'
+ URI fileUrl = new URI(url.replaceAll(" ", "%20"));
+ file = new File(fileUrl);
+ }
+ catch(Exception ex) {
+ // on windows some network urls WILL fail, so we HAVE to have a fallback
+ System.out.println("unable to convert using standard java: " + url + " " + ex);
+
+ // fall back to old method of converting url to file
+ int cut = 5; // file://
+ while(cut < url.length() && url.charAt(cut)=='/')
+ cut++;
+
+ if(cut+1 >= url.length() || url.charAt(cut+1) != ':') // "/C:/" -> "C:/"
+ cut--;
+
+ String path = url.substring(cut);
+ //System.out.println("opening file: "+path+" URL="+url);
+
+ // can not have %20 in the name or it will not find it, needs to be " ".
+ file = new File(path.replaceAll("\\%20"," "));
+ }
}
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2025-01-11 20:10:47
|
Revision: 2816
http://sourceforge.net/p/swingme/code/2816
Author: yuranet
Date: 2025-01-11 20:10:45 +0000 (Sat, 11 Jan 2025)
Log Message:
-----------
fix for audio on Linux
Modified Paths:
--------------
me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
Modified: me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-12-31 03:05:10 UTC (rev 2815)
+++ me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2025-01-11 20:10:45 UTC (rev 2816)
@@ -83,6 +83,8 @@
LOGGER.log(Level.INFO, "failed to getClip()", ex);
// not sure what the solution to this error is, but one thing we can try is useDefaultMixer
useDefaultMixer = true;
+ // this can also throw:
+ // java.lang.IllegalArgumentException: Mixer not supported: null
clip = AudioSystem.getClip(null);
}
@@ -90,7 +92,10 @@
// does not allow loading audiostream with unknown length,
// and has deadlocks when playing more then one song at the same time
if (!useDefaultMixer && "org.classpath.icedtea.pulseaudio.PulseAudioClip".equals(clip.getClass().getName())) {
- clip.close();
+ try {
+ clip.close();
+ }
+ catch (Throwable th) {}
useDefaultMixer = true;
clip = AudioSystem.getClip(null);
}
@@ -170,7 +175,7 @@
}
public void closeImpl() {
- LOGGER.fine("closeImpl: " + clip);
+ LOGGER.info("closeImpl: " + clip);
if (clip != null) {
clip.close();
clip = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-12-31 03:05:13
|
Revision: 2815
http://sourceforge.net/p/swingme/code/2815
Author: yuranet
Date: 2024-12-31 03:05:10 +0000 (Tue, 31 Dec 2024)
Log Message:
-----------
too much log spam
Modified Paths:
--------------
me4se/src/org/me4se/impl/BasicMMPlayer.java
Modified: me4se/src/org/me4se/impl/BasicMMPlayer.java
===================================================================
--- me4se/src/org/me4se/impl/BasicMMPlayer.java 2024-12-30 01:49:57 UTC (rev 2814)
+++ me4se/src/org/me4se/impl/BasicMMPlayer.java 2024-12-31 03:05:10 UTC (rev 2815)
@@ -138,7 +138,7 @@
prefetchImpl();
}
catch(Exception e){
- e.printStackTrace();
+ //e.printStackTrace();
MediaException mx = new MediaException(e.toString());
mx.initCause(e);
throw mx;
@@ -154,7 +154,7 @@
realizeImpl();
}
catch(Exception e){
- e.printStackTrace();
+ //e.printStackTrace();
MediaException mx = new MediaException(e.toString());
mx.initCause(e);
throw mx;
@@ -187,7 +187,7 @@
throw e;
}
catch(Exception e){
- e.printStackTrace();
+ //e.printStackTrace();
MediaException mx = new MediaException(e.toString());
mx.initCause(e);
throw mx;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-12-30 01:49:59
|
Revision: 2814
http://sourceforge.net/p/swingme/code/2814
Author: yuranet
Date: 2024-12-30 01:49:57 +0000 (Mon, 30 Dec 2024)
Log Message:
-----------
exit logging
Modified Paths:
--------------
iOSME/src/net/yura/ios/SwingMEiOSApplication.java
iOSME/src/net/yura/ios/WebViewController.java
Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2024-12-23 16:29:24 UTC (rev 2813)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2024-12-30 01:49:57 UTC (rev 2814)
@@ -242,6 +242,8 @@
@Override
public void applicationWillTerminate(UIApplication application) {
+ System.out.println("[SwingMEiOS] applicationWillTerminate");
+
MIDlet midlet = MIDlet.DEFAULT_MIDLET;
if (midlet != null) {
try {
Modified: iOSME/src/net/yura/ios/WebViewController.java
===================================================================
--- iOSME/src/net/yura/ios/WebViewController.java 2024-12-23 16:29:24 UTC (rev 2813)
+++ iOSME/src/net/yura/ios/WebViewController.java 2024-12-30 01:49:57 UTC (rev 2814)
@@ -1,7 +1,6 @@
package net.yura.ios;
import org.moe.natj.general.Pointer;
-import apple.foundation.NSBundle;
import apple.foundation.NSData;
import apple.foundation.NSError;
import apple.foundation.NSURL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-12-23 16:29:26
|
Revision: 2813
http://sourceforge.net/p/swingme/code/2813
Author: yuranet
Date: 2024-12-23 16:29:24 +0000 (Mon, 23 Dec 2024)
Log Message:
-----------
try useDefaultMixer if getClip throws
Modified Paths:
--------------
me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
Property Changed:
----------------
me4se/
Index: me4se
===================================================================
--- me4se 2024-12-07 18:28:02 UTC (rev 2812)
+++ me4se 2024-12-23 16:29:24 UTC (rev 2813)
Property changes on: me4se
___________________________________________________________________
Modified: svn:ignore
## -1,6 +1,7 ##
+tmpclasses
CVS
+.classpath
+build
.cvsignore
+dist
.project
-.classpath
-dist
-build
Modified: me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-12-07 18:28:02 UTC (rev 2812)
+++ me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-12-23 16:29:24 UTC (rev 2813)
@@ -3,6 +3,7 @@
import java.net.URL;
import java.util.HashSet;
import java.util.Set;
+import java.util.logging.Level;
import java.util.logging.Logger;
import javax.microedition.media.PlayerListener;
import javax.microedition.midlet.ApplicationManager;
@@ -63,7 +64,7 @@
public void startImpl() throws Exception {
LOGGER.fine("Start called for clip: "+clip);
-
+
if (clip == null) {
getAudioInputStream();
@@ -71,14 +72,29 @@
clip = (Clip) AudioSystem.getLine(info);
}
else {
- clip = useDefaultMixer ? AudioSystem.getClip(null) : AudioSystem.getClip();
- // on Linux java 1.8 PulseAudioClip is nasty and does not work,
- // does not allow loading audiostream with unknown length,
- // and has deadlocks when playing more then one song at the same time
- if (!useDefaultMixer && "org.classpath.icedtea.pulseaudio.PulseAudioClip".equals(clip.getClass().getName())) {
- useDefaultMixer = true;
+ if (useDefaultMixer) {
clip = AudioSystem.getClip(null);
}
+ else {
+ try {
+ clip = AudioSystem.getClip();
+ }
+ catch(Exception ex) { // java.lang.IllegalArgumentException: No line matching interface Clip supporting format PCM_SIGNED unknown sample rate, 16 bit, stereo, 4 bytes/frame, big-endian is supported.
+ LOGGER.log(Level.INFO, "failed to getClip()", ex);
+ // not sure what the solution to this error is, but one thing we can try is useDefaultMixer
+ useDefaultMixer = true;
+ clip = AudioSystem.getClip(null);
+ }
+
+ // on Linux java 1.8 PulseAudioClip is nasty and does not work,
+ // does not allow loading audiostream with unknown length,
+ // and has deadlocks when playing more then one song at the same time
+ if (!useDefaultMixer && "org.classpath.icedtea.pulseaudio.PulseAudioClip".equals(clip.getClass().getName())) {
+ clip.close();
+ useDefaultMixer = true;
+ clip = AudioSystem.getClip(null);
+ }
+ }
}
if (AudioSystem.isLineSupported(new DataLine.Info(SourceDataLine.class, audioInputStream.getFormat(), AudioSystem.NOT_SPECIFIED))) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-12-07 18:28:05
|
Revision: 2812
http://sourceforge.net/p/swingme/code/2812
Author: yuranet
Date: 2024-12-07 18:28:02 +0000 (Sat, 07 Dec 2024)
Log Message:
-----------
allow OptionPane to open before any UI is created
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/Label.java
SwingME/src/net/yura/mobile/gui/components/OptionPane.java
Modified: SwingME/src/net/yura/mobile/gui/components/Label.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Label.java 2024-12-07 17:03:35 UTC (rev 2811)
+++ SwingME/src/net/yura/mobile/gui/components/Label.java 2024-12-07 18:28:02 UTC (rev 2812)
@@ -305,9 +305,15 @@
// if the width has not been set yet
// we will assume as can take the default amount
Border b = getInsets();
- int resonableTextLength = getDesktopPane().getWidth() - ( b.getLeft()+b.getRight() );
- int minimumIconWidth = getIconWidth(getIcon()) + padding *2;
- return Math.max(resonableTextLength,minimumIconWidth);
+ int maxw = getDesktopPane().getWidth();
+ // check just in case we are creating some UI before we know the full size
+ // e.g. OptionPane opens with a message during construction
+ if (maxw > 0) {
+ int resonableTextLength = maxw - (b.getLeft() + b.getRight());
+ int minimumIconWidth = getIconWidth(getIcon()) + padding * 2;
+ return Math.max(resonableTextLength, minimumIconWidth);
+ }
+ return Integer.MAX_VALUE;
}
protected int getCombinedWidth(int textWidth, int iconWidth) {
Modified: SwingME/src/net/yura/mobile/gui/components/OptionPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/OptionPane.java 2024-12-07 17:03:35 UTC (rev 2811)
+++ SwingME/src/net/yura/mobile/gui/components/OptionPane.java 2024-12-07 18:28:02 UTC (rev 2812)
@@ -214,11 +214,14 @@
private Component getComponentFromObject(Object object) {
DesktopPane dp = getDesktopPane();
+ // if the construction of UI also triggered a OptionPane to open, we may not know the size of the DesktopPane yet
+ // we do not want to squash everything into an impossibly small space, so we just go with a sensible default
+ int dpw = dp.getWidth() > 0 ? dp.getWidth() : 1024;
if (object instanceof Component) {
Component component = (Component)object;
if (component instanceof TextField && component.getPreferredWidth() == -1) {
- component.setPreferredSize(dp.getWidth()/2, component.getPreferredHeight());
+ component.setPreferredSize(dpw / 2, component.getPreferredHeight());
}
return component;
}
@@ -228,7 +231,7 @@
Border dialogInsets = getInsets();
- int space = dp.getWidth() - 12 - scroll.getBarThickness() - dialogInsets.getLeft() - dialogInsets.getRight(); // padding
+ int space = dpw - 12 - scroll.getBarThickness() - dialogInsets.getLeft() - dialogInsets.getRight(); // padding
if (dp.VERY_BIG_SCREEN) {
icon.workoutPreferredSize();
space = space - icon.getWidthWithBorder();
@@ -327,7 +330,8 @@
// check all the buttons fit on the screen, if no, make then arrange vertically
cmdPanel.workoutMinimumSize();
- if (cmdPanel.getWidth() > getDesktopPane().getWidth()) {
+ int dpw = getDesktopPane().getWidth();
+ if (dpw > 0 && cmdPanel.getWidth() > dpw) {
cmdPanel.setLayout(new BoxLayout(Graphics.VCENTER));
}
}
@@ -388,11 +392,11 @@
int maxw = dp.getWidth();
int maxh = dp.getHeight() - dp.getMenuHeight()*2;
- if (getHeightWithBorder() > maxh) {
+ if (maxh > 0 && getHeightWithBorder() > maxh) {
setFocusedComponent(null);
setBounds(0,0,getWidthWithBorder() + scroll.getBarThickness(), maxh);
}
- if (getWidthWithBorder() > maxw) {
+ if (maxw > 0 && getWidthWithBorder() > maxw) {
setFocusedComponent(null);
setBounds(0,0,maxw, getHeightWithBorder() +((getHeightWithBorder() == maxh)?0:scroll.getBarThickness()) );
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
