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-html4j.git
commit 073558aa838290b32e34a114bcb2a6bedca7c166 Merge: 1e383e4 784196d Author: Jaroslav Tulach <jaroslav.tul...@apidesign.org> AuthorDate: Mon Dec 21 14:12:03 2020 +0100 Improving readability by using text blocks .../netbeans/html/boot/fx/AbstractFXPresenter.java | 21 +- .../java/org/netbeans/html/boot/fx/FXConsole.java | 11 +- .../java/html/boot/script/KnockoutEnvJSTest.java | 7 +- .../java/html/boot/script/ScriptEngineTest.java | 28 +- .../org/netbeans/html/boot/impl/JsCallback.java | 15 +- .../html/boot/impl/JavaScriptProcesorTest.java | 187 +++--- .../netbeans/html/boot/impl/JsCallbackTest.java | 8 +- .../org/netbeans/html/boot/impl/JsMethods.java | 28 +- .../java/org/netbeans/html/boot/impl/JsUtils.java | 27 +- .../presenters/browser/JavaScriptUtilities.java | 11 +- .../org/netbeans/html/presenters/spi/Generic.java | 211 +++--- .../org/netbeans/html/geo/impl/JsGLProvider.java | 36 +- .../netbeans/html/geo/impl/GeoProcessorTest.java | 69 +- json-tck/pom.xml | 8 - .../main/java/net/java/html/js/tests/Bodies.java | 151 +++-- .../java/net/java/html/js/tests/Factorial.java | 7 +- .../main/java/net/java/html/js/tests/Receiver.java | 8 +- .../src/main/java/net/java/html/js/tests/Sum.java | 20 +- .../net/java/html/json/tests/GCKnockoutTest.java | 36 +- .../net/java/html/json/tests/KnockoutTest.java | 306 ++++----- .../java/net/java/html/json/tests/MinesTest.java | 33 +- .../main/java/net/java/html/json/tests/Utils.java | 79 +-- .../netbeans/html/json/impl/ModelProcessor.java | 68 +- .../net/java/html/json/ModelProcessorTest.java | 710 +++++++++++---------- .../html/ko/felix/test/KnockoutFelixTCKImpl.java | 11 +- .../html/ko/osgi/test/KnockoutEquinoxTCKImpl.java | 11 +- .../java/org/netbeans/html/wstyrus/LoadJSON.java | 11 +- .../netbeans/html/wstyrus/TyrusKnockoutTest.java | 11 +- .../main/java/org/netbeans/html/ko4j/Knockout.java | 234 +++---- .../main/java/org/netbeans/html/ko4j/LoadJSON.java | 88 +-- .../main/java/org/netbeans/html/ko4j/LoadWS.java | 59 +- .../org/netbeans/html/ko4j/KnockoutFXTest.java | 11 +- pom.xml | 7 +- .../html/presenters/webkit/GtkKnockoutTest.java | 17 +- .../java/org/netbeans/html/xhr4j/LoadJSON.java | 24 +- .../org/netbeans/html/xhr4j/JsonKnockoutTest.java | 11 +- 36 files changed, 1355 insertions(+), 1225 deletions(-) diff --cc json-tck/src/main/java/net/java/html/json/tests/MinesTest.java index e436bd8,f33e557..2fac125 --- a/json-tck/src/main/java/net/java/html/json/tests/MinesTest.java +++ b/json-tck/src/main/java/net/java/html/json/tests/MinesTest.java @@@ -40,23 -40,22 +40,22 @@@ public final class MinesTest @KOTest public void paintTheGridOnClick() throws Throwable { if (m == null) { BrwsrCtx ctx = Utils.newContext(MinesTest.class); - Object exp = Utils.exposeHTML(MinesTest.class, - " <button id='init' data-bind='click: normalSize'></button>\n" + - " <table>\n" + - " <tbody id='table'>\n" + - " <!-- ko foreach: rows -->\n" + - " <tr>\n" + - " <!-- ko foreach: columns -->\n" + - " <td data-bind='css: style' >\n" + - " <div data-bind='text: html'></div>\n" + - " </td>\n" + - " <!-- /ko -->\n" + - " </tr>\n" + - " <!-- /ko -->\n" + - " </tbody>\n" + - " </table>\n" + - "" - ); + Object exp = Utils.exposeHTML(MinesTest.class, """ - <button id='init' data-bind='click: normalSize'></button> - <table> - <tbody id='table'> - <!-- ko foreach: rows --> - <tr> - <!-- ko foreach: columns --> - <td data-bind='css: style' > - <div data-bind='text: html'></div> - </td> - <!-- /ko --> - </tr> - <!-- /ko --> - </tbody> - </table> - """); ++ <button id='init' data-bind='click: normalSize'></button> ++ <table> ++ <tbody id='table'> ++ <!-- ko foreach: rows --> ++ <tr> ++ <!-- ko foreach: columns --> ++ <td data-bind='css: style' > ++ <div data-bind='text: html'></div> ++ </td> ++ <!-- /ko --> ++ </tr> ++ <!-- /ko --> ++ </tbody> ++ </table> ++ """); m = Models.bind(new Mines(), ctx); m.applyBindings(); int cnt = Utils.countChildren(MinesTest.class, "table"); diff --cc webkit/src/test/java/org/netbeans/html/presenters/webkit/GtkKnockoutTest.java index 0318685,860c72e..bdf851e --- a/webkit/src/test/java/org/netbeans/html/presenters/webkit/GtkKnockoutTest.java +++ b/webkit/src/test/java/org/netbeans/html/presenters/webkit/GtkKnockoutTest.java @@@ -187,16 -179,15 +187,19 @@@ public final class GtkKnockoutTest exte ) public native Object executeScript(String script, Object[] arguments); - @JavaScriptBody(args = { }, body = - "var h;" - + "if (!!window && !!window.location && !!window.location.href)\n" - + " h = window.location.href;\n" - + "else " - + " h = null;" - + "return h;\n" + @JavaScriptBody(args = { }, body = + """ - var h;if (!!window && !!window.location && !!window.location.href) ++ var h; ++ if (!!window && !!window.location && !!window.location.href) { + h = window.location.href; - else h = null;return h; ++ } else { ++ h = null; ++ } ++ return h; + """ ) private static native String findBaseURL(); - + @Override public URI prepareURL(String content, String mimeType, String[] parameters) { try { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists