Author: ivaynberg
Date: Fri Feb 12 06:26:38 2010
New Revision: 909254
URL: http://svn.apache.org/viewvc?rev=909254&view=rev
Log:
cleanup wip
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2QP.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/Strings.java
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java?rev=909254&r1=909253&r2=909254&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/prototype/Index.java
Fri Feb 12 06:26:38 2010
@@ -21,7 +21,6 @@
import org.apache.wicket.markup.html.link.ILinkListener;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.request.target.component.ComponentRequestTarget;
import org.apache.wicket.util.string.AppendingStringBuffer;
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java?rev=909254&r1=909253&r2=909254&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java
Fri Feb 12 06:26:38 2010
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.examples.niceurl;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java?rev=909254&r1=909253&r2=909254&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2.java
Fri Feb 12 06:26:38 2010
@@ -18,10 +18,10 @@
import java.util.Random;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
@@ -40,17 +40,8 @@
*/
public Page2(PageParameters parameters)
{
- String p1 = "CANNOT RESOLVE FROM URL";
- if (parameters.containsKey("param1"))
- {
- p1 = parameters.getString("param1");
- }
- String p2 = "CANNOT RESOLVE FROM URL";
- if (parameters.containsKey("param2"))
- {
- p2 = parameters.getString("param2");
- }
-
+ String p1 =
parameters.getNamedParameter("param1").toString("CANNOT RESOLVE FROM URL");
+ String p2 =
parameters.getNamedParameter("param2").toString("CANNOT RESOLVE FROM URL");
add(new Label("p1", p1));
add(new Label("p2", p2));
@@ -58,8 +49,8 @@
String newP2 = String.valueOf(random.nextInt());
PageParameters params = new PageParameters();
- params.put("param1", newP1 + " " + newP2);
- params.put("param2", newP2 + " " + newP1);
+ params.setNamedParameter("param1", newP1 + " " + newP2);
+ params.setNamedParameter("param2", newP2 + " " + newP1);
BookmarkablePageLink link = new
BookmarkablePageLink("refreshLink", getClass(), params);
add(link);
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2QP.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2QP.java?rev=909254&r1=909253&r2=909254&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2QP.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2QP.java
Fri Feb 12 06:26:38 2010
@@ -16,8 +16,7 @@
*/
package org.apache.wicket.examples.niceurl;
-import org.apache.wicket.PageParameters;
-import org.apache.wicket.request.target.coding.QueryStringUrlCodingStrategy;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
* Simple bookmarkable page that displays page parameters which is mounted
with another parameter
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java?rev=909254&r1=909253&r2=909254&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java
Fri Feb 12 06:26:38 2010
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.examples.niceurl.mounted;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.examples.niceurl.Home;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java?rev=909254&r1=909253&r2=909254&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java
Fri Feb 12 06:26:38 2010
@@ -16,10 +16,10 @@
*/
package org.apache.wicket.examples.niceurl.mounted;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.examples.niceurl.Home;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java?rev=909254&r1=909253&r2=909254&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
Fri Feb 12 06:26:38 2010
@@ -16,13 +16,14 @@
*/
package org.apache.wicket.examples.niceurl.mounted;
+import java.util.List;
import java.util.Random;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.examples.niceurl.Home;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
@@ -42,36 +43,14 @@
public Page5(PageParameters parameters)
{
String p1 = "CANNOT RESOLVE FROM URL";
- if (parameters.containsKey("param1"))
+ if (parameters.getNamedParameterKeys().contains("param1"))
{
- StringBuffer sb = new StringBuffer();
- String[] array = parameters.getStringArray("param1");
- for (int i = 0; i < array.length; i++)
- {
- sb.append(array[i]);
- if (array.length - 1 != i)
- {
- sb.append(", ");
- }
- }
-
- p1 = sb.toString();
+ p1 = join(parameters.getNamedParameters("param1"));
}
String p2 = "CANNOT RESOLVE FROM URL";
- if (parameters.containsKey("param2"))
+ if (parameters.getNamedParameterKeys().contains("param2"))
{
- StringBuffer sb = new StringBuffer();
- String[] array = parameters.getStringArray("param2");
- for (int i = 0; i < array.length; i++)
- {
- sb.append(array[i]);
- if (array.length - 1 != i)
- {
- sb.append(", ");
- }
- }
-
- p2 = sb.toString();
+ p2 = join(parameters.getNamedParameters("param2"));
}
add(new Label("p1", p1));
@@ -81,11 +60,30 @@
String newP2 = String.valueOf(random.nextInt());
PageParameters params = new PageParameters();
- params.put("param1", newP1);
- params.put("param2", newP2);
+ params.setNamedParameter("param1", newP1);
+ params.setNamedParameter("param2", newP2);
BookmarkablePageLink link = new
BookmarkablePageLink("refreshLink", Page5.class, params);
add(link);
add(new BookmarkablePageLink("homeLink", Home.class));
}
+
+ /**
+ * @param parameters
+ * @return
+ */
+ private String join(List<org.apache.wicket.util.string.StringValue>
values)
+ {
+ StringBuffer sb = new StringBuffer();
+ for (org.apache.wicket.util.string.StringValue sv : values)
+ {
+ if (sb.length() > 0)
+ {
+ sb.append(", ");
+ }
+
+ sb.append(sv.toString());
+ }
+ return sb.toString();
+ }
}
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java?rev=909254&r1=909253&r2=909254&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
Fri Feb 12 06:26:38 2010
@@ -26,7 +26,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.wicket.Application;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -39,6 +38,7 @@
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.util.file.Files;
import org.apache.wicket.util.file.Folder;
import org.apache.wicket.util.lang.Bytes;
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java?rev=909254&r1=909253&r2=909254&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/guestbook/GuestbookTest.java
Fri Feb 12 06:26:38 2010
@@ -52,8 +52,7 @@
*/
public void test_1() throws Exception
{
- GuestBookApplication book = new GuestBookApplication();
- WicketTester tester = new WicketTester(book);
+ WicketTester tester = new WicketTester();
tester.startPage(GuestBook.class);
tester.assertContains("Wicket Examples - guestbook");
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/Strings.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/Strings.java?rev=909254&r1=909253&r2=909254&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/Strings.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/string/Strings.java
Fri Feb 12 06:26:38 2010
@@ -603,6 +603,23 @@
* @param fragments
* @return combined fragments
*/
+ public static String join(String separator, List<String> fragments)
+ {
+ if (fragments == null)
+ {
+ return "";
+ }
+ return join(separator, fragments.toArray(new
String[fragments.size()]));
+ }
+
+
+ /**
+ * Joins string fragments using the specified separator
+ *
+ * @param separator
+ * @param fragments
+ * @return combined fragments
+ */
public static String join(String separator, String... fragments)
{
if ((fragments == null) || (fragments.length < 1))
