You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by gs...@apache.org on 2007/10/16 01:11:05 UTC
svn commit: r584966 [3/4] - in /wicket/trunk/jdk-1.5/wicket-examples:
.settings/ src/main/java/org/apache/wicket/examples/
src/main/java/org/apache/wicket/examples/ajax/builtin/
src/main/java/org/apache/wicket/examples/ajax/builtin/modal/ src/main/java...
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Contact.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Contact.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Contact.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Contact.java Mon Oct 15 16:10:50 2007
@@ -49,8 +49,8 @@
*/
public String toString()
{
- return "[Contact id=" + id + " firstName=" + firstName + " lastName=" + lastName
- + " homePhone=" + homePhone + " cellPhone=" + cellPhone + "]";
+ return "[Contact id=" + id + " firstName=" + firstName + " lastName=" + lastName +
+ " homePhone=" + homePhone + " cellPhone=" + cellPhone + "]";
}
@@ -70,10 +70,10 @@
if (obj instanceof Contact)
{
Contact other = (Contact)obj;
- return other.getFirstName().equals(getFirstName())
- && other.getLastName().equals(getLastName())
- && other.getHomePhone().equals(getHomePhone())
- && other.getCellPhone().equals(getCellPhone());
+ return other.getFirstName().equals(getFirstName()) &&
+ other.getLastName().equals(getLastName()) &&
+ other.getHomePhone().equals(getHomePhone()) &&
+ other.getCellPhone().equals(getCellPhone());
}
else
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java Mon Oct 15 16:10:50 2007
@@ -23,8 +23,7 @@
/**
- * Implementation of IDataProvider that retrieves contacts from the contact
- * database.
+ * Implementation of IDataProvider that retrieves contacts from the contact database.
*
* @author igor
*
@@ -37,8 +36,8 @@
}
/**
- * retrieves contacts from database starting with index <code>first</code>
- * and ending with <code>first+count</code>
+ * retrieves contacts from database starting with index <code>first</code> and ending with
+ * <code>first+count</code>
*
* @see org.apache.wicket.markup.repeater.data.IDataProvider#iterator(int, int)
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactGenerator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactGenerator.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactGenerator.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactGenerator.java Mon Oct 15 16:10:50 2007
@@ -74,8 +74,8 @@
}
/**
- * generats <code>count</code> number contacts and puts them into
- * <code>collection</code> collection
+ * generats <code>count</code> number contacts and puts them into <code>collection</code>
+ * collection
*
* @param collection
* @param count
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactsDatabase.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactsDatabase.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactsDatabase.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactsDatabase.java Mon Oct 15 16:10:50 2007
@@ -106,8 +106,8 @@
{
return (asc) ? lnameIdx : lnameDescIdx;
}
- throw new RuntimeException("uknown sort option [" + prop
- + "]. valid options: [firstName] , [lastName]");
+ throw new RuntimeException("uknown sort option [" + prop +
+ "]. valid options: [firstName] , [lastName]");
}
/**
@@ -133,8 +133,8 @@
}
else
{
- throw new IllegalArgumentException("contact [" + contact.getFirstName()
- + "] is already persistent");
+ throw new IllegalArgumentException("contact [" + contact.getFirstName() +
+ "] is already persistent");
}
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.java Mon Oct 15 16:10:50 2007
@@ -52,24 +52,26 @@
}
});
- columns.add(new PropertyColumn(new Model("ID"), "id") {
+ columns.add(new PropertyColumn(new Model("ID"), "id")
+ {
@Override
public String getCssClass()
{
return "numeric";
}
});
-
+
columns.add(new PropertyColumn(new Model("First Name"), "firstName", "firstName"));
-
- columns.add(new PropertyColumn(new Model("Last Name"), "lastName", "lastName") {
+
+ columns.add(new PropertyColumn(new Model("Last Name"), "lastName", "lastName")
+ {
@Override
public String getCssClass()
{
return "last-name";
}
});
-
+
columns.add(new PropertyColumn(new Model("Home Phone"), "homePhone"));
columns.add(new PropertyColumn(new Model("Cell Phone"), "cellPhone"));
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ExamplePage.java Mon Oct 15 16:10:50 2007
@@ -19,9 +19,8 @@
import org.apache.wicket.examples.WicketExamplePage;
/**
- * Base class for all pages in the QuickStart application. Any page which
- * subclasses this page can get session properties from QuickStartSession via
- * getQuickStartSession().
+ * Base class for all pages in the QuickStart application. Any page which subclasses this page can
+ * get session properties from QuickStartSession via getQuickStartSession().
*/
public abstract class ExamplePage extends WicketExamplePage
{
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java Mon Oct 15 16:10:50 2007
@@ -33,9 +33,9 @@
/**
- * Page that demonstrates using RefreshingView in a form. The component reuses
- * its items, to allow adding or removing rows without necessarily validating
- * the form, and preserving component state which preserves error messages, etc.
+ * Page that demonstrates using RefreshingView in a form. The component reuses its items, to allow
+ * adding or removing rows without necessarily validating the form, and preserving component state
+ * which preserves error messages, etc.
*/
public class FormPage extends BasePage
{
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/GridViewPage.java Mon Oct 15 16:10:50 2007
@@ -40,8 +40,8 @@
protected void populateItem(Item item)
{
final Contact contact = (Contact)item.getModelObject();
- item.add(new Label("firstName", contact.getFirstName() + " "
- + contact.getLastName()));
+ item.add(new Label("firstName", contact.getFirstName() + " " +
+ contact.getLastName()));
}
protected void populateEmptyItem(Item item)
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortableContactDataProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortableContactDataProvider.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortableContactDataProvider.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortableContactDataProvider.java Mon Oct 15 16:10:50 2007
@@ -24,8 +24,7 @@
/**
- * implementation of IDataProvider for contacts that keeps track of sort
- * information
+ * implementation of IDataProvider for contacts that keeps track of sort information
*
* @author igor
*
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignInApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignInApplication.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignInApplication.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignInApplication.java Mon Oct 15 16:10:50 2007
@@ -49,8 +49,7 @@
}
/**
- * @see org.apache.wicket.protocol.http.WebApplication#newSession(Request,
- * Response)
+ * @see org.apache.wicket.protocol.http.WebApplication#newSession(Request, Response)
*/
public Session newSession(Request request, Response response)
{
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignInSession.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignInSession.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignInSession.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/signin/SignInSession.java Mon Oct 15 16:10:50 2007
@@ -43,8 +43,8 @@
}
/**
- * Checks the given username and password, returning a User object if if the
- * username and password identify a valid user.
+ * Checks the given username and password, returning a User object if if the username and
+ * password identify a valid user.
*
* @param username
* The username
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/AuthenticatedWebPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/AuthenticatedWebPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/AuthenticatedWebPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/AuthenticatedWebPage.java Mon Oct 15 16:10:50 2007
@@ -19,8 +19,7 @@
import org.apache.wicket.examples.WicketExamplePage;
/**
- * Base class to check access to a page. If user is not logged in, redirect to
- * the log-in page.
+ * Base class to check access to a page. If user is not logged in, redirect to the log-in page.
*
* @author Jonathan Locke
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2.java Mon Oct 15 16:10:50 2007
@@ -22,8 +22,8 @@
/**
- * Simple example of a sign in page. It extends SignInPage, a base class which
- * provide standard functionality for typical log-in pages
+ * Simple example of a sign in page. It extends SignInPage, a base class which provide standard
+ * functionality for typical log-in pages
*
* @author Jonathan Locke
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2Session.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2Session.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2Session.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/signin2/SignIn2Session.java Mon Oct 15 16:10:50 2007
@@ -17,7 +17,6 @@
package org.apache.wicket.examples.signin2;
import org.apache.wicket.Request;
-import org.apache.wicket.Response;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.WebSession;
@@ -45,8 +44,8 @@
}
/**
- * Checks the given username and password, returning a User object if if the
- * username and password identify a valid user.
+ * Checks the given username and password, returning a User object if if the username and
+ * password identify a valid user.
*
* @param username
* The username
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java Mon Oct 15 16:10:50 2007
@@ -67,8 +67,7 @@
private static final Log log = LogFactory.getLog(SourcesPage.class);
/**
- * Model for retrieving the source code from the classpath of a packaged
- * resource.
+ * Model for retrieving the source code from the classpath of a packaged resource.
*/
public class SourceModel extends AbstractReadOnlyModel
{
@@ -118,24 +117,24 @@
return renderer.highlight(name, sb.toString(), "UTF-8", true);
}
}
- return Strings.escapeMarkup(sb.toString(), false, true).toString().replaceAll("\n", "<br />");
+ return Strings.escapeMarkup(sb.toString(), false, true).toString().replaceAll("\n",
+ "<br />");
}
catch (IOException e)
{
- log.error("Unable to read resource stream for: " + name + "; Page="
- + page.toString(), e);
+ log.error("Unable to read resource stream for: " + name + "; Page=" +
+ page.toString(), e);
return "";
}
finally
{
IOUtils.closeQuietly(br);
}
- }
+ }
}
/**
- * Model for retrieving the contents of a package directory from the class
- * path.
+ * Model for retrieving the contents of a package directory from the class path.
*/
public class PackagedResourcesModel extends AbstractReadOnlyModel implements IDetachable
{
@@ -166,31 +165,31 @@
if (resources.isEmpty())
{
get(page);
-// PackageName name = PackageName.forClass(page);
-// ClassLoader loader = page.getClassLoader();
-// String path = Strings.replaceAll(name.getName(), ".", "/").toString();
-// try
-// {
-// // gives the urls for each place where the package
-// // path could be found. There could be multiple
-// // jar files containing the same package, so each
-// // jar file has its own url.
+// PackageName name = PackageName.forClass(page);
+// ClassLoader loader = page.getClassLoader();
+// String path = Strings.replaceAll(name.getName(), ".", "/").toString();
+// try
+// {
+// // gives the urls for each place where the package
+// // path could be found. There could be multiple
+// // jar files containing the same package, so each
+// // jar file has its own url.
//
-// Enumeration urls = loader.getResources(path);
-// while (urls.hasMoreElements())
-// {
-// URL url = (URL)urls.nextElement();
+// Enumeration urls = loader.getResources(path);
+// while (urls.hasMoreElements())
+// {
+// URL url = (URL)urls.nextElement();
//
-// // the url points to the directory structure
-// // embedded in the classpath.
+// // the url points to the directory structure
+// // embedded in the classpath.
//
-// getPackageContents(url);
-// }
-// }
-// catch (IOException e)
-// {
-// log.error("Unable to read resource for: " + path, e);
-// }
+// getPackageContents(url);
+// }
+// }
+// catch (IOException e)
+// {
+// log.error("Unable to read resource for: " + path, e);
+// }
}
return resources;
}
@@ -233,7 +232,8 @@
}
}
- private final void addResources(final Class scope, final AppendingStringBuffer relativePath, final File dir)
+ private final void addResources(final Class scope,
+ final AppendingStringBuffer relativePath, final File dir)
{
File[] files = dir.listFiles();
for (int i = 0; i < files.length; i++)
@@ -241,7 +241,8 @@
File file = files[i];
if (file.isDirectory())
{
- addResources(scope, new AppendingStringBuffer(relativePath).append(file.getName()).append('/'), file);
+ addResources(scope, new AppendingStringBuffer(relativePath).append(
+ file.getName()).append('/'), file);
}
else
{
@@ -251,14 +252,15 @@
{
resources.add(relativePath + name);
}
-
+
}
}
}
private void get(Class scope)
{
- String packageRef = Strings.replaceAll(PackageName.forClass(scope).getName(), ".", "/").toString();
+ String packageRef = Strings.replaceAll(PackageName.forClass(scope).getName(), ".", "/")
+ .toString();
ClassLoader loader = scope.getClassLoader();
try
{
@@ -290,27 +292,38 @@
{
basedir = new File(uri);
}
- catch(IllegalArgumentException e)
+ catch (IllegalArgumentException e)
{
log.debug("Can't construct the uri as a file: " + absolutePath);
- // if this is throwen then the path is not really a file. but could be a zip.
+ // if this is throwen then the path is not really a
+ // file. but could be a zip.
String jarZipPart = uri.getSchemeSpecificPart();
- // lowercased for testing if jar/zip, but leave the real filespec unchanged
+ // lowercased for testing if jar/zip, but leave the
+ // real filespec unchanged
String lowerJarZipPart = jarZipPart.toLowerCase();
int index = lowerJarZipPart.indexOf(".zip");
- if(index == -1) index = lowerJarZipPart.indexOf(".jar");
- if(index == -1) throw e;
-
- String filename = jarZipPart.substring(0, index+4); // 4 = len of ".jar" or ".zip"
- log.debug("trying the filename: " + filename + " to load as a zip/jar.");
- JarFile jarFile = new JarFile(filename,false);
+ if (index == -1)
+ index = lowerJarZipPart.indexOf(".jar");
+ if (index == -1)
+ throw e;
+
+ String filename = jarZipPart.substring(0, index + 4); // 4 =
+ // len
+ // of
+ // ".jar"
+ // or
+ // ".zip"
+ log
+ .debug("trying the filename: " + filename +
+ " to load as a zip/jar.");
+ JarFile jarFile = new JarFile(filename, false);
scanJarFile(scope, packageRef, jarFile);
return;
}
if (!basedir.isDirectory())
{
- throw new IllegalStateException("unable to read resources from directory "
- + basedir);
+ throw new IllegalStateException(
+ "unable to read resources from directory " + basedir);
}
addResources(scope, new AppendingStringBuffer(), basedir);
}
@@ -324,7 +337,7 @@
return;
}
- private void scanJarFile(Class scope,String packageRef, JarFile jf)
+ private void scanJarFile(Class scope, String packageRef, JarFile jf)
{
Enumeration enumeration = jf.entries();
while (enumeration.hasMoreElements())
@@ -384,8 +397,8 @@
}
/**
- * Container for displaying the source of the selected page, resource or
- * other element from the package.
+ * Container for displaying the source of the selected page, resource or other element from the
+ * package.
*/
public class CodePanel extends WebMarkupContainer
{
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java Mon Oct 15 16:10:50 2007
@@ -37,7 +37,8 @@
add(new Label("message", new SessionModel()));
// First a normal bookmarkable link (which is stateless by default)
add(new BookmarkablePageLink("linkToStatelessPage", StatelessPage.class));
- // The second with a stateless link, so the onclick will be called but on a stateless page.
+ // The second with a stateless link, so the onclick will be called but
+ // on a stateless page.
add(new StatelessLink("linkToStatefulPage")
{
/**
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/SessionModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/SessionModel.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/SessionModel.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/SessionModel.java Mon Oct 15 16:10:50 2007
@@ -21,8 +21,7 @@
import org.apache.wicket.model.AbstractReadOnlyModel;
/**
- * Model that displays whether a session was created yet, and if it was, prints
- * the session id.
+ * Model that displays whether a session was created yet, and if it was, prints the session id.
*
* @author Eelco Hillenius
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Application.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Application.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Application.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Application.java Mon Oct 15 16:10:50 2007
@@ -67,8 +67,10 @@
return new ResourceStreamRequestTarget(new XSLTResourceStream(xslStream, docStream));
}
});
-
- // All requests to bookmarkable page "Page" will be captured, and the "Sent" page is shown instead
- mount(new CapturingBookmarkablePageRequestTargetUrlCodingStrategy("/capturedpage", EmailPage.class, Sent.class));
+
+ // All requests to bookmarkable page "Page" will be captured, and the
+ // "Sent" page is shown instead
+ mount(new CapturingBookmarkablePageRequestTargetUrlCodingStrategy("/capturedpage",
+ EmailPage.class, Sent.class));
}
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTarget.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTarget.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTarget.java Mon Oct 15 16:10:50 2007
@@ -54,8 +54,8 @@
* @param displayedPageClass
* the bookmarkable page to display in the browser
*/
- public CapturingBookmarkablePageRequestTarget(Class capturedPageClass, Class displayedPageClass,
- PageParameters pageParameters)
+ public CapturingBookmarkablePageRequestTarget(Class capturedPageClass,
+ Class displayedPageClass, PageParameters pageParameters)
{
super(capturedPageClass, pageParameters);
this.displayedPageClass = displayedPageClass;
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTargetUrlCodingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTargetUrlCodingStrategy.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTargetUrlCodingStrategy.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTargetUrlCodingStrategy.java Mon Oct 15 16:10:50 2007
@@ -30,6 +30,7 @@
{
Class capturedPageClass;
Class displayedPageClass;
+
/**
* Construct.
*
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/EmailPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/EmailPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/EmailPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/EmailPage.java Mon Oct 15 16:10:50 2007
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.examples.staticpages;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
/**
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Home.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Home.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Home.java Mon Oct 15 16:10:50 2007
@@ -25,14 +25,13 @@
import org.apache.wicket.model.Model;
/**
- * Examples for serving static files. These examples show how to serve files (or
- * more generally data streams) by reusing the powerful Wicket concepts like
- * IResourceStream, IRequestTarget and IRequestTargetUrlCodingStrategy.
+ * Examples for serving static files. These examples show how to serve files (or more generally data
+ * streams) by reusing the powerful Wicket concepts like IResourceStream, IRequestTarget and
+ * IRequestTargetUrlCodingStrategy.
*
- * XXX Notice the use of a WebMarkupContainer to produce the static links, since
- * with plain <tt>href</tt> attribute Wicket's
- * {@link RelativePathPrefixHandler} would prepend the servlet context path but
- * without Wicket's filter path.
+ * XXX Notice the use of a WebMarkupContainer to produce the static links, since with plain
+ * <tt>href</tt> attribute Wicket's {@link RelativePathPrefixHandler} would prepend the servlet
+ * context path but without Wicket's filter path.
*
* @author <a href="mailto:jbq@apache.org">Jean-Baptiste Quenot</a>
*/
@@ -46,13 +45,12 @@
add(new StaticLink("helloxslt", new Model("xsldocs/hello.html")));
/*
- * Sending a Wicket page by email: all requests to bookmarkable page
- * "Page" will be captured, and the "Sent" page is shown instead, see
- * the "/capture" mount in staticpages.Application. Unfortunately, you
- * cannot use CapturingBookmarkablePageRequestTarget in an event
- * listener like onClick() unless you change the application's
- * IRequestCycleSettings to ONE_PASS_RENDER, thus we use mount() in the
- * application
+ * Sending a Wicket page by email: all requests to bookmarkable page "Page" will be
+ * captured, and the "Sent" page is shown instead, see the "/capture" mount in
+ * staticpages.Application. Unfortunately, you cannot use
+ * CapturingBookmarkablePageRequestTarget in an event listener like onClick() unless you
+ * change the application's IRequestCycleSettings to ONE_PASS_RENDER, thus we use mount() in
+ * the application
*/
add(new BookmarkablePageLink("emailwicketpage", EmailPage.class));
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuote.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuote.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuote.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuote.java Mon Oct 15 16:10:50 2007
@@ -27,14 +27,14 @@
import java.net.URLConnection;
/**
- * Provides access to a SOAP service for getting stock quotes based on a symbol.
- * Found on http://www.devx.com/Java/Article/27559/0/page/2
+ * Provides access to a SOAP service for getting stock quotes based on a symbol. Found on
+ * http://www.devx.com/Java/Article/27559/0/page/2
*/
public class StockQuote
{
/**
- * We used to use the www.xmethods.com demo webservice for stockquotes.
- * We now use webservicex, as xmethods was really overloaded and unreliable.
+ * We used to use the www.xmethods.com demo webservice for stockquotes. We now use webservicex,
+ * as xmethods was really overloaded and unreliable.
*/
private static final String serviceUrl = "http://www.webservicex.net/stockquote.asmx";
@@ -211,7 +211,8 @@
private String createMessage(String symbol)
{
StringBuffer message = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
- message.append("<soap:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">");
+ message
+ .append("<soap:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">");
message.append(" <soap:Body>");
message.append(" <GetQuote xmlns=\"http://www.webserviceX.NET/\">");
message.append(" <symbol>").append(symbol).append("</symbol>");
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java Mon Oct 15 16:10:50 2007
@@ -23,17 +23,15 @@
import org.apache.wicket.model.Model;
/**
- * Gets a stock quote from a webservice. This component is a full blown, built
- * from the ground up component. See the other stock quote examples for
- * alternatives of creating custom components.
+ * Gets a stock quote from a webservice. This component is a full blown, built from the ground up
+ * component. See the other stock quote examples for alternatives of creating custom components.
*
- * The model that is provided is used as the symbol for lookup. When used
- * without an explicit model, the component tries the CompoundPropertyModel
- * method of retrieving the model first. When that results in an empty string,
- * the component will use its ID as symbol.
+ * The model that is provided is used as the symbol for lookup. When used without an explicit model,
+ * the component tries the CompoundPropertyModel method of retrieving the model first. When that
+ * results in an empty string, the component will use its ID as symbol.
*
- * You can use this component in your webapplication just as you might want to
- * use a <code>Label</code>.
+ * You can use this component in your webapplication just as you might want to use a
+ * <code>Label</code>.
*/
public class StockQuoteLabel extends WebComponent
{
@@ -49,8 +47,7 @@
}
/**
- * Convenience constructor. Same as StockQuoteLabel(String, new
- * Model(String))
+ * Convenience constructor. Same as StockQuoteLabel(String, new Model(String))
*
* @param id
* See Component
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel2.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel2.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel2.java Mon Oct 15 16:10:50 2007
@@ -20,12 +20,10 @@
import org.apache.wicket.model.AbstractReadOnlyModel;
/**
- * StockQuote example provided by Jonathan Locke. This component shows you how
- * to reuse existing components (the StockQuoteLabel ISA Label), and how to use
- * models internally in your component.
+ * StockQuote example provided by Jonathan Locke. This component shows you how to reuse existing
+ * components (the StockQuoteLabel ISA Label), and how to use models internally in your component.
*
- * Note that this component doesn't work with CompoundPropertyModel's lazy
- * initialization.
+ * Note that this component doesn't work with CompoundPropertyModel's lazy initialization.
*/
public class StockQuoteLabel2 extends Label
{
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuotePage.java Mon Oct 15 16:10:50 2007
@@ -64,8 +64,8 @@
}
/**
- * Quote instance used for communicating between the form input field and
- * the display labels for showing the stock quote.
+ * Quote instance used for communicating between the form input field and the display labels for
+ * showing the stock quote.
*/
private final Quote quote = new Quote();
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page1.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page1.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page1.java Mon Oct 15 16:10:50 2007
@@ -18,8 +18,8 @@
/**
* Concrete page. Note that it extends {@link TemplatePage} and the markup uses
- * <wicket:extend> tags to define the region that is to be expanded into
- * the parent's <wicket:child> element.
+ * <wicket:extend> tags to define the region that is to be expanded into the parent's
+ * <wicket:child> element.
*
* @author Eelco Hillenius
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page2.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page2.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/Page2.java Mon Oct 15 16:10:50 2007
@@ -18,8 +18,8 @@
/**
* Concrete page. Note that it extends {@link TemplatePage} and the markup uses
- * <wicket:extend> tags to define the region that is to be expanded into
- * the parent's <wicket:child> element.
+ * <wicket:extend> tags to define the region that is to be expanded into the parent's
+ * <wicket:child> element.
*
* @author Eelco Hillenius
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java Mon Oct 15 16:10:50 2007
@@ -26,9 +26,8 @@
import org.apache.wicket.model.PropertyModel;
/**
- * Base page that serves as a template for pages that inherit from it. Doesn't
- * have to be abstract, but was made abstract here to stress the fact that this
- * page is not meant for direct use.
+ * Base page that serves as a template for pages that inherit from it. Doesn't have to be abstract,
+ * but was made abstract here to stress the fact that this page is not meant for direct use.
*
* @author Eelco Hillenius
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java Mon Oct 15 16:10:50 2007
@@ -30,8 +30,8 @@
/**
- * Converts between unescaped and escaped unicode and shows a custom model.
- * Handy for message bundles.
+ * Converts between unescaped and escaped unicode and shows a custom model. Handy for message
+ * bundles.
*
* @author Eelco Hillenius
*/
@@ -49,17 +49,14 @@
private String translationType = (String)translationTypes.get(0);
/**
- * Model that does the conversion. Note that as we 'pull' the value every
- * time we render (we get the current value of message), we don't need to
- * update the model itself. The alternative strategy would be to have a
- * model with it's own, translated, string representation of the source,
- * which should be updated on every form post (e.g. by overriding
- * {@link Form#onSubmit} and in that method explicitly setting the new
- * value). But as you can see, this method is slighly easier, and if we
- * wanted to use the translated value in e.g. a database, we could just
- * query this model directly or indirectly by calling
- * {@link Component#getModelObject()} on the component that holds it, and we
- * would have a recent value.
+ * Model that does the conversion. Note that as we 'pull' the value every time we render (we get
+ * the current value of message), we don't need to update the model itself. The alternative
+ * strategy would be to have a model with it's own, translated, string representation of the
+ * source, which should be updated on every form post (e.g. by overriding {@link Form#onSubmit}
+ * and in that method explicitly setting the new value). But as you can see, this method is
+ * slighly easier, and if we wanted to use the translated value in e.g. a database, we could
+ * just query this model directly or indirectly by calling {@link Component#getModelObject()} on
+ * the component that holds it, and we would have a recent value.
*/
private final class ConverterModel extends Model
{
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java Mon Oct 15 16:10:50 2007
@@ -96,6 +96,7 @@
/**
* TODO
+ *
* @return Collection
*/
public Collection getUploads()
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java Mon Oct 15 16:10:50 2007
@@ -22,10 +22,8 @@
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.TextField;
import org.apache.wicket.model.Model;
-import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.util.resource.IStringResourceStream;
import org.apache.wicket.util.resource.PackageResourceStream;
import org.apache.wicket.velocity.markup.html.VelocityPanel;
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java Mon Oct 15 16:10:50 2007
@@ -28,14 +28,12 @@
public class Index extends WicketExamplePage
{
/**
- * Link to the wizard. It's an internal link instead of a bookmarkable page
- * to help us with backbutton surpression. Wizards by default do not
- * partipcate in versioning, which has the effect that whenever a button is
- * clicked in the wizard, it will never result in a change of the
- * redirection url. However, though that'll work just fine when you are
- * already in the wizard, there is still the first access to the wizard. But
- * if you link to the page that renders it using and internal link, you'll
- * circumvent that.
+ * Link to the wizard. It's an internal link instead of a bookmarkable page to help us with
+ * backbutton surpression. Wizards by default do not partipcate in versioning, which has the
+ * effect that whenever a button is clicked in the wizard, it will never result in a change of
+ * the redirection url. However, though that'll work just fine when you are already in the
+ * wizard, there is still the first access to the wizard. But if you link to the page that
+ * renders it using and internal link, you'll circumvent that.
*/
private static final class WizardLink extends Link
{
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java Mon Oct 15 16:10:50 2007
@@ -42,10 +42,10 @@
/**
- * This wizard shows some basic form use. It uses custom panels for the form
- * elements, and a single domain object ({@link User}) as it's subject. Also,
- * the user roles step}is an optional step, that will only be executed when
- * assignRoles is true (and that value is edited in the user details step).
+ * This wizard shows some basic form use. It uses custom panels for the form elements, and a single
+ * domain object ({@link User}) as it's subject. Also, the user roles step}is an optional step,
+ * that will only be executed when assignRoles is true (and that value is edited in the user details
+ * step).
*
* @author Eelco Hillenius
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizard.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizard.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizard.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizard.java Mon Oct 15 16:10:50 2007
@@ -21,12 +21,12 @@
import org.apache.wicket.extensions.wizard.WizardModel;
/**
- * This is kind of the hello world example for wizards. It doesn't do anything
- * useful, except displaying some static text and following static flow.
+ * This is kind of the hello world example for wizards. It doesn't do anything useful, except
+ * displaying some static text and following static flow.
* <p>
- * {@link StaticContentStep static content steps} are useful when you have some
- * text to display that you don't want to define seperate panels for. E.g. when
- * the contents come from a database, this is a convenient class to use.
+ * {@link StaticContentStep static content steps} are useful when you have some text to display that
+ * you don't want to define seperate panels for. E.g. when the contents come from a database, this
+ * is a convenient class to use.
* </p>
*
* @author Eelco Hillenius
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizardWithPanels.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizardWithPanels.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizardWithPanels.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizardWithPanels.java Mon Oct 15 16:10:50 2007
@@ -22,12 +22,12 @@
import org.apache.wicket.extensions.wizard.WizardStep;
/**
- * This is kind of the hello world example for wizards. It doesn't do anything
- * useful, except displaying some static text and following static flow.
+ * This is kind of the hello world example for wizards. It doesn't do anything useful, except
+ * displaying some static text and following static flow.
* <p>
- * {@link StaticContentStep static content steps} are useful when you have some
- * text to display that you don't want to define seperate panels for. E.g. when
- * the contents come from a database, this is a convenient class to use.
+ * {@link StaticContentStep static content steps} are useful when you have some text to display that
+ * you don't want to define seperate panels for. E.g. when the contents come from a database, this
+ * is a convenient class to use.
* </p>
*
* @author Eelco Hillenius
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/AnnotPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/AnnotPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/AnnotPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/AnnotPage.java Mon Oct 15 16:10:50 2007
@@ -22,16 +22,19 @@
import org.apache.wicket.spring.injection.annot.SpringBean;
+public class AnnotPage extends ContactsDisplayPage
+{
-public class AnnotPage extends ContactsDisplayPage {
+ @SpringBean
+ private ContactDao dao;
- @SpringBean private ContactDao dao;
-
- public AnnotPage() {
+ public AnnotPage()
+ {
}
- protected SortableDataProvider getDataProvider() {
+ protected SortableDataProvider getDataProvider()
+ {
return new ProxyDataProvider(dao);
}
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/ProxyDataProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/ProxyDataProvider.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/ProxyDataProvider.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/ProxyDataProvider.java Mon Oct 15 16:10:50 2007
@@ -22,19 +22,23 @@
import org.apache.wicket.spring.common.ContactDao;
import org.apache.wicket.spring.common.web.ContactDataProvider;
-public class ProxyDataProvider extends ContactDataProvider {
+public class ProxyDataProvider extends ContactDataProvider
+{
private ContactDao dao;
- public ProxyDataProvider(ContactDao dao) {
+ public ProxyDataProvider(ContactDao dao)
+ {
this.dao = dao;
}
- protected ContactDao getContactDao() {
+ protected ContactDao getContactDao()
+ {
return dao;
}
- public IModel model(Object object) {
- return new ProxyModel((Contact) object, dao);
+ public IModel model(Object object)
+ {
+ return new ProxyModel((Contact)object, dao);
}
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/ProxyModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/ProxyModel.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/ProxyModel.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/annot/web/ProxyModel.java Mon Oct 15 16:10:50 2007
@@ -20,15 +20,18 @@
import org.apache.wicket.spring.common.ContactDao;
import org.apache.wicket.spring.common.web.ContactDetachableModel;
-public class ProxyModel extends ContactDetachableModel {
+public class ProxyModel extends ContactDetachableModel
+{
private ContactDao dao;
- public ProxyModel(Contact contact, ContactDao dao) {
+ public ProxyModel(Contact contact, ContactDao dao)
+ {
super(contact);
this.dao = dao;
}
- protected ContactDao getContactDao() {
+ protected ContactDao getContactDao()
+ {
return dao;
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/Contact.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/Contact.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/Contact.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/Contact.java Mon Oct 15 16:10:50 2007
@@ -49,8 +49,8 @@
*/
public String toString()
{
- return "[Contact id=" + id + " firstName=" + firstName + " lastName=" + lastName
- + " homePhone=" + homePhone + " cellPhone=" + cellPhone + "]";
+ return "[Contact id=" + id + " firstName=" + firstName + " lastName=" + lastName +
+ " homePhone=" + homePhone + " cellPhone=" + cellPhone + "]";
}
@@ -66,10 +66,10 @@
if (obj instanceof Contact)
{
Contact other = (Contact)obj;
- return other.getFirstName().equals(getFirstName())
- && other.getLastName().equals(getLastName())
- && other.getHomePhone().equals(getHomePhone())
- && other.getCellPhone().equals(getCellPhone());
+ return other.getFirstName().equals(getFirstName()) &&
+ other.getLastName().equals(getLastName()) &&
+ other.getHomePhone().equals(getHomePhone()) &&
+ other.getCellPhone().equals(getCellPhone());
}
else
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDao.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDao.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDao.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDao.java Mon Oct 15 16:10:50 2007
@@ -24,7 +24,8 @@
* @author Igor Vaynberg (ivaynberg)
*
*/
-public interface ContactDao {
+public interface ContactDao
+{
/**
* @return total number of contacts available
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDaoImpl.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDaoImpl.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDaoImpl.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactDaoImpl.java Mon Oct 15 16:10:50 2007
@@ -25,14 +25,15 @@
import java.util.Map;
/**
- * a dao implementation with an auto-generated embedded database. in a true
- * application this dao would interface with a real database, but because we
- * want to keep dependencies to a minimum we generate our own database here.
+ * a dao implementation with an auto-generated embedded database. in a true application this dao
+ * would interface with a real database, but because we want to keep dependencies to a minimum we
+ * generate our own database here.
*
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class ContactDaoImpl implements ContactDao {
+public class ContactDaoImpl implements ContactDao
+{
private Map map = Collections.synchronizedMap(new HashMap());
private List fnameIdx = Collections.synchronizedList(new ArrayList());
@@ -49,8 +50,10 @@
* @param count
* number of contacts to generate at startup
*/
- public ContactDaoImpl() {
- for (int i = 0; i < 35; i++) {
+ public ContactDaoImpl()
+ {
+ for (int i = 0; i < 35; i++)
+ {
add(ContactGenerator.getInstance().generate());
}
updateIndecies();
@@ -62,15 +65,16 @@
* @param id
* @return contact
*/
- public Contact get(long id) {
- Contact c = (Contact) map.get(new Long(id));
+ public Contact get(long id)
+ {
+ Contact c = (Contact)map.get(new Long(id));
if (c == null)
- throw new RuntimeException("contact with id [" + id
- + "] not found in the database");
+ throw new RuntimeException("contact with id [" + id + "] not found in the database");
return c;
}
- protected void add(final Contact contact) {
+ protected void add(final Contact contact)
+ {
map.put(new Long(contact.getId()), contact);
fnameIdx.add(contact);
lnameIdx.add(contact);
@@ -87,28 +91,34 @@
* @param sortAsc
* @return list of contacts
*/
- public Iterator find(QueryParam qp) {
- List sublist = getIndex(qp.getSort(), qp.isSortAsc()).subList(
- qp.getFirst(), qp.getFirst() + qp.getCount());
+ public Iterator find(QueryParam qp)
+ {
+ List sublist = getIndex(qp.getSort(), qp.isSortAsc()).subList(qp.getFirst(),
+ qp.getFirst() + qp.getCount());
return sublist.iterator();
}
- protected List getIndex(String prop, boolean asc) {
+ protected List getIndex(String prop, boolean asc)
+ {
if (prop == null)
return fnameIdx;
- if (prop.equals("firstName")) {
+ if (prop.equals("firstName"))
+ {
return (asc) ? fnameIdx : fnameDescIdx;
- } else if (prop.equals("lastName")) {
+ }
+ else if (prop.equals("lastName"))
+ {
return (asc) ? lnameIdx : lnameDescIdx;
}
- throw new RuntimeException("uknown sort option [" + prop
- + "]. valid options: [firstName] , [lastName]");
+ throw new RuntimeException("uknown sort option [" + prop +
+ "]. valid options: [firstName] , [lastName]");
}
/**
* @return number of contacts in the database
*/
- public int count() {
+ public int count()
+ {
return fnameIdx.size();
}
@@ -117,14 +127,18 @@
*
* @param contact
*/
- public void save(final Contact contact) {
- if (contact.getId() == 0) {
+ public void save(final Contact contact)
+ {
+ if (contact.getId() == 0)
+ {
contact.setId(ContactGenerator.getInstance().generateId());
add(contact);
updateIndecies();
- } else {
- throw new IllegalArgumentException("contact ["
- + contact.getFirstName() + "] is already persistent");
+ }
+ else
+ {
+ throw new IllegalArgumentException("contact [" + contact.getFirstName() +
+ "] is already persistent");
}
}
@@ -133,7 +147,8 @@
*
* @param contact
*/
- public void delete(final Contact contact) {
+ public void delete(final Contact contact)
+ {
map.remove(new Long(contact.getId()));
fnameIdx.remove(contact);
@@ -144,32 +159,37 @@
contact.setId(0);
}
- private void updateIndecies() {
- Collections.sort(fnameIdx, new Comparator() {
- public int compare(Object arg0, Object arg1) {
- return ((Contact) arg0).getFirstName().compareTo(
- ((Contact) arg1).getFirstName());
+ private void updateIndecies()
+ {
+ Collections.sort(fnameIdx, new Comparator()
+ {
+ public int compare(Object arg0, Object arg1)
+ {
+ return ((Contact)arg0).getFirstName().compareTo(((Contact)arg1).getFirstName());
}
});
- Collections.sort(lnameIdx, new Comparator() {
- public int compare(Object arg0, Object arg1) {
- return ((Contact) arg0).getLastName().compareTo(
- ((Contact) arg1).getLastName());
+ Collections.sort(lnameIdx, new Comparator()
+ {
+ public int compare(Object arg0, Object arg1)
+ {
+ return ((Contact)arg0).getLastName().compareTo(((Contact)arg1).getLastName());
}
});
- Collections.sort(fnameDescIdx, new Comparator() {
- public int compare(Object arg0, Object arg1) {
- return ((Contact) arg1).getFirstName().compareTo(
- ((Contact) arg0).getFirstName());
+ Collections.sort(fnameDescIdx, new Comparator()
+ {
+ public int compare(Object arg0, Object arg1)
+ {
+ return ((Contact)arg1).getFirstName().compareTo(((Contact)arg0).getFirstName());
}
});
- Collections.sort(lnameDescIdx, new Comparator() {
- public int compare(Object arg0, Object arg1) {
- return ((Contact) arg1).getLastName().compareTo(
- ((Contact) arg0).getLastName());
+ Collections.sort(lnameDescIdx, new Comparator()
+ {
+ public int compare(Object arg0, Object arg1)
+ {
+ return ((Contact)arg1).getLastName().compareTo(((Contact)arg0).getLastName());
}
});
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactGenerator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactGenerator.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactGenerator.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/ContactGenerator.java Mon Oct 15 16:10:50 2007
@@ -24,7 +24,8 @@
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class ContactGenerator {
+public class ContactGenerator
+{
private static ContactGenerator instance = new ContactGenerator();
private static long nextId = 1;
@@ -32,29 +33,31 @@
/**
* @return static instance of generator
*/
- public static ContactGenerator getInstance() {
+ public static ContactGenerator getInstance()
+ {
return instance;
}
- private String[] firstNames = { "Jacob", "Emily", "Michael", "Sarah",
- "Matthew", "Brianna", "Nicholas", "Samantha", "Christopher",
- "Hailey", "Abner", "Abby", "Joshua", "Douglas", "Jack", "Keith",
- "Gerald", "Samuel", "Willie", "Larry", "Jose", "Timothy", "Sandra",
+ private String[] firstNames = { "Jacob", "Emily", "Michael", "Sarah", "Matthew", "Brianna",
+ "Nicholas", "Samantha", "Christopher", "Hailey", "Abner", "Abby", "Joshua", "Douglas",
+ "Jack", "Keith", "Gerald", "Samuel", "Willie", "Larry", "Jose", "Timothy", "Sandra",
"Kathleen", "Pamela", "Virginia", "Debra", "Maria", "Linda" };
- private String[] lastNames = { "Smiith", "Johnson", "Williams", "Jones",
- "Brown", "Donahue", "Bailey", "Rose", "Allen", "Black", "Davis",
- "Clark", "Hall", "Lee", "Baker", "Gonzalez", "Nelson", "Moore",
- "Wilson", "Graham", "Fisher", "Cruz", "Ortiz", "Gomez", "Murray" };
+ private String[] lastNames = { "Smiith", "Johnson", "Williams", "Jones", "Brown", "Donahue",
+ "Bailey", "Rose", "Allen", "Black", "Davis", "Clark", "Hall", "Lee", "Baker",
+ "Gonzalez", "Nelson", "Moore", "Wilson", "Graham", "Fisher", "Cruz", "Ortiz", "Gomez",
+ "Murray" };
- private ContactGenerator() {
+ private ContactGenerator()
+ {
}
/**
* @return unique id
*/
- public synchronized long generateId() {
+ public synchronized long generateId()
+ {
return nextId++;
}
@@ -63,9 +66,9 @@
*
* @return generated contact
*/
- public Contact generate() {
- Contact contact = new Contact(randomString(firstNames),
- randomString(lastNames));
+ public Contact generate()
+ {
+ Contact contact = new Contact(randomString(firstNames), randomString(lastNames));
contact.setId(generateId());
contact.setHomePhone(generatePhoneNumber());
contact.setCellPhone(generatePhoneNumber());
@@ -73,29 +76,34 @@
}
/**
- * generats <code>count</code> number contacts and puts them into
- * <code>collection</code> collection
+ * generats <code>count</code> number contacts and puts them into <code>collection</code>
+ * collection
*
* @param collection
* @param count
*/
- public void generate(Collection collection, int count) {
- for (int i = 0; i < count; i++) {
+ public void generate(Collection collection, int count)
+ {
+ for (int i = 0; i < count; i++)
+ {
collection.add(generate());
}
}
- private String generatePhoneNumber() {
- return new StringBuffer().append(rint(2, 9)).append(rint(0, 9)).append(
- rint(0, 9)).append("-555-").append(rint(1, 9)).append(
- rint(0, 9)).append(rint(0, 9)).append(rint(0, 9)).toString();
+ private String generatePhoneNumber()
+ {
+ return new StringBuffer().append(rint(2, 9)).append(rint(0, 9)).append(rint(0, 9)).append(
+ "-555-").append(rint(1, 9)).append(rint(0, 9)).append(rint(0, 9))
+ .append(rint(0, 9)).toString();
}
- private int rint(int min, int max) {
- return (int) (Math.random() * (max - min) + min);
+ private int rint(int min, int max)
+ {
+ return (int)(Math.random() * (max - min) + min);
}
- private String randomString(String[] choices) {
+ private String randomString(String[] choices)
+ {
return choices[rint(0, choices.length)];
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/QueryParam.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/QueryParam.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/QueryParam.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/QueryParam.java Mon Oct 15 16:10:50 2007
@@ -22,7 +22,8 @@
*
* @author Igor Vaynberg (ivaynberg)
*/
-public class QueryParam {
+public class QueryParam
+{
private int first;
private int count;
@@ -32,21 +33,20 @@
private boolean sortAsc;
/**
- * Set to return <tt>count</tt> elements, starting at the <tt>first</tt>
- * element.
+ * Set to return <tt>count</tt> elements, starting at the <tt>first</tt> element.
*
* @param first
* First element to return.
* @param count
* Number of elements to return.
*/
- public QueryParam(int first, int count) {
+ public QueryParam(int first, int count)
+ {
this(first, count, null, true);
}
/**
- * Set to return <tt>count</tt> sorted elements, starting at the
- * <tt>first</tt> element.
+ * Set to return <tt>count</tt> sorted elements, starting at the <tt>first</tt> element.
*
* @param first
* First element to return.
@@ -57,30 +57,36 @@
* @param sortAsc
* Sort ascending or descending.
*/
- public QueryParam(int first, int count, String sort, boolean sortAsc) {
+ public QueryParam(int first, int count, String sort, boolean sortAsc)
+ {
this.first = first;
this.count = count;
this.sort = sort;
this.sortAsc = sortAsc;
}
- public int getCount() {
+ public int getCount()
+ {
return count;
}
- public int getFirst() {
+ public int getFirst()
+ {
return first;
}
- public String getSort() {
+ public String getSort()
+ {
return sort;
}
- public boolean isSortAsc() {
+ public boolean isSortAsc()
+ {
return sortAsc;
}
- public boolean hasSort() {
+ public boolean hasSort()
+ {
return sort != null;
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/BasePage.java Mon Oct 15 16:10:50 2007
@@ -24,8 +24,10 @@
*
* @author Igor Vaynberg (ivaynberg)
*/
-public class BasePage extends WebPage {
- public BasePage() {
+public class BasePage extends WebPage
+{
+ public BasePage()
+ {
add(new BookmarkablePageLink("home-link", HomePage.class));
}
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactDataProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactDataProvider.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactDataProvider.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactDataProvider.java Mon Oct 15 16:10:50 2007
@@ -23,28 +23,31 @@
import org.apache.wicket.spring.common.QueryParam;
/**
- * Base class for contact data provider implementations. This class implements
- * everything except retrieval of the dao object, this way we can isolate that
- * for our examples.
+ * Base class for contact data provider implementations. This class implements everything except
+ * retrieval of the dao object, this way we can isolate that for our examples.
*
* @author Igor Vaynberg (ivaynerg)
*
*/
-public abstract class ContactDataProvider extends SortableDataProvider {
+public abstract class ContactDataProvider extends SortableDataProvider
+{
- public ContactDataProvider() {
+ public ContactDataProvider()
+ {
setSort("firstName", true);
}
protected abstract ContactDao getContactDao();
- public final Iterator iterator(int first, int count) {
- QueryParam qp = new QueryParam(first, count, getSort().getProperty(),
- getSort().isAscending());
+ public final Iterator iterator(int first, int count)
+ {
+ QueryParam qp = new QueryParam(first, count, getSort().getProperty(), getSort()
+ .isAscending());
return getContactDao().find(qp);
}
- public final int size() {
+ public final int size()
+ {
return getContactDao().count();
}
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactDetachableModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactDetachableModel.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactDetachableModel.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactDetachableModel.java Mon Oct 15 16:10:50 2007
@@ -22,9 +22,8 @@
import org.apache.wicket.spring.common.ContactDao;
/**
- * Base class for contact detachable models. This class implements all necessary
- * logic except retrieval of the dao object, this way we can isolate that logic
- * in our example implementations.
+ * Base class for contact detachable models. This class implements all necessary logic except
+ * retrieval of the dao object, this way we can isolate that logic in our example implementations.
*
* @author Igor Vaynberg (ivaynberg)
*
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactsDisplayPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactsDisplayPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactsDisplayPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ContactsDisplayPage.java Mon Oct 15 16:10:50 2007
@@ -31,13 +31,13 @@
* @author Igor Vaynberg (ivaynberg)
*
*/
-public abstract class ContactsDisplayPage extends BasePage {
- public ContactsDisplayPage() {
+public abstract class ContactsDisplayPage extends BasePage
+{
+ public ContactsDisplayPage()
+ {
IColumn[] cols = new IColumn[4];
- cols[0] = new PropertyColumn(new Model("first name"), "firstName",
- "firstName");
- cols[1] = new PropertyColumn(new Model("last name"), "lastName",
- "lastName");
+ cols[0] = new PropertyColumn(new Model("first name"), "firstName", "firstName");
+ cols[1] = new PropertyColumn(new Model("last name"), "lastName", "lastName");
cols[2] = new PropertyColumn(new Model("home phone"), "homePhone");
cols[3] = new PropertyColumn(new Model("cell phone"), "cellPhone");
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ExampleApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ExampleApplication.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ExampleApplication.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/common/web/ExampleApplication.java Mon Oct 15 16:10:50 2007
@@ -26,40 +26,44 @@
* @author Igor Vaynberg (ivaynberg)
*
*/
-public class ExampleApplication extends SpringWebApplication {
+public class ExampleApplication extends SpringWebApplication
+{
/**
- * this field holds a contact dao proxy that is safe to use in wicket
- * components
+ * this field holds a contact dao proxy that is safe to use in wicket components
*/
private ContactDao contactDaoProxy;
/**
- * this field holds the actual contact dao retrieved from spring context.
- * this object should never be serialized because it will take the container
- * with it, so BE CAREFUL when using this.
+ * this field holds the actual contact dao retrieved from spring context. this object should
+ * never be serialized because it will take the container with it, so BE CAREFUL when using
+ * this.
*/
private ContactDao contactDao;
@Override
- protected void init() {
+ protected void init()
+ {
// THIS LINE IS IMPORTANT - IT INSTALLS THE COMPONENT INJECTOR THAT WILL
// INJECT NEWLY CREATED COMPONENTS WITH THEIR SPRING DEPENDENCIES
addComponentInstantiationListener(new SpringComponentInjector(this));
}
/**
- * Retrieves contact dao bean. This bean should not be serialized so BE
- * CAREFUL when using it.
+ * Retrieves contact dao bean. This bean should not be serialized so BE CAREFUL when using it.
*
* @return contact dao bean
*/
- public ContactDao getContactDao() {
- if (contactDao == null) {
- synchronized (this) {
- if (contactDao == null) {
- contactDao = (ContactDao) internalGetApplicationContext()
- .getBean("contactDao", ContactDao.class);
+ public ContactDao getContactDao()
+ {
+ if (contactDao == null)
+ {
+ synchronized (this)
+ {
+ if (contactDao == null)
+ {
+ contactDao = (ContactDao)internalGetApplicationContext().getBean("contactDao",
+ ContactDao.class);
}
}
}
@@ -67,24 +71,29 @@
}
/**
- * Returns a lazy init proxy for the dao bean. This proxy is safe to
- * serialize and will take up very little space when serialized.
+ * Returns a lazy init proxy for the dao bean. This proxy is safe to serialize and will take up
+ * very little space when serialized.
*
* @return a lazy init proxy for the dao bean
*/
- public ContactDao getContactDaoProxy() {
- if (contactDaoProxy == null) {
- synchronized (this) {
- if (contactDaoProxy == null) {
- contactDaoProxy = (ContactDao) createSpringBeanProxy(
- ContactDao.class, "contactDao");
+ public ContactDao getContactDaoProxy()
+ {
+ if (contactDaoProxy == null)
+ {
+ synchronized (this)
+ {
+ if (contactDaoProxy == null)
+ {
+ contactDaoProxy = (ContactDao)createSpringBeanProxy(ContactDao.class,
+ "contactDao");
}
}
}
return contactDaoProxy;
}
- public Class getHomePage() {
+ public Class getHomePage()
+ {
return HomePage.class;
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/direct/web/DirectDataProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/direct/web/DirectDataProvider.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/direct/web/DirectDataProvider.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/direct/web/DirectDataProvider.java Mon Oct 15 16:10:50 2007
@@ -24,13 +24,16 @@
import org.apache.wicket.spring.common.web.ContactDataProvider;
import org.apache.wicket.spring.common.web.ExampleApplication;
-public class DirectDataProvider extends ContactDataProvider {
+public class DirectDataProvider extends ContactDataProvider
+{
- protected ContactDao getContactDao() {
+ protected ContactDao getContactDao()
+ {
return ((ExampleApplication)Application.get()).getContactDao();
}
- public IModel model(Object object) {
+ public IModel model(Object object)
+ {
return new DirectModel((Contact)object);
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/direct/web/DirectModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/direct/web/DirectModel.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/direct/web/DirectModel.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/direct/web/DirectModel.java Mon Oct 15 16:10:50 2007
@@ -23,14 +23,17 @@
import org.apache.wicket.spring.common.web.ContactDetachableModel;
import org.apache.wicket.spring.common.web.ExampleApplication;
-public class DirectModel extends ContactDetachableModel {
+public class DirectModel extends ContactDetachableModel
+{
- public DirectModel(Contact contact) {
+ public DirectModel(Contact contact)
+ {
super(contact);
}
- protected ContactDao getContactDao() {
- return ((ExampleApplication) Application.get()).getContactDao();
+ protected ContactDao getContactDao()
+ {
+ return ((ExampleApplication)Application.get()).getContactDao();
}
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/direct/web/DirectPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/direct/web/DirectPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/direct/web/DirectPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/direct/web/DirectPage.java Mon Oct 15 16:10:50 2007
@@ -20,13 +20,16 @@
import org.apache.wicket.spring.common.web.ContactsDisplayPage;
-public class DirectPage extends ContactsDisplayPage {
+public class DirectPage extends ContactsDisplayPage
+{
- public DirectPage() {
+ public DirectPage()
+ {
}
- protected SortableDataProvider getDataProvider() {
+ protected SortableDataProvider getDataProvider()
+ {
return new DirectDataProvider();
}
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/proxy/web/ProxyDataProvider.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/proxy/web/ProxyDataProvider.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/proxy/web/ProxyDataProvider.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/proxy/web/ProxyDataProvider.java Mon Oct 15 16:10:50 2007
@@ -22,19 +22,23 @@
import org.apache.wicket.spring.common.ContactDao;
import org.apache.wicket.spring.common.web.ContactDataProvider;
-public class ProxyDataProvider extends ContactDataProvider {
+public class ProxyDataProvider extends ContactDataProvider
+{
private ContactDao dao;
- public ProxyDataProvider(ContactDao dao) {
+ public ProxyDataProvider(ContactDao dao)
+ {
this.dao = dao;
}
- protected ContactDao getContactDao() {
+ protected ContactDao getContactDao()
+ {
return dao;
}
- public IModel model(Object object) {
- return new ProxyModel((Contact) object, dao);
+ public IModel model(Object object)
+ {
+ return new ProxyModel((Contact)object, dao);
}
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/proxy/web/ProxyModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/proxy/web/ProxyModel.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/proxy/web/ProxyModel.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/proxy/web/ProxyModel.java Mon Oct 15 16:10:50 2007
@@ -20,15 +20,18 @@
import org.apache.wicket.spring.common.ContactDao;
import org.apache.wicket.spring.common.web.ContactDetachableModel;
-public class ProxyModel extends ContactDetachableModel {
+public class ProxyModel extends ContactDetachableModel
+{
private ContactDao dao;
- public ProxyModel(Contact contact, ContactDao dao) {
+ public ProxyModel(Contact contact, ContactDao dao)
+ {
super(contact);
this.dao = dao;
}
- protected ContactDao getContactDao() {
+ protected ContactDao getContactDao()
+ {
return dao;
}
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/proxy/web/ProxyPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/proxy/web/ProxyPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/proxy/web/ProxyPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/spring/proxy/web/ProxyPage.java Mon Oct 15 16:10:50 2007
@@ -24,17 +24,21 @@
import org.apache.wicket.spring.common.web.ExampleApplication;
-public class ProxyPage extends ContactsDisplayPage {
+public class ProxyPage extends ContactsDisplayPage
+{
- public ProxyPage() {
+ public ProxyPage()
+ {
}
- private ContactDao getContactDao() {
- return ((ExampleApplication) Application.get()).getContactDaoProxy();
+ private ContactDao getContactDao()
+ {
+ return ((ExampleApplication)Application.get()).getContactDaoProxy();
}
- protected SortableDataProvider getDataProvider() {
+ protected SortableDataProvider getDataProvider()
+ {
return new ProxyDataProvider(getContactDao());
}
}