Merge branch 'master' into pr-215-master
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/724e4846 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/724e4846 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/724e4846 Branch: refs/heads/master Commit: 724e4846bb9196c509899c580e513c2da36a899b Parents: 18ac7db e4922f1 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Mar 20 21:58:03 2017 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Mar 20 21:58:03 2017 +0100 ---------------------------------------------------------------------- testing/wicket-js-tests/Gruntfile.js | 2 +- .../src/main/java/org/apache/wicket/ResourceBundles.java | 10 +++++++--- .../org/apache/wicket/ajax/form/AjaxFormSubmitTest.java | 1 - .../extensions/markup/html/repeater/tree/NestedTree.java | 8 ++++++-- .../wicket/extensions/markup/html/repeater/tree/Node.java | 1 - 5 files changed, 14 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/724e4846/testing/wicket-js-tests/Gruntfile.js ---------------------------------------------------------------------- diff --cc testing/wicket-js-tests/Gruntfile.js index 9e24d4c,2d2b816..9c7f733 --- a/testing/wicket-js-tests/Gruntfile.js +++ b/testing/wicket-js-tests/Gruntfile.js @@@ -113,7 -113,7 +113,7 @@@ module.exports = function(grunt) urls: [ 'http://localhost:38887/test/js/all.html?1.12.4', 'http://localhost:38887/test/js/all.html?2.2.4', - 'http://localhost:38887/test/js/all.html?3.2.0' - 'http://localhost:38887/test/js/all.html?3.2.0' ++ 'http://localhost:38887/test/js/all.html?3.2.0' ] } }, http://git-wip-us.apache.org/repos/asf/wicket/blob/724e4846/wicket-core/src/main/java/org/apache/wicket/ResourceBundles.java ---------------------------------------------------------------------- diff --cc wicket-core/src/main/java/org/apache/wicket/ResourceBundles.java index e4dba73,34def5a..432514e --- a/wicket-core/src/main/java/org/apache/wicket/ResourceBundles.java +++ b/wicket-core/src/main/java/org/apache/wicket/ResourceBundles.java @@@ -110,21 -110,21 +110,25 @@@ public class ResourceBundle public JavaScriptReferenceHeaderItem addJavaScriptBundle(Class<?> scope, String name, boolean defer, JavaScriptResourceReference... references) { -- List<JavaScriptReferenceHeaderItem> items = new ArrayList<JavaScriptReferenceHeaderItem>(); ++ List<JavaScriptReferenceHeaderItem> items = new ArrayList<>(); ++ for (JavaScriptResourceReference curReference : references) { items.add(JavaScriptHeaderItem.forReference(curReference)); } ++ ConcatResourceBundleReference<JavaScriptReferenceHeaderItem> bundleReference = newBundleResourceReference(scope, name, items); ++ if (Application.exists()) { IJavaScriptCompressor javaScriptCompressor = Application.get().getResourceSettings().getJavaScriptCompressor(); bundleReference.setCompressor(javaScriptCompressor); } -- if(defer){ - return addBundle(JavaScriptHeaderItem.forReference(bundleReference, defer)); - }else{ ++ ++ if (defer) { + return addBundle(JavaScriptHeaderItem.forReference(bundleReference, defer)); - }else{ ++ } else{ return addBundle(JavaScriptHeaderItem.forReference(bundleReference)); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/724e4846/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java ---------------------------------------------------------------------- diff --cc wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java index 873ca91,0569f7f..da7c2e0 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java @@@ -16,7 -16,7 +16,6 @@@ */ package org.apache.wicket.ajax.form; --import org.apache.wicket.Page; import org.apache.wicket.util.tester.FormTester; import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/wicket/blob/724e4846/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.java ---------------------------------------------------------------------- diff --cc wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.java index c104517,3ab5b8e..80e9117 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/NestedTree.java @@@ -86,7 -86,7 +86,7 @@@ public abstract class NestedTree<T> ext /** * Overridden to let the node output its markup id. * -- * @see #updateNode(Object, Optional<IPartialPageRequestHandler>) ++ * @see #updateNode(T, IPartialPageRequestHandler) * @see Component#setOutputMarkupId(boolean) */ @Override @@@ -101,8 -101,8 +101,8 @@@ /** * Overridden to update the corresponding {@link BranchItem} only. - * - * @param node + * - * @param node ++ * @param t * node to update * @param target * request target must not be @code null} @@@ -129,7 -129,7 +129,11 @@@ /** * Overridden to update the corresponding {@link Node} only. ++<<<<<<< HEAD + * ++======= + * ++>>>>>>> master * @param node * node to update * @param target http://git-wip-us.apache.org/repos/asf/wicket/blob/724e4846/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/Node.java ---------------------------------------------------------------------- diff --cc wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/Node.java index 06cbe24,1d9f957..aeb1ad0 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/Node.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/Node.java @@@ -78,8 -78,8 +78,7 @@@ public abstract class Node<T> extends P protected void onInitialize() { super.onInitialize(); - - MarkupContainer junction = createJunctionComponent("junction"); junction.add(new StyleBehavior()); add(junction);
