diff --git a/webfx-kit/pom.xml b/webfx-kit/pom.xml index 8e7e4df3cc..c19f157248 100644 --- a/webfx-kit/pom.xml +++ b/webfx-kit/pom.xml @@ -16,24 +16,26 @@ pom - webfx-kit-gwt webfx-kit-javafxbase-emul webfx-kit-javafxcontrols-emul webfx-kit-javafxcontrols-peers-base - webfx-kit-javafxcontrols-peers-gwt + webfx-kit-javafxcontrols-peers-gwt-j2cl webfx-kit-javafxcontrols-registry - webfx-kit-javafxcontrols-registry-gwt + webfx-kit-javafxcontrols-registry-gwt-j2cl webfx-kit-javafxgraphics-emul + webfx-kit-javafxgraphics-fat-j2cl + webfx-kit-javafxgraphics-gwt-j2cl + webfx-kit-javafxgraphics-openjfx webfx-kit-javafxgraphics-peers webfx-kit-javafxgraphics-peers-base - webfx-kit-javafxgraphics-peers-gwt + webfx-kit-javafxgraphics-peers-gwt-j2cl webfx-kit-javafxgraphics-registry - webfx-kit-javafxgraphics-registry-gwt + webfx-kit-javafxgraphics-registry-gwt-j2cl webfx-kit-javafxmedia-emul webfx-kit-javafxmedia-gluon - webfx-kit-javafxmedia-peers-gwt + webfx-kit-javafxmedia-peers-gwt-j2cl webfx-kit-javafxmedia-registry - webfx-kit-javafxmedia-registry-gwt + webfx-kit-javafxmedia-registry-gwt-j2cl webfx-kit-javafxweb-emul webfx-kit-javafxweb-enginepeer webfx-kit-javafxweb-peers-base @@ -41,8 +43,8 @@ webfx-kit-javafxweb-registry webfx-kit-javafxweb-registry-gwt webfx-kit-launcher - webfx-kit-openjfx - webfx-kit-platform-audio-openjfx-gwt + webfx-kit-platform-audio-openjfx-gwt-j2cl + webfx-kit-platform-browser-openjfx webfx-kit-platform-visibility-openjfx webfx-kit-statusbar webfx-kit-statusbar-gluon @@ -50,7 +52,7 @@ webfx-kit-util webfx-kit-util-scene webfx-kit-webgl - webfx-kit-webgl-gwt + webfx-kit-webgl-gwt-j2cl \ No newline at end of file diff --git a/webfx-kit/webfx-kit-javafxbase-emul/pom.xml b/webfx-kit/webfx-kit-javafxbase-emul/pom.xml index 21684dd69b..a4b71a1d3a 100644 --- a/webfx-kit/webfx-kit-javafxbase-emul/pom.xml +++ b/webfx-kit/webfx-kit-javafxbase-emul/pom.xml @@ -13,4 +13,15 @@ webfx-kit-javafxbase-emul + + + + dev.webfx + webfx-platform-javabase-emul-j2cl + 0.1.0-SNAPSHOT + runtime + + + + \ No newline at end of file diff --git a/webfx-kit/webfx-kit-javafxbase-emul/src/main/java/com/sun/javafx/collections/SortHelper.java b/webfx-kit/webfx-kit-javafxbase-emul/src/main/java/com/sun/javafx/collections/SortHelper.java index 64377a21ce..293829eee4 100644 --- a/webfx-kit/webfx-kit-javafxbase-emul/src/main/java/com/sun/javafx/collections/SortHelper.java +++ b/webfx-kit/webfx-kit-javafxbase-emul/src/main/java/com/sun/javafx/collections/SortHelper.java @@ -25,7 +25,6 @@ package com.sun.javafx.collections; -import java.lang.reflect.Array; import java.util.Arrays; import java.util.Comparator; import java.util.List; @@ -42,7 +41,8 @@ public class SortHelper { private static final int INSERTIONSORT_THRESHOLD = 7; public > int[] sort(List list) { - T[] a = (T[]) Array.newInstance(Comparable.class, list.size()); + //T[] a = (T[]) Array.newInstance(Comparable.class, list.size()); + Comparable[] a = new Comparable[list.size()]; try { a = list.toArray(a); } catch (ArrayStoreException e) { @@ -86,7 +86,7 @@ public int[] sort(T[] a, Comparator c) { } public int[] sort(T[] a, int fromIndex, int toIndex, - Comparator c) { + Comparator c) { rangeCheck(a.length, fromIndex, toIndex); T[] aux = (T[])copyOfRange(a, fromIndex, toIndex); int[] result = initPermutation(a.length); @@ -112,7 +112,7 @@ public int[] sort(int[] a, int fromIndex, int toIndex) { private static void rangeCheck(int arrayLen, int fromIndex, int toIndex) { if (fromIndex > toIndex) throw new IllegalArgumentException("fromIndex(" + fromIndex + - ") > toIndex(" + toIndex+")"); + ") > toIndex(" + toIndex+")"); if (fromIndex < 0) throw new ArrayIndexOutOfBoundsException(fromIndex); if (toIndex > arrayLen) @@ -126,7 +126,7 @@ private static int[] copyOfRange(int[] original, int from, int to) { throw new IllegalArgumentException(from + " > " + to); int[] copy = new int[newLength]; System.arraycopy(original, from, copy, 0, - Math.min(original.length - from, newLength)); + Math.min(original.length - from, newLength)); return copy; } @@ -138,11 +138,11 @@ private static T[] copyOfRange(U[] original, int from, int to, Class " + to); - T[] copy = ((Object)newType == (Object)Object[].class) - ? (T[]) new Object[newLength] - : (T[]) Array.newInstance(newType.getComponentType(), newLength); + T[] copy = //((Object)newType == (Object)Object[].class) + /*?*/ (T[]) new Object[newLength] + /*: (T[]) Array.newInstance(newType.getComponentType(), newLength)*/; System.arraycopy(original, from, copy, 0, - Math.min(original.length - from, newLength)); + Math.min(original.length - from, newLength)); return copy; } @@ -150,17 +150,17 @@ private static T[] copyOfRange(U[] original, int from, int to, Classlow && - ((Comparable) dest[j-1]).compareTo(dest[j])>0; j--) + ((Comparable) dest[j-1]).compareTo(dest[j])>0; j--) swap(dest, j, j-1); return; } @@ -201,17 +201,17 @@ private void mergeSort(int[] src, * Merge sort from Oracle JDK 6 */ private void mergeSort(Object[] src, - Object[] dest, - int low, - int high, - int off) { + Object[] dest, + int low, + int high, + int off) { int length = high - low; // Insertion sort on smallest arrays if (length < INSERTIONSORT_THRESHOLD) { for (int i=low; ilow && - ((Comparable) dest[j-1]).compareTo(dest[j])>0; j--) + ((Comparable) dest[j-1]).compareTo(dest[j])>0; j--) swap(dest, j, j-1); return; } @@ -249,16 +249,16 @@ private void mergeSort(Object[] src, } private void mergeSort(Object[] src, - Object[] dest, - int low, int high, int off, - Comparator c) { + Object[] dest, + int low, int high, int off, + Comparator c) { int length = high - low; // Insertion sort on smallest arrays if (length < INSERTIONSORT_THRESHOLD) { for (int i=low; ilow && c.compare(dest[j-1], dest[j])>0; j--) - swap(dest, j, j-1); + for (int j=i; j>low && c.compare(dest[j-1], dest[j])>0; j--) + swap(dest, j, j-1); return; } @@ -274,8 +274,8 @@ private void mergeSort(Object[] src, // If list is already sorted, just copy from src to dest. This is an // optimization that results in faster sorts for nearly ordered lists. if (c.compare(src[mid-1], src[mid]) <= 0) { - System.arraycopy(src, low, dest, destLow, length); - return; + System.arraycopy(src, low, dest, destLow, length); + return; } // Merge sorted halves (now in src) into dest diff --git a/webfx-kit/webfx-kit-javafxcontrols-emul/pom.xml b/webfx-kit/webfx-kit-javafxcontrols-emul/pom.xml index 0dba56dccd..36a3071a8c 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-emul/pom.xml +++ b/webfx-kit/webfx-kit-javafxcontrols-emul/pom.xml @@ -27,6 +27,13 @@ 0.1.0-SNAPSHOT + + org.treblereel.gwt.gwtproject.time + gwt-time + 202203291 + runtime + + dev.webfx webfx-kit-javafxcontrols-registry @@ -46,6 +53,13 @@ 0.1.0-SNAPSHOT + + dev.webfx + webfx-platform-javabase-emul-j2cl + 0.1.0-SNAPSHOT + runtime + + dev.webfx webfx-platform-resource diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/pom.xml b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/pom.xml similarity index 94% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/pom.xml rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/pom.xml index 6d9f6acc4d..8e2d042f99 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/pom.xml +++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/pom.xml @@ -11,7 +11,7 @@ 0.1.0-SNAPSHOT - webfx-kit-javafxcontrols-peers-gwt + webfx-kit-javafxcontrols-peers-gwt-j2cl @@ -62,7 +62,7 @@ dev.webfx - webfx-kit-javafxgraphics-peers-gwt + webfx-kit-javafxgraphics-peers-gwt-j2cl 0.1.0-SNAPSHOT diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlButtonBasePeer.java b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlButtonBasePeer.java similarity index 92% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlButtonBasePeer.java rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlButtonBasePeer.java index fc47d2c825..c36df5a38b 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlButtonBasePeer.java +++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlButtonBasePeer.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxcontrols.gwt.html; +package dev.webfx.kit.mapper.peers.javafxcontrols.gwtj2cl.html; import elemental2.dom.HTMLElement; import javafx.scene.control.ButtonBase; diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlButtonPeer.java b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlButtonPeer.java similarity index 84% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlButtonPeer.java rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlButtonPeer.java index f7f552919a..f95e3a0333 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlButtonPeer.java +++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlButtonPeer.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxcontrols.gwt.html; +package dev.webfx.kit.mapper.peers.javafxcontrols.gwtj2cl.html; import elemental2.dom.HTMLElement; import javafx.scene.Node; @@ -6,8 +6,8 @@ import javafx.scene.control.ButtonBase; import dev.webfx.kit.mapper.peers.javafxcontrols.base.ButtonPeerBase; import dev.webfx.kit.mapper.peers.javafxcontrols.base.ButtonPeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.NoWrapWhiteSpacePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.NoWrapWhiteSpacePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; /** * @author Bruno Salmon diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlCheckBoxPeer.java b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlCheckBoxPeer.java similarity index 86% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlCheckBoxPeer.java rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlCheckBoxPeer.java index b4ba196330..0ab8afc067 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlCheckBoxPeer.java +++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlCheckBoxPeer.java @@ -1,10 +1,10 @@ -package dev.webfx.kit.mapper.peers.javafxcontrols.gwt.html; +package dev.webfx.kit.mapper.peers.javafxcontrols.gwtj2cl.html; import elemental2.dom.HTMLElement; import javafx.scene.control.CheckBox; import dev.webfx.kit.mapper.peers.javafxcontrols.base.CheckBoxPeerBase; import dev.webfx.kit.mapper.peers.javafxcontrols.base.CheckBoxPeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; /** * @author Bruno Salmon diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlChoiceBoxPeer.java b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlChoiceBoxPeer.java similarity index 88% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlChoiceBoxPeer.java rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlChoiceBoxPeer.java index 490f68f4b6..fb43a57c81 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlChoiceBoxPeer.java +++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlChoiceBoxPeer.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxcontrols.gwt.html; +package dev.webfx.kit.mapper.peers.javafxcontrols.gwtj2cl.html; import elemental2.dom.HTMLOptionElement; import elemental2.dom.HTMLSelectElement; @@ -6,9 +6,9 @@ import javafx.scene.control.ChoiceBox; import dev.webfx.kit.mapper.peers.javafxcontrols.base.ChoiceBoxPeerBase; import dev.webfx.kit.mapper.peers.javafxcontrols.base.ChoiceBoxPeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable.HtmlLayoutMeasurableNoGrow; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable.HtmlLayoutMeasurableNoGrow; import dev.webfx.kit.mapper.peers.javafxgraphics.SceneRequester; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import java.util.List; import java.util.stream.Collectors; diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlControlPeer.java b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlControlPeer.java similarity index 92% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlControlPeer.java rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlControlPeer.java index 659a14c677..c4f01ddafd 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlControlPeer.java +++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlControlPeer.java @@ -1,11 +1,11 @@ -package dev.webfx.kit.mapper.peers.javafxcontrols.gwt.html; +package dev.webfx.kit.mapper.peers.javafxcontrols.gwtj2cl.html; import elemental2.dom.CSSStyleDeclaration; import elemental2.dom.HTMLElement; import javafx.geometry.Insets; import javafx.scene.control.Control; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlRegionPeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlRegionPeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import dev.webfx.kit.mapper.peers.javafxcontrols.base.ControlPeerBase; import dev.webfx.kit.mapper.peers.javafxcontrols.base.ControlPeerMixin; diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlDatePickerPeer.java b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlDatePickerPeer.java similarity index 68% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlDatePickerPeer.java rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlDatePickerPeer.java index 60407b26ab..34698c77e8 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlDatePickerPeer.java +++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlDatePickerPeer.java @@ -1,9 +1,8 @@ -package dev.webfx.kit.mapper.peers.javafxcontrols.gwt.html; +package dev.webfx.kit.mapper.peers.javafxcontrols.gwtj2cl.html; -import elemental2.dom.HTMLElement; -import javafx.scene.control.DatePicker; import dev.webfx.kit.mapper.peers.javafxcontrols.base.TextFieldPeerBase; import dev.webfx.kit.mapper.peers.javafxcontrols.base.TextFieldPeerMixin; +import javafx.scene.control.DatePicker; /** * @author Bruno Salmon @@ -14,11 +13,7 @@ public final class HtmlDatePickerPeer extends HtmlTextFieldPeer { public HtmlDatePickerPeer() { - super(); - } - - public HtmlDatePickerPeer(NB base, HTMLElement element) { - super(base, element); + super("fx-datepicker"); } } diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlHyperlinkPeer.java b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlHyperlinkPeer.java similarity index 75% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlHyperlinkPeer.java rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlHyperlinkPeer.java index c70f78e813..3e18dafadf 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlHyperlinkPeer.java +++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlHyperlinkPeer.java @@ -1,11 +1,11 @@ -package dev.webfx.kit.mapper.peers.javafxcontrols.gwt.html; +package dev.webfx.kit.mapper.peers.javafxcontrols.gwtj2cl.html; import elemental2.dom.HTMLElement; import javafx.scene.control.Hyperlink; import dev.webfx.kit.mapper.peers.javafxcontrols.base.ButtonBasePeerBase; import dev.webfx.kit.mapper.peers.javafxcontrols.base.ButtonBasePeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable.HtmlLayoutMeasurableNoGrow; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable.HtmlLayoutMeasurableNoGrow; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; /** * @author Bruno Salmon diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlLabelPeer.java b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlLabelPeer.java similarity index 80% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlLabelPeer.java rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlLabelPeer.java index a95f3e13a3..7b2cb7c9e5 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlLabelPeer.java +++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlLabelPeer.java @@ -1,10 +1,10 @@ -package dev.webfx.kit.mapper.peers.javafxcontrols.gwt.html; +package dev.webfx.kit.mapper.peers.javafxcontrols.gwtj2cl.html; import javafx.scene.control.Label; import dev.webfx.kit.mapper.peers.javafxcontrols.base.LabelPeerBase; import dev.webfx.kit.mapper.peers.javafxcontrols.base.LabelPeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable.HtmlLayoutMeasurableNoGrow; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable.HtmlLayoutMeasurableNoGrow; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; /** * @author Bruno Salmon diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlLabeledPeer.java b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlLabeledPeer.java similarity index 89% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlLabeledPeer.java rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlLabeledPeer.java index 8593dc19c7..87fcd8e5da 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlLabeledPeer.java +++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlLabeledPeer.java @@ -1,12 +1,12 @@ -package dev.webfx.kit.mapper.peers.javafxcontrols.gwt.html; +package dev.webfx.kit.mapper.peers.javafxcontrols.gwtj2cl.html; import dev.webfx.kit.mapper.peers.javafxcontrols.base.LabeledPeerBase; import dev.webfx.kit.mapper.peers.javafxcontrols.base.LabeledPeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlImageViewPeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlNodePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.HtmlSvgNodePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlPaints; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlImageViewPeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlNodePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.HtmlSvgNodePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlPaints; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import dev.webfx.platform.util.Strings; import elemental2.dom.Element; import elemental2.dom.HTMLElement; diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlProgressBarPeer.java b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlProgressBarPeer.java similarity index 80% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlProgressBarPeer.java rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlProgressBarPeer.java index 89ac033536..fa072f358a 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlProgressBarPeer.java +++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlProgressBarPeer.java @@ -1,10 +1,10 @@ -package dev.webfx.kit.mapper.peers.javafxcontrols.gwt.html; +package dev.webfx.kit.mapper.peers.javafxcontrols.gwtj2cl.html; import dev.webfx.kit.mapper.peers.javafxcontrols.base.ProgressBarPeerBase; import dev.webfx.kit.mapper.peers.javafxcontrols.base.ProgressBarPeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlRegionPeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable.HtmlLayoutMeasurable; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlRegionPeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable.HtmlLayoutMeasurable; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import elemental2.dom.HTMLElement; import elemental2.dom.HTMLProgressElement; import javafx.scene.control.ProgressBar; diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlRadioButtonPeer.java b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlRadioButtonPeer.java similarity index 85% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlRadioButtonPeer.java rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlRadioButtonPeer.java index 8dcd9f0dd1..f1aac7f4dc 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlRadioButtonPeer.java +++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlRadioButtonPeer.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxcontrols.gwt.html; +package dev.webfx.kit.mapper.peers.javafxcontrols.gwtj2cl.html; import elemental2.dom.CSSProperties; import elemental2.dom.CSSStyleDeclaration; @@ -7,9 +7,9 @@ import javafx.scene.control.RadioButton; import dev.webfx.kit.mapper.peers.javafxcontrols.base.RadioButtonPeerBase; import dev.webfx.kit.mapper.peers.javafxcontrols.base.RadioButtonPeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.NoWrapWhiteSpacePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable.HtmlLayoutMeasurableNoGrow; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.NoWrapWhiteSpacePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable.HtmlLayoutMeasurableNoGrow; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import dev.webfx.platform.util.Booleans; /** diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlScrollPanePeer.java b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlScrollPanePeer.java similarity index 95% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlScrollPanePeer.java rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlScrollPanePeer.java index 4d93b28d95..097e31b633 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlScrollPanePeer.java +++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlScrollPanePeer.java @@ -1,11 +1,11 @@ -package dev.webfx.kit.mapper.peers.javafxcontrols.gwt.html; +package dev.webfx.kit.mapper.peers.javafxcontrols.gwtj2cl.html; import dev.webfx.kit.mapper.peers.javafxcontrols.base.ScrollPanePeerBase; import dev.webfx.kit.mapper.peers.javafxcontrols.base.ScrollPanePeerMixin; import dev.webfx.kit.mapper.peers.javafxgraphics.SceneRequester; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlRegionPeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable.HtmlLayoutMeasurable; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlRegionPeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable.HtmlLayoutMeasurable; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import dev.webfx.kit.util.properties.FXProperties; import dev.webfx.platform.uischeduler.UiScheduler; import elemental2.dom.Element; @@ -172,7 +172,7 @@ private void callPerfectScrollbarInitialize(Element psContainer, boolean suppres private void callPerfectScrollbarUpdate(Element psContainer) { psContainer.scrollLeft = scrollLeft; psContainer.scrollTop = scrollTop; - PerfectScrollbar ps = (PerfectScrollbar) Js.asPropertyMap(psContainer).get("ps"); + PerfectScrollbar ps = Js.cast(Js.asPropertyMap(psContainer).get("ps")); ps.update(); } diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlSliderPeer.java b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlSliderPeer.java similarity index 86% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlSliderPeer.java rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlSliderPeer.java index 81db9ff2ed..4f287ca2f8 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlSliderPeer.java +++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlSliderPeer.java @@ -1,10 +1,10 @@ -package dev.webfx.kit.mapper.peers.javafxcontrols.gwt.html; +package dev.webfx.kit.mapper.peers.javafxcontrols.gwtj2cl.html; import dev.webfx.kit.mapper.peers.javafxcontrols.base.SliderPeerBase; import dev.webfx.kit.mapper.peers.javafxcontrols.base.SliderPeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlRegionPeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable.HtmlLayoutMeasurable; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlRegionPeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable.HtmlLayoutMeasurable; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import dev.webfx.platform.util.Numbers; import dev.webfx.platform.util.Strings; import elemental2.dom.HTMLElement; diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlTextAreaPeer.java b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlTextAreaPeer.java similarity index 50% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlTextAreaPeer.java rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlTextAreaPeer.java index c15b5f4bf3..5b460806a0 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlTextAreaPeer.java +++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlTextAreaPeer.java @@ -1,11 +1,10 @@ -package dev.webfx.kit.mapper.peers.javafxcontrols.gwt.html; +package dev.webfx.kit.mapper.peers.javafxcontrols.gwtj2cl.html; -import elemental2.dom.HTMLElement; -import javafx.scene.control.TextArea; import dev.webfx.kit.mapper.peers.javafxcontrols.base.TextAreaPeerBase; import dev.webfx.kit.mapper.peers.javafxcontrols.base.TextAreaPeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable.HtmlLayoutMeasurable; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable.HtmlLayoutMeasurable; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; +import javafx.scene.control.TextArea; /** * @author Bruno Salmon @@ -17,12 +16,8 @@ public final class HtmlTextAreaPeer implements TextAreaPeerMixin, HtmlLayoutMeasurable { public HtmlTextAreaPeer() { - this((NB) new TextAreaPeerBase(), HtmlUtil.createTextArea()); - } - - public HtmlTextAreaPeer(NB base, HTMLElement element) { - super(base, element); - element.style.resize = "none"; // To disable the html text area resize feature + super((NB) new TextAreaPeerBase(), HtmlUtil.createTextArea(), "fx-textarea"); + getElement().style.resize = "none"; // To disable the html text area resize feature } } diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlTextFieldPeer.java b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlTextFieldPeer.java similarity index 79% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlTextFieldPeer.java rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlTextFieldPeer.java index a91fa00f2f..8b83d085b7 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlTextFieldPeer.java +++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlTextFieldPeer.java @@ -1,11 +1,11 @@ -package dev.webfx.kit.mapper.peers.javafxcontrols.gwt.html; +package dev.webfx.kit.mapper.peers.javafxcontrols.gwtj2cl.html; import dev.webfx.kit.mapper.peers.javafxcontrols.base.TextFieldPeerBase; import dev.webfx.kit.mapper.peers.javafxcontrols.base.TextFieldPeerMixin; import dev.webfx.kit.mapper.peers.javafxgraphics.SceneRequester; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable.HtmlLayoutMeasurable; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.HtmlSvgNodePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable.HtmlLayoutMeasurable; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.HtmlSvgNodePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import elemental2.dom.Element; import elemental2.dom.HTMLElement; import elemental2.dom.HTMLInputElement; @@ -29,15 +29,23 @@ public class HtmlTextFieldPeer implements TextFieldPeerMixin, HtmlLayoutMeasurable { public HtmlTextFieldPeer() { - this(HtmlUtil.createSpanElement()/*HtmlUtil.createTextInput()*/); + this(HtmlUtil.createSpanElement()); } public HtmlTextFieldPeer(HTMLElement element) { - this((NB) new TextFieldPeerBase(), element); + this(element, "fx-textfield"); } - public HtmlTextFieldPeer(NB base, HTMLElement element) { - super(base, element); + public HtmlTextFieldPeer(String tagName) { + this(HtmlUtil.createSpanElement(), tagName); + } + + public HtmlTextFieldPeer(HTMLElement element, String tagName) { + this((NB) new TextFieldPeerBase(), element, tagName); + } + + public HtmlTextFieldPeer(NB base, HTMLElement element, String tagName) { + super(base, element, tagName); } @Override diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlTextInputControlPeer.java b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlTextInputControlPeer.java similarity index 96% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlTextInputControlPeer.java rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlTextInputControlPeer.java index 2bece3ef1e..ef8df1628a 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlTextInputControlPeer.java +++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlTextInputControlPeer.java @@ -1,10 +1,10 @@ -package dev.webfx.kit.mapper.peers.javafxcontrols.gwt.html; +package dev.webfx.kit.mapper.peers.javafxcontrols.gwtj2cl.html; import dev.webfx.kit.mapper.peers.javafxcontrols.base.TextInputControlPeerBase; import dev.webfx.kit.mapper.peers.javafxcontrols.base.TextInputControlPeerMixin; import dev.webfx.kit.mapper.peers.javafxgraphics.NodePeer; import dev.webfx.kit.mapper.peers.javafxgraphics.SceneRequester; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import dev.webfx.kit.util.properties.FXProperties; import dev.webfx.platform.uischeduler.UiScheduler; import dev.webfx.platform.util.Booleans; @@ -29,9 +29,9 @@ public abstract class HtmlTextInputControlPeer extends HtmlControlPeer implements TextInputControlPeerMixin, TextInputControl.SelectableTextInputControlPeer { - public HtmlTextInputControlPeer(NB base, HTMLElement textInputElement) { + public HtmlTextInputControlPeer(NB base, HTMLElement textInputElement, String containerTag) { super(base, textInputElement); - prepareDomForAdditionalSkinChildren("fx-textinputcontrol"); + prepareDomForAdditionalSkinChildren(containerTag); // Restoring pointer events (were disabled by prepareDomForAdditionalSkinChildren()) in case the graphic is clickable (ex: radio button) HtmlUtil.setStyleAttribute(getChildrenContainer(), "pointer-events", "auto"); textInputElement.oninput = e -> { diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlToggleButtonPeer.java b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlToggleButtonPeer.java similarity index 76% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlToggleButtonPeer.java rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlToggleButtonPeer.java index 8ff2a86e8f..1d25e942e3 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/HtmlToggleButtonPeer.java +++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/HtmlToggleButtonPeer.java @@ -1,12 +1,12 @@ -package dev.webfx.kit.mapper.peers.javafxcontrols.gwt.html; +package dev.webfx.kit.mapper.peers.javafxcontrols.gwtj2cl.html; import elemental2.dom.HTMLElement; import javafx.scene.control.ToggleButton; import dev.webfx.kit.mapper.peers.javafxcontrols.base.ToggleButtonPeerBase; import dev.webfx.kit.mapper.peers.javafxcontrols.base.ToggleButtonPeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable.HtmlLayoutCache; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable.HtmlLayoutMeasurable; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable.HtmlLayoutCache; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable.HtmlLayoutMeasurable; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; /** * @author Bruno Salmon diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/PerfectScrollbar.java b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/PerfectScrollbar.java similarity index 68% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/PerfectScrollbar.java rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/PerfectScrollbar.java index 27e91cd116..2d55e14f1d 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/PerfectScrollbar.java +++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/gwtj2cl/html/PerfectScrollbar.java @@ -1,15 +1,16 @@ -package dev.webfx.kit.mapper.peers.javafxcontrols.gwt.html; +package dev.webfx.kit.mapper.peers.javafxcontrols.gwtj2cl.html; import elemental2.dom.Element; import jsinterop.annotations.JsConstructor; import jsinterop.annotations.JsMethod; +import jsinterop.annotations.JsPackage; import jsinterop.annotations.JsType; import jsinterop.base.JsPropertyMap; /** * @author Bruno Salmon */ -@JsType(isNative = true, namespace = "window") +@JsType(isNative = true, namespace = JsPackage.GLOBAL, name = "PerfectScrollbar") public class PerfectScrollbar { @JsConstructor diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/resources/public/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/perfect-scrollbar.css b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/resources/public/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/perfect-scrollbar.css similarity index 100% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/resources/public/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/perfect-scrollbar.css rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/resources/public/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/perfect-scrollbar.css diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/resources/public/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/perfect-scrollbar.externs.js b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/resources/public/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/perfect-scrollbar.externs.js new file mode 100644 index 0000000000..ddf985de86 --- /dev/null +++ b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/resources/public/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/perfect-scrollbar.externs.js @@ -0,0 +1,11 @@ +/** + * @constructor + */ +var PerfectScrollbar = function (container, options) {}; + +PerfectScrollbar.prototype = { + "destroy": function () {}, + "onScroll": function () {}, + "removePsClasses": function () {}, + "update": function () {} +}; diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/resources/public/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/perfect-scrollbar.js b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/resources/public/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/perfect-scrollbar.js similarity index 100% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/resources/public/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/perfect-scrollbar.js rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/resources/public/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/perfect-scrollbar.js diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/resources/public/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/perfect-scrollbar.min.js b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/resources/public/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/perfect-scrollbar.min.js similarity index 100% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/src/main/resources/public/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/perfect-scrollbar.min.js rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/src/main/resources/public/dev/webfx/kit/mapper/peers/javafxcontrols/gwt/html/perfect-scrollbar.min.js diff --git a/webfx-kit/webfx-kit-javafxcontrols-peers-gwt/webfx.xml b/webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/webfx.xml similarity index 100% rename from webfx-kit/webfx-kit-javafxcontrols-peers-gwt/webfx.xml rename to webfx-kit/webfx-kit-javafxcontrols-peers-gwt-j2cl/webfx.xml diff --git a/webfx-kit/webfx-kit-javafxcontrols-registry-gwt/pom.xml b/webfx-kit/webfx-kit-javafxcontrols-registry-gwt-j2cl/pom.xml similarity index 84% rename from webfx-kit/webfx-kit-javafxcontrols-registry-gwt/pom.xml rename to webfx-kit/webfx-kit-javafxcontrols-registry-gwt-j2cl/pom.xml index 092e8bb041..4962fab713 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-registry-gwt/pom.xml +++ b/webfx-kit/webfx-kit-javafxcontrols-registry-gwt-j2cl/pom.xml @@ -11,7 +11,7 @@ 0.1.0-SNAPSHOT - webfx-kit-javafxcontrols-registry-gwt + webfx-kit-javafxcontrols-registry-gwt-j2cl @@ -23,7 +23,7 @@ dev.webfx - webfx-kit-javafxcontrols-peers-gwt + webfx-kit-javafxcontrols-peers-gwt-j2cl 0.1.0-SNAPSHOT @@ -35,7 +35,7 @@ dev.webfx - webfx-kit-javafxgraphics-peers-gwt + webfx-kit-javafxgraphics-peers-gwt-j2cl 0.1.0-SNAPSHOT diff --git a/webfx-kit/webfx-kit-javafxcontrols-registry-gwt/src/main/java/dev/webfx/kit/registry/javafxcontrols/JavaFxControlsRegistry.java b/webfx-kit/webfx-kit-javafxcontrols-registry-gwt-j2cl/src/main/java/dev/webfx/kit/registry/javafxcontrols/JavaFxControlsRegistry.java similarity index 94% rename from webfx-kit/webfx-kit-javafxcontrols-registry-gwt/src/main/java/dev/webfx/kit/registry/javafxcontrols/JavaFxControlsRegistry.java rename to webfx-kit/webfx-kit-javafxcontrols-registry-gwt-j2cl/src/main/java/dev/webfx/kit/registry/javafxcontrols/JavaFxControlsRegistry.java index f3f9ac2133..ebc1da786e 100644 --- a/webfx-kit/webfx-kit-javafxcontrols-registry-gwt/src/main/java/dev/webfx/kit/registry/javafxcontrols/JavaFxControlsRegistry.java +++ b/webfx-kit/webfx-kit-javafxcontrols-registry-gwt-j2cl/src/main/java/dev/webfx/kit/registry/javafxcontrols/JavaFxControlsRegistry.java @@ -3,8 +3,8 @@ import com.sun.javafx.scene.control.LabeledText; import javafx.scene.control.skin.ToolkitTextBox; import javafx.scene.control.*; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlTextPeer; -import dev.webfx.kit.mapper.peers.javafxcontrols.gwt.html.*; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlTextPeer; +import dev.webfx.kit.mapper.peers.javafxcontrols.gwtj2cl.html.*; import static dev.webfx.kit.mapper.peers.javafxgraphics.NodePeerFactoryRegistry.registerNodePeerFactory; diff --git a/webfx-kit/webfx-kit-javafxcontrols-registry-gwt/webfx.xml b/webfx-kit/webfx-kit-javafxcontrols-registry-gwt-j2cl/webfx.xml similarity index 100% rename from webfx-kit/webfx-kit-javafxcontrols-registry-gwt/webfx.xml rename to webfx-kit/webfx-kit-javafxcontrols-registry-gwt-j2cl/webfx.xml diff --git a/webfx-kit/webfx-kit-javafxgraphics-emul/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/emul_coupling/base/StagePeerBase.java b/webfx-kit/webfx-kit-javafxgraphics-emul/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/emul_coupling/base/StagePeerBase.java index 3f3b8e2953..5cc3b462bb 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-emul/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/emul_coupling/base/StagePeerBase.java +++ b/webfx-kit/webfx-kit-javafxgraphics-emul/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/emul_coupling/base/StagePeerBase.java @@ -44,10 +44,10 @@ public void changedWindowSize() { scenePeer.changedWindowSize(width, height); lastWidth = width; lastHeight = height; - // Workaround for a browser bug observed on Chrome on iPad where the window width/height properties were still - // not final after rotating the iPad despite the resize event being fired in JS. So we schedule a subsequent - // update to get the final values (this won't create an infinite loop, because these values will stabilize). - UiScheduler.scheduleInAnimationFrame(this::changedWindowSize, 5); // 5 animation frames seem enough + // Workaround for a browser bug observed on iPad where the window width/height properties were still not final + // after rotating the iPad despite the resize event being fired in JS. So we schedule a subsequent update to get + // the final values (this won't create an infinite loop, because these values will stabilize). + UiScheduler.scheduleDelay(500, this::changedWindowSize); // 500ms seem enough } protected abstract double getPeerWindowWidth(); diff --git a/webfx-kit/webfx-kit-javafxgraphics-emul/src/main/java/javafx/scene/AccessibleAttribute.java b/webfx-kit/webfx-kit-javafxgraphics-emul/src/main/java/javafx/scene/AccessibleAttribute.java index e53d07e5c8..a65f049576 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-emul/src/main/java/javafx/scene/AccessibleAttribute.java +++ b/webfx-kit/webfx-kit-javafxgraphics-emul/src/main/java/javafx/scene/AccessibleAttribute.java @@ -31,7 +31,7 @@ import javafx.scene.input.KeyCombination; import javafx.scene.text.Font; -import java.time.LocalDate; +//import java.time.LocalDate; /** * This enum describes the attributes that an assistive technology @@ -214,7 +214,7 @@ public enum AccessibleAttribute { *
  • Parameters:
    • * */ - DATE(LocalDate.class), + //DATE(LocalDate.class), /** * Returns true if the node is editable, otherwise false. diff --git a/webfx-kit/webfx-kit-javafxgraphics-emul/src/main/java/javafx/stage/Window.java b/webfx-kit/webfx-kit-javafxgraphics-emul/src/main/java/javafx/stage/Window.java index cdac46bb3b..e1ad400b78 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-emul/src/main/java/javafx/stage/Window.java +++ b/webfx-kit/webfx-kit-javafxgraphics-emul/src/main/java/javafx/stage/Window.java @@ -11,9 +11,9 @@ import dev.webfx.kit.mapper.peers.javafxgraphics.markers.HasSceneProperty; import dev.webfx.kit.mapper.peers.javafxgraphics.markers.HasWidthProperty; import dev.webfx.kit.util.properties.FXProperties; +import dev.webfx.platform.scheduler.Scheduled; import dev.webfx.platform.uischeduler.AnimationFramePass; import dev.webfx.platform.uischeduler.UiScheduler; -import dev.webfx.platform.scheduler.Scheduled; import javafx.beans.property.*; import javafx.event.*; import javafx.geometry.Rectangle2D; diff --git a/webfx-kit/webfx-kit-javafxgraphics-fat-j2cl/pom.xml b/webfx-kit/webfx-kit-javafxgraphics-fat-j2cl/pom.xml new file mode 100644 index 0000000000..2342f796f6 --- /dev/null +++ b/webfx-kit/webfx-kit-javafxgraphics-fat-j2cl/pom.xml @@ -0,0 +1,232 @@ + + + + 4.0.0 + + + dev.webfx + webfx-kit + 0.1.0-SNAPSHOT + + + webfx-kit-javafxgraphics-fat-j2cl + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-dependencies + generate-sources + + unpack + + + + + dev.webfx + webfx-kit-javafxgraphics-gwt-j2cl + ${webfx.version} + + + dev.webfx + webfx-kit-launcher + ${webfx.version} + + + dev.webfx + webfx-kit-javafxgraphics-emul + ${webfx.version} + + + dev.webfx + webfx-kit-javafxgraphics-peers + ${webfx.version} + + + dev.webfx + webfx-kit-javafxgraphics-peers-base + ${webfx.version} + + + dev.webfx + webfx-kit-javafxgraphics-peers-gwt-j2cl + ${webfx.version} + + + dev.webfx + webfx-kit-javafxgraphics-registry-gwt-j2cl + ${webfx.version} + + + dev.webfx + webfx-kit-util + ${webfx.version} + + + **/*.java + **/module-info.java + ${project.build.directory}/generated-sources + + + + + + + org.apache.maven.plugins + maven-resources-plugin + ${plugin.resources.version} + + + + ${project.build.directory}/generated-sources + + + + src/main/java + + **/*.java + **/*.native.js + + + + src/main/resources + + externs.js + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + generate-sources + generate-sources + + compile + + + + ${project.build.directory}/generated-sources + + + + + + + + + + + + + dev.webfx + webfx-kit-javafxbase-emul + 0.1.0-SNAPSHOT + compile + + + + com.google.jsinterop + base + compile + + + + com.google.elemental2 + elemental2-core + compile + + + + com.google.elemental2 + elemental2-dom + compile + + + + com.google.elemental2 + elemental2-svg + compile + + + + com.google.elemental2 + elemental2-webstorage + compile + + + + org.treblereel.gwt.nio + gwt-nio + 1.1 + runtime + + + + com.google.jsinterop + jsinterop-annotations + compile + + + + dev.webfx + webfx-platform-boot + 0.1.0-SNAPSHOT + provided + + + + dev.webfx + webfx-platform-console + 0.1.0-SNAPSHOT + provided + + + + dev.webfx + webfx-platform-javabase-emul-j2cl + 0.1.0-SNAPSHOT + runtime + + + + dev.webfx + webfx-platform-scheduler + 0.1.0-SNAPSHOT + provided + + + + dev.webfx + webfx-platform-uischeduler + 0.1.0-SNAPSHOT + provided + + + + dev.webfx + webfx-platform-useragent + 0.1.0-SNAPSHOT + provided + + + + dev.webfx + webfx-platform-util + 0.1.0-SNAPSHOT + provided + + + + + \ No newline at end of file diff --git a/webfx-kit/webfx-kit-javafxgraphics-fat-j2cl/src/main/resources/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/CanvasRenderingContext2D.externs.js b/webfx-kit/webfx-kit-javafxgraphics-fat-j2cl/src/main/resources/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/CanvasRenderingContext2D.externs.js new file mode 100644 index 0000000000..5514b199af --- /dev/null +++ b/webfx-kit/webfx-kit-javafxgraphics-fat-j2cl/src/main/resources/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/CanvasRenderingContext2D.externs.js @@ -0,0 +1,17 @@ +/** + * @externs + */ + +/** + * @param {(number|DOMMatrixReadOnly)} m11OrMatrix + * @param {number=} m12 + * @param {number=} m21 + * @param {number=} m22 + * @param {number=} dx + * @param {number=} dy + * @return {undefined} + */ +CanvasRenderingContext2D.prototype.setTransform = function( + m11OrMatrix, m12, m21, m22, dx, dy) {}; + +// we adds the method to `CanvasRenderingContext2D` because we can't replace methods in `BaseRenderingContext2D` \ No newline at end of file diff --git a/webfx-kit/webfx-kit-javafxgraphics-fat-j2cl/webfx.xml b/webfx-kit/webfx-kit-javafxgraphics-fat-j2cl/webfx.xml new file mode 100644 index 0000000000..1199fc9a40 --- /dev/null +++ b/webfx-kit/webfx-kit-javafxgraphics-fat-j2cl/webfx.xml @@ -0,0 +1,257 @@ + + + + + dev.webfx.kit.launcher.spi.impl.gwt.GwtWebFxKitLauncherProvider + dev.webfx.kit.mapper.spi.impl.gwt.GwtWebFxKitHtmlMapperProvider + + + + + + + webfx-kit-javafxbase-emul + webfx-platform-boot + webfx-platform-console + webfx-platform-uischeduler + webfx-platform-util + webfx-platform-scheduler + webfx-platform-useragent + jsinterop-base + elemental2-core + elemental2-dom + elemental2-svg + elemental2-webstorage + jsinterop-annotations + java-nio-emul + webfx-platform-javabase-emul-j2cl + + + webfx-kit-launcher + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-dependencies + generate-sources + + unpack + + + + + dev.webfx + webfx-kit-javafxgraphics-gwt-j2cl + ${webfx.version} + + + dev.webfx + webfx-kit-launcher + ${webfx.version} + + + dev.webfx + webfx-kit-javafxgraphics-emul + ${webfx.version} + + + dev.webfx + webfx-kit-javafxgraphics-peers + ${webfx.version} + + + dev.webfx + webfx-kit-javafxgraphics-peers-base + ${webfx.version} + + + dev.webfx + webfx-kit-javafxgraphics-peers-gwt-j2cl + ${webfx.version} + + + dev.webfx + webfx-kit-javafxgraphics-registry-gwt-j2cl + ${webfx.version} + + + dev.webfx + webfx-kit-util + ${webfx.version} + + + **/*.java + **/module-info.java + ${project.build.directory}/generated-sources + + + + + + + org.apache.maven.plugins + maven-resources-plugin + ${plugin.resources.version} + + + + ${project.build.directory}/generated-sources + + + + src/main/java + + **/*.java + **/*.native.js + + + + src/main/resources + + externs.js + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + generate-sources + generate-sources + + compile + + + + ${project.build.directory}/generated-sources + + + + + + + + + + + + + + + + + + + +
    +
    + + + +
    +
    + + + +     \ No newline at end of file diff --git a/webfx-kit/webfx-kit-gwt/pom.xml b/webfx-kit/webfx-kit-javafxgraphics-gwt-j2cl/pom.xml similarity index 87% rename from webfx-kit/webfx-kit-gwt/pom.xml rename to webfx-kit/webfx-kit-javafxgraphics-gwt-j2cl/pom.xml index 4c80688d79..775ec9e664 100644 --- a/webfx-kit/webfx-kit-gwt/pom.xml +++ b/webfx-kit/webfx-kit-javafxgraphics-gwt-j2cl/pom.xml @@ -11,7 +11,7 @@ 0.1.0-SNAPSHOT - webfx-kit-gwt + webfx-kit-javafxgraphics-gwt-j2cl @@ -49,7 +49,7 @@ dev.webfx - webfx-kit-javafxgraphics-peers-gwt + webfx-kit-javafxgraphics-peers-gwt-j2cl 0.1.0-SNAPSHOT @@ -71,6 +71,12 @@ 0.1.0-SNAPSHOT     + + dev.webfx + webfx-platform-useragent + 0.1.0-SNAPSHOT + + dev.webfx webfx-platform-util diff --git a/webfx-kit/webfx-kit-gwt/src/main/java/dev/webfx/kit/launcher/spi/impl/gwt/Clipboard.java b/webfx-kit/webfx-kit-javafxgraphics-gwt-j2cl/src/main/java/dev/webfx/kit/launcher/spi/impl/gwt/Clipboard.java similarity index 100% rename from webfx-kit/webfx-kit-gwt/src/main/java/dev/webfx/kit/launcher/spi/impl/gwt/Clipboard.java rename to webfx-kit/webfx-kit-javafxgraphics-gwt-j2cl/src/main/java/dev/webfx/kit/launcher/spi/impl/gwt/Clipboard.java diff --git a/webfx-kit/webfx-kit-gwt/src/main/java/dev/webfx/kit/launcher/spi/impl/gwt/GwtFastPixelReaderWriter.java b/webfx-kit/webfx-kit-javafxgraphics-gwt-j2cl/src/main/java/dev/webfx/kit/launcher/spi/impl/gwt/GwtFastPixelReaderWriter.java similarity index 96% rename from webfx-kit/webfx-kit-gwt/src/main/java/dev/webfx/kit/launcher/spi/impl/gwt/GwtFastPixelReaderWriter.java rename to webfx-kit/webfx-kit-javafxgraphics-gwt-j2cl/src/main/java/dev/webfx/kit/launcher/spi/impl/gwt/GwtFastPixelReaderWriter.java index 87a90545e3..54c50ed16e 100644 --- a/webfx-kit/webfx-kit-gwt/src/main/java/dev/webfx/kit/launcher/spi/impl/gwt/GwtFastPixelReaderWriter.java +++ b/webfx-kit/webfx-kit-javafxgraphics-gwt-j2cl/src/main/java/dev/webfx/kit/launcher/spi/impl/gwt/GwtFastPixelReaderWriter.java @@ -1,7 +1,7 @@ package dev.webfx.kit.launcher.spi.impl.gwt; import dev.webfx.kit.launcher.spi.FastPixelReaderWriter; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.ImageDataHelper; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.ImageDataHelper; import elemental2.dom.ImageData; import javafx.scene.image.Image; diff --git a/webfx-kit/webfx-kit-gwt/src/main/java/dev/webfx/kit/launcher/spi/impl/gwt/GwtWebFxKitLauncherProvider.java b/webfx-kit/webfx-kit-javafxgraphics-gwt-j2cl/src/main/java/dev/webfx/kit/launcher/spi/impl/gwt/GwtWebFxKitLauncherProvider.java similarity index 87% rename from webfx-kit/webfx-kit-gwt/src/main/java/dev/webfx/kit/launcher/spi/impl/gwt/GwtWebFxKitLauncherProvider.java rename to webfx-kit/webfx-kit-javafxgraphics-gwt-j2cl/src/main/java/dev/webfx/kit/launcher/spi/impl/gwt/GwtWebFxKitLauncherProvider.java index 6d7dfdd543..629c9598f3 100644 --- a/webfx-kit/webfx-kit-gwt/src/main/java/dev/webfx/kit/launcher/spi/impl/gwt/GwtWebFxKitLauncherProvider.java +++ b/webfx-kit/webfx-kit-javafxgraphics-gwt-j2cl/src/main/java/dev/webfx/kit/launcher/spi/impl/gwt/GwtWebFxKitLauncherProvider.java @@ -4,15 +4,16 @@ import dev.webfx.kit.launcher.spi.FastPixelReaderWriter; import dev.webfx.kit.launcher.spi.impl.base.WebFxKitLauncherProviderBase; import dev.webfx.kit.mapper.WebFxKitMapper; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.CanvasElementHelper; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.Context2DHelper; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlNodePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.UserInteraction; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.DragboardDataTransferHolder; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlFonts; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.CanvasElementHelper; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.Context2DHelper; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlNodePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.UserInteraction; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.DragboardDataTransferHolder; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlFonts; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import dev.webfx.kit.util.properties.FXProperties; import dev.webfx.platform.console.Console; +import dev.webfx.platform.useragent.UserAgent; import dev.webfx.platform.util.Strings; import dev.webfx.platform.util.collection.Collections; import dev.webfx.platform.util.function.Factory; @@ -44,12 +45,6 @@ */ public final class GwtWebFxKitLauncherProvider extends WebFxKitLauncherProviderBase { - private static final boolean IS_SAFARI; - static { - String userAgent = DomGlobal.navigator.userAgent.toLowerCase(); - IS_SAFARI = userAgent.contains("safari") && !userAgent.contains("chrome") && !userAgent.contains("android"); - } - private Application application; private HostServices hostServices; @@ -64,10 +59,10 @@ public HostServices getHostServices() { // Note: Safari is blocking (on macOS) or ignoring (on iOS) window.open() when not called during a user // interaction. If we are in that case, it's better to postpone the window opening to the next user // interaction (which we hope will happen soon, such as a key or mouse release). - if (IS_SAFARI && !UserInteraction.isUserInteracting()) { - UserInteraction.runOnNextUserInteraction(() -> { - DomGlobal.window.open(uri, "_blank"); - }, true); + if (UserAgent.isSafari() && !UserInteraction.isUserInteracting()) { + UserInteraction.runOnNextUserInteraction(() -> + DomGlobal.window.open(uri, "_blank") + , true); } else { // For other browsers, or with Safari but during a user interaction (ex: mouse click), it's ok to // open the browser window straightaway. @@ -232,19 +227,15 @@ public ObservableList loadingFonts() { } private static boolean supportsWebPJS() { - return true; - } /*-{ // Check FF, Edge by user agent - var m = navigator.userAgent.match(/(Edge|Firefox)\/(\d+)\./) - if (m) { - return (m[1] === 'Firefox' && +m[2] >= 65) - || (m[1] === 'Edge' && +m[2] >= 18) - } - + if (UserAgent.isFireFox()) + return UserAgent.getBrowserMajorVersion() >= 65; + if (UserAgent.isEdge()) + return UserAgent.getBrowserMajorVersion() >= 18; // Use canvas hack for webkit-based browsers - var e = document.createElement('canvas'); - return e.toDataURL && e.toDataURL('image/webp').indexOf('data:image/webp') == 0; - }-*/; + HTMLCanvasElement e = (HTMLCanvasElement) DomGlobal.document.createElement("canvas"); + return Js.asPropertyMap(e).has("toDataURL") && e.toDataURL("image/webp").startsWith("data:image/webp"); + }; @Override public void launchApplication(Factory applicationFactory, String... args) { diff --git a/webfx-kit/webfx-kit-gwt/src/main/java/dev/webfx/kit/mapper/spi/impl/gwt/GwtWebFxKitHtmlMapperProvider.java b/webfx-kit/webfx-kit-javafxgraphics-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/spi/impl/gwt/GwtWebFxKitHtmlMapperProvider.java similarity index 65% rename from webfx-kit/webfx-kit-gwt/src/main/java/dev/webfx/kit/mapper/spi/impl/gwt/GwtWebFxKitHtmlMapperProvider.java rename to webfx-kit/webfx-kit-javafxgraphics-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/spi/impl/gwt/GwtWebFxKitHtmlMapperProvider.java index d35e52d3c0..a1d98f80f1 100644 --- a/webfx-kit/webfx-kit-gwt/src/main/java/dev/webfx/kit/mapper/spi/impl/gwt/GwtWebFxKitHtmlMapperProvider.java +++ b/webfx-kit/webfx-kit-javafxgraphics-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/spi/impl/gwt/GwtWebFxKitHtmlMapperProvider.java @@ -4,13 +4,13 @@ import dev.webfx.kit.mapper.peers.javafxgraphics.emul_coupling.ScenePeer; import dev.webfx.kit.mapper.peers.javafxgraphics.emul_coupling.StagePeer; import dev.webfx.kit.mapper.peers.javafxgraphics.emul_coupling.WindowPeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlGraphicsContext; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlScenePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.ImageDataHelper; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.ImageDataPixelWriter; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.GwtPrimaryStagePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.GwtSecondaryStagePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.GwtWindowPeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlGraphicsContext; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlScenePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.ImageDataHelper; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.ImageDataPixelWriter; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.GwtJ2clPrimaryStagePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.GwtJ2clSecondaryStagePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.GwtJ2clWindowPeer; import dev.webfx.kit.mapper.spi.impl.base.WebFxKitMapperProviderBase; import javafx.scene.Scene; import javafx.scene.canvas.Canvas; @@ -28,13 +28,13 @@ public final class GwtWebFxKitHtmlMapperProvider extends WebFxKitMapperProviderB @Override public StagePeer createStagePeer(Stage stage) { if (stage == WebFxKitLauncher.getPrimaryStage()) - return new GwtPrimaryStagePeer(stage); - return new GwtSecondaryStagePeer(stage); + return new GwtJ2clPrimaryStagePeer(stage); + return new GwtJ2clSecondaryStagePeer(stage); } @Override public WindowPeer createWindowPeer(Window window) { - return new GwtWindowPeer(window); + return new GwtJ2clWindowPeer(window); } @Override diff --git a/webfx-kit/webfx-kit-gwt/src/main/java/dev/webfx/kit/mapper/spi/impl/gwt/GwtWebFxKitSvgMapperProvider.java b/webfx-kit/webfx-kit-javafxgraphics-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/spi/impl/gwt/GwtWebFxKitSvgMapperProvider.java similarity index 71% rename from webfx-kit/webfx-kit-gwt/src/main/java/dev/webfx/kit/mapper/spi/impl/gwt/GwtWebFxKitSvgMapperProvider.java rename to webfx-kit/webfx-kit-javafxgraphics-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/spi/impl/gwt/GwtWebFxKitSvgMapperProvider.java index 518c6c5771..d36b696bf1 100644 --- a/webfx-kit/webfx-kit-gwt/src/main/java/dev/webfx/kit/mapper/spi/impl/gwt/GwtWebFxKitSvgMapperProvider.java +++ b/webfx-kit/webfx-kit-javafxgraphics-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/spi/impl/gwt/GwtWebFxKitSvgMapperProvider.java @@ -7,9 +7,9 @@ import dev.webfx.kit.mapper.peers.javafxgraphics.emul_coupling.StagePeer; import dev.webfx.kit.mapper.peers.javafxgraphics.emul_coupling.WindowPeer; import dev.webfx.kit.mapper.spi.impl.base.WebFxKitMapperProviderBase; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlScenePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.GwtPrimaryStagePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.GwtSecondaryStagePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlScenePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.GwtJ2clPrimaryStagePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.GwtJ2clSecondaryStagePeer; import dev.webfx.kit.launcher.WebFxKitLauncher; /** @@ -20,8 +20,8 @@ public final class GwtWebFxKitSvgMapperProvider extends WebFxKitMapperProviderBa @Override public StagePeer createStagePeer(Stage stage) { if (stage == WebFxKitLauncher.getPrimaryStage()) - return new GwtPrimaryStagePeer(stage); - return new GwtSecondaryStagePeer(stage); + return new GwtJ2clPrimaryStagePeer(stage); + return new GwtJ2clSecondaryStagePeer(stage); } @Override diff --git a/webfx-kit/webfx-kit-gwt/webfx.xml b/webfx-kit/webfx-kit-javafxgraphics-gwt-j2cl/webfx.xml similarity index 100% rename from webfx-kit/webfx-kit-gwt/webfx.xml rename to webfx-kit/webfx-kit-javafxgraphics-gwt-j2cl/webfx.xml diff --git a/webfx-kit/webfx-kit-openjfx/pom.xml b/webfx-kit/webfx-kit-javafxgraphics-openjfx/pom.xml similarity index 97% rename from webfx-kit/webfx-kit-openjfx/pom.xml rename to webfx-kit/webfx-kit-javafxgraphics-openjfx/pom.xml index 5f070742ef..0760d4bfbc 100644 --- a/webfx-kit/webfx-kit-openjfx/pom.xml +++ b/webfx-kit/webfx-kit-javafxgraphics-openjfx/pom.xml @@ -11,7 +11,7 @@ 0.1.0-SNAPSHOT - webfx-kit-openjfx + webfx-kit-javafxgraphics-openjfx diff --git a/webfx-kit/webfx-kit-openjfx/src/main/java/dev/webfx/kit/launcher/spi/impl/openjfx/JavaFxWebFxKitLauncherProvider.java b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/dev/webfx/kit/launcher/spi/impl/openjfx/JavaFxWebFxKitLauncherProvider.java similarity index 100% rename from webfx-kit/webfx-kit-openjfx/src/main/java/dev/webfx/kit/launcher/spi/impl/openjfx/JavaFxWebFxKitLauncherProvider.java rename to webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/dev/webfx/kit/launcher/spi/impl/openjfx/JavaFxWebFxKitLauncherProvider.java diff --git a/webfx-kit/webfx-kit-openjfx/src/main/java/dev/webfx/kit/launcher/spi/impl/openjfx/OpenJFXFastPixelReaderWriter.java b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/dev/webfx/kit/launcher/spi/impl/openjfx/OpenJFXFastPixelReaderWriter.java similarity index 100% rename from webfx-kit/webfx-kit-openjfx/src/main/java/dev/webfx/kit/launcher/spi/impl/openjfx/OpenJFXFastPixelReaderWriter.java rename to webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/dev/webfx/kit/launcher/spi/impl/openjfx/OpenJFXFastPixelReaderWriter.java diff --git a/webfx-kit/webfx-kit-openjfx/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/openjfx/skin/FxControlPeerSkin.java b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/openjfx/skin/FxControlPeerSkin.java similarity index 100% rename from webfx-kit/webfx-kit-openjfx/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/openjfx/skin/FxControlPeerSkin.java rename to webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/dev/webfx/kit/mapper/peers/javafxcontrols/openjfx/skin/FxControlPeerSkin.java diff --git a/webfx-kit/webfx-kit-openjfx/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/openjfx/FxLayoutMeasurable.java b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/openjfx/FxLayoutMeasurable.java similarity index 100% rename from webfx-kit/webfx-kit-openjfx/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/openjfx/FxLayoutMeasurable.java rename to webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/openjfx/FxLayoutMeasurable.java diff --git a/webfx-kit/webfx-kit-openjfx/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/openjfx/FxNodePeer.java b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/openjfx/FxNodePeer.java similarity index 100% rename from webfx-kit/webfx-kit-openjfx/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/openjfx/FxNodePeer.java rename to webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/openjfx/FxNodePeer.java diff --git a/webfx-kit/webfx-kit-openjfx/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/openjfx/FxRegionPeer.java b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/openjfx/FxRegionPeer.java similarity index 100% rename from webfx-kit/webfx-kit-openjfx/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/openjfx/FxRegionPeer.java rename to webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/openjfx/FxRegionPeer.java diff --git a/webfx-kit/webfx-kit-openjfx/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/openjfx/LayoutMeasurable.java b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/openjfx/LayoutMeasurable.java similarity index 100% rename from webfx-kit/webfx-kit-openjfx/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/openjfx/LayoutMeasurable.java rename to webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/openjfx/LayoutMeasurable.java diff --git a/webfx-kit/webfx-kit-openjfx/src/main/java/dev/webfx/platform/uischeduler/spi/impl/openjfx/FxUiSchedulerProvider.java b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/dev/webfx/platform/uischeduler/spi/impl/openjfx/FxUiSchedulerProvider.java similarity index 100% rename from webfx-kit/webfx-kit-openjfx/src/main/java/dev/webfx/platform/uischeduler/spi/impl/openjfx/FxUiSchedulerProvider.java rename to webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/dev/webfx/platform/uischeduler/spi/impl/openjfx/FxUiSchedulerProvider.java diff --git a/webfx-kit/webfx-kit-openjfx/src/main/java/module-info.java b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/module-info.java similarity index 96% rename from webfx-kit/webfx-kit-openjfx/src/main/java/module-info.java rename to webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/module-info.java index fcbd56af56..ffc7ca7395 100644 --- a/webfx-kit/webfx-kit-openjfx/src/main/java/module-info.java +++ b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/java/module-info.java @@ -1,6 +1,6 @@ // File managed by WebFX (DO NOT EDIT MANUALLY) -module webfx.kit.openjfx { +module webfx.kit.javafxgraphics.openjfx { // Direct dependencies modules requires java.base; diff --git a/webfx-kit/webfx-kit-openjfx/src/main/resources/META-INF/services/dev.webfx.kit.launcher.spi.WebFxKitLauncherProvider b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/META-INF/services/dev.webfx.kit.launcher.spi.WebFxKitLauncherProvider similarity index 100% rename from webfx-kit/webfx-kit-openjfx/src/main/resources/META-INF/services/dev.webfx.kit.launcher.spi.WebFxKitLauncherProvider rename to webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/META-INF/services/dev.webfx.kit.launcher.spi.WebFxKitLauncherProvider diff --git a/webfx-kit/webfx-kit-openjfx/src/main/resources/META-INF/services/dev.webfx.platform.uischeduler.spi.UiSchedulerProvider b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/META-INF/services/dev.webfx.platform.uischeduler.spi.UiSchedulerProvider similarity index 100% rename from webfx-kit/webfx-kit-openjfx/src/main/resources/META-INF/services/dev.webfx.platform.uischeduler.spi.UiSchedulerProvider rename to webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/META-INF/services/dev.webfx.platform.uischeduler.spi.UiSchedulerProvider diff --git a/webfx-kit/webfx-kit-openjfx/src/main/resources/css/search-box.css b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/css/search-box.css similarity index 100% rename from webfx-kit/webfx-kit-openjfx/src/main/resources/css/search-box.css rename to webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/css/search-box.css diff --git a/webfx-kit/webfx-kit-openjfx/src/main/resources/css/search-box.png b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/css/search-box.png similarity index 100% rename from webfx-kit/webfx-kit-openjfx/src/main/resources/css/search-box.png rename to webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/css/search-box.png diff --git a/webfx-kit/webfx-kit-openjfx/src/main/resources/css/search-clear-over.png b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/css/search-clear-over.png similarity index 100% rename from webfx-kit/webfx-kit-openjfx/src/main/resources/css/search-clear-over.png rename to webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/css/search-clear-over.png diff --git a/webfx-kit/webfx-kit-openjfx/src/main/resources/css/search-clear.png b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/css/search-clear.png similarity index 100% rename from webfx-kit/webfx-kit-openjfx/src/main/resources/css/search-clear.png rename to webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/css/search-clear.png diff --git a/webfx-kit/webfx-kit-openjfx/src/main/resources/css/tableview-no-horizontal-scrollbar.css b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/css/tableview-no-horizontal-scrollbar.css similarity index 100% rename from webfx-kit/webfx-kit-openjfx/src/main/resources/css/tableview-no-horizontal-scrollbar.css rename to webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/css/tableview-no-horizontal-scrollbar.css diff --git a/webfx-kit/webfx-kit-openjfx/src/main/resources/css/tableview-no-vertical-scrollbar.css b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/css/tableview-no-vertical-scrollbar.css similarity index 100% rename from webfx-kit/webfx-kit-openjfx/src/main/resources/css/tableview-no-vertical-scrollbar.css rename to webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/css/tableview-no-vertical-scrollbar.css diff --git a/webfx-kit/webfx-kit-openjfx/src/main/resources/css/toggleswitch.css b/webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/css/toggleswitch.css similarity index 100% rename from webfx-kit/webfx-kit-openjfx/src/main/resources/css/toggleswitch.css rename to webfx-kit/webfx-kit-javafxgraphics-openjfx/src/main/resources/css/toggleswitch.css diff --git a/webfx-kit/webfx-kit-openjfx/webfx.xml b/webfx-kit/webfx-kit-javafxgraphics-openjfx/webfx.xml similarity index 100% rename from webfx-kit/webfx-kit-openjfx/webfx.xml rename to webfx-kit/webfx-kit-javafxgraphics-openjfx/webfx.xml diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/pom.xml b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/pom.xml similarity index 98% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/pom.xml rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/pom.xml index 1a4d7cadb0..59c30d52ed 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/pom.xml +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/pom.xml @@ -11,7 +11,7 @@ 0.1.0-SNAPSHOT - webfx-kit-javafxgraphics-peers-gwt + webfx-kit-javafxgraphics-peers-gwt-j2cl diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/CanvasElementHelper.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/CanvasElementHelper.java similarity index 97% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/CanvasElementHelper.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/CanvasElementHelper.java index 3db256c966..756a7b7241 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/CanvasElementHelper.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/CanvasElementHelper.java @@ -1,8 +1,8 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import dev.webfx.kit.launcher.WebFxKitLauncher; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.HtmlSvgNodePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.HtmlSvgNodePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import elemental2.dom.CSSProperties; import elemental2.dom.CanvasRenderingContext2D; import elemental2.dom.HTMLCanvasElement; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/CanvasRenderingContext2DWithMatrixSetTransform.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/CanvasRenderingContext2DWithMatrixSetTransform.java similarity index 88% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/CanvasRenderingContext2DWithMatrixSetTransform.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/CanvasRenderingContext2DWithMatrixSetTransform.java index 9da15c6204..e979c5ff54 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/CanvasRenderingContext2DWithMatrixSetTransform.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/CanvasRenderingContext2DWithMatrixSetTransform.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import elemental2.dom.CanvasRenderingContext2D; import elemental2.dom.DOMMatrixReadOnly; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/Context2DHelper.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/Context2DHelper.java similarity index 96% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/Context2DHelper.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/Context2DHelper.java index 61924eaf9d..4afb3e90b6 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/Context2DHelper.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/Context2DHelper.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import elemental2.dom.CanvasRenderingContext2D; import elemental2.dom.HTMLCanvasElement; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/Context2DStateSnapshot.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/Context2DStateSnapshot.java similarity index 97% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/Context2DStateSnapshot.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/Context2DStateSnapshot.java index f44c01b181..87b4ea4dd2 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/Context2DStateSnapshot.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/Context2DStateSnapshot.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import elemental2.dom.BaseRenderingContext2D; import elemental2.dom.CanvasRenderingContext2D; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlArcPeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlArcPeer.java similarity index 94% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlArcPeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlArcPeer.java index 13ab7ce040..591cf33d44 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlArcPeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlArcPeer.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import elemental2.dom.HTMLCanvasElement; import elemental2.dom.HTMLElement; @@ -7,7 +7,7 @@ import javafx.scene.shape.ArcType; import dev.webfx.kit.mapper.peers.javafxgraphics.base.ArcPeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.ArcPeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; /** * @author Bruno Salmon diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlCanvasPeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlCanvasPeer.java similarity index 98% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlCanvasPeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlCanvasPeer.java index 1ee4b2e535..82e9156248 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlCanvasPeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlCanvasPeer.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import dev.webfx.kit.launcher.WebFxKitLauncher; import dev.webfx.kit.mapper.peers.javafxgraphics.base.CanvasPeerBase; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlCirclePeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlCirclePeer.java similarity index 93% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlCirclePeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlCirclePeer.java index 7a779b9552..8e480b0341 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlCirclePeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlCirclePeer.java @@ -1,9 +1,9 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import elemental2.dom.CSSProperties; import elemental2.dom.CSSStyleDeclaration; import elemental2.dom.HTMLElement; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import javafx.scene.shape.Circle; import dev.webfx.kit.mapper.peers.javafxgraphics.base.CirclePeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.CirclePeerMixin; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlGraphicsContext.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlGraphicsContext.java similarity index 98% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlGraphicsContext.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlGraphicsContext.java index 5231bddc5c..1b2622350b 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlGraphicsContext.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlGraphicsContext.java @@ -1,9 +1,9 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import dev.webfx.kit.launcher.WebFxKitLauncher; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlFonts; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlPaints; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlFonts; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlPaints; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import dev.webfx.platform.console.Console; import dev.webfx.platform.util.Objects; import elemental2.core.Function; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlGroupPeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlGroupPeer.java similarity index 84% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlGroupPeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlGroupPeer.java index 702c7a66ec..c8507a4d3c 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlGroupPeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlGroupPeer.java @@ -1,7 +1,7 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import elemental2.dom.HTMLElement; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import javafx.scene.Group; import dev.webfx.kit.mapper.peers.javafxgraphics.base.GroupPeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.GroupPeerMixin; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlImageViewPeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlImageViewPeer.java similarity index 98% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlImageViewPeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlImageViewPeer.java index 817133ee1c..c5f1589483 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlImageViewPeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlImageViewPeer.java @@ -1,10 +1,10 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import dev.webfx.kit.mapper.peers.javafxgraphics.base.ImageViewPeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.ImageViewPeerMixin; import dev.webfx.kit.mapper.peers.javafxgraphics.emul_coupling.HasSizeChangedCallback; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlPaints; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlPaints; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import dev.webfx.kit.mapper.peers.javafxgraphics.markers.HasTextFillProperty; import dev.webfx.platform.resource.Resource; import dev.webfx.platform.util.Numbers; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlLayoutPeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlLayoutPeer.java similarity index 85% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlLayoutPeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlLayoutPeer.java index 51e08ff969..a38fff45c2 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlLayoutPeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlLayoutPeer.java @@ -1,8 +1,8 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import javafx.geometry.Insets; import javafx.scene.layout.Region; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import dev.webfx.kit.mapper.peers.javafxgraphics.base.RegionPeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.RegionPeerMixin; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlLinePeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlLinePeer.java similarity index 86% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlLinePeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlLinePeer.java index 68af71e955..492815e21d 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlLinePeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlLinePeer.java @@ -1,10 +1,10 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import dev.webfx.kit.mapper.peers.javafxgraphics.base.LinePeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.LinePeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.svg.SvgLinePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.svg.SvgShapePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.svg.SvgLinePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.svg.SvgShapePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import elemental2.dom.HTMLElement; import javafx.scene.Cursor; import javafx.scene.shape.Line; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlNodePeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlNodePeer.java similarity index 94% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlNodePeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlNodePeer.java index 45c84960e6..651da13ffd 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlNodePeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlNodePeer.java @@ -1,10 +1,10 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import dev.webfx.kit.mapper.peers.javafxgraphics.base.NodePeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.NodePeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.HtmlSvgNodePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlPaints; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlTransforms; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.HtmlSvgNodePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlPaints; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlTransforms; import dev.webfx.platform.util.Strings; import elemental2.dom.CSSProperties; import elemental2.dom.CSSStyleDeclaration; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlPathPeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlPathPeer.java similarity index 85% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlPathPeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlPathPeer.java index 2885558790..c37cdcb16e 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlPathPeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlPathPeer.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import elemental2.dom.Element; import elemental2.dom.HTMLElement; @@ -6,11 +6,11 @@ import javafx.scene.shape.FillRule; import javafx.scene.shape.Path; import javafx.scene.shape.PathElement; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.SvgRoot; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.SvgRootBase; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.svg.SvgPathPeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.SvgUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.SvgRoot; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.SvgRootBase; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.svg.SvgPathPeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.SvgUtil; import dev.webfx.kit.mapper.peers.javafxgraphics.SceneRequester; import dev.webfx.kit.mapper.peers.javafxgraphics.base.PathPeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.PathPeerMixin; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlRectanglePeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlRectanglePeer.java similarity index 96% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlRectanglePeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlRectanglePeer.java index e4ed5d5835..3022093b84 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlRectanglePeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlRectanglePeer.java @@ -1,8 +1,8 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import elemental2.dom.CSSProperties; import elemental2.dom.HTMLElement; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import javafx.scene.shape.Rectangle; import dev.webfx.kit.mapper.peers.javafxgraphics.base.RectanglePeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.RectanglePeerMixin; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlRegionPeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlRegionPeer.java similarity index 97% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlRegionPeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlRegionPeer.java index bf1ce1fd1a..6dc73c4d4e 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlRegionPeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlRegionPeer.java @@ -1,10 +1,10 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import dev.webfx.kit.mapper.peers.javafxgraphics.base.RegionPeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.RegionPeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.DomType; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlPaints; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.DomType; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlPaints; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import dev.webfx.platform.util.collection.Collections; import elemental2.dom.CSSProperties; import elemental2.dom.CSSStyleDeclaration; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlSVGPathPeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlSVGPathPeer.java similarity index 82% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlSVGPathPeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlSVGPathPeer.java index 243de0f311..51e0a4569c 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlSVGPathPeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlSVGPathPeer.java @@ -1,11 +1,11 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import dev.webfx.kit.mapper.peers.javafxgraphics.base.SVGPathPeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.SVGPathPeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable.HtmlLayoutCache; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable.HtmlLayoutMeasurableNoGrow; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.svg.SvgPathPeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable.HtmlLayoutCache; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable.HtmlLayoutMeasurableNoGrow; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.svg.SvgPathPeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import elemental2.dom.HTMLElement; import elemental2.svg.SVGRect; import javafx.geometry.BoundingBox; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlSVGShapePeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlSVGShapePeer.java similarity index 94% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlSVGShapePeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlSVGShapePeer.java index 6df97135e0..f5487b93e6 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlSVGShapePeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlSVGShapePeer.java @@ -1,13 +1,13 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import dev.webfx.kit.mapper.peers.javafxgraphics.SceneRequester; import dev.webfx.kit.mapper.peers.javafxgraphics.base.ShapePeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.ShapePeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.SvgRoot; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.SvgRootBase; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.svg.SvgShapePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.SvgUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.SvgRoot; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.SvgRootBase; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.svg.SvgShapePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.SvgUtil; import elemental2.dom.CSSProperties; import elemental2.dom.CSSStyleDeclaration; import elemental2.dom.DomGlobal; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlScenePeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlScenePeer.java similarity index 98% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlScenePeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlScenePeer.java index 57f25c41c8..5b7053b7d2 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlScenePeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlScenePeer.java @@ -1,12 +1,12 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import dev.webfx.kit.mapper.peers.javafxgraphics.HasNoChildrenPeers; import dev.webfx.kit.mapper.peers.javafxgraphics.NodePeer; import dev.webfx.kit.mapper.peers.javafxgraphics.emul_coupling.base.ScenePeerBase; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.HtmlSvgNodePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.FxEvents; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlPaints; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.HtmlSvgNodePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.FxEvents; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlPaints; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import dev.webfx.kit.util.properties.FXProperties; import dev.webfx.platform.console.Console; import dev.webfx.platform.uischeduler.UiScheduler; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlShapePeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlShapePeer.java similarity index 94% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlShapePeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlShapePeer.java index 6b7e86715b..66bfc855c3 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlShapePeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlShapePeer.java @@ -1,7 +1,7 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import elemental2.dom.HTMLElement; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlPaints; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlPaints; import javafx.scene.paint.Paint; import javafx.scene.shape.Shape; import javafx.scene.shape.StrokeLineCap; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlSvgTextPeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlSvgTextPeer.java similarity index 90% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlSvgTextPeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlSvgTextPeer.java index c5a394956b..adb17e33f5 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlSvgTextPeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlSvgTextPeer.java @@ -1,14 +1,14 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import dev.webfx.kit.mapper.peers.javafxgraphics.SceneRequester; import dev.webfx.kit.mapper.peers.javafxgraphics.base.TextPeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.TextPeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable.HtmlLayoutMeasurableNoHGrow; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.SvgRoot; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.SvgRootBase; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.svg.SvgTextPeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.SvgUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable.HtmlLayoutMeasurableNoHGrow; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.SvgRoot; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.SvgRootBase; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.svg.SvgTextPeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.SvgUtil; import elemental2.dom.*; import elemental2.svg.SVGRect; import javafx.geometry.VPos; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlTextPeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlTextPeer.java similarity index 95% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlTextPeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlTextPeer.java index a5e8891c0d..98daa2f3aa 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/HtmlTextPeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/HtmlTextPeer.java @@ -1,12 +1,12 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import dev.webfx.kit.mapper.peers.javafxgraphics.base.TextPeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.TextPeerMixin; import dev.webfx.kit.mapper.peers.javafxgraphics.emul_coupling.HasSizeChangedCallback; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable.HtmlLayoutCache; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable.HtmlLayoutMeasurableNoHGrow; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlPaints; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable.HtmlLayoutCache; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable.HtmlLayoutMeasurableNoHGrow; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlPaints; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import dev.webfx.platform.uischeduler.UiScheduler; import dev.webfx.platform.util.Numbers; import elemental2.dom.CSSProperties; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/ImageDataHelper.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/ImageDataHelper.java similarity index 95% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/ImageDataHelper.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/ImageDataHelper.java index 3cdb5c1478..cd8283dfdd 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/ImageDataHelper.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/ImageDataHelper.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import elemental2.dom.HTMLCanvasElement; import elemental2.dom.ImageData; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/ImageDataPixelReader.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/ImageDataPixelReader.java similarity index 97% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/ImageDataPixelReader.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/ImageDataPixelReader.java index b305d96325..2a15d15ba0 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/ImageDataPixelReader.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/ImageDataPixelReader.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import elemental2.core.Uint8ClampedArray; import elemental2.dom.ImageData; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/ImageDataPixelWriter.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/ImageDataPixelWriter.java similarity index 95% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/ImageDataPixelWriter.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/ImageDataPixelWriter.java index 12811622bd..571b098714 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/ImageDataPixelWriter.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/ImageDataPixelWriter.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import elemental2.dom.ImageData; import javafx.scene.image.AbstractPixelWriter; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/NoWrapWhiteSpacePeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/NoWrapWhiteSpacePeer.java new file mode 100644 index 0000000000..0d2527d5ef --- /dev/null +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/NoWrapWhiteSpacePeer.java @@ -0,0 +1,4 @@ +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; + +public interface NoWrapWhiteSpacePeer { +} diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/NormalWhiteSpacePeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/NormalWhiteSpacePeer.java new file mode 100644 index 0000000000..a1dbd5cb12 --- /dev/null +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/NormalWhiteSpacePeer.java @@ -0,0 +1,4 @@ +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; + +public interface NormalWhiteSpacePeer { +} diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/UserInteraction.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/UserInteraction.java similarity index 96% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/UserInteraction.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/UserInteraction.java index 03bdf79878..9c40df682e 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/UserInteraction.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/UserInteraction.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html; import java.util.ArrayList; import java.util.Iterator; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/layoutmeasurable/HtmlLayoutCache.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/layoutmeasurable/HtmlLayoutCache.java similarity index 95% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/layoutmeasurable/HtmlLayoutCache.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/layoutmeasurable/HtmlLayoutCache.java index 7d0d6370ca..1ffd6d663a 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/layoutmeasurable/HtmlLayoutCache.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/layoutmeasurable/HtmlLayoutCache.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable; import javafx.geometry.Bounds; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/layoutmeasurable/HtmlLayoutMeasurable.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/layoutmeasurable/HtmlLayoutMeasurable.java similarity index 96% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/layoutmeasurable/HtmlLayoutMeasurable.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/layoutmeasurable/HtmlLayoutMeasurable.java index c6390eb21a..95dbe7302c 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/layoutmeasurable/HtmlLayoutMeasurable.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/layoutmeasurable/HtmlLayoutMeasurable.java @@ -1,7 +1,7 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable; import dev.webfx.kit.mapper.peers.javafxgraphics.emul_coupling.LayoutMeasurable; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlNodePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlNodePeer; import elemental2.dom.CSSProperties; import elemental2.dom.CSSStyleDeclaration; import elemental2.dom.DOMRect; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/layoutmeasurable/HtmlLayoutMeasurableNoGrow.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/layoutmeasurable/HtmlLayoutMeasurableNoGrow.java similarity index 64% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/layoutmeasurable/HtmlLayoutMeasurableNoGrow.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/layoutmeasurable/HtmlLayoutMeasurableNoGrow.java index 74a0717e7f..027896e9ab 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/layoutmeasurable/HtmlLayoutMeasurableNoGrow.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/layoutmeasurable/HtmlLayoutMeasurableNoGrow.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable; /** * @author Bruno Salmon diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/layoutmeasurable/HtmlLayoutMeasurableNoHGrow.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/layoutmeasurable/HtmlLayoutMeasurableNoHGrow.java similarity index 79% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/layoutmeasurable/HtmlLayoutMeasurableNoHGrow.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/layoutmeasurable/HtmlLayoutMeasurableNoHGrow.java index 1b3fcedf8f..4fa5597e7c 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/layoutmeasurable/HtmlLayoutMeasurableNoHGrow.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/layoutmeasurable/HtmlLayoutMeasurableNoHGrow.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable; /** * @author Bruno Salmon diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/layoutmeasurable/HtmlLayoutMeasurableNoVGrow.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/layoutmeasurable/HtmlLayoutMeasurableNoVGrow.java similarity index 79% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/layoutmeasurable/HtmlLayoutMeasurableNoVGrow.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/layoutmeasurable/HtmlLayoutMeasurableNoVGrow.java index 2dde640665..8ad8c44ef3 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/layoutmeasurable/HtmlLayoutMeasurableNoVGrow.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/html/layoutmeasurable/HtmlLayoutMeasurableNoVGrow.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable; /** * @author Bruno Salmon diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/shared/GwtPrimaryStagePeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/shared/GwtJ2clPrimaryStagePeer.java similarity index 94% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/shared/GwtPrimaryStagePeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/shared/GwtJ2clPrimaryStagePeer.java index 7e96905665..e2c4e01825 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/shared/GwtPrimaryStagePeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/shared/GwtJ2clPrimaryStagePeer.java @@ -1,9 +1,9 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared; import dev.webfx.kit.mapper.peers.javafxgraphics.emul_coupling.base.ScenePeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.emul_coupling.base.StagePeerBase; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlScenePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlScenePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import dev.webfx.platform.scheduler.Scheduled; import dev.webfx.platform.uischeduler.UiScheduler; import elemental2.dom.Event; @@ -19,7 +19,7 @@ /** * @author Bruno Salmon */ -public final class GwtPrimaryStagePeer extends StagePeerBase { +public final class GwtJ2clPrimaryStagePeer extends StagePeerBase { // Variable that will contain the correction to apply on HTML window.screenY, because browsers return a wrong value! // What WebFX expects from window.screenY is to return the position on the screen of the top left corner of the @@ -30,7 +30,7 @@ public final class GwtPrimaryStagePeer extends StagePeerBase { private Scheduled windowPositionWatcher; - public GwtPrimaryStagePeer(Stage stage) { + public GwtJ2clPrimaryStagePeer(Stage stage) { super(stage); // Disabling browser horizontal and vertical scroll bars HtmlUtil.setStyleAttribute(document.documentElement, "overflow", "hidden"); diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/shared/GwtSecondaryStagePeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/shared/GwtJ2clSecondaryStagePeer.java similarity index 90% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/shared/GwtSecondaryStagePeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/shared/GwtJ2clSecondaryStagePeer.java index 54269e3c5c..4c38ba5bd9 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/shared/GwtSecondaryStagePeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/shared/GwtJ2clSecondaryStagePeer.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared; import elemental2.dom.CSSProperties; import elemental2.dom.CSSStyleDeclaration; @@ -9,21 +9,21 @@ import javafx.stage.Stage; import dev.webfx.kit.mapper.peers.javafxgraphics.emul_coupling.base.ScenePeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.emul_coupling.base.StagePeerBase; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlScenePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlScenePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import static elemental2.dom.DomGlobal.document; /** * @author Bruno Salmon */ -public final class GwtSecondaryStagePeer extends StagePeerBase { +public final class GwtJ2clSecondaryStagePeer extends StagePeerBase { private HTMLElement modalBackgroundDiv; private final HTMLElement stageDiv = HtmlUtil.createDivElement(); private final CSSStyleDeclaration stageDivStyle = stageDiv.style; - public GwtSecondaryStagePeer(Stage stage) { + public GwtJ2clSecondaryStagePeer(Stage stage) { super(stage); stageDivStyle.position = "absolute"; stageDivStyle.overflow = "hidden"; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/shared/GwtWindowPeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/shared/GwtJ2clWindowPeer.java similarity index 90% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/shared/GwtWindowPeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/shared/GwtJ2clWindowPeer.java index f910f58564..c18e90a600 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/shared/GwtWindowPeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/shared/GwtJ2clWindowPeer.java @@ -1,9 +1,9 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared; import dev.webfx.kit.mapper.peers.javafxgraphics.emul_coupling.base.ScenePeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.emul_coupling.base.WindowPeerBase; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlScenePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlScenePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import elemental2.dom.CSSProperties; import elemental2.dom.CSSStyleDeclaration; import elemental2.dom.DomGlobal; @@ -13,13 +13,13 @@ import static elemental2.dom.DomGlobal.document; -public class GwtWindowPeer extends WindowPeerBase { +public class GwtJ2clWindowPeer extends WindowPeerBase { // We actually don't create a separate window like in JavaFX, but simply simulate a window in the DOM private final HTMLElement windowElement = HtmlUtil.createElement("fx-window"); private final CSSStyleDeclaration windowStyle = windowElement.style; - public GwtWindowPeer(Window window) { + public GwtJ2clWindowPeer(Window window) { super(window); windowStyle.position = "absolute"; windowStyle.overflow = "hidden"; @@ -45,7 +45,7 @@ public void setBounds(float x, float y, boolean xSet, boolean ySet, float w, flo if (xSet) windowStyle.left = (x - DomGlobal.window.screenX) + "px"; if (ySet) - windowStyle.top = (y - DomGlobal.window.screenY - GwtPrimaryStagePeer.windowScreenYCorrection) + "px"; + windowStyle.top = (y - DomGlobal.window.screenY - GwtJ2clPrimaryStagePeer.windowScreenYCorrection) + "px"; if (w < 0 && cw > 0) w = cw; // + 6; if (h < 0 && ch > 0) diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/shared/HtmlSvgNodePeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/shared/HtmlSvgNodePeer.java similarity index 99% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/shared/HtmlSvgNodePeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/shared/HtmlSvgNodePeer.java index 687ccdef4c..6554653a2a 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/shared/HtmlSvgNodePeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/shared/HtmlSvgNodePeer.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared; import com.sun.javafx.cursor.CursorType; import com.sun.javafx.event.EventHandlerManager; @@ -11,9 +11,9 @@ import dev.webfx.kit.mapper.peers.javafxgraphics.base.NodePeerImpl; import dev.webfx.kit.mapper.peers.javafxgraphics.base.NodePeerMixin; import dev.webfx.kit.mapper.peers.javafxgraphics.emul_coupling.LayoutMeasurable; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.UserInteraction; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.svg.SvgNodePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.*; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.UserInteraction; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.svg.SvgNodePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.*; import dev.webfx.platform.uischeduler.UiScheduler; import dev.webfx.platform.util.Booleans; import dev.webfx.platform.util.Strings; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/shared/SvgRoot.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/shared/SvgRoot.java similarity index 75% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/shared/SvgRoot.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/shared/SvgRoot.java index 7688cd0d09..1881e72808 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/shared/SvgRoot.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/shared/SvgRoot.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared; import elemental2.dom.Element; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/shared/SvgRootBase.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/shared/SvgRootBase.java similarity index 61% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/shared/SvgRootBase.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/shared/SvgRootBase.java index 18fcf77173..a1e0e1453f 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/shared/SvgRootBase.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/shared/SvgRootBase.java @@ -1,7 +1,7 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared; import elemental2.dom.Element; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.SvgUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.SvgUtil; public class SvgRootBase implements SvgRoot { diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgCirclePeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgCirclePeer.java similarity index 88% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgCirclePeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgCirclePeer.java index a5b7ccd44a..ddae4de388 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgCirclePeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgCirclePeer.java @@ -1,7 +1,7 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.svg; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.svg; import elemental2.dom.Element; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.SvgUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.SvgUtil; import javafx.scene.shape.Circle; import dev.webfx.kit.mapper.peers.javafxgraphics.base.CirclePeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.CirclePeerMixin; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgGroupPeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgGroupPeer.java similarity index 82% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgGroupPeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgGroupPeer.java index 5bdd4dadec..5ccaf99fce 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgGroupPeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgGroupPeer.java @@ -1,7 +1,7 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.svg; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.svg; import elemental2.dom.Element; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.SvgUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.SvgUtil; import javafx.scene.Group; import dev.webfx.kit.mapper.peers.javafxgraphics.base.GroupPeerMixin; import dev.webfx.kit.mapper.peers.javafxgraphics.base.GroupPeerBase; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgLayoutPeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgLayoutPeer.java similarity index 87% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgLayoutPeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgLayoutPeer.java index adb7a7b8de..87ca77403a 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgLayoutPeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgLayoutPeer.java @@ -1,7 +1,7 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.svg; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.svg; import javafx.geometry.Insets; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.SvgUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.SvgUtil; import javafx.scene.layout.Background; import javafx.scene.layout.Border; import javafx.scene.layout.Region; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgLinePeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgLinePeer.java similarity index 88% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgLinePeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgLinePeer.java index 0e721c1faa..79a421bf78 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgLinePeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgLinePeer.java @@ -1,8 +1,8 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.svg; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.svg; import dev.webfx.kit.mapper.peers.javafxgraphics.base.LinePeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.LinePeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.SvgUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.SvgUtil; import elemental2.dom.Element; import javafx.scene.shape.Line; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgNodePeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgNodePeer.java similarity index 95% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgNodePeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgNodePeer.java index 5751c2ba1d..ac04704533 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgNodePeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgNodePeer.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.svg; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.svg; import elemental2.dom.Element; import javafx.geometry.VPos; @@ -12,11 +12,11 @@ import dev.webfx.kit.mapper.peers.javafxgraphics.base.NodePeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.NodePeerMixin; import dev.webfx.kit.mapper.peers.javafxgraphics.emul_coupling.ScenePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.HtmlSvgNodePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.SvgRoot; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlPaints; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.SvgUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.HtmlSvgNodePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.SvgRoot; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlPaints; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.SvgUtil; import java.util.*; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgPathPeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgPathPeer.java similarity index 91% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgPathPeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgPathPeer.java index 41ac0f0f09..d739c794b6 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgPathPeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgPathPeer.java @@ -1,8 +1,8 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.svg; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.svg; import dev.webfx.kit.mapper.peers.javafxgraphics.base.PathPeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.PathPeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.SvgUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.SvgUtil; import dev.webfx.platform.util.collection.Collections; import elemental2.dom.Element; import javafx.collections.ListChangeListener; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgRectanglePeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgRectanglePeer.java similarity index 91% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgRectanglePeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgRectanglePeer.java index 1f2c6b6ada..63821c1210 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgRectanglePeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgRectanglePeer.java @@ -1,7 +1,7 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.svg; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.svg; import elemental2.dom.Element; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.SvgUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.SvgUtil; import javafx.scene.shape.Rectangle; import dev.webfx.kit.mapper.peers.javafxgraphics.base.RectanglePeerMixin; import dev.webfx.kit.mapper.peers.javafxgraphics.base.RectanglePeerBase; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgRegionPeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgRegionPeer.java similarity index 92% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgRegionPeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgRegionPeer.java index e4c5340e4f..2aa103ac41 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgRegionPeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgRegionPeer.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.svg; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.svg; import elemental2.dom.Element; import javafx.scene.layout.Region; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgScenePeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgScenePeer.java similarity index 87% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgScenePeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgScenePeer.java index 0bcb710be0..972020e81a 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgScenePeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgScenePeer.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.svg; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.svg; import elemental2.dom.DomGlobal; import elemental2.dom.Element; @@ -10,15 +10,15 @@ import javafx.scene.paint.Color; import javafx.scene.paint.LinearGradient; import javafx.scene.paint.Paint; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlNodePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.SvgRoot; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.SvgRootBase; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlNodePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.SvgRoot; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.SvgRootBase; import dev.webfx.kit.mapper.peers.javafxgraphics.emul_coupling.base.ScenePeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.NodePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.shared.HtmlSvgNodePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlPaints; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.SvgUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.shared.HtmlSvgNodePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlPaints; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.SvgUtil; import dev.webfx.kit.util.properties.FXProperties; import dev.webfx.platform.util.Numbers; import dev.webfx.platform.util.collection.Collections; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgShapePeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgShapePeer.java similarity index 97% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgShapePeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgShapePeer.java index 911228624e..ea4e1a4363 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgShapePeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgShapePeer.java @@ -1,8 +1,8 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.svg; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.svg; import dev.webfx.kit.mapper.peers.javafxgraphics.base.ShapePeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.ShapePeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.SvgUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.SvgUtil; import dev.webfx.platform.util.collection.Collections; import elemental2.dom.Element; import elemental2.svg.SVGLocatable; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgTextPeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgTextPeer.java similarity index 95% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgTextPeer.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgTextPeer.java index ff7434fe7f..b0962bfae6 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/svg/SvgTextPeer.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/svg/SvgTextPeer.java @@ -1,8 +1,8 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.svg; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.svg; import dev.webfx.kit.mapper.peers.javafxgraphics.base.TextPeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.TextPeerMixin; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.SvgUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.SvgUtil; import dev.webfx.platform.util.Numbers; import javafx.geometry.VPos; import javafx.scene.text.Font; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/DomType.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/DomType.java similarity index 53% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/DomType.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/DomType.java index d907769f59..36ad82f82d 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/DomType.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/DomType.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util; /** * @author Bruno Salmon diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/DragboardDataTransferHolder.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/DragboardDataTransferHolder.java similarity index 86% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/DragboardDataTransferHolder.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/DragboardDataTransferHolder.java index 87967d8db7..1eb94c981c 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/DragboardDataTransferHolder.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/DragboardDataTransferHolder.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util; import elemental2.dom.DataTransfer; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/FxEvents.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/FxEvents.java similarity index 97% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/FxEvents.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/FxEvents.java index 5c2aeff970..3168197b6e 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/FxEvents.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/FxEvents.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util; import javafx.event.EventType; import javafx.scene.Node; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/HtmlFonts.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/HtmlFonts.java similarity index 90% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/HtmlFonts.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/HtmlFonts.java index 04c1302959..d0cdb08b0f 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/HtmlFonts.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/HtmlFonts.java @@ -1,9 +1,9 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util; import elemental2.dom.Element; import javafx.scene.text.Font; import javafx.scene.text.FontPosture; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlNodePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlNodePeer; /** * @author Bruno Salmon diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/HtmlPaints.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/HtmlPaints.java similarity index 98% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/HtmlPaints.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/HtmlPaints.java index d166a7ddd9..60e3a9076e 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/HtmlPaints.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/HtmlPaints.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util; import javafx.scene.paint.*; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/HtmlTransforms.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/HtmlTransforms.java similarity index 98% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/HtmlTransforms.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/HtmlTransforms.java index ca81cab258..3ef9864b37 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/HtmlTransforms.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/HtmlTransforms.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util; import dev.webfx.platform.util.collection.Collections; import javafx.scene.transform.*; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/HtmlUtil.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/HtmlUtil.java similarity index 99% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/HtmlUtil.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/HtmlUtil.java index 5e567554ba..e13c1751a7 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/HtmlUtil.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/HtmlUtil.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util; import dev.webfx.platform.util.Strings; import elemental2.dom.*; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/SvgTransforms.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/SvgTransforms.java similarity index 96% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/SvgTransforms.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/SvgTransforms.java index 721b62167e..2fdc4fe947 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/SvgTransforms.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/SvgTransforms.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util; import dev.webfx.platform.util.collection.Collections; import javafx.scene.transform.*; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/SvgUtil.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/SvgUtil.java similarity index 98% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/SvgUtil.java rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/SvgUtil.java index 230e05f3eb..02d2314d74 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/util/SvgUtil.java +++ b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwtj2cl/util/SvgUtil.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util; +package dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util; import elemental2.dom.Element; import javafx.scene.paint.*; diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/webfx.xml b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/webfx.xml similarity index 100% rename from webfx-kit/webfx-kit-javafxgraphics-peers-gwt/webfx.xml rename to webfx-kit/webfx-kit-javafxgraphics-peers-gwt-j2cl/webfx.xml diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/NoWrapWhiteSpacePeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/NoWrapWhiteSpacePeer.java deleted file mode 100644 index c0c9cb9340..0000000000 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/NoWrapWhiteSpacePeer.java +++ /dev/null @@ -1,4 +0,0 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; - -public interface NoWrapWhiteSpacePeer { -} diff --git a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/NormalWhiteSpacePeer.java b/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/NormalWhiteSpacePeer.java deleted file mode 100644 index 6718c88e63..0000000000 --- a/webfx-kit/webfx-kit-javafxgraphics-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxgraphics/gwt/html/NormalWhiteSpacePeer.java +++ /dev/null @@ -1,4 +0,0 @@ -package dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html; - -public interface NormalWhiteSpacePeer { -} diff --git a/webfx-kit/webfx-kit-javafxgraphics-registry-gwt/pom.xml b/webfx-kit/webfx-kit-javafxgraphics-registry-gwt-j2cl/pom.xml similarity index 88% rename from webfx-kit/webfx-kit-javafxgraphics-registry-gwt/pom.xml rename to webfx-kit/webfx-kit-javafxgraphics-registry-gwt-j2cl/pom.xml index 8d38ff8a7c..8ed9453df9 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-registry-gwt/pom.xml +++ b/webfx-kit/webfx-kit-javafxgraphics-registry-gwt-j2cl/pom.xml @@ -11,7 +11,7 @@ 0.1.0-SNAPSHOT - webfx-kit-javafxgraphics-registry-gwt + webfx-kit-javafxgraphics-registry-gwt-j2cl @@ -29,7 +29,7 @@ dev.webfx - webfx-kit-javafxgraphics-peers-gwt + webfx-kit-javafxgraphics-peers-gwt-j2cl 0.1.0-SNAPSHOT diff --git a/webfx-kit/webfx-kit-javafxgraphics-registry-gwt/src/main/java/dev/webfx/kit/registry/javafxgraphics/JavaFxGraphicsRegistry.java b/webfx-kit/webfx-kit-javafxgraphics-registry-gwt-j2cl/src/main/java/dev/webfx/kit/registry/javafxgraphics/JavaFxGraphicsRegistry.java similarity index 97% rename from webfx-kit/webfx-kit-javafxgraphics-registry-gwt/src/main/java/dev/webfx/kit/registry/javafxgraphics/JavaFxGraphicsRegistry.java rename to webfx-kit/webfx-kit-javafxgraphics-registry-gwt-j2cl/src/main/java/dev/webfx/kit/registry/javafxgraphics/JavaFxGraphicsRegistry.java index f2421ded8c..9b76bff2a0 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-registry-gwt/src/main/java/dev/webfx/kit/registry/javafxgraphics/JavaFxGraphicsRegistry.java +++ b/webfx-kit/webfx-kit-javafxgraphics-registry-gwt-j2cl/src/main/java/dev/webfx/kit/registry/javafxgraphics/JavaFxGraphicsRegistry.java @@ -5,7 +5,7 @@ import javafx.scene.shape.*; import javafx.scene.text.Text; import dev.webfx.kit.mapper.peers.javafxgraphics.NodePeerFactoryRegistry; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.*; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.*; import static dev.webfx.kit.mapper.peers.javafxgraphics.NodePeerFactoryRegistry.*; diff --git a/webfx-kit/webfx-kit-javafxgraphics-registry-gwt/src/main/java/dev/webfx/kit/registry/javafxgraphics/SvgJavaFxGraphicsRegistry.java b/webfx-kit/webfx-kit-javafxgraphics-registry-gwt-j2cl/src/main/java/dev/webfx/kit/registry/javafxgraphics/SvgJavaFxGraphicsRegistry.java similarity index 94% rename from webfx-kit/webfx-kit-javafxgraphics-registry-gwt/src/main/java/dev/webfx/kit/registry/javafxgraphics/SvgJavaFxGraphicsRegistry.java rename to webfx-kit/webfx-kit-javafxgraphics-registry-gwt-j2cl/src/main/java/dev/webfx/kit/registry/javafxgraphics/SvgJavaFxGraphicsRegistry.java index dec854ede1..eaf28af5cf 100644 --- a/webfx-kit/webfx-kit-javafxgraphics-registry-gwt/src/main/java/dev/webfx/kit/registry/javafxgraphics/SvgJavaFxGraphicsRegistry.java +++ b/webfx-kit/webfx-kit-javafxgraphics-registry-gwt-j2cl/src/main/java/dev/webfx/kit/registry/javafxgraphics/SvgJavaFxGraphicsRegistry.java @@ -1,7 +1,7 @@ package dev.webfx.kit.registry.javafxgraphics; import dev.webfx.kit.mapper.peers.javafxgraphics.NodePeerFactoryRegistry; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.svg.SvgLayoutPeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.svg.SvgLayoutPeer; public class SvgJavaFxGraphicsRegistry { diff --git a/webfx-kit/webfx-kit-javafxgraphics-registry-gwt/webfx.xml b/webfx-kit/webfx-kit-javafxgraphics-registry-gwt-j2cl/webfx.xml similarity index 100% rename from webfx-kit/webfx-kit-javafxgraphics-registry-gwt/webfx.xml rename to webfx-kit/webfx-kit-javafxgraphics-registry-gwt-j2cl/webfx.xml diff --git a/webfx-kit/webfx-kit-javafxmedia-emul/pom.xml b/webfx-kit/webfx-kit-javafxmedia-emul/pom.xml index af8e604964..108e0f61b1 100644 --- a/webfx-kit/webfx-kit-javafxmedia-emul/pom.xml +++ b/webfx-kit/webfx-kit-javafxmedia-emul/pom.xml @@ -34,6 +34,13 @@ provided + + dev.webfx + webfx-platform-javabase-emul-j2cl + 0.1.0-SNAPSHOT + runtime + + dev.webfx webfx-platform-util diff --git a/webfx-kit/webfx-kit-javafxmedia-peers-gwt/pom.xml b/webfx-kit/webfx-kit-javafxmedia-peers-gwt-j2cl/pom.xml similarity index 90% rename from webfx-kit/webfx-kit-javafxmedia-peers-gwt/pom.xml rename to webfx-kit/webfx-kit-javafxmedia-peers-gwt-j2cl/pom.xml index 8e3c35f3df..ef6039493d 100644 --- a/webfx-kit/webfx-kit-javafxmedia-peers-gwt/pom.xml +++ b/webfx-kit/webfx-kit-javafxmedia-peers-gwt-j2cl/pom.xml @@ -11,7 +11,7 @@ 0.1.0-SNAPSHOT - webfx-kit-javafxmedia-peers-gwt + webfx-kit-javafxmedia-peers-gwt-j2cl @@ -77,13 +77,7 @@ dev.webfx - webfx-kit-javafxgraphics-peers-gwt - 0.1.0-SNAPSHOT - - - - dev.webfx - webfx-platform-boot + webfx-kit-javafxgraphics-peers-gwt-j2cl 0.1.0-SNAPSHOT diff --git a/webfx-kit/webfx-kit-javafxmedia-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwt/GwtMediaPlayerPeer.java b/webfx-kit/webfx-kit-javafxmedia-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwtj2cl/GwtJ2clMediaPlayerPeer.java similarity index 98% rename from webfx-kit/webfx-kit-javafxmedia-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwt/GwtMediaPlayerPeer.java rename to webfx-kit/webfx-kit-javafxmedia-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwtj2cl/GwtJ2clMediaPlayerPeer.java index 488d60d5db..336dc4bec7 100644 --- a/webfx-kit/webfx-kit-javafxmedia-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwt/GwtMediaPlayerPeer.java +++ b/webfx-kit/webfx-kit-javafxmedia-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwtj2cl/GwtJ2clMediaPlayerPeer.java @@ -1,7 +1,7 @@ -package dev.webfx.kit.mapper.peers.javafxmedia.spi.gwt; +package dev.webfx.kit.mapper.peers.javafxmedia.spi.gwtj2cl; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.UserInteraction; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.UserInteraction; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import dev.webfx.kit.mapper.peers.javafxmedia.MediaPlayerPeer; import dev.webfx.platform.console.Console; import dev.webfx.platform.scheduler.Scheduled; @@ -28,7 +28,7 @@ /** * @author Bruno Salmon */ -public final class GwtMediaPlayerPeer implements MediaPlayerPeer { +public final class GwtJ2clMediaPlayerPeer implements MediaPlayerPeer { private static final boolean PREFER_MEDIA_ELEMENT_TO_AUDIO_BUFFER_FOR_NON_AUDIO_CLIP = !"false".equals(WebStorageWindow.of(DomGlobal.window).localStorage.getItem("PREFER_MEDIA_ELEMENT_TO_AUDIO_BUFFER_FOR_NON_AUDIO_CLIP")); private static final long MEDIA_PLAYER_CURRENT_TIME_SYNC_RATE_MILLIS = 250; // Same rate as mediaElement.ontimeupdate @@ -67,7 +67,7 @@ public final class GwtMediaPlayerPeer implements MediaPlayerPeer { private int playedCycleCount = 0; private Runnable onEndOfMedia, onPlaying; - public GwtMediaPlayerPeer(MediaPlayer mediaPlayer, boolean audioClip) { + public GwtJ2clMediaPlayerPeer(MediaPlayer mediaPlayer, boolean audioClip) { this.mediaPlayer = mediaPlayer; this.mediaUrl = mediaPlayer.getMedia().getSource(); this.audioClip = audioClip; @@ -431,7 +431,8 @@ public void setMute(boolean mute) { private AnalyserNode getOrCreateAnalyzer() { if (analyser == null) { analyser = getAudioContext().createAnalyser(); - analyser.frequencyBinCount = arraySize; + //analyser.frequencyBinCount = arraySize; // Readonly field + analyser.fftSize = 2 * arraySize; analyser.minDecibels = -60; analyser.maxDecibels = 0; byteTimeArray = new Uint8Array(arraySize); @@ -734,7 +735,7 @@ private void memoriseWorkingCrossOrigin(HTMLMediaElement mediaElement) { static { UserInteraction.runOnNextUserInteraction(() -> { String tinySilentMp3Data = "data:audio/mpeg;base64,SUQzBAAAAAABEVRYWFgAAAAtAAADY29tbWVudABCaWdTb3VuZEJhbmsuY29tIC8gTGFTb25vdGhlcXVlLm9yZwBURU5DAAAAHQAAA1N3aXRjaCBQbHVzIMKpIE5DSCBTb2Z0d2FyZQBUSVQyAAAABgAAAzIyMzUAVFNTRQAAAA8AAANMYXZmNTcuODMuMTAwAAAAAAAAAAAAAAD/80DEAAAAA0gAAAAATEFNRTMuMTAwVVVVVVVVVVVVVUxBTUUzLjEwMFVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVf/zQsRbAAADSAAAAABVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVf/zQMSkAAADSAAAAABVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV"; - new GwtMediaPlayerPeer(new MediaPlayer(new Media(tinySilentMp3Data)), true).play(); // This will unlock the sound + new GwtJ2clMediaPlayerPeer(new MediaPlayer(new Media(tinySilentMp3Data)), true).play(); // This will unlock the sound }); } } diff --git a/webfx-kit/webfx-kit-javafxmedia-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwt/GwtMediaViewPeer.java b/webfx-kit/webfx-kit-javafxmedia-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwtj2cl/GwtJ2clMediaViewPeer.java similarity index 83% rename from webfx-kit/webfx-kit-javafxmedia-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwt/GwtMediaViewPeer.java rename to webfx-kit/webfx-kit-javafxmedia-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwtj2cl/GwtJ2clMediaViewPeer.java index 21aad898a2..034a6c41bf 100644 --- a/webfx-kit/webfx-kit-javafxmedia-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwt/GwtMediaViewPeer.java +++ b/webfx-kit/webfx-kit-javafxmedia-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwtj2cl/GwtJ2clMediaViewPeer.java @@ -1,12 +1,12 @@ -package dev.webfx.kit.mapper.peers.javafxmedia.spi.gwt; +package dev.webfx.kit.mapper.peers.javafxmedia.spi.gwtj2cl; import dev.webfx.kit.mapper.peers.javafxgraphics.SceneRequester; import dev.webfx.kit.mapper.peers.javafxgraphics.base.NodePeerBase; import dev.webfx.kit.mapper.peers.javafxgraphics.base.NodePeerMixin; import dev.webfx.kit.mapper.peers.javafxgraphics.emul_coupling.HasSizeChangedCallback; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlNodePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.layoutmeasurable.HtmlLayoutMeasurable; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlNodePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.layoutmeasurable.HtmlLayoutMeasurable; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import elemental2.dom.Element; import elemental2.dom.HTMLElement; import elemental2.dom.HTMLMediaElement; @@ -17,18 +17,18 @@ /** * @author Bruno Salmon */ -public class GwtMediaViewPeer +public class GwtJ2clMediaViewPeer , NM extends NodePeerMixin> extends HtmlNodePeer implements HtmlLayoutMeasurable, HasSizeChangedCallback { private final HTMLVideoElement videoElement; private boolean loaded; - public GwtMediaViewPeer() { + public GwtJ2clMediaViewPeer() { this((NB) new NodePeerBase(), HtmlUtil.createElement("video")); } - public GwtMediaViewPeer(NB base, HTMLElement element) { + public GwtJ2clMediaViewPeer(NB base, HTMLElement element) { super(base, element); videoElement = (HTMLVideoElement) getElement(); videoElement.controls = false; // There is no controls in JavaFX MediaView @@ -45,8 +45,10 @@ public void bind(N node, SceneRequester sceneRequester) { super.bind(node, sceneRequester); N mediaView = getNode(); MediaPlayer mediaPlayer = mediaView.getMediaPlayer(); - GwtMediaPlayerPeer peer = (GwtMediaPlayerPeer) mediaPlayer.getPeer(); - peer.setMediaElement(videoElement); // This set videoElement listeners, including onloadedmetadata + if (mediaPlayer != null) { + GwtJ2clMediaPlayerPeer peer = (GwtJ2clMediaPlayerPeer) mediaPlayer.getPeer(); + peer.setMediaElement(videoElement); // This set videoElement listeners, including onloadedmetadata + } // In addition, we would like to notify the size change which happens when metadata is loaded, but adding a // listener through videoElement.addEventListener("onloadedmetadata") doesn't work (it's never called). // So we redefine videoElement.onloadedmetadata but call the listener initially set by GwtMediaPlayerPeer. diff --git a/webfx-kit/webfx-kit-javafxmedia-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwt/GwtWebFxKitMediaMapperProvider.java b/webfx-kit/webfx-kit-javafxmedia-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwtj2cl/GwtJ2clWebFxKitMediaMapperProvider.java similarity index 60% rename from webfx-kit/webfx-kit-javafxmedia-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwt/GwtWebFxKitMediaMapperProvider.java rename to webfx-kit/webfx-kit-javafxmedia-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwtj2cl/GwtJ2clWebFxKitMediaMapperProvider.java index 75186625e1..859a72b129 100644 --- a/webfx-kit/webfx-kit-javafxmedia-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwt/GwtWebFxKitMediaMapperProvider.java +++ b/webfx-kit/webfx-kit-javafxmedia-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwtj2cl/GwtJ2clWebFxKitMediaMapperProvider.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxmedia.spi.gwt; +package dev.webfx.kit.mapper.peers.javafxmedia.spi.gwtj2cl; import dev.webfx.kit.mapper.peers.javafxmedia.MediaPlayerPeer; import dev.webfx.kit.mapper.peers.javafxmedia.spi.WebFxKitMediaMapperProvider; @@ -7,11 +7,11 @@ /** * @author Bruno Salmon */ -public final class GwtWebFxKitMediaMapperProvider implements WebFxKitMediaMapperProvider { +public final class GwtJ2clWebFxKitMediaMapperProvider implements WebFxKitMediaMapperProvider { @Override public MediaPlayerPeer createMediaPlayerPeer(MediaPlayer mediaPlayer, boolean audioClip) { - return new GwtMediaPlayerPeer(mediaPlayer, audioClip); + return new GwtJ2clMediaPlayerPeer(mediaPlayer, audioClip); } } diff --git a/webfx-kit/webfx-kit-javafxmedia-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwt/StopWatch.java b/webfx-kit/webfx-kit-javafxmedia-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwtj2cl/StopWatch.java similarity index 97% rename from webfx-kit/webfx-kit-javafxmedia-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwt/StopWatch.java rename to webfx-kit/webfx-kit-javafxmedia-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwtj2cl/StopWatch.java index 5178cd45c3..e8c4b97f53 100644 --- a/webfx-kit/webfx-kit-javafxmedia-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwt/StopWatch.java +++ b/webfx-kit/webfx-kit-javafxmedia-peers-gwt-j2cl/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwtj2cl/StopWatch.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.mapper.peers.javafxmedia.spi.gwt; +package dev.webfx.kit.mapper.peers.javafxmedia.spi.gwtj2cl; import java.util.function.Supplier; diff --git a/webfx-kit/webfx-kit-javafxmedia-peers-gwt/webfx.xml b/webfx-kit/webfx-kit-javafxmedia-peers-gwt-j2cl/webfx.xml similarity index 84% rename from webfx-kit/webfx-kit-javafxmedia-peers-gwt/webfx.xml rename to webfx-kit/webfx-kit-javafxmedia-peers-gwt-j2cl/webfx.xml index dfd13d92f4..6bef2e4831 100644 --- a/webfx-kit/webfx-kit-javafxmedia-peers-gwt/webfx.xml +++ b/webfx-kit/webfx-kit-javafxmedia-peers-gwt-j2cl/webfx.xml @@ -6,7 +6,7 @@ - dev.webfx.kit.mapper.peers.javafxmedia.spi.gwt.GwtWebFxKitMediaMapperProvider + dev.webfx.kit.mapper.peers.javafxmedia.spi.gwtj2cl.GwtJ2clWebFxKitMediaMapperProvider diff --git a/webfx-kit/webfx-kit-javafxmedia-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwt/GwtMediaModuleBooter.java b/webfx-kit/webfx-kit-javafxmedia-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwt/GwtMediaModuleBooter.java deleted file mode 100644 index 17c4b9b7c0..0000000000 --- a/webfx-kit/webfx-kit-javafxmedia-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxmedia/spi/gwt/GwtMediaModuleBooter.java +++ /dev/null @@ -1,83 +0,0 @@ -package dev.webfx.kit.mapper.peers.javafxmedia.spi.gwt; - -import dev.webfx.platform.boot.spi.ApplicationModuleBooter; -import elemental2.dom.AddEventListenerOptions; -import elemental2.dom.DomGlobal; -import javafx.scene.media.Media; -import javafx.scene.media.MediaPlayer; - -import java.util.ArrayList; -import java.util.List; - -/** - * - * The purpose of this module booter is to ensure that the sound will play ok on iOS and iPadOS after the first user - * interaction. - * ========================== - * Description of the problem - * ========================== - * Other OS automatically unlock the sound on first user interaction, even if the application code doesn't request - * playing sound at this time, it can still start playing sound any time later, even not necessarily during a user - * interaction. On iOS and iPadOS however, this sound unlocking is not automatic, it happens only if the application - * requests playing sound DURING the user interaction. - * Because of this difference, if the JavaFX application code tries to start playing sound using setOnMouseClicked(), - * this won't work (it will work however with setOnMousePressed() or setOnMouseReleased()). This is due to the way - * WebFX emulates the JavaFX click event, which is not based on the JavaScript "click" event as opposed to the other - * events, because JavaFX has its own way to fire it when detecting the mouse released, and WebFX postpones this process - * (see HtmlScenePeer.java, installMouseListeners() and passHtmlMouseEventOnToFx() methods). - * =========================== - * Description of the solution - * =========================== - * This module booter will automatically detect the first user interaction and play a silent sound for a very short time - * during that interaction, causing the sound unlocking even on iOS and iPadOS. Then, if the JavaFX application requests - * playing sound using setOnMouseClicked(), it will work because the sound unlocking has previously been done. - * - * @author Bruno Salmon - */ -@Deprecated -public class GwtMediaModuleBooter implements ApplicationModuleBooter { - - private static boolean AUDIO_REQUIRES_USER_INTERACTION_FIRST = true; - private static final List ON_FIRST_USER_INTERACTION_RUNNABLES = new ArrayList<>(); - - public static boolean audioRequiresUserInteractionFirst() { - return AUDIO_REQUIRES_USER_INTERACTION_FIRST; - } - - public static void runOnFirstUserInteraction(Runnable onFirstUserInteraction) { - ON_FIRST_USER_INTERACTION_RUNNABLES.add(onFirstUserInteraction); - } - - @Override - public String getModuleName() { - return "webfx-kit-javafxmedia-peer-gwt"; - } - - @Override - public int getBootLevel() { - return APPLICATION_BOOT_LEVEL; - } - - @Override - public void bootModule() { - AddEventListenerOptions options = AddEventListenerOptions.create(); - options.setPassive(true); // We promise we won't call preventDefault() - options.setCapture(true); // Our listener will be called first - options.setOnce(true); // We need the listener to be called only once (will be automatically removed after that) - // We use "mousedown", "touchstart" and "keydown" events to detect the first user interaction - DomGlobal.window.addEventListener("mousedown", e -> doOnUserInteraction(), options); - DomGlobal.window.addEventListener("touchstart", e -> doOnUserInteraction(), options); - DomGlobal.window.addEventListener("keydown", e -> doOnUserInteraction(), options); - } - - private void doOnUserInteraction() { - if (AUDIO_REQUIRES_USER_INTERACTION_FIRST) { - String tinySilentMp3Data = "data:audio/mpeg;base64,SUQzBAAAAAABEVRYWFgAAAAtAAADY29tbWVudABCaWdTb3VuZEJhbmsuY29tIC8gTGFTb25vdGhlcXVlLm9yZwBURU5DAAAAHQAAA1N3aXRjaCBQbHVzIMKpIE5DSCBTb2Z0d2FyZQBUSVQyAAAABgAAAzIyMzUAVFNTRQAAAA8AAANMYXZmNTcuODMuMTAwAAAAAAAAAAAAAAD/80DEAAAAA0gAAAAATEFNRTMuMTAwVVVVVVVVVVVVVUxBTUUzLjEwMFVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVf/zQsRbAAADSAAAAABVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVf/zQMSkAAADSAAAAABVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV"; - new GwtMediaPlayerPeer(new MediaPlayer(new Media(tinySilentMp3Data)), true).play(); // This will unlock the sound - AUDIO_REQUIRES_USER_INTERACTION_FIRST = false; - ON_FIRST_USER_INTERACTION_RUNNABLES.forEach(Runnable::run); - ON_FIRST_USER_INTERACTION_RUNNABLES.clear(); - } - } - -} diff --git a/webfx-kit/webfx-kit-javafxmedia-registry-gwt/pom.xml b/webfx-kit/webfx-kit-javafxmedia-registry-gwt-j2cl/pom.xml similarity index 88% rename from webfx-kit/webfx-kit-javafxmedia-registry-gwt/pom.xml rename to webfx-kit/webfx-kit-javafxmedia-registry-gwt-j2cl/pom.xml index ae27290319..976f1248ab 100644 --- a/webfx-kit/webfx-kit-javafxmedia-registry-gwt/pom.xml +++ b/webfx-kit/webfx-kit-javafxmedia-registry-gwt-j2cl/pom.xml @@ -11,7 +11,7 @@ 0.1.0-SNAPSHOT - webfx-kit-javafxmedia-registry-gwt + webfx-kit-javafxmedia-registry-gwt-j2cl @@ -29,7 +29,7 @@ dev.webfx - webfx-kit-javafxmedia-peers-gwt + webfx-kit-javafxmedia-peers-gwt-j2cl 0.1.0-SNAPSHOT diff --git a/webfx-kit/webfx-kit-javafxmedia-registry-gwt/src/main/java/dev/webfx/kit/registry/javafxmedia/JavaFxMediaRegistry.java b/webfx-kit/webfx-kit-javafxmedia-registry-gwt-j2cl/src/main/java/dev/webfx/kit/registry/javafxmedia/JavaFxMediaRegistry.java similarity index 66% rename from webfx-kit/webfx-kit-javafxmedia-registry-gwt/src/main/java/dev/webfx/kit/registry/javafxmedia/JavaFxMediaRegistry.java rename to webfx-kit/webfx-kit-javafxmedia-registry-gwt-j2cl/src/main/java/dev/webfx/kit/registry/javafxmedia/JavaFxMediaRegistry.java index 014a6416f7..d8ce0c89e1 100644 --- a/webfx-kit/webfx-kit-javafxmedia-registry-gwt/src/main/java/dev/webfx/kit/registry/javafxmedia/JavaFxMediaRegistry.java +++ b/webfx-kit/webfx-kit-javafxmedia-registry-gwt-j2cl/src/main/java/dev/webfx/kit/registry/javafxmedia/JavaFxMediaRegistry.java @@ -1,6 +1,6 @@ package dev.webfx.kit.registry.javafxmedia; -import dev.webfx.kit.mapper.peers.javafxmedia.spi.gwt.GwtMediaViewPeer; +import dev.webfx.kit.mapper.peers.javafxmedia.spi.gwtj2cl.GwtJ2clMediaViewPeer; import javafx.scene.media.MediaView; import static dev.webfx.kit.mapper.peers.javafxgraphics.NodePeerFactoryRegistry.registerNodePeerFactory; @@ -10,7 +10,7 @@ public class JavaFxMediaRegistry { public static void registerMediaView() { - registerNodePeerFactory(MediaView.class, GwtMediaViewPeer::new); + registerNodePeerFactory(MediaView.class, GwtJ2clMediaViewPeer::new); } } diff --git a/webfx-kit/webfx-kit-javafxmedia-registry-gwt/webfx.xml b/webfx-kit/webfx-kit-javafxmedia-registry-gwt-j2cl/webfx.xml similarity index 100% rename from webfx-kit/webfx-kit-javafxmedia-registry-gwt/webfx.xml rename to webfx-kit/webfx-kit-javafxmedia-registry-gwt-j2cl/webfx.xml diff --git a/webfx-kit/webfx-kit-javafxweb-peers-gwt/pom.xml b/webfx-kit/webfx-kit-javafxweb-peers-gwt/pom.xml index 5d9f590070..30503af01c 100644 --- a/webfx-kit/webfx-kit-javafxweb-peers-gwt/pom.xml +++ b/webfx-kit/webfx-kit-javafxweb-peers-gwt/pom.xml @@ -40,7 +40,7 @@ dev.webfx - webfx-kit-javafxgraphics-peers-gwt + webfx-kit-javafxgraphics-peers-gwt-j2cl 0.1.0-SNAPSHOT diff --git a/webfx-kit/webfx-kit-javafxweb-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxweb/spi/gwt/HtmlWebViewPeer.java b/webfx-kit/webfx-kit-javafxweb-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxweb/spi/gwt/HtmlWebViewPeer.java index 4de43977a6..d671eaab0c 100644 --- a/webfx-kit/webfx-kit-javafxweb-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxweb/spi/gwt/HtmlWebViewPeer.java +++ b/webfx-kit/webfx-kit-javafxweb-peers-gwt/src/main/java/dev/webfx/kit/mapper/peers/javafxweb/spi/gwt/HtmlWebViewPeer.java @@ -1,8 +1,8 @@ package dev.webfx.kit.mapper.peers.javafxweb.spi.gwt; import dev.webfx.kit.mapper.peers.javafxgraphics.HasNoChildrenPeers; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlNodePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.util.HtmlUtil; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlNodePeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.util.HtmlUtil; import dev.webfx.platform.util.Strings; import elemental2.dom.CSSProperties; import elemental2.dom.DomGlobal; diff --git a/webfx-kit/webfx-kit-platform-audio-openjfx-gwt/pom.xml b/webfx-kit/webfx-kit-platform-audio-openjfx-gwt-j2cl/pom.xml similarity index 78% rename from webfx-kit/webfx-kit-platform-audio-openjfx-gwt/pom.xml rename to webfx-kit/webfx-kit-platform-audio-openjfx-gwt-j2cl/pom.xml index 4dc5506905..d7938cc750 100644 --- a/webfx-kit/webfx-kit-platform-audio-openjfx-gwt/pom.xml +++ b/webfx-kit/webfx-kit-platform-audio-openjfx-gwt-j2cl/pom.xml @@ -11,14 +11,14 @@ 0.1.0-SNAPSHOT - webfx-kit-platform-audio-openjfx-gwt + webfx-kit-platform-audio-openjfx-gwt-j2cl - org.openjfx - javafx-media - provided + dev.webfx + webfx-kit-javafxmedia-emul + 0.1.0-SNAPSHOT diff --git a/webfx-kit/webfx-kit-platform-audio-openjfx-gwt/src/main/java/dev/webfx/kit/platform/audio/spi/impl/openjfxgwt/OpenJFXGwtAudioServiceProvider.java b/webfx-kit/webfx-kit-platform-audio-openjfx-gwt-j2cl/src/main/java/dev/webfx/kit/platform/audio/spi/impl/openjfxgwtj2cl/OpenJFXGwtJ2clAudioServiceProvider.java similarity index 61% rename from webfx-kit/webfx-kit-platform-audio-openjfx-gwt/src/main/java/dev/webfx/kit/platform/audio/spi/impl/openjfxgwt/OpenJFXGwtAudioServiceProvider.java rename to webfx-kit/webfx-kit-platform-audio-openjfx-gwt-j2cl/src/main/java/dev/webfx/kit/platform/audio/spi/impl/openjfxgwtj2cl/OpenJFXGwtJ2clAudioServiceProvider.java index b53536fa7f..233dfb7073 100644 --- a/webfx-kit/webfx-kit-platform-audio-openjfx-gwt/src/main/java/dev/webfx/kit/platform/audio/spi/impl/openjfxgwt/OpenJFXGwtAudioServiceProvider.java +++ b/webfx-kit/webfx-kit-platform-audio-openjfx-gwt-j2cl/src/main/java/dev/webfx/kit/platform/audio/spi/impl/openjfxgwtj2cl/OpenJFXGwtJ2clAudioServiceProvider.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.platform.audio.spi.impl.openjfxgwt; +package dev.webfx.kit.platform.audio.spi.impl.openjfxgwtj2cl; import dev.webfx.platform.audio.Audio; import dev.webfx.platform.audio.spi.AudioServiceProvider; @@ -8,16 +8,16 @@ /** * @author Bruno Salmon */ -public final class OpenJFXGwtAudioServiceProvider implements AudioServiceProvider { +public final class OpenJFXGwtJ2clAudioServiceProvider implements AudioServiceProvider { @Override public Audio loadSound(String url) { - return new OpenJFXGwtSound(new AudioClip(url)); + return new OpenJFXGwtJ2clSound(new AudioClip(url)); } @Override public Audio loadMusic(String url) { - return new OpenJFXGwtMusic(new Media(url)); + return new OpenJFXGwtJ2clMusic(new Media(url)); } @Override diff --git a/webfx-kit/webfx-kit-platform-audio-openjfx-gwt/src/main/java/dev/webfx/kit/platform/audio/spi/impl/openjfxgwt/OpenJFXGwtMusic.java b/webfx-kit/webfx-kit-platform-audio-openjfx-gwt-j2cl/src/main/java/dev/webfx/kit/platform/audio/spi/impl/openjfxgwtj2cl/OpenJFXGwtJ2clMusic.java similarity index 92% rename from webfx-kit/webfx-kit-platform-audio-openjfx-gwt/src/main/java/dev/webfx/kit/platform/audio/spi/impl/openjfxgwt/OpenJFXGwtMusic.java rename to webfx-kit/webfx-kit-platform-audio-openjfx-gwt-j2cl/src/main/java/dev/webfx/kit/platform/audio/spi/impl/openjfxgwtj2cl/OpenJFXGwtJ2clMusic.java index c74dee0c2e..b0a16d6cd9 100644 --- a/webfx-kit/webfx-kit-platform-audio-openjfx-gwt/src/main/java/dev/webfx/kit/platform/audio/spi/impl/openjfxgwt/OpenJFXGwtMusic.java +++ b/webfx-kit/webfx-kit-platform-audio-openjfx-gwt-j2cl/src/main/java/dev/webfx/kit/platform/audio/spi/impl/openjfxgwtj2cl/OpenJFXGwtJ2clMusic.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.platform.audio.spi.impl.openjfxgwt; +package dev.webfx.kit.platform.audio.spi.impl.openjfxgwtj2cl; import dev.webfx.platform.audio.Audio; import dev.webfx.platform.audio.AudioSpectrumListener; @@ -8,12 +8,12 @@ /** * @author Bruno Salmon */ -public class OpenJFXGwtMusic implements Audio { +public class OpenJFXGwtJ2clMusic implements Audio { private MediaPlayer mediaPlayer; private boolean playing; - public OpenJFXGwtMusic(Media media) { + public OpenJFXGwtJ2clMusic(Media media) { mediaPlayer = new MediaPlayer(media); } diff --git a/webfx-kit/webfx-kit-platform-audio-openjfx-gwt/src/main/java/dev/webfx/kit/platform/audio/spi/impl/openjfxgwt/OpenJFXGwtSound.java b/webfx-kit/webfx-kit-platform-audio-openjfx-gwt-j2cl/src/main/java/dev/webfx/kit/platform/audio/spi/impl/openjfxgwtj2cl/OpenJFXGwtJ2clSound.java similarity index 90% rename from webfx-kit/webfx-kit-platform-audio-openjfx-gwt/src/main/java/dev/webfx/kit/platform/audio/spi/impl/openjfxgwt/OpenJFXGwtSound.java rename to webfx-kit/webfx-kit-platform-audio-openjfx-gwt-j2cl/src/main/java/dev/webfx/kit/platform/audio/spi/impl/openjfxgwtj2cl/OpenJFXGwtJ2clSound.java index ff1ce979ca..459c3ac27f 100644 --- a/webfx-kit/webfx-kit-platform-audio-openjfx-gwt/src/main/java/dev/webfx/kit/platform/audio/spi/impl/openjfxgwt/OpenJFXGwtSound.java +++ b/webfx-kit/webfx-kit-platform-audio-openjfx-gwt-j2cl/src/main/java/dev/webfx/kit/platform/audio/spi/impl/openjfxgwtj2cl/OpenJFXGwtJ2clSound.java @@ -1,4 +1,4 @@ -package dev.webfx.kit.platform.audio.spi.impl.openjfxgwt; +package dev.webfx.kit.platform.audio.spi.impl.openjfxgwtj2cl; import dev.webfx.platform.audio.Audio; import dev.webfx.platform.audio.AudioSpectrumListener; @@ -7,12 +7,12 @@ /** * @author Bruno Salmon */ -final class OpenJFXGwtSound implements Audio { +final class OpenJFXGwtJ2clSound implements Audio { private AudioClip audioClip; private long startTime; - public OpenJFXGwtSound(AudioClip audioClip) { + public OpenJFXGwtJ2clSound(AudioClip audioClip) { this.audioClip = audioClip; } diff --git a/webfx-kit/webfx-kit-platform-audio-openjfx-gwt-j2cl/src/main/resources/META-INF/services/dev.webfx.platform.audio.spi.AudioServiceProvider b/webfx-kit/webfx-kit-platform-audio-openjfx-gwt-j2cl/src/main/resources/META-INF/services/dev.webfx.platform.audio.spi.AudioServiceProvider new file mode 100644 index 0000000000..2fe137932d --- /dev/null +++ b/webfx-kit/webfx-kit-platform-audio-openjfx-gwt-j2cl/src/main/resources/META-INF/services/dev.webfx.platform.audio.spi.AudioServiceProvider @@ -0,0 +1 @@ +dev.webfx.kit.platform.audio.spi.impl.openjfxgwtj2cl.OpenJFXGwtJ2clAudioServiceProvider diff --git a/webfx-kit/webfx-kit-platform-audio-openjfx-gwt/webfx.xml b/webfx-kit/webfx-kit-platform-audio-openjfx-gwt-j2cl/webfx.xml similarity index 87% rename from webfx-kit/webfx-kit-platform-audio-openjfx-gwt/webfx.xml rename to webfx-kit/webfx-kit-platform-audio-openjfx-gwt-j2cl/webfx.xml index cf633949b8..5372cc2aa2 100644 --- a/webfx-kit/webfx-kit-platform-audio-openjfx-gwt/webfx.xml +++ b/webfx-kit/webfx-kit-platform-audio-openjfx-gwt-j2cl/webfx.xml @@ -10,7 +10,7 @@ - dev.webfx.kit.platform.audio.spi.impl.openjfxgwt.OpenJFXGwtAudioServiceProvider + dev.webfx.kit.platform.audio.spi.impl.openjfxgwtj2cl.OpenJFXGwtJ2clAudioServiceProvider \ No newline at end of file diff --git a/webfx-kit/webfx-kit-platform-audio-openjfx-gwt/src/main/java/module-info.java b/webfx-kit/webfx-kit-platform-audio-openjfx-gwt/src/main/java/module-info.java deleted file mode 100644 index c083c777b0..0000000000 --- a/webfx-kit/webfx-kit-platform-audio-openjfx-gwt/src/main/java/module-info.java +++ /dev/null @@ -1,12 +0,0 @@ -// File managed by WebFX (DO NOT EDIT MANUALLY) - -module webfx.kit.platform.audio.openjfx.gwt { - - // Direct dependencies modules - requires javafx.media; - requires webfx.platform.audio; - - // Exported packages - exports dev.webfx.kit.platform.audio.spi.impl.openjfxgwt; - -} \ No newline at end of file diff --git a/webfx-kit/webfx-kit-platform-audio-openjfx-gwt/src/main/resources/META-INF/services/dev.webfx.platform.audio.spi.AudioServiceProvider b/webfx-kit/webfx-kit-platform-audio-openjfx-gwt/src/main/resources/META-INF/services/dev.webfx.platform.audio.spi.AudioServiceProvider deleted file mode 100644 index 8d90628eb2..0000000000 --- a/webfx-kit/webfx-kit-platform-audio-openjfx-gwt/src/main/resources/META-INF/services/dev.webfx.platform.audio.spi.AudioServiceProvider +++ /dev/null @@ -1 +0,0 @@ -dev.webfx.kit.platform.audio.spi.impl.openjfxgwt.OpenJFXGwtAudioServiceProvider diff --git a/webfx-kit/webfx-kit-platform-browser-openjfx/pom.xml b/webfx-kit/webfx-kit-platform-browser-openjfx/pom.xml new file mode 100644 index 0000000000..5272c3dde1 --- /dev/null +++ b/webfx-kit/webfx-kit-platform-browser-openjfx/pom.xml @@ -0,0 +1,37 @@ + + + + 4.0.0 + + + dev.webfx + webfx-kit + 0.1.0-SNAPSHOT + + + webfx-kit-platform-browser-openjfx + + + + + org.openjfx + javafx-graphics + + + + dev.webfx + webfx-kit-launcher + 0.1.0-SNAPSHOT + + + + dev.webfx + webfx-platform-browser + 0.1.0-SNAPSHOT + + + + + \ No newline at end of file diff --git a/webfx-kit/webfx-kit-platform-browser-openjfx/src/main/java/dev/webfx/kit/platform/browser/spi/impl/openjfx/OpenJFXBrowserProvider.java b/webfx-kit/webfx-kit-platform-browser-openjfx/src/main/java/dev/webfx/kit/platform/browser/spi/impl/openjfx/OpenJFXBrowserProvider.java new file mode 100644 index 0000000000..2b6e8ff6bc --- /dev/null +++ b/webfx-kit/webfx-kit-platform-browser-openjfx/src/main/java/dev/webfx/kit/platform/browser/spi/impl/openjfx/OpenJFXBrowserProvider.java @@ -0,0 +1,18 @@ +package dev.webfx.kit.platform.browser.spi.impl.openjfx; + +import dev.webfx.kit.launcher.WebFxKitLauncher; +import dev.webfx.platform.browser.spi.BrowserProvider; +import javafx.application.Application; + +/** + * @author Bruno Salmon + */ +public class OpenJFXBrowserProvider implements BrowserProvider { + + @Override + public void launchExternalBrowser(String url) { + Application application = WebFxKitLauncher.getApplication(); + application.getHostServices().showDocument(url); + } + +} diff --git a/webfx-kit/webfx-kit-platform-browser-openjfx/src/main/java/module-info.java b/webfx-kit/webfx-kit-platform-browser-openjfx/src/main/java/module-info.java new file mode 100644 index 0000000000..66d62e6db9 --- /dev/null +++ b/webfx-kit/webfx-kit-platform-browser-openjfx/src/main/java/module-info.java @@ -0,0 +1,16 @@ +// File managed by WebFX (DO NOT EDIT MANUALLY) + +module webfx.kit.platform.browser.openjfx { + + // Direct dependencies modules + requires javafx.graphics; + requires webfx.kit.launcher; + requires webfx.platform.browser; + + // Exported packages + exports dev.webfx.kit.platform.browser.spi.impl.openjfx; + + // Provided services + provides dev.webfx.platform.browser.spi.BrowserProvider with dev.webfx.kit.platform.browser.spi.impl.openjfx.OpenJFXBrowserProvider; + +} \ No newline at end of file diff --git a/webfx-kit/webfx-kit-platform-browser-openjfx/src/main/resources/META-INF/services/dev.webfx.platform.browser.spi.BrowserProvider b/webfx-kit/webfx-kit-platform-browser-openjfx/src/main/resources/META-INF/services/dev.webfx.platform.browser.spi.BrowserProvider new file mode 100644 index 0000000000..8e5a66a402 --- /dev/null +++ b/webfx-kit/webfx-kit-platform-browser-openjfx/src/main/resources/META-INF/services/dev.webfx.platform.browser.spi.BrowserProvider @@ -0,0 +1 @@ +dev.webfx.kit.platform.browser.spi.impl.openjfx.OpenJFXBrowserProvider diff --git a/webfx-kit/webfx-kit-webgl-gwt/webfx.xml b/webfx-kit/webfx-kit-platform-browser-openjfx/webfx.xml similarity index 63% rename from webfx-kit/webfx-kit-webgl-gwt/webfx.xml rename to webfx-kit/webfx-kit-platform-browser-openjfx/webfx.xml index 87ee7d7ec8..026e6d0faa 100644 --- a/webfx-kit/webfx-kit-webgl-gwt/webfx.xml +++ b/webfx-kit/webfx-kit-platform-browser-openjfx/webfx.xml @@ -6,12 +6,12 @@ + + dev.webfx.kit.platform.browser.spi.impl.openjfx.OpenJFXBrowserProvider + + - - dev.webfx.kit.webgl.spi.impl.gwt.GwtWebGLProvider - - \ No newline at end of file diff --git a/webfx-kit/webfx-kit-statusbar/pom.xml b/webfx-kit/webfx-kit-statusbar/pom.xml index 1f81b1510b..0457ae6834 100644 --- a/webfx-kit/webfx-kit-statusbar/pom.xml +++ b/webfx-kit/webfx-kit-statusbar/pom.xml @@ -21,6 +21,13 @@ provided + + dev.webfx + webfx-platform-javabase-emul-j2cl + 0.1.0-SNAPSHOT + runtime + + dev.webfx webfx-platform-util diff --git a/webfx-kit/webfx-kit-webgl-gwt/pom.xml b/webfx-kit/webfx-kit-webgl-gwt-j2cl/pom.xml similarity index 83% rename from webfx-kit/webfx-kit-webgl-gwt/pom.xml rename to webfx-kit/webfx-kit-webgl-gwt-j2cl/pom.xml index db3116e175..0c0e8c043b 100644 --- a/webfx-kit/webfx-kit-webgl-gwt/pom.xml +++ b/webfx-kit/webfx-kit-webgl-gwt-j2cl/pom.xml @@ -11,10 +11,16 @@ 0.1.0-SNAPSHOT - webfx-kit-webgl-gwt + webfx-kit-webgl-gwt-j2cl + + dev.webfx + webfx-kit-javafxbase-emul + 0.1.0-SNAPSHOT + + dev.webfx webfx-kit-javafxgraphics-emul @@ -50,13 +56,13 @@ dev.webfx - webfx-kit-javafxgraphics-peers-gwt + webfx-kit-javafxgraphics-peers-gwt-j2cl 0.1.0-SNAPSHOT dev.webfx - webfx-kit-javafxmedia-peers-gwt + webfx-kit-javafxmedia-peers-gwt-j2cl 0.1.0-SNAPSHOT @@ -74,7 +80,7 @@ dev.webfx - webfx-platform-typedarray-gwt + webfx-platform-typedarray-gwt-j2cl 0.1.0-SNAPSHOT diff --git a/webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLActiveInfo.java b/webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLActiveInfo.java similarity index 59% rename from webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLActiveInfo.java rename to webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLActiveInfo.java index e62194a9af..d4deda0364 100644 --- a/webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLActiveInfo.java +++ b/webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLActiveInfo.java @@ -1,15 +1,15 @@ -package dev.webfx.kit.webgl.spi.impl.gwt; +package dev.webfx.kit.webgl.spi.impl.gwtj2cl; import dev.webfx.kit.webgl.WebGLActiveInfo; /** * @author Bruno Salmon */ -public class GwtWebGLActiveInfo implements WebGLActiveInfo { +public class GwtJ2clWebGLActiveInfo implements WebGLActiveInfo { final elemental2.webgl.WebGLActiveInfo jsWebGLActiveInfo; - public GwtWebGLActiveInfo(elemental2.webgl.WebGLActiveInfo jsWebGLActiveInfo) { + public GwtJ2clWebGLActiveInfo(elemental2.webgl.WebGLActiveInfo jsWebGLActiveInfo) { this.jsWebGLActiveInfo = jsWebGLActiveInfo; } diff --git a/webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLBuffer.java b/webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLBuffer.java similarity index 50% rename from webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLBuffer.java rename to webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLBuffer.java index e13505e597..19e986b954 100644 --- a/webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLBuffer.java +++ b/webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLBuffer.java @@ -1,15 +1,15 @@ -package dev.webfx.kit.webgl.spi.impl.gwt; +package dev.webfx.kit.webgl.spi.impl.gwtj2cl; import dev.webfx.kit.webgl.WebGLBuffer; /** * @author Bruno Salmon */ -public class GwtWebGLBuffer implements WebGLBuffer { +public class GwtJ2clWebGLBuffer implements WebGLBuffer { final elemental2.webgl.WebGLBuffer jsWebGLBuffer; - public GwtWebGLBuffer(elemental2.webgl.WebGLBuffer jsWebGLBuffer) { + public GwtJ2clWebGLBuffer(elemental2.webgl.WebGLBuffer jsWebGLBuffer) { this.jsWebGLBuffer = jsWebGLBuffer; } } diff --git a/webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLFramebuffer.java b/webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLFramebuffer.java similarity index 50% rename from webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLFramebuffer.java rename to webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLFramebuffer.java index 559486c2ab..678183b66b 100644 --- a/webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLFramebuffer.java +++ b/webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLFramebuffer.java @@ -1,15 +1,15 @@ -package dev.webfx.kit.webgl.spi.impl.gwt; +package dev.webfx.kit.webgl.spi.impl.gwtj2cl; import dev.webfx.kit.webgl.WebGLFramebuffer; /** * @author Bruno Salmon */ -public class GwtWebGLFramebuffer implements WebGLFramebuffer { +public class GwtJ2clWebGLFramebuffer implements WebGLFramebuffer { final elemental2.webgl.WebGLFramebuffer jsWebGLFramebuffer; - public GwtWebGLFramebuffer(elemental2.webgl.WebGLFramebuffer jsWebGLFramebuffer) { + public GwtJ2clWebGLFramebuffer(elemental2.webgl.WebGLFramebuffer jsWebGLFramebuffer) { this.jsWebGLFramebuffer = jsWebGLFramebuffer; } } diff --git a/webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLProgram.java b/webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLProgram.java similarity index 50% rename from webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLProgram.java rename to webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLProgram.java index af828eca49..b67eec4cd7 100644 --- a/webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLProgram.java +++ b/webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLProgram.java @@ -1,15 +1,15 @@ -package dev.webfx.kit.webgl.spi.impl.gwt; +package dev.webfx.kit.webgl.spi.impl.gwtj2cl; import dev.webfx.kit.webgl.WebGLProgram; /** * @author Bruno Salmon */ -public class GwtWebGLProgram implements WebGLProgram { +public class GwtJ2clWebGLProgram implements WebGLProgram { final elemental2.webgl.WebGLProgram jsWebGLProgram; - public GwtWebGLProgram(elemental2.webgl.WebGLProgram jsWebGLProgram) { + public GwtJ2clWebGLProgram(elemental2.webgl.WebGLProgram jsWebGLProgram) { this.jsWebGLProgram = jsWebGLProgram; } } diff --git a/webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLProvider.java b/webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLProvider.java similarity index 80% rename from webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLProvider.java rename to webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLProvider.java index 515c1d81c7..1d2f4a31a7 100644 --- a/webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLProvider.java +++ b/webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLProvider.java @@ -1,8 +1,8 @@ -package dev.webfx.kit.webgl.spi.impl.gwt; +package dev.webfx.kit.webgl.spi.impl.gwtj2cl; import dev.webfx.kit.mapper.peers.javafxgraphics.NodePeer; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.CanvasElementHelper; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlCanvasPeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.CanvasElementHelper; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlCanvasPeer; import dev.webfx.kit.webgl.spi.WebGLProviderBase; import elemental2.dom.HTMLCanvasElement; import elemental2.webgl.WebGLRenderingContext; @@ -12,7 +12,7 @@ /** * @author Bruno Salmon */ -public class GwtWebGLProvider extends WebGLProviderBase { +public class GwtJ2clWebGLProvider extends WebGLProviderBase { @Override public dev.webfx.kit.webgl.WebGLRenderingContext getWebGLContext(Canvas canvas) { @@ -27,7 +27,7 @@ private static dev.webfx.kit.webgl.WebGLRenderingContext getContext(Canvas canva WebGLRenderingContext jsContext = getJsWebGLRenderingContext(canvas, webglContextName); if (jsContext == null) return null; - dev.webfx.kit.webgl.WebGLRenderingContext gln = new GwtWebGLRenderingContext(jsContext); + dev.webfx.kit.webgl.WebGLRenderingContext gln = new GwtJ2clWebGLRenderingContext(jsContext); canvas.getProperties().put(key, gln); return gln; } diff --git a/webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLRenderingContext.java b/webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLRenderingContext.java similarity index 73% rename from webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLRenderingContext.java rename to webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLRenderingContext.java index 4345b2c008..16f2c958e8 100644 --- a/webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLRenderingContext.java +++ b/webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLRenderingContext.java @@ -1,10 +1,10 @@ -package dev.webfx.kit.webgl.spi.impl.gwt; +package dev.webfx.kit.webgl.spi.impl.gwtj2cl; -import dev.webfx.kit.mapper.peers.javafxgraphics.gwt.html.HtmlGraphicsContext; -import dev.webfx.kit.mapper.peers.javafxmedia.spi.gwt.GwtMediaPlayerPeer; +import dev.webfx.kit.mapper.peers.javafxgraphics.gwtj2cl.html.HtmlGraphicsContext; +import dev.webfx.kit.mapper.peers.javafxmedia.spi.gwtj2cl.GwtJ2clMediaPlayerPeer; import dev.webfx.kit.webgl.*; import dev.webfx.platform.typedarray.TypedArray; -import dev.webfx.platform.typedarray.spi.impl.gwt.GwtTypedArray; +import dev.webfx.platform.typedarray.spi.impl.gwtj2cl.GwtJ2clTypedArray; import elemental2.dom.HTMLImageElement; import elemental2.dom.HTMLVideoElement; import javafx.scene.image.Image; @@ -13,11 +13,11 @@ * @author Bruno Salmon */ -public class GwtWebGLRenderingContext implements WebGLRenderingContext { +public class GwtJ2clWebGLRenderingContext implements WebGLRenderingContext { private final elemental2.webgl.WebGLRenderingContext gl; - public GwtWebGLRenderingContext(elemental2.webgl.WebGLRenderingContext gl) { + public GwtJ2clWebGLRenderingContext(elemental2.webgl.WebGLRenderingContext gl) { this.gl = gl; } @@ -33,72 +33,72 @@ public void clearColor(double red, double green, double blue, double alpha) { @Override public WebGLShader createShader(int type) { - return new GwtWebGLShader(gl.createShader(type)); + return new GwtJ2clWebGLShader(gl.createShader(type)); } @Override public void shaderSource(WebGLShader shader, String source) { - gl.shaderSource(((GwtWebGLShader) shader).jsWebGLShader, source); + gl.shaderSource(((GwtJ2clWebGLShader) shader).jsWebGLShader, source); } @Override public void compileShader(WebGLShader shader) { - gl.compileShader(((GwtWebGLShader) shader).jsWebGLShader); + gl.compileShader(((GwtJ2clWebGLShader) shader).jsWebGLShader); } @Override public Object getShaderParameter(WebGLShader shader, int pname) { - return gl.getShaderParameter(((GwtWebGLShader) shader).jsWebGLShader, pname); + return gl.getShaderParameter(((GwtJ2clWebGLShader) shader).jsWebGLShader, pname); } @Override public void deleteShader(WebGLShader shader) { - gl.deleteShader(((GwtWebGLShader) shader).jsWebGLShader); + gl.deleteShader(((GwtJ2clWebGLShader) shader).jsWebGLShader); } @Override public String getShaderInfoLog(WebGLShader shader) { - return gl.getShaderInfoLog(((GwtWebGLShader) shader).jsWebGLShader); + return gl.getShaderInfoLog(((GwtJ2clWebGLShader) shader).jsWebGLShader); } @Override public WebGLProgram createProgram() { - return new GwtWebGLProgram(gl.createProgram()); + return new GwtJ2clWebGLProgram(gl.createProgram()); } @Override public void attachShader(WebGLProgram program, WebGLShader shader) { - gl.attachShader(((GwtWebGLProgram) program).jsWebGLProgram, ((GwtWebGLShader) shader).jsWebGLShader); + gl.attachShader(((GwtJ2clWebGLProgram) program).jsWebGLProgram, ((GwtJ2clWebGLShader) shader).jsWebGLShader); } @Override public void linkProgram(WebGLProgram program) { - gl.linkProgram(((GwtWebGLProgram) program).jsWebGLProgram); + gl.linkProgram(((GwtJ2clWebGLProgram) program).jsWebGLProgram); } @Override public Object getProgramParameter(WebGLProgram program, int pname) { - return gl.getProgramParameter(((GwtWebGLProgram) program).jsWebGLProgram, pname); + return gl.getProgramParameter(((GwtJ2clWebGLProgram) program).jsWebGLProgram, pname); } @Override public String getProgramInfoLog(WebGLProgram program) { - return gl.getProgramInfoLog(((GwtWebGLProgram) program).jsWebGLProgram); + return gl.getProgramInfoLog(((GwtJ2clWebGLProgram) program).jsWebGLProgram); } @Override public WebGLBuffer createBuffer() { - return new GwtWebGLBuffer(gl.createBuffer()); + return new GwtJ2clWebGLBuffer(gl.createBuffer()); } @Override public void bindBuffer(int target, WebGLBuffer buffer) { - gl.bindBuffer(target, ((GwtWebGLBuffer) buffer).jsWebGLBuffer); + gl.bindBuffer(target, ((GwtJ2clWebGLBuffer) buffer).jsWebGLBuffer); } @Override public void bufferData(int target, TypedArray data, int usage) { - GwtTypedArray gwtArrayBuffer = (GwtTypedArray) data; + GwtJ2clTypedArray gwtArrayBuffer = (GwtJ2clTypedArray) data; if (gwtArrayBuffer.jsArrayBuffer != null) gl.bufferData(target, gwtArrayBuffer.jsArrayBuffer, usage); else @@ -107,12 +107,12 @@ public void bufferData(int target, TypedArray data, int usage) { @Override public int getAttribLocation(WebGLProgram program, String name) { - return gl.getAttribLocation(((GwtWebGLProgram) program).jsWebGLProgram, name); + return gl.getAttribLocation(((GwtJ2clWebGLProgram) program).jsWebGLProgram, name); } @Override public WebGLUniformLocation getUniformLocation(WebGLProgram program, String name) { - return new GwtWebGLUniformLocation(gl.getUniformLocation(((GwtWebGLProgram) program).jsWebGLProgram, name)); + return new GwtJ2clWebGLUniformLocation(gl.getUniformLocation(((GwtJ2clWebGLProgram) program).jsWebGLProgram, name)); } @Override @@ -132,7 +132,7 @@ public void depthFunc(int func) { @Override public void useProgram(WebGLProgram program) { - gl.useProgram(((GwtWebGLProgram) program).jsWebGLProgram); + gl.useProgram(((GwtJ2clWebGLProgram) program).jsWebGLProgram); } @Override @@ -142,7 +142,7 @@ public void drawArrays(int mode, int first, int count) { @Override public void uniformMatrix4fv(WebGLUniformLocation location, boolean transpose, double[] data) { - gl.uniformMatrix4fv(((GwtWebGLUniformLocation) location).jsWebGLUniformLocation, transpose, data); + gl.uniformMatrix4fv(((GwtJ2clWebGLUniformLocation) location).jsWebGLUniformLocation, transpose, data); } @Override @@ -162,12 +162,12 @@ public void drawElements(int mode, int count, int type, double offset) { @Override public WebGLTexture createTexture() { - return new GwtWebGLTexture(gl.createTexture()); + return new GwtJ2clWebGLTexture(gl.createTexture()); } @Override public void bindTexture(int target, WebGLTexture texture) { - gl.bindTexture(target, ((GwtWebGLTexture) texture).jsWebGLTexture); + gl.bindTexture(target, ((GwtJ2clWebGLTexture) texture).jsWebGLTexture); } @Override @@ -183,7 +183,7 @@ public void texImage2D(int target, int level, int internalformat, int format, in @Override public void texImage2D(int target, int level, int internalformat, int format, int type, int img, int format0, int type0, TypedArray pixels) { - GwtTypedArray gwtArrayBuffer = (GwtTypedArray) pixels; + GwtJ2clTypedArray gwtArrayBuffer = (GwtJ2clTypedArray) pixels; gl.texImage2D(target, level, internalformat, format, type, img, format0, type0, gwtArrayBuffer == null ? null : gwtArrayBuffer.jsArrayBufferView); } @@ -204,18 +204,18 @@ public void activeTexture(int texture) { @Override public void uniform1i(WebGLUniformLocation location, int value) { - gl.uniform1i(((GwtWebGLUniformLocation) location).jsWebGLUniformLocation, value); + gl.uniform1i(((GwtJ2clWebGLUniformLocation) location).jsWebGLUniformLocation, value); } @Override public void texImage2D(int target, int level, int internalformat, int format, int type, javafx.scene.media.MediaView img) { - HTMLVideoElement video = (HTMLVideoElement) ((GwtMediaPlayerPeer) img.getMediaPlayer().getPeer()).getMediaElement(); + HTMLVideoElement video = (HTMLVideoElement) ((GwtJ2clMediaPlayerPeer) img.getMediaPlayer().getPeer()).getMediaElement(); gl.texImage2D(target, level, internalformat, format, type, video); } @Override public void bindAttribLocation(WebGLProgram program, int index, String name) { - gl.bindAttribLocation(((GwtWebGLProgram) program).jsWebGLProgram, index, name); + gl.bindAttribLocation(((GwtJ2clWebGLProgram) program).jsWebGLProgram, index, name); } @Override @@ -260,17 +260,17 @@ public void cullFace(int mode) { @Override public void deleteBuffer(WebGLBuffer buffer) { - gl.deleteBuffer(((GwtWebGLBuffer) buffer).jsWebGLBuffer); + gl.deleteBuffer(((GwtJ2clWebGLBuffer) buffer).jsWebGLBuffer); } @Override public void deleteProgram(WebGLProgram program) { - gl.deleteProgram(((GwtWebGLProgram) program).jsWebGLProgram); + gl.deleteProgram(((GwtJ2clWebGLProgram) program).jsWebGLProgram); } @Override public void deleteTexture(WebGLTexture texture) { - gl.deleteTexture(((GwtWebGLTexture) texture).jsWebGLTexture); + gl.deleteTexture(((GwtJ2clWebGLTexture) texture).jsWebGLTexture); } @Override @@ -285,7 +285,7 @@ public void depthRange(double nearVal, double farVal) { @Override public void detachShader(WebGLProgram program, WebGLShader shader) { - gl.detachShader(((GwtWebGLProgram) program).jsWebGLProgram, ((GwtWebGLShader) shader).jsWebGLShader); + gl.detachShader(((GwtJ2clWebGLProgram) program).jsWebGLProgram, ((GwtJ2clWebGLShader) shader).jsWebGLShader); } @Override @@ -310,7 +310,7 @@ public Object flush() { @Override public void framebufferTexture2D(int target, int attachment, int textarget, WebGLTexture texture, int level) { - gl.framebufferTexture2D(target, attachment, textarget, ((GwtWebGLTexture) texture).jsWebGLTexture, level); + gl.framebufferTexture2D(target, attachment, textarget, ((GwtJ2clWebGLTexture) texture).jsWebGLTexture, level); } @Override @@ -345,7 +345,7 @@ public Object getRenderbufferParameter(int target, int pname) { @Override public String getShaderSource(WebGLShader shader) { - return gl.getShaderSource(((GwtWebGLShader) shader).jsWebGLShader); + return gl.getShaderSource(((GwtJ2clWebGLShader) shader).jsWebGLShader); } @Override @@ -355,7 +355,7 @@ public Object getTexParameter(int target, int pname) { @Override public Object getUniform(WebGLProgram program, WebGLUniformLocation location) { - return gl.getUniform(((GwtWebGLProgram) program).jsWebGLProgram, ((GwtWebGLUniformLocation) location).jsWebGLUniformLocation); + return gl.getUniform(((GwtJ2clWebGLProgram) program).jsWebGLProgram, ((GwtJ2clWebGLUniformLocation) location).jsWebGLUniformLocation); } @Override @@ -450,67 +450,67 @@ public void texParameterf(int target, int pname, double param) { @Override public void uniform1f(WebGLUniformLocation location, double value) { - gl.uniform1f(((GwtWebGLUniformLocation) location).jsWebGLUniformLocation, value); + gl.uniform1f(((GwtJ2clWebGLUniformLocation) location).jsWebGLUniformLocation, value); } @Override public void uniform1fv(WebGLUniformLocation location, double[] value) { - gl.uniform1fv(((GwtWebGLUniformLocation) location).jsWebGLUniformLocation, value); + gl.uniform1fv(((GwtJ2clWebGLUniformLocation) location).jsWebGLUniformLocation, value); } @Override public void uniform1iv(WebGLUniformLocation location, Object[] value) { - gl.uniform1iv(((GwtWebGLUniformLocation) location).jsWebGLUniformLocation, value); + gl.uniform1iv(((GwtJ2clWebGLUniformLocation) location).jsWebGLUniformLocation, value); } @Override public void uniform2fv(WebGLUniformLocation location, double[] value) { - gl.uniform2fv(((GwtWebGLUniformLocation) location).jsWebGLUniformLocation, value); + gl.uniform2fv(((GwtJ2clWebGLUniformLocation) location).jsWebGLUniformLocation, value); } @Override public void uniform2iv(WebGLUniformLocation location, Object[] value) { - gl.uniform2iv(((GwtWebGLUniformLocation) location).jsWebGLUniformLocation, value); + gl.uniform2iv(((GwtJ2clWebGLUniformLocation) location).jsWebGLUniformLocation, value); } @Override public void uniform3f(WebGLUniformLocation location, double value1, double value2, double value3) { - gl.uniform3f(((GwtWebGLUniformLocation) location).jsWebGLUniformLocation, value1, value2, value3); + gl.uniform3f(((GwtJ2clWebGLUniformLocation) location).jsWebGLUniformLocation, value1, value2, value3); } @Override public void uniform3fv(WebGLUniformLocation location, double[] value) { - gl.uniform3fv(((GwtWebGLUniformLocation) location).jsWebGLUniformLocation, value); + gl.uniform3fv(((GwtJ2clWebGLUniformLocation) location).jsWebGLUniformLocation, value); } @Override public void uniform3iv(WebGLUniformLocation location, Object[] value) { - gl.uniform3iv(((GwtWebGLUniformLocation) location).jsWebGLUniformLocation, value); + gl.uniform3iv(((GwtJ2clWebGLUniformLocation) location).jsWebGLUniformLocation, value); } @Override public void uniform4f(WebGLUniformLocation location, double value1, double value2, double value3, double value4) { - gl.uniform4f(((GwtWebGLUniformLocation) location).jsWebGLUniformLocation, value1, value2, value3, value4); + gl.uniform4f(((GwtJ2clWebGLUniformLocation) location).jsWebGLUniformLocation, value1, value2, value3, value4); } @Override public void uniform4fv(WebGLUniformLocation location, double[] value) { - gl.uniform4fv(((GwtWebGLUniformLocation) location).jsWebGLUniformLocation, value); + gl.uniform4fv(((GwtJ2clWebGLUniformLocation) location).jsWebGLUniformLocation, value); } @Override public void uniformMatrix2fv(WebGLUniformLocation location, boolean transpose, double[] data) { - gl.uniformMatrix2fv(((GwtWebGLUniformLocation) location).jsWebGLUniformLocation, transpose, data); + gl.uniformMatrix2fv(((GwtJ2clWebGLUniformLocation) location).jsWebGLUniformLocation, transpose, data); } @Override public void uniformMatrix3fv(WebGLUniformLocation location, boolean transpose, double[] data) { - gl.uniformMatrix3fv(((GwtWebGLUniformLocation) location).jsWebGLUniformLocation, transpose, data); + gl.uniformMatrix3fv(((GwtJ2clWebGLUniformLocation) location).jsWebGLUniformLocation, transpose, data); } @Override public void validateProgram(WebGLProgram program) { - gl.validateProgram(((GwtWebGLProgram) program).jsWebGLProgram); + gl.validateProgram(((GwtJ2clWebGLProgram) program).jsWebGLProgram); } @Override @@ -555,7 +555,7 @@ public Object getExtension(String name) { @Override public void bindFramebuffer(int target, WebGLFramebuffer buffer) { - gl.bindFramebuffer(target, buffer == null ? null : ((GwtWebGLFramebuffer) buffer).jsWebGLFramebuffer); + gl.bindFramebuffer(target, buffer == null ? null : ((GwtJ2clWebGLFramebuffer) buffer).jsWebGLFramebuffer); } @Override @@ -565,22 +565,22 @@ public int checkFramebufferStatus(int target) { @Override public WebGLFramebuffer createFramebuffer() { - return new GwtWebGLFramebuffer(gl.createFramebuffer()); + return new GwtJ2clWebGLFramebuffer(gl.createFramebuffer()); } @Override public WebGLActiveInfo getActiveAttrib(WebGLProgram program, int index) { - return new GwtWebGLActiveInfo(gl.getActiveAttrib(((GwtWebGLProgram) program).jsWebGLProgram, index)); + return new GwtJ2clWebGLActiveInfo(gl.getActiveAttrib(((GwtJ2clWebGLProgram) program).jsWebGLProgram, index)); } @Override public WebGLActiveInfo getActiveUniform(WebGLProgram program, int index) { - return new GwtWebGLActiveInfo(gl.getActiveUniform(((GwtWebGLProgram) program).jsWebGLProgram, index)); + return new GwtJ2clWebGLActiveInfo(gl.getActiveUniform(((GwtJ2clWebGLProgram) program).jsWebGLProgram, index)); } @Override public void uniform2f(WebGLUniformLocation location, double value1, double value2) { - gl.uniform2f(((GwtWebGLUniformLocation) location).jsWebGLUniformLocation, value1, value2); + gl.uniform2f(((GwtJ2clWebGLUniformLocation) location).jsWebGLUniformLocation, value1, value2); } @Override diff --git a/webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLShader.java b/webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLShader.java similarity index 50% rename from webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLShader.java rename to webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLShader.java index f9dce60b9d..3c0b9cbdc5 100644 --- a/webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLShader.java +++ b/webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLShader.java @@ -1,15 +1,15 @@ -package dev.webfx.kit.webgl.spi.impl.gwt; +package dev.webfx.kit.webgl.spi.impl.gwtj2cl; import dev.webfx.kit.webgl.WebGLShader; /** * @author Bruno Salmon */ -public class GwtWebGLShader implements WebGLShader { +public class GwtJ2clWebGLShader implements WebGLShader { final elemental2.webgl.WebGLShader jsWebGLShader; - public GwtWebGLShader(elemental2.webgl.WebGLShader jsWebGLShader) { + public GwtJ2clWebGLShader(elemental2.webgl.WebGLShader jsWebGLShader) { this.jsWebGLShader = jsWebGLShader; } } diff --git a/webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLTexture.java b/webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLTexture.java similarity index 50% rename from webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLTexture.java rename to webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLTexture.java index 4043e1f916..081ebbf8cf 100644 --- a/webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLTexture.java +++ b/webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLTexture.java @@ -1,15 +1,15 @@ -package dev.webfx.kit.webgl.spi.impl.gwt; +package dev.webfx.kit.webgl.spi.impl.gwtj2cl; import dev.webfx.kit.webgl.WebGLTexture; /** * @author Bruno Salmon */ -public class GwtWebGLTexture implements WebGLTexture { +public class GwtJ2clWebGLTexture implements WebGLTexture { final elemental2.webgl.WebGLTexture jsWebGLTexture; - public GwtWebGLTexture(elemental2.webgl.WebGLTexture jsWebGLTexture) { + public GwtJ2clWebGLTexture(elemental2.webgl.WebGLTexture jsWebGLTexture) { this.jsWebGLTexture = jsWebGLTexture; } } diff --git a/webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLUniformLocation.java b/webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLUniformLocation.java similarity index 50% rename from webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLUniformLocation.java rename to webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLUniformLocation.java index 3e931c2ea2..7f3cd6ce6a 100644 --- a/webfx-kit/webfx-kit-webgl-gwt/src/main/java/dev/webfx/kit/webgl/spi/impl/gwt/GwtWebGLUniformLocation.java +++ b/webfx-kit/webfx-kit-webgl-gwt-j2cl/src/main/java/dev/webfx/kit/webgl/spi/impl/gwtj2cl/GwtJ2clWebGLUniformLocation.java @@ -1,15 +1,15 @@ -package dev.webfx.kit.webgl.spi.impl.gwt; +package dev.webfx.kit.webgl.spi.impl.gwtj2cl; import dev.webfx.kit.webgl.WebGLUniformLocation; /** * @author Bruno Salmon */ -public class GwtWebGLUniformLocation implements WebGLUniformLocation { +public class GwtJ2clWebGLUniformLocation implements WebGLUniformLocation { final elemental2.webgl.WebGLUniformLocation jsWebGLUniformLocation; - public GwtWebGLUniformLocation(elemental2.webgl.WebGLUniformLocation jsWebGLUniformLocation) { + public GwtJ2clWebGLUniformLocation(elemental2.webgl.WebGLUniformLocation jsWebGLUniformLocation) { this.jsWebGLUniformLocation = jsWebGLUniformLocation; } } diff --git a/webfx-kit/webfx-kit-webgl-gwt-j2cl/webfx.xml b/webfx-kit/webfx-kit-webgl-gwt-j2cl/webfx.xml new file mode 100644 index 0000000000..5a350fffb8 --- /dev/null +++ b/webfx-kit/webfx-kit-webgl-gwt-j2cl/webfx.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + webfx-kit-javafxbase-emul + + + + + dev.webfx.kit.webgl.spi.impl.gwtj2cl.GwtJ2clWebGLProvider + + + \ No newline at end of file diff --git a/webfx-kit/webfx-kit-webgl/pom.xml b/webfx-kit/webfx-kit-webgl/pom.xml index 43218470a7..bf35911694 100644 --- a/webfx-kit/webfx-kit-webgl/pom.xml +++ b/webfx-kit/webfx-kit-webgl/pom.xml @@ -27,6 +27,13 @@ provided + + dev.webfx + webfx-platform-javabase-emul-j2cl + 0.1.0-SNAPSHOT + runtime + + dev.webfx webfx-platform-typedarray diff --git a/webfx-kit/webfx-kit-webgl/src/main/resources/META-INF/services/dev.webfx.kit.webgl.spi.WebGLKitProvider b/webfx-kit/webfx-kit-webgl/src/main/resources/META-INF/services/dev.webfx.kit.webgl.spi.WebGLKitProvider index 40dab4e2ae..c67228c421 100644 --- a/webfx-kit/webfx-kit-webgl/src/main/resources/META-INF/services/dev.webfx.kit.webgl.spi.WebGLKitProvider +++ b/webfx-kit/webfx-kit-webgl/src/main/resources/META-INF/services/dev.webfx.kit.webgl.spi.WebGLKitProvider @@ -1 +1 @@ -dev.webfx.kit.webgl.spi.impl.gwt.GwtWebGLKitProvider +dev.webfx.kit.webgl.spi.impl.gwtj2cl.GwtWebGLKitProvider