This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 60957e3 Bringing #3095 into master to resolve merge conflicts
60957e3 is described below
commit 60957e38044088545b791192f978d689704c0e28
Author: Jaroslav Tulach <[email protected]>
AuthorDate: Tue Aug 10 10:44:45 2021 +0200
Bringing #3095 into master to resolve merge conflicts
---
.../htmlui/resources/desktop_build.gradle.fmk | 2 +-
.../gradle/htmlui/resources/gradle.properties.fmk | 4 ++--
.../modules/gradle/htmlui/resources/layer.xml | 1 +
.../gradle/htmlui/resources/root_build.gradle.fmk | 3 ++-
.../gradle/htmlui/resources/src_main_java_Demo.fmk | 23 ++++++----------------
.../gradle/htmlui/resources/web_build.gradle.fmk | 2 +-
6 files changed, 13 insertions(+), 22 deletions(-)
diff --git
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_build.gradle.fmk
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_build.gradle.fmk
index c4c2755..71b86b0 100644
---
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_build.gradle.fmk
+++
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/desktop_build.gradle.fmk
@@ -52,7 +52,7 @@ if (!jdk8) {
dependencies {
implementation commonProject
implementation "org.netbeans.html:net.java.html.boot:1.7.2"
- implementation "com.dukescript.api:javafx.beaninfo:0.5"
+ implementation "com.dukescript.api:javafx.beaninfo:0.6"
runtimeOnly "com.dukescript.api:javafx.base:8.60.11"
runtimeOnly "org.netbeans.html:net.java.html.boot.fx:1.7.2"
}
diff --git
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/gradle.properties.fmk
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/gradle.properties.fmk
index b5379c3..ebe4ca9 100644
---
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/gradle.properties.fmk
+++
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/gradle.properties.fmk
@@ -18,9 +18,9 @@
under the License.
-->
-action.run.args=bck2brwsrShow
+action.run.args=bck2brwsrShow -t
action.debug.args=run --debug-jvm
action.custom-1=Run in Browser
-action.custom-1.args=bck2brwsrShow
+action.custom-1.args=bck2brwsrShow -t
diff --git
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/layer.xml
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/layer.xml
index 719d483..2345148 100644
---
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/layer.xml
+++
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/layer.xml
@@ -103,6 +103,7 @@
<attr name="javax.script.ScriptEngine"
stringvalue="freemarker"/>
</file>
<file name="index.html"
url="src_main_webapp_pages_index.html.fmk">
+ <attr name="important"
boolvalue="true"/>
<attr name="javax.script.ScriptEngine"
stringvalue="freemarker"/>
</file>
</folder>
diff --git
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/root_build.gradle.fmk
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/root_build.gradle.fmk
index dea1aaf..2ba3db0 100644
---
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/root_build.gradle.fmk
+++
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/root_build.gradle.fmk
@@ -39,7 +39,8 @@ sourceCompatibility = '1.8'
dependencies {
implementation "org.netbeans.html:net.java.html.json:1.7.2"
implementation "com.dukescript.api:javafx.base:8.60.11"
- implementation "com.dukescript.api:javafx.beaninfo:0.5"
+ implementation "com.dukescript.api:javafx.beaninfo:0.6"
+ annotationProcessor "com.dukescript.api:javafx.beaninfo:0.6"
runtimeOnly "org.netbeans.html:ko4j:1.7.2"
}
</#noparse>
diff --git
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_java_Demo.fmk
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_java_Demo.fmk
index dea0ca2..5d96631 100644
---
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_java_Demo.fmk
+++
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/src_main_java_Demo.fmk
@@ -30,31 +30,20 @@ import javafx.beans.property.StringProperty;
import javafx.collections.FXCollections;
import static net.java.html.json.Models.applyBindings;
-public final class Demo implements FXBeanInfo.Provider {
- private final StringProperty desc = new SimpleStringProperty(this, "desc",
"Buy Milk");
- private final ListProperty<String> todos = new SimpleListProperty<>(this,
"todos", FXCollections.observableArrayList());
- private final IntegerBinding numTodos =
Bindings.createIntegerBinding(todos::size, todos);
[email protected]
+public final class Demo extends DemoBeanInfo {
+ final StringProperty desc = new SimpleStringProperty(this, "desc", "");
+ final ListProperty<String> todos = new SimpleListProperty<>(this, "todos",
FXCollections.observableArrayList());
+ final IntegerBinding numTodos = Bindings.createIntegerBinding(todos::size,
todos);
void addTodo() {
todos.getValue().add(desc.getValue());
desc.setValue("");
}
- private final FXBeanInfo info = FXBeanInfo.newBuilder(this)
- .property(desc)
- .property(todos)
- .property("numTodos", numTodos)
- .action("addTodo", this::addTodo)
- .build();
-
- @Override
- public FXBeanInfo getFXBeanInfo() {
- return info;
- }
-
public static void onPageLoad() {
Demo model = new Demo();
+ model.desc.setValue("Try Java in browser @ " +
System.currentTimeMillis());
applyBindings(model);
}
-
}
\ No newline at end of file
diff --git
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk
index bbbc5ba..43ee3ab 100644
---
a/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk
+++
b/java/gradle.htmlui/src/org/netbeans/modules/gradle/htmlui/resources/web_build.gradle.fmk
@@ -23,7 +23,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath "org.apidesign.bck2brwsr:bck2brwsr-maven-plugin:0.50"
+ classpath "org.apidesign.bck2brwsr:bck2brwsr-maven-plugin:0.51"
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
