You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2016/04/25 11:48:54 UTC
[16/17] wicket git commit: WICKET-6137 don't render dot separator
when no renderCount and no behaviorId
WICKET-6137 don't render dot separator when no renderCount and no behaviorId
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/69f48627
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/69f48627
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/69f48627
Branch: refs/heads/master
Commit: 69f4862756477ce78208cc1f09420884f262c6a1
Parents: 19e01b2
Author: Sven Meier <sv...@apache.org>
Authored: Tue Apr 5 10:45:21 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Mon Apr 25 11:45:04 2016 +0200
----------------------------------------------------------------------
.../core/request/mapper/BookmarkableMapperTest.java | 4 ++--
.../wicket/core/request/mapper/MountedMapperTest.java | 4 ++--
.../wicket/core/request/mapper/PackageMapperTest.java | 4 ++--
.../core/request/mapper/PageInstanceMapperTest.java | 4 ++--
.../wicket/request/mapper/info/ComponentInfoTest.java | 10 +++++-----
.../wicket/request/mapper/info/PageComponentInfoTest.java | 2 +-
.../apache/wicket/stateless/StatelessDynmicLinksTest.java | 6 +++---
.../apache/wicket/request/mapper/info/ComponentInfo.java | 10 ++++++++--
8 files changed, 25 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/69f48627/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
index 5ee7dd2..f4fc1aa 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
@@ -174,7 +174,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
@Test
public void decode5()
{
- Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "?15-.-foo-bar");
+ Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "?15--foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
@@ -195,7 +195,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
public void decode6()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME
- + "/i1/i2?15-.-foo-bar&a=b&b=c");
+ + "/i1/i2?15--foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
http://git-wip-us.apache.org/repos/asf/wicket/blob/69f48627/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
index 37823ac..d92cc83 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
@@ -207,7 +207,7 @@ public class MountedMapperTest extends AbstractMapperTest
@Test
public void decode5()
{
- Url url = Url.parse("some/mount/path?15-.-foo-bar");
+ Url url = Url.parse("some/mount/path?15--foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
@@ -227,7 +227,7 @@ public class MountedMapperTest extends AbstractMapperTest
@Test
public void decode6()
{
- Url url = Url.parse("some/mount/path/i1/i2?15-.-foo-bar&a=b&b=c");
+ Url url = Url.parse("some/mount/path/i1/i2?15--foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
http://git-wip-us.apache.org/repos/asf/wicket/blob/69f48627/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
index e1e3cca..6a620ad 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
@@ -240,7 +240,7 @@ public class PackageMapperTest extends AbstractMapperTest
@Test
public void decode5()
{
- Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "?15-.-foo-bar");
+ Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "?15--foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
@@ -260,7 +260,7 @@ public class PackageMapperTest extends AbstractMapperTest
@Test
public void decode6()
{
- Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-.-foo-bar&a=b&b=c");
+ Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15--foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
http://git-wip-us.apache.org/repos/asf/wicket/blob/69f48627/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
index 97ebd52..9a2eaf0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
@@ -87,7 +87,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
@Test
public void decode3()
{
- Url url = Url.parse("wicket/page?4-.-a-b-c");
+ Url url = Url.parse("wicket/page?4--a-b-c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
@@ -104,7 +104,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
@Test
public void decode4()
{
- Url url = Url.parse("wickett/pagee?4-.-a:b-c");
+ Url url = Url.parse("wickett/pagee?4--a:b-c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertNull(handler);
http://git-wip-us.apache.org/repos/asf/wicket/blob/69f48627/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
index 431ed3a..c543f87 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java
@@ -31,7 +31,7 @@ public class ComponentInfoTest extends Assert
@Test
public void test1()
{
- String s = ".-component-path";
+ String s = "-component-path";
ComponentInfo info = ComponentInfo.parse(s);
assertEquals("component:path", info.getComponentPath());
assertNull(info.getBehaviorId());
@@ -45,7 +45,7 @@ public class ComponentInfoTest extends Assert
@Test
public void test2()
{
- String s = "-component-path";
+ String s = "component-path";
ComponentInfo info = ComponentInfo.parse(s);
assertEquals(null, info);
}
@@ -70,7 +70,7 @@ public class ComponentInfoTest extends Assert
{
String s = "-";
ComponentInfo info = ComponentInfo.parse(s);
- assertEquals(null, info);
+ assertEquals(s, info.toString());
}
/**
@@ -89,7 +89,7 @@ public class ComponentInfoTest extends Assert
@Test
public void test6()
{
- String s = ".-compo~~nent-path";
+ String s = "-compo~~nent-path";
ComponentInfo info = ComponentInfo.parse(s);
assertEquals("compo--nent:path", info.getComponentPath());
assertNull(info.getBehaviorId());
@@ -103,7 +103,7 @@ public class ComponentInfoTest extends Assert
@Test
public void test7()
{
- String s = ".-co~mpo~~nent-path";
+ String s = "-co~mpo~~nent-path";
ComponentInfo info = ComponentInfo.parse(s);
assertEquals("co-mpo--nent:path", info.getComponentPath());
assertNull(info.getBehaviorId());
http://git-wip-us.apache.org/repos/asf/wicket/blob/69f48627/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
index 823f834..9fe3a4f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
@@ -51,7 +51,7 @@ public class PageComponentInfoTest extends TestCase
@Test
public void test1()
{
- String s = "2-.-foo-bar-baz";
+ String s = "2--foo-bar-baz";
PageComponentInfo info = PageComponentInfo.parse(s);
testPageComponentInfo(info, 2, "foo:bar:baz");
assertEquals(s, info.toString());
http://git-wip-us.apache.org/repos/asf/wicket/blob/69f48627/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java
index 4968d96..f5f5284 100644
--- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java
@@ -36,15 +36,15 @@ public class StatelessDynmicLinksTest extends WicketTestCase
tester.startPage(StatelessPageWithDynamicLinks.class);
assertTrue(tester.getLastResponseAsString().contains("LINK-1"));
- tester.getRequest().setUrl(Url.parse("stateless?-.-links:1"));
+ tester.getRequest().setUrl(Url.parse("stateless?--links:1"));
tester.processRequest();
assertTrue(tester.getLastResponseAsString().contains("LINK-2"));
- tester.getRequest().setUrl(Url.parse("stateless?-.-links:2"));
+ tester.getRequest().setUrl(Url.parse("stateless?--links:2"));
tester.processRequest();
assertTrue(tester.getLastResponseAsString().contains("LINK-3"));
- tester.getRequest().setUrl(Url.parse("stateless?-.-links:3"));
+ tester.getRequest().setUrl(Url.parse("stateless?--links:3"));
tester.processRequest();
assertTrue(tester.getLastResponseAsString().contains("LINK-4"));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/69f48627/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java b/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
index 1263c66..ca11e48 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ComponentInfo.java
@@ -167,7 +167,9 @@ public class ComponentInfo
result.append(renderCount);
}
- result.append(BEHAVIOR_INDEX_SEPARATOR);
+ if (renderCount != null || behaviorId != null) {
+ result.append(BEHAVIOR_INDEX_SEPARATOR);
+ }
if (behaviorId != null)
{
@@ -227,7 +229,11 @@ public class ComponentInfo
Integer renderCount = null;
String listenerParts[] = Strings.split(listenerInterface, BEHAVIOR_INDEX_SEPARATOR);
- if (listenerParts.length == 2)
+ if (listenerParts.length == 0)
+ {
+ return new ComponentInfo(renderCount, componentPath, behaviorIndex);
+ }
+ else if (listenerParts.length == 2)
{
if (isNumber(listenerParts[0]))
{