You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2016/04/01 16:29:25 UTC
[1/2] wicket git commit: WICKET-6134: Revert "WICKET-6043 Cannot set
wicket:enclosure on queued component in ListView"
Repository: wicket
Updated Branches:
refs/heads/master 788ca7129 -> 42b24d665
WICKET-6134: Revert "WICKET-6043 Cannot set wicket:enclosure on queued component in ListView"
This reverts commit 7bb27cc2e2386136190aadedbab8d7d5090af42d.
Conflicts:
wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListItem.java
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8b5ba206
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8b5ba206
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8b5ba206
Branch: refs/heads/master
Commit: 8b5ba2060f7b9ea047378be13087b0ad9bf991cc
Parents: 788ca71
Author: Andrea Del Bene <ad...@apache.org>
Authored: Fri Apr 1 15:05:14 2016 +0200
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Fri Apr 1 16:01:41 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/markup/html/list/ListItem.java | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/8b5ba206/wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListItem.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListItem.java
index 35654c5..1cf4b0f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListItem.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/list/ListItem.java
@@ -16,9 +16,7 @@
*/
package org.apache.wicket.markup.html.list;
-import org.apache.wicket.DequeueContext;
import org.apache.wicket.IGenericComponent;
-import org.apache.wicket.IQueueRegion;
import org.apache.wicket.model.IModel;
/**
@@ -30,7 +28,7 @@ import org.apache.wicket.model.IModel;
* @param <T>
* Model object type
*/
-public class ListItem<T> extends LoopItem implements IGenericComponent<T, ListItem<T>>, IQueueRegion
+public class ListItem<T> extends LoopItem implements IGenericComponent<T, ListItem<T>>
{
private static final long serialVersionUID = 1L;
@@ -73,10 +71,4 @@ public class ListItem<T> extends LoopItem implements IGenericComponent<T, ListIt
{
super(id, index);
}
-
- @Override
- public DequeueContext newDequeueContext()
- {
- return new DequeueContext(getMarkup(), this, true);
- }
}
[2/2] wicket git commit: WICKET-6134 Added regression test for
WICKET-6043
Posted by ad...@apache.org.
WICKET-6134 Added regression test for WICKET-6043
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/42b24d66
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/42b24d66
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/42b24d66
Branch: refs/heads/master
Commit: 42b24d6656131d7c927366d5a9cf80a607959ba7
Parents: 8b5ba20
Author: Andrea Del Bene <ad...@apache.org>
Authored: Fri Apr 1 16:15:47 2016 +0200
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Fri Apr 1 16:19:25 2016 +0200
----------------------------------------------------------------------
.../wicket/markup/html/internal/BasePage.html | 14 +++++
.../wicket/markup/html/internal/BasePage.java | 29 ++++++++++
.../markup/html/internal/EnclosureTest.java | 10 ++++
.../html/internal/ListViewInContainerPage.html | 23 ++++++++
.../html/internal/ListViewInContainerPage.java | 60 ++++++++++++++++++++
5 files changed, 136 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/42b24d66/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/BasePage.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/BasePage.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/BasePage.html
new file mode 100644
index 0000000..495ac59
--- /dev/null
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/BasePage.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html xmlns:wicket="http://wicket.apache.org">
+ <head>
+ <meta charset="utf-8" />
+
+ <title>Apache Wicket Quickstart</title>
+
+ <link href='http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz:regular,bold' rel='stylesheet' type='text/css' />
+ <link rel="stylesheet" href="style.css" type="text/css" media="screen" title="Stylesheet" />
+ </head>
+ <body>
+ <wicket:child />
+ </body>
+</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/42b24d66/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/BasePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/BasePage.java
new file mode 100644
index 0000000..643c098
--- /dev/null
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/BasePage.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.markup.html.internal;
+
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+public class BasePage extends WebPage {
+
+ public BasePage(PageParameters parameters)
+ {
+ super(parameters);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/42b24d66/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
index 8ddc60a..b661ef9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
@@ -445,6 +445,16 @@ public class EnclosureTest extends WicketTestCase
tester.startPage(p);
}
+ /**
+ * Test case for https://issues.apache.org/jira/browse/WICKET-6043
+ */
+ @Test
+ public void enclosureInsideContainererAndInheritance() throws Exception
+ {
+ tester.startPage(ListViewInContainerPage.class);
+ tester.assertRenderedPage(ListViewInContainerPage.class);
+ }
+
private static class TestPageMarkup extends WebPage implements IMarkupResourceStreamProvider
{
private String markup;
http://git-wip-us.apache.org/repos/asf/wicket/blob/42b24d66/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/ListViewInContainerPage.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/ListViewInContainerPage.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/ListViewInContainerPage.html
new file mode 100644
index 0000000..59510b4
--- /dev/null
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/ListViewInContainerPage.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<wicket:extend xmlns:wicket="http://wicket.apache.org">
+ <div id="hd">
+ <div id="logo">
+ <img src="logo.png" width="50px" height="50px" alt="Wicket Logo" />
+ <h1>Apache Wicket</h1>
+ </div>
+ </div>
+ <div id="bd">
+
+ <div wicket:id="liste">
+ <wicket:enclosure child="testenc">
+ <span wicket:id="testenc"></span>
+ </wicket:enclosure>
+ <span wicket:id="testlib"></span>
+ </div>
+ <p>
+ Please mention the correct Wicket version: <wicket:container wicket:id="version">1.5-SNAPSHOT</wicket:container>.
+ </p>
+ </div>
+ <div id="ft">
+ </div>
+</wicket:extend>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/42b24d66/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/ListViewInContainerPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/ListViewInContainerPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/ListViewInContainerPage.java
new file mode 100644
index 0000000..58f9e3f
--- /dev/null
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/ListViewInContainerPage.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.markup.html.internal;
+
+import java.util.ArrayList;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+public class ListViewInContainerPage extends BasePage
+{
+ private static final long serialVersionUID = 1L;
+
+ public ListViewInContainerPage(final PageParameters parameters)
+ {
+ super(parameters);
+
+ add(new Label("version", getApplication().getFrameworkSettings().getVersion()));
+
+ ArrayList<Integer> values = new ArrayList<>();
+ values.add(1);
+ values.add(2);
+ values.add(3);
+
+ add(new ListView<Integer>("liste", values)
+ {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void populateItem(final ListItem<Integer> item)
+ {
+ final Label testenc = new Label("testenc", Model.of("enclosure " + item.getModelObject()));
+ item.queue(testenc);
+
+ final Label testlib = new Label("testlib", Model.of("no enclosure " + item.getModelObject()));
+ item.queue(testlib);
+ }
+ });
+ }
+}