fix gui layer

digitalgust · Mar 2, 2024 · e3eff13 · e3eff13
2 parents 57f6073 + 6bdda66
commit e3eff13
Show file tree

Hide file tree

Showing 11 changed files with 605 additions and 30 deletions.
diff --git a/desktop/glfw_gui/java/pom.xml b/desktop/glfw_gui/java/pom.xml
@@ -8,7 +8,7 @@
     <groupId>io.github.digitalgust</groupId>
     <artifactId>glfw_gui</artifactId>
     <name>${project.groupId}:${project.artifactId}</name>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <description>miniJVM desktop platform gui library</description>
     <url>https://github.com/digitalgust/miniJVM</url>
 
@@ -145,7 +145,7 @@
         <dependency>
             <groupId>io.github.digitalgust</groupId>
             <artifactId>minijvm_rt</artifactId>
-            <version>1.1.3</version>
+            <version>1.1.4</version>
         </dependency>
     </dependencies>
 

diff --git a/extlib/xgui/pom.xml b/extlib/xgui/pom.xml
@@ -9,7 +9,7 @@
     <groupId>io.github.digitalgust</groupId>
     <artifactId>xgui</artifactId>
     <name>${project.groupId}:${project.artifactId}</name>
-    <version>1.1.8</version>
+    <version>1.1.9</version>
     <description>miniJVM mobile platform gui library</description>
     <url>https://github.com/digitalgust/miniJVM</url>
 
@@ -158,12 +158,12 @@
         <dependency>
             <groupId>io.github.digitalgust</groupId>
             <artifactId>glfw_gui</artifactId>
-            <version>1.1.4</version>
+            <version>1.1.5</version>
         </dependency>
         <dependency>
             <groupId>io.github.digitalgust</groupId>
             <artifactId>glfm_gui</artifactId>
-            <version>1.1.4</version>
+            <version>1.1.5</version>
         </dependency>
     </dependencies>
 

diff --git a/extlib/xgui/src/main/java/org/mini/gui/GContainer.java b/extlib/xgui/src/main/java/org/mini/gui/GContainer.java
@@ -260,7 +260,7 @@ public <T extends GObject> T findByName(String name) {
     <T extends GObject> T findSonByXY(float x, float y) {
         GObject front = null, mid = null, back = null, menu = null;
         synchronized (elements) {
-            for (int i = elements.size() - 1; i >= 0; i--) {
+            for (int i = 0; i < elements.size(); i++) {
                 GObject nko = elements.get(i);
                 if (nko.isInArea(x, y)) {
                     if (nko.getLayer() == LAYER_INNER) {

diff --git a/minijvm/java/pom.xml b/minijvm/java/pom.xml
@@ -8,7 +8,7 @@
     <groupId>io.github.digitalgust</groupId>
     <artifactId>minijvm_rt</artifactId>
     <name>${project.groupId}:${project.artifactId}</name>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
     <description>miniJVM runtime library</description>
     <url>https://github.com/digitalgust/miniJVM</url>
 

diff --git a/minijvm/java/src/main/java/java/util/Collections.java b/minijvm/java/src/main/java/java/util/Collections.java
@@ -24,21 +24,14 @@
  */
 
 package java.util;
-import java.io.Serializable;
+
+
+import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.IOException;
+import java.io.Serializable;
 import java.lang.reflect.Array;
-import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.function.UnaryOperator;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-import sun.misc.SharedSecrets;
+import java.util.function.*;
 
 /**
  * This class consists exclusively of static methods that operate on or return
@@ -1841,7 +1834,7 @@ static class UnmodifiableNavigableMap<K,V>
         private static final long serialVersionUID = -4858195264774772197L;
 
         /**
-         * A class for the {@link EMPTY_NAVIGABLE_MAP} which needs readResolve
+         * A class for the {@link } which needs readResolve
          * to preserve singleton property.
          *
          * @param <K> type of keys, if there were any, and of bounds
@@ -1862,7 +1855,7 @@ public NavigableSet<K> navigableKeySet()
         }
 
         /**
-         * Singleton for {@link emptyNavigableMap()} which is also immutable.
+         * Singleton for {@link ()} which is also immutable.
          */
         private static final EmptyNavigableMap<?,?> EMPTY_NAVIGABLE_MAP =
                 new EmptyNavigableMap<>();
@@ -1961,7 +1954,7 @@ public NavigableMap<K, V> tailMap(K fromKey, boolean inclusive)
      *
      * It is imperative that the user manually synchronize on the returned
      * collection when traversing it via {@link Iterator}, {@link Spliterator}
-     * or {@link Stream}:
+     * or {@link }:
      * <pre>
      *  Collection c = Collections.synchronizedCollection(myCollection);
      *     ...
@@ -5127,7 +5120,6 @@ public boolean equals(Object o) {
 
         private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
             ois.defaultReadObject();
-            SharedSecrets.getJavaOISAccess().checkArray(ois, Object[].class, n);
         }
     }
 
@@ -5448,7 +5440,6 @@ public static boolean disjoint(Collection<?> c1, Collection<?> c2) {
      * @see Collection#addAll(Collection)
      * @since 1.5
      */
-    @SafeVarargs
     public static <T> boolean addAll(Collection<? super T> c, T... elements) {
         boolean result = false;
         for (T element : elements)