update gui and set java.version

digitalgust · Sep 29, 2024 · a5e5257 · a5e5257
1 parent 18e9ecd
commit a5e5257
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/extlib/xgui/src/main/java/org/mini/gui/GViewSlot.java b/extlib/xgui/src/main/java/org/mini/gui/GViewSlot.java
@@ -169,7 +169,7 @@ public void moveTo(int slot, long timeInMils) {
     public void moveTo(GObject go, long timeInMils) {
         if (containsImpl(go)) {
             GObject curGo = getElementsImpl().get(active);
-            if (curGo != null && go != null) {
+            if (curGo != null && go != null && swapTask == null) {
                 SlotSwaper swaper = new SlotSwaper(this, curGo, go, timeInMils);
                 swapTask = new GCmd(swaper);
                 GForm.addCmd(swapTask);

diff --git a/extlib/xgui/src/main/java/org/mini/gui/guilib/GuiScriptLib.java b/extlib/xgui/src/main/java/org/mini/gui/guilib/GuiScriptLib.java
@@ -111,6 +111,9 @@ public static void doHttpCallback(GForm form, String callback, String url, int c
             if (callback.contains(".")) {
                 String[] ss = callback.split("\\.");
                 GContainer gobj = GToolkit.getComponent(form, ss[0]);
+                if (gobj == null) {
+                    gobj = GToolkit.getComponent(GCallBack.getInstance().getApplication().getForm(), ss[0]);
+                }
                 if (gobj != null) {
                     Interpreter inp = gobj.getInterpreter();
                     inp.callSub(ss[1] + "(\"" + url + "\"," + code + ",\"" + reply + "\")");

diff --git a/minijvm/java/src/main/resource/sys.properties b/minijvm/java/src/main/resource/sys.properties
@@ -6,7 +6,7 @@ java.class.path=jvm_set_value : classpath  jvm startup with -cp
 java.home=
 java.vendor=org.minijvm
 java.vendor.url=https://github.com/digitalgust/miniJVM
-java.version=1.0
+java.version=1.8.0
 line.separator=jvm_set_value: posix="\n"  windows="\r\n"
 os.arch=
 os.name=jvm_set_value: "Mac" "Linux" "Windows"