svn commit: r764330 - in /wicket/trunk/wicket/src: main/java/org/apache/wicket/Component.java test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLinkTest.java

[jdonnerstag]

Author: jdonnerstag
Date: Sun Apr 12 21:23:49 2009
New Revision: 764330

URL: http://svn.apache.org/viewvc?rev=764330&view=rev
Log:
applied WICKET-2184 Check component id against invalid chars ':' and empty IDs
Issue: WICKET-2184

Modified:
    wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
    
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLinkTest.java

Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=764330&r1=764329&r2=764330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java 
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Sun Apr 
12 21:23:49 2009
@@ -4336,10 +4336,19 @@
         */
        final void setId(final String id)
        {
-               if ((id == null) && !(this instanceof Page))
+               if (!(this instanceof Page))
                {
-                       throw new WicketRuntimeException("Null component id is 
not allowed.");
+                       if (Strings.isEmpty(id))
+                       {
+                               throw new WicketRuntimeException("Null or empty 
component ID's are not allowed.");
+                       }
+               }
+
+               if ((id != null) && (id.indexOf(':') != -1))
+               {
+                       throw new WicketRuntimeException("The component ID must 
not contain ':' chars.");
                }
+
                this.id = id;
        }
 

Modified: 
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLinkTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLinkTest.java?rev=764330&r1=764329&r2=764330&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLinkTest.java
 (original)
+++ 
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLinkTest.java
 Sun Apr 12 21:23:49 2009
@@ -43,6 +43,7 @@
         * 
         * @throws Exception
         */
+       @Override
        public void setUp() throws Exception
        {
                super.setUp();
@@ -54,7 +55,7 @@
         */
        public void testGetPageNumberPositive()
        {
-               PagingNavigationIncrementLink link = new 
PagingNavigationIncrementLink("", mock, 1);
+               PagingNavigationIncrementLink link = new 
PagingNavigationIncrementLink("xx", mock, 1);
                assertEquals(0, link.getPageNumber());
                pagecount = 1;
                assertEquals(0, link.getPageNumber());
@@ -69,7 +70,7 @@
         */
        public void testGetPageNumberNegative()
        {
-               PagingNavigationIncrementLink link = new 
PagingNavigationIncrementLink("", mock, -1);
+               PagingNavigationIncrementLink link = new 
PagingNavigationIncrementLink("xx", mock, -1);
                assertEquals(0, link.getPageNumber());
                pagecount = 1;
                assertEquals(0, link.getPageNumber());
@@ -87,7 +88,7 @@
         */
        public void testGetPageNumberTwo()
        {
-               PagingNavigationIncrementLink link = new 
PagingNavigationIncrementLink("", mock, 2);
+               PagingNavigationIncrementLink link = new 
PagingNavigationIncrementLink("xx", mock, 2);
                assertEquals(0, link.getPageNumber());
                pagecount = 1;
                assertEquals(0, link.getPageNumber());
@@ -108,7 +109,7 @@
         */
        public void testIsFirstLastPage()
        {
-               PagingNavigationIncrementLink link = new 
PagingNavigationIncrementLink("", mock, 0);
+               PagingNavigationIncrementLink link = new 
PagingNavigationIncrementLink("xx", mock, 0);
 
                pagecount = 0;
                currentpage = 0;