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 [2/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/compref/NonBookmarkablePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/NonBookmarkablePage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/NonBookmarkablePage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/NonBookmarkablePage.java Mon Oct 15 16:10:50 2007
@@ -20,9 +20,8 @@
import org.apache.wicket.markup.html.link.PageLink;
/**
- * Example page that cannot be bookmarked. A page is bookmarkable when it has a
- * public default constructor and/or a constructor with a
- * {@link org.apache.wicket.PageParameters} argument.
+ * Example page that cannot be bookmarked. A page is bookmarkable when it has a public default
+ * constructor and/or a constructor with a {@link org.apache.wicket.PageParameters} argument.
*
* @author Eelco Hillenius
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Person.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Person.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Person.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/Person.java Mon Oct 15 16:10:50 2007
@@ -151,7 +151,7 @@
*/
public String toString()
{
- return "[Person name=" + name + ", lastName=" + lastName + ", dateOfBirth=" + dateOfBirth
- + "]";
+ return "[Person name=" + name + ", lastName=" + lastName + ", dateOfBirth=" + dateOfBirth +
+ "]";
}
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/SelectPage.java Mon Oct 15 16:10:50 2007
@@ -36,8 +36,7 @@
/**
- * Page with examples on
- * {@link org.apache.wicket.extensions.markup.html.form.select.Select}.
+ * Page with examples on {@link org.apache.wicket.extensions.markup.html.form.select.Select}.
*
* @author Igor Vaynberg (ivaynberg)
* @author Eelco Hillenius
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/compref/TextFieldPage.java Mon Oct 15 16:10:50 2007
@@ -96,7 +96,9 @@
form.add(new TextField("integer", Integer.class));
}
- /** Simple data class that acts as a holder for the data for the input fields. */
+ /**
+ * Simple data class that acts as a holder for the data for the input fields.
+ */
private static class Input implements IClusterable
{
// Normally we would have played nice and made it a proper JavaBean with
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/AlternativePageFromWebContext.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/AlternativePageFromWebContext.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/AlternativePageFromWebContext.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/AlternativePageFromWebContext.java Mon Oct 15 16:10:50 2007
@@ -22,8 +22,7 @@
/**
* The markup for this page is loaded from the web context by a custom
- * {@link IResourceStreamLocator} locator set in
- * {@link CustomResourceLoadingApplication}.
+ * {@link IResourceStreamLocator} locator set in {@link CustomResourceLoadingApplication}.
*
* @author Eelco Hillenius
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java Mon Oct 15 16:10:50 2007
@@ -31,7 +31,6 @@
import org.apache.wicket.util.string.Strings;
-
/**
* Application class for the custom resource loading example.
*
@@ -56,8 +55,8 @@
// Log attempt
if (log.isDebugEnabled())
{
- log.debug("Attempting to locate resource '" + path
- + "' using classloader the servlet context");
+ log.debug("Attempting to locate resource '" + path +
+ "' using classloader the servlet context");
}
String location;
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageFromWebContext.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageFromWebContext.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageFromWebContext.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageFromWebContext.java Mon Oct 15 16:10:50 2007
@@ -22,8 +22,7 @@
/**
* The markup for this page is loaded from the web context by a custom
- * {@link IResourceStreamLocator} locator set in
- * {@link CustomResourceLoadingApplication}.
+ * {@link IResourceStreamLocator} locator set in {@link CustomResourceLoadingApplication}.
*
* @author Eelco Hillenius
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.java Mon Oct 15 16:10:50 2007
@@ -47,15 +47,13 @@
}
/**
- * This implementation loads from a custom name/ location. While not
- * advisable as the default way of loading resources, overriding this method
- * can provide a component specific break out so that you e.g. can load a
- * template from a database without any other component or the application
- * having to know about it.
+ * This implementation loads from a custom name/ location. While not advisable as the default
+ * way of loading resources, overriding this method can provide a component specific break out
+ * so that you e.g. can load a template from a database without any other component or the
+ * application having to know about it.
*
* @param container
- * The MarkupContainer which requests to load the Markup resource
- * stream
+ * The MarkupContainer which requests to load the Markup resource stream
* @param containerClass
* The container the markup should be associated with
* @return A IResourceStream if the resource was found
@@ -76,10 +74,9 @@
}
/**
- * Prevent the markup from ever be cached. This is optionally - components
- * that don't implement {@link IMarkupCacheKeyProvider} will just have their
- * markup cached - but is useful when markup varies. If you don't need such
- * dynamic loading, it is advisible to not implement
+ * Prevent the markup from ever be cached. This is optionally - components that don't implement
+ * {@link IMarkupCacheKeyProvider} will just have their markup cached - but is useful when
+ * markup varies. If you don't need such dynamic loading, it is advisible to not implement
* {@link IMarkupCacheKeyProvider}.
*
* @see org.apache.wicket.markup.IMarkupCacheKeyProvider#getCacheKey(org.apache.wicket.MarkupContainer,
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java Mon Oct 15 16:10:50 2007
@@ -38,8 +38,7 @@
import org.apache.wicket.model.PropertyModel;
/**
- * Demonstrates components from the wicket-date project and a bunch of locale
- * fiddling.
+ * Demonstrates components from the wicket-date project and a bunch of locale fiddling.
*/
public class DatesPage extends WicketExamplePage
{
@@ -138,7 +137,7 @@
public DatesPage()
{
selectedLocale = Session.get().getLocale();
- Form localeForm = new Form("localeForm");
+ Form localeForm = new Form("localeForm");
localeForm.add(new LocaleDropDownChoice("localeSelect"));
localeForm.add(new Link("localeUSLink")
{
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/ApplicationView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/ApplicationView.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/ApplicationView.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/ApplicationView.java Mon Oct 15 16:10:50 2007
@@ -21,8 +21,7 @@
import org.apache.wicket.markup.html.panel.Panel;
/**
- * A Wicket panel that shows interesting information about a given Wicket
- * session.
+ * A Wicket panel that shows interesting information about a given Wicket session.
*
* @author Jonathan Locke
*/
@@ -44,18 +43,18 @@
// Basic attributes
add(new Label("name", application.getName()));
- add(new Label("componentUseCheck", ""
- + application.getDebugSettings().getComponentUseCheck()));
- add(new Label("compressWhitespace", ""
- + application.getMarkupSettings().getCompressWhitespace()));
+ add(new Label("componentUseCheck", "" +
+ application.getDebugSettings().getComponentUseCheck()));
+ add(new Label("compressWhitespace", "" +
+ application.getMarkupSettings().getCompressWhitespace()));
add(new Label("stripComments", "" + application.getMarkupSettings().getStripComments()));
add(new Label("stripWicketTags", "" + application.getMarkupSettings().getStripWicketTags()));
- add(new Label("bufferResponse", ""
- + application.getRequestCycleSettings().getBufferResponse()));
- add(new Label("resourcePollFrequency", ""
- + application.getResourceSettings().getResourcePollFrequency()));
+ add(new Label("bufferResponse", "" +
+ application.getRequestCycleSettings().getBufferResponse()));
+ add(new Label("resourcePollFrequency", "" +
+ application.getResourceSettings().getResourcePollFrequency()));
add(new Label("versionPages", "" + application.getPageSettings().getVersionPagesByDefault()));
- add(new Label("pageMapEvictionStrategy", ""
- + application.getSessionSettings().getPageMapEvictionStrategy()));
+ add(new Label("pageMapEvictionStrategy", "" +
+ application.getSessionSettings().getPageMapEvictionStrategy()));
}
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/InspectorBug.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/InspectorBug.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/InspectorBug.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/InspectorBug.java Mon Oct 15 16:10:50 2007
@@ -24,8 +24,8 @@
import org.apache.wicket.markup.html.panel.Panel;
/**
- * A page that shows interesting attributes of the Wicket environment, including
- * the current session and the component tree for the current page.
+ * A page that shows interesting attributes of the Wicket environment, including the current session
+ * and the component tree for the current page.
*
* @author Jonathan Locke
*/
@@ -46,7 +46,7 @@
super(id);
PageParameters parameters = new PageParameters();
parameters.put("pageId", page.getId());
- Link link = new BookmarkablePageLink("link", InspectorPage.class, parameters);
+ Link link = new BookmarkablePageLink("link", InspectorPage.class, parameters);
link.add(new Image("bug"));
add(link);
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/InspectorPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/InspectorPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/InspectorPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/InspectorPage.java Mon Oct 15 16:10:50 2007
@@ -28,15 +28,15 @@
import org.apache.wicket.util.string.StringValueConversionException;
/**
- * A page that shows interesting attributes of the Wicket environment, including
- * the current session and the component tree for the current page.
+ * A page that shows interesting attributes of the Wicket environment, including the current session
+ * and the component tree for the current page.
*
* @author Jonathan Locke
*/
public final class InspectorPage extends WebPage
{
private static final long serialVersionUID = 1L;
-
+
/**
* Constructor.
*
@@ -58,10 +58,10 @@
}
add(new PageView("page", entry == null ? null : entry.getPage()));
add(new Image("bug"));
- add(new BookmarkablePageLink("allsessions",LiveSessionsPage.class));
+ add(new BookmarkablePageLink("allsessions", LiveSessionsPage.class));
add(new Label("wicketVersion", getApplication().getFrameworkSettings().getVersion()));
}
-
+
/**
* @see org.apache.wicket.Component#isVersioned()
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/LiveSessionsPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/LiveSessionsPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/LiveSessionsPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/LiveSessionsPage.java Mon Oct 15 16:10:50 2007
@@ -48,30 +48,31 @@
public LiveSessionsPage()
{
add(new Image("bug"));
-
+
add(new ApplicationView("application", Application.get()));
-
+
Link link = new Link("togglelink")
{
private static final long serialVersionUID = 1L;
- public void onClick()
+ public void onClick()
{
WebApplication webApplication = (WebApplication)Application.get();
webApplication.getRequestLoggerSettings().setRequestsWindowSize(500);
- boolean enabled = webApplication.getRequestLoggerSettings().isRequestLoggerEnabled();
+ boolean enabled = webApplication.getRequestLoggerSettings()
+ .isRequestLoggerEnabled();
webApplication.getRequestLoggerSettings().setRequestLoggerEnabled(!enabled);
}
};
- link.add( new Label("toggletext", new Model()
+ link.add(new Label("toggletext", new Model()
{
private static final long serialVersionUID = 1L;
-
- public Object getObject()
+
+ public Object getObject()
{
WebApplication webApplication = (WebApplication)Application.get();
IRequestLogger requestLogger = webApplication.getRequestLogger();
- if(requestLogger == null)
+ if (requestLogger == null)
{
return "Enable request recording";
}
@@ -80,10 +81,10 @@
return "Disable request recording";
}
};
-
+
}));
add(link);
- add(new Label("totalSessions",new Model()
+ add(new Label("totalSessions", new Model()
{
private static final long serialVersionUID = 1L;
@@ -92,46 +93,47 @@
return new Integer(getRequestLogger().getTotalCreatedSessions());
}
}));
- add(new Label("peakSessions",new Model()
+ add(new Label("peakSessions", new Model()
{
private static final long serialVersionUID = 1L;
-
+
public Object getObject()
{
return new Integer(getRequestLogger().getPeakSessions());
}
}));
- add(new Label("liveSessions",new Model()
+ add(new Label("liveSessions", new Model()
{
private static final long serialVersionUID = 1L;
-
+
public Object getObject()
{
return new Integer(getRequestLogger().getPeakSessions());
}
}));
-
+
Model sessionModel = new Model()
{
private static final long serialVersionUID = 1L;
-
+
public Object getObject()
{
return Arrays.asList(getRequestLogger().getLiveSessions());
}
};
- PageableListView listView = new PageableListView("sessions",sessionModel,50)
+ PageableListView listView = new PageableListView("sessions", sessionModel, 50)
{
private static final long serialVersionUID = 1L;
-
+
private final SimpleDateFormat sdf = new SimpleDateFormat("dd MMM hh:mm:ss.SSS");
-
- protected void populateItem(ListItem item)
+
+ protected void populateItem(ListItem item)
{
final SessionData sd = (SessionData)item.getModelObject();
Link link = new Link("id")
{
private static final long serialVersionUID = 1L;
+
/**
* @see org.apache.wicket.markup.html.link.Link#onClick()
*/
@@ -140,25 +142,25 @@
setResponsePage(new RequestsPage(sd));
}
};
- link.add( new Label("id",new Model(sd.getSessionId())));
- item.add( link);
- item.add( new Label("lastRequestTime",new Model(sdf.format(sd.getLastActive()))) );
- item.add( new Label("requestCount",new Model(new Long(sd.getNumberOfRequests()))) );
- item.add( new Label("requestsTime",new Model(new Long(sd.getTotalTimeTaken()))) );
- item.add( new Label("sessionSize",new Model(Bytes.bytes(sd.getSessionSize()))) );
+ link.add(new Label("id", new Model(sd.getSessionId())));
+ item.add(link);
+ item.add(new Label("lastRequestTime", new Model(sdf.format(sd.getLastActive()))));
+ item.add(new Label("requestCount", new Model(new Long(sd.getNumberOfRequests()))));
+ item.add(new Label("requestsTime", new Model(new Long(sd.getTotalTimeTaken()))));
+ item.add(new Label("sessionSize", new Model(Bytes.bytes(sd.getSessionSize()))));
}
};
add(listView);
-
- PagingNavigator navigator = new PagingNavigator("navigator",listView);
+
+ PagingNavigator navigator = new PagingNavigator("navigator", listView);
add(navigator);
}
-
+
IRequestLogger getRequestLogger()
{
WebApplication webApplication = (WebApplication)Application.get();
final IRequestLogger requestLogger;
- if(webApplication.getRequestLogger() == null)
+ if (webApplication.getRequestLogger() == null)
{
// make default one.
requestLogger = new RequestLogger();
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/PageMapView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/PageMapView.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/PageMapView.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/PageMapView.java Mon Oct 15 16:10:50 2007
@@ -38,8 +38,7 @@
/**
- * A Wicket panel that shows interesting information about a given Wicket
- * pagemap.
+ * A Wicket panel that shows interesting information about a given Wicket pagemap.
*
* @author Jonathan Locke
*/
@@ -63,7 +62,7 @@
add(new Label("name", pageMap.getName() == null ? "null" : pageMap.getName()));
add(new Label("size", "" + Bytes.bytes(pageMap.getSizeInBytes())));
- // Get entry accesses
+ // Get entry accesses
// Get entry accesses
final ArrayListStack accessStack;
if (pageMap instanceof AccessStackPageMap)
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/RequestsPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/RequestsPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/RequestsPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/RequestsPage.java Mon Oct 15 16:10:50 2007
@@ -46,36 +46,39 @@
{
private static final long serialVersionUID = 1L;
private final SimpleDateFormat sdf = new SimpleDateFormat("dd MMM hh:mm:ss.SSS");
+
/**
* Construct.
+ *
* @param sessionData
*/
public RequestsPage(final SessionData sessionData)
{
add(new Image("bug"));
- if(sessionData == null)
+ if (sessionData == null)
{
add(new Label("id").setVisible(false));
- add(new Label("sessionInfo").setVisible(false));
+ add(new Label("sessionInfo").setVisible(false));
add(new Label("startDate").setVisible(false));
- add(new Label("lastRequestTime").setVisible(false));
+ add(new Label("lastRequestTime").setVisible(false));
add(new Label("numberOfRequests").setVisible(false));
add(new Label("totalTimeTaken").setVisible(false));
- add(new Label("size").setVisible(false));
+ add(new Label("size").setVisible(false));
add(new WebMarkupContainer("sessionid"));
}
else
{
add(new Label("id", new Model(sessionData.getSessionId())));
- add(new Label("sessionInfo",new Model((Serializable)sessionData.getSessionInfo())));
- add(new Label("startDate",new Model(sdf.format(sessionData.getStartDate()))));
- add(new Label("lastRequestTime",new Model(sdf.format(sessionData.getLastActive()))));
- add(new Label("numberOfRequests",new Model(new Long(sessionData.getNumberOfRequests()))));
- add(new Label("totalTimeTaken",new Model(new Long(sessionData.getTotalTimeTaken()))));
- add(new Label("size", new Model(Bytes.bytes(sessionData.getSessionSize()))));
+ add(new Label("sessionInfo", new Model((Serializable)sessionData.getSessionInfo())));
+ add(new Label("startDate", new Model(sdf.format(sessionData.getStartDate()))));
+ add(new Label("lastRequestTime", new Model(sdf.format(sessionData.getLastActive()))));
+ add(new Label("numberOfRequests",
+ new Model(new Long(sessionData.getNumberOfRequests()))));
+ add(new Label("totalTimeTaken", new Model(new Long(sessionData.getTotalTimeTaken()))));
+ add(new Label("size", new Model(Bytes.bytes(sessionData.getSessionSize()))));
add(new WebMarkupContainer("sessionid").setVisible(false));
- }
-
+ }
+
IModel requestsModel = new Model()
{
private static final long serialVersionUID = 1L;
@@ -83,13 +86,13 @@
public Object getObject()
{
List requests = getRequestLogger().getRequests();
- if(sessionData != null)
+ if (sessionData != null)
{
- List returnValues = new ArrayList ();
- for (int i=0;i<requests.size();i++)
+ List returnValues = new ArrayList();
+ for (int i = 0; i < requests.size(); i++)
{
RequestData data = (RequestData)requests.get(i);
- if(sessionData.getSessionId().equals(data.getSessionId()))
+ if (sessionData.getSessionId().equals(data.getSessionId()))
{
returnValues.add(data);
}
@@ -99,29 +102,31 @@
return requests;
}
};
- PageableListView listView = new PageableListView("requests",requestsModel,50)
+ PageableListView listView = new PageableListView("requests", requestsModel, 50)
{
private static final long serialVersionUID = 1L;
-
- protected void populateItem(ListItem item)
+
+ protected void populateItem(ListItem item)
{
RequestData rd = (RequestData)item.getModelObject();
- item.add(new Label("id", new Model(rd.getSessionId())).setVisible(sessionData == null));
+ item.add(new Label("id", new Model(rd.getSessionId()))
+ .setVisible(sessionData == null));
item.add(new Label("startDate", new Model(sdf.format(rd.getStartDate()))));
item.add(new Label("timeTaken", new Model(rd.getTimeTaken())));
item.add(new Label("eventTarget", new Model(rd.getEventTarget())));
item.add(new Label("responseTarget", new Model(rd.getResponseTarget())));
item.add(new Label("alteredObjects", new Model(rd.getAlteredObjects())))
.setEscapeModelStrings(false);
- item.add(new Label("sessionSize", new Model(Bytes.bytes(rd.getSessionSize().longValue()))));
+ item.add(new Label("sessionSize", new Model(Bytes.bytes(rd.getSessionSize()
+ .longValue()))));
}
};
add(listView);
-
- PagingNavigator navigator = new PagingNavigator("navigator",listView);
+
+ PagingNavigator navigator = new PagingNavigator("navigator", listView);
add(navigator);
}
-
+
IRequestLogger getRequestLogger()
{
WebApplication webApplication = (WebApplication)Application.get();
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/SessionView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/SessionView.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/SessionView.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug/SessionView.java Mon Oct 15 16:10:50 2007
@@ -31,8 +31,7 @@
/**
- * A Wicket panel that shows interesting information about a given Wicket
- * session.
+ * A Wicket panel that shows interesting information about a given Wicket session.
*
* @author Jonathan Locke
*/
@@ -59,7 +58,7 @@
{
private static final long serialVersionUID = 1L;
- public Object getObject()
+ public Object getObject()
{
return Bytes.bytes(Objects.sizeof(session));
}
@@ -68,7 +67,7 @@
{
private static final long serialVersionUID = 1L;
- public Object getObject()
+ public Object getObject()
{
return Bytes.bytes(session.getSizeInBytes());
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/echo/Echo.java Mon Oct 15 16:10:50 2007
@@ -24,8 +24,7 @@
/**
- * The simplest form application possible. Just prints any user input to a
- * label.
+ * The simplest form application possible. Just prints any user input to a label.
*
* @author Eelco Hillenius
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/Home.java Mon Oct 15 16:10:50 2007
@@ -46,8 +46,8 @@
}
/**
- * Because only servlet 2.4 supports web.xml locale-encoding-mapping-list
- * deployment descriptors, this is a workaround for servlet 2.3
+ * Because only servlet 2.4 supports web.xml locale-encoding-mapping-list deployment
+ * descriptors, this is a workaround for servlet 2.3
*/
protected void configureResponse()
{
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/BeforeAndAfterBorder.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/BeforeAndAfterBorder.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/BeforeAndAfterBorder.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/BeforeAndAfterBorder.java Mon Oct 15 16:10:50 2007
@@ -22,8 +22,8 @@
import org.apache.wicket.markup.html.border.MarkupComponentBorder;
/**
- * Simple example to show how a border works. Adding this border to e.g. a label
- * that displays 'x' results in '[ x ]' being displayed.
+ * Simple example to show how a border works. Adding this border to e.g. a label that displays 'x'
+ * results in '[ x ]' being displayed.
*
* @author jcompagner
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java Mon Oct 15 16:10:50 2007
@@ -309,8 +309,7 @@
}
/**
- * Sets locale for the user's session (getLocale() is inherited from
- * Component)
+ * Sets locale for the user's session (getLocale() is inherited from Component)
*
* @param locale
* The new locale
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java Mon Oct 15 16:10:50 2007
@@ -19,7 +19,6 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -29,14 +28,13 @@
/**
- * Simple model object for FormInput example. Has a number of simple properties
- * that can be retrieved and set.
+ * Simple model object for FormInput example. Has a number of simple properties that can be
+ * retrieved and set.
*/
public final class FormInputModel implements IClusterable
{
/**
- * Represents a line of text. Hack to get around the fact that strings are
- * immutable.
+ * Represents a line of text. Hack to get around the fact that strings are immutable.
*/
public final class Line implements IClusterable
{
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/Multiply.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/Multiply.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/Multiply.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/Multiply.java Mon Oct 15 16:10:50 2007
@@ -22,13 +22,12 @@
import org.apache.wicket.model.PropertyModel;
/**
- * Displays how a {@link FormComponentPanel} can be used. Needs a model that
- * resolves to an Integer object.
+ * Displays how a {@link FormComponentPanel} can be used. Needs a model that resolves to an Integer
+ * object.
* <p>
- * Note that setting a new model value for this example wouldn't make sense, as
- * it would mismatch with the lhs and rhs. You would use this component's model
- * (value) primarily to write the result to some object, without ever directly
- * setting it in code yourself.
+ * Note that setting a new model value for this example wouldn't make sense, as it would mismatch
+ * with the lhs and rhs. You would use this component's model (value) primarily to write the result
+ * to some object, without ever directly setting it in code yourself.
* </p>
*
* @author eelcohillenius
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/UsPhoneNumber.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/UsPhoneNumber.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/UsPhoneNumber.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/UsPhoneNumber.java Mon Oct 15 16:10:50 2007
@@ -19,10 +19,9 @@
import org.apache.wicket.IClusterable;
/**
- * Represents a US phone number. We use this instead of the direct string to
- * trigger conversion to and from string. Conversion in general may be
- * re-evaluated in Wicket 1.3, hopefully making this a hack from the past by
- * then.
+ * Represents a US phone number. We use this instead of the direct string to trigger conversion to
+ * and from string. Conversion in general may be re-evaluated in Wicket 1.3, hopefully making this a
+ * hack from the past by then.
*
* @author Eelco Hillenius
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java Mon Oct 15 16:10:50 2007
@@ -34,8 +34,7 @@
public class BodyFrame extends WebPage
{
/**
- * Model that returns the url to the bookmarkable page that is set in the
- * current frame target.
+ * Model that returns the url to the bookmarkable page that is set in the current frame target.
*/
private final class FrameModel extends Model
{
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java Mon Oct 15 16:10:50 2007
@@ -24,23 +24,21 @@
/**
- * The left frame. This page is not bookmarkable, but it's instance is created
- * by {@link org.apache.wicket.examples.frames.BodyFrame} and hold in the same page map as
- * index. It uses the frameTarget object as a shared model; this page updates
- * that model, and as the Index uses that to set the frame tag, any changes to
- * it should be reflected with the next render.
+ * The left frame. This page is not bookmarkable, but it's instance is created by
+ * {@link org.apache.wicket.examples.frames.BodyFrame} and hold in the same page map as index. It
+ * uses the frameTarget object as a shared model; this page updates that model, and as the Index
+ * uses that to set the frame tag, any changes to it should be reflected with the next render.
*
* @author Eelco Hillenius
*/
public class LeftFrame extends WebPage
{
/**
- * Link that, when clicked, changes the frame target's frame class (and as
- * that is a shared model which is also being used by the 'master page'
- * {@link BodyFrame}, changes are immediately reflected) and set the
- * response page to the top level page {@link BodyFrame}. Tags that use
- * this link should have a <code>target="_parent"</code> attribute, so
- * that the top frame will be refreshed.
+ * Link that, when clicked, changes the frame target's frame class (and as that is a shared
+ * model which is also being used by the 'master page' {@link BodyFrame}, changes are
+ * immediately reflected) and set the response page to the top level page {@link BodyFrame}.
+ * Tags that use this link should have a <code>target="_parent"</code> attribute, so that the
+ * top frame will be refreshed.
*/
private static final class ChangeFramePageLink extends Link
{
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java Mon Oct 15 16:10:50 2007
@@ -31,8 +31,8 @@
/**
- * A simple "guest book" example that allows visitors to the page to add a
- * comment and see the comments others have added.
+ * A simple "guest book" example that allows visitors to the page to add a comment and see the
+ * comments others have added.
*
* For unit testing, added a parameter to clear the commentList.
*
@@ -80,7 +80,7 @@
{
// Construct form with no validation listener
super(id, new CompoundPropertyModel(new Comment()));
-
+
// this is just to make the unit test happy
setMarkupId("commentForm");
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/guice/GuiceApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/guice/GuiceApplication.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/guice/GuiceApplication.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/guice/GuiceApplication.java Mon Oct 15 16:10:50 2007
@@ -34,7 +34,7 @@
{
addComponentInstantiationListener(new GuiceComponentInjector(this));
}
-
+
/**
* @see org.apache.wicket.Application#getHomePage()
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java Mon Oct 15 16:10:50 2007
@@ -33,9 +33,9 @@
{
@Inject
private IMyService service;
-
+
private String labelValue = "<not yet initialized>";
-
+
/**
* Constructor
*/
@@ -54,13 +54,13 @@
});
add(new Label("message", new AbstractReadOnlyModel()
{
-
+
@Override
public Object getObject()
{
return labelValue;
}
-
+
}));
}
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/guice/service/IMyService.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/guice/service/IMyService.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/guice/service/IMyService.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/guice/service/IMyService.java Mon Oct 15 16:10:50 2007
@@ -28,6 +28,7 @@
{
/**
* Retrieves the text to say "Hello World".
+ *
* @return "Hello World"
*/
public String getHelloWorldText();
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Game.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Game.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Game.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Game.java Mon Oct 15 16:10:50 2007
@@ -23,10 +23,9 @@
/**
- * Implementation of the actual hangman game model. The model holds the word
- * generator, the current word, retries remaining and the correctLetters that
- * have been guessed. It also answers questions such as whether all retries have
- * been used.
+ * Implementation of the actual hangman game model. The model holds the word generator, the current
+ * word, retries remaining and the correctLetters that have been guessed. It also answers questions
+ * such as whether all retries have been used.
*
* @author Chris Turner
* @author Jonathan Locke
@@ -77,9 +76,8 @@
}
/**
- * Guess the given letter for the current word. If the letter matches then
- * the word is updated otherwise the guesses remaining counter is reduced.
- * The letter guessed is also recorded.
+ * Guess the given letter for the current word. If the letter matches then the word is updated
+ * otherwise the guesses remaining counter is reduced. The letter guessed is also recorded.
*
* @param letter
* The letter being guessed
@@ -110,8 +108,7 @@
}
/**
- * Check whether the user has successfully guessed all of the correctLetters
- * in the word.
+ * Check whether the user has successfully guessed all of the correctLetters in the word.
*
* @return Whether all of the correctLetters have been guessed or not
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanApplication.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanApplication.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanApplication.java Mon Oct 15 16:10:50 2007
@@ -46,8 +46,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/hangman/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Home.java Mon Oct 15 16:10:50 2007
@@ -20,8 +20,8 @@
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
/**
- * The home page for the hangman application. Contains just a single hyperlink
- * to the actual guess page that runs the game.
+ * The home page for the hangman application. Contains just a single hyperlink to the actual guess
+ * page that runs the game.
*
* @author Chris Turner
* @author Jonathan Locke
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java Mon Oct 15 16:10:50 2007
@@ -75,8 +75,8 @@
*/
public ResourceReference getSharedImageResource()
{
- return new ResourceReference(Letter.class, asString()
- + (isGuessed() ? "_enabled" : "_disabled"))
+ return new ResourceReference(Letter.class, asString() +
+ (isGuessed() ? "_enabled" : "_disabled"))
{
protected Resource newResource()
{
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/WordGenerator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/WordGenerator.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/WordGenerator.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/WordGenerator.java Mon Oct 15 16:10:50 2007
@@ -30,10 +30,9 @@
/**
- * The word generator is responsible for reading in a list of words from a data
- * file and serving them up in a random order. The generator keeps a state
- * record of which words it has served and randomises them again when the last
- * word has been served.
+ * The word generator is responsible for reading in a list of words from a data file and serving
+ * them up in a random order. The generator keeps a state record of which words it has served and
+ * randomises them again when the last word has been served.
*
* @author Chris Turner
* @version 1.0
@@ -47,8 +46,7 @@
private int index;
/**
- * Create the word generator, loading the words and preparing them for
- * serving.
+ * Create the word generator, loading the words and preparing them for serving.
*/
public WordGenerator()
{
@@ -71,8 +69,7 @@
}
/**
- * Create the word generator using the supplied array of words as the word
- * source to use.
+ * Create the word generator using the supplied array of words as the word source to use.
*
* @param words
* The words to use
@@ -108,8 +105,8 @@
}
/**
- * Randomises the list of loaded words and sets the index back to the
- * beginning of the word list.
+ * Randomises the list of loaded words and sets the index back to the beginning of the word
+ * list.
*/
private void shuffle()
{
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java Mon Oct 15 16:10:50 2007
@@ -39,8 +39,8 @@
public final class Home extends WicketExamplePage
{
/**
- * A dynamic image resource using {@link Home#drawCircle(Graphics2D)} to
- * draw a random circle on the canvas.
+ * A dynamic image resource using {@link Home#drawCircle(Graphics2D)} to draw a random circle on
+ * the canvas.
*
*/
private final class CircleDynamicImageResource extends RenderedDynamicImageResource
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java Mon Oct 15 16:10:50 2007
@@ -21,14 +21,13 @@
/**
- * Ensures that user is authenticated in session. If no user is signed in, a
- * sign in is forced by redirecting the browser to the SignIn page.
+ * Ensures that user is authenticated in session. If no user is signed in, a sign in is forced by
+ * redirecting the browser to the SignIn page.
* <p>
- * This base class also creates a border for each page subclass, automatically
- * adding children of the page to the border. This accomplishes two important
- * things: (1) subclasses do not have to repeat the code to create the border
- * navigation and (2) since subclasses do not repeat this code, they are not
- * hardwired to page navigation structure details
+ * This base class also creates a border for each page subclass, automatically adding children of
+ * the page to the border. This accomplishes two important things: (1) subclasses do not have to
+ * repeat the code to create the border navigation and (2) since subclasses do not repeat this code,
+ * they are not hardwired to page navigation structure details
*
* @author Jonathan Locke
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/Book.java Mon Oct 15 16:10:50 2007
@@ -83,8 +83,7 @@
* @param author
* The author of the book
* @param isFiction
- * True (FICTION) if the book is fiction, false (NON_FICTION) if
- * it is not.
+ * True (FICTION) if the book is fiction, false (NON_FICTION) if it is not.
*/
public Book(final String title, final String author, final boolean isFiction)
{
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java Mon Oct 15 16:10:50 2007
@@ -65,8 +65,8 @@
"noBookTitle", this)));
String writingStyles;
- final boolean hasStyles = (book.getWritingStyles() != null)
- && (book.getWritingStyles().size() > 0);
+ final boolean hasStyles = (book.getWritingStyles() != null) &&
+ (book.getWritingStyles().size() > 0);
if (hasStyles)
{
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java Mon Oct 15 16:10:50 2007
@@ -48,8 +48,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/library/LibrarySession.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibrarySession.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibrarySession.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibrarySession.java Mon Oct 15 16:10:50 2007
@@ -46,8 +46,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/linkomatic/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java Mon Oct 15 16:10:50 2007
@@ -121,7 +121,8 @@
new BookmarkablePageLink("page1", Page1.class)).addCircleLink(160, 50, 35,
new BookmarkablePageLink("page2", Page2.class)).addPolygonLink(
new int[] { 212, 79, 241, 4, 279, 54, 212, 79 },
- new BookmarkablePageLink("page3", Page3.class)).add(RelativePathPrefixHandler.RELATIVE_PATH_BEHAVIOR));
+ new BookmarkablePageLink("page3", Page3.class)).add(
+ RelativePathPrefixHandler.RELATIVE_PATH_BEHAVIOR));
// Popup example
PopupSettings popupSettings = new PopupSettings(PageMap.forName("popuppagemap")).setHeight(
@@ -129,14 +130,15 @@
add(new BookmarkablePageLink("popupLink", Popup.class).setPopupSettings(popupSettings));
// Popup example
- add(new BookmarkablePageLink("popupButtonLink", Popup.class).setPopupSettings(popupSettings));
+ add(new BookmarkablePageLink("popupButtonLink", Popup.class)
+ .setPopupSettings(popupSettings));
// External site link
add(new ExternalLink("google", "http://www.google.com", "Click this link to go to Google"));
// And that link as a popup
- PopupSettings googlePopupSettings = new PopupSettings(PopupSettings.RESIZABLE
- | PopupSettings.SCROLLBARS).setHeight(500).setWidth(700);
+ PopupSettings googlePopupSettings = new PopupSettings(PopupSettings.RESIZABLE |
+ PopupSettings.SCROLLBARS).setHeight(500).setWidth(700);
add(new ExternalLink("googlePopup", "http://www.google.com",
"Click this link to go to Google in a popup").setPopupSettings(googlePopupSettings));
@@ -147,7 +149,7 @@
FeedbackPanel feedbackPanel = new FeedbackPanel("feedback");
add(feedbackPanel);
add(new RedirectForm("redirectForm"));
-
+
Link linkToAnchor = new Link("linkToAnchor")
{
public void onClick()
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page1.java Mon Oct 15 16:10:50 2007
@@ -20,7 +20,6 @@
import org.apache.wicket.examples.WicketExamplePage;
-
/**
* Trivial bookmarkable page.
*
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page2.java Mon Oct 15 16:10:50 2007
@@ -20,7 +20,6 @@
import org.apache.wicket.examples.WicketExamplePage;
-
/**
* Trivial page.
*
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Page3.java Mon Oct 15 16:10:50 2007
@@ -21,7 +21,6 @@
import org.apache.wicket.markup.html.basic.Label;
-
/**
* Trivial page.
*
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java Mon Oct 15 16:10:50 2007
@@ -35,9 +35,8 @@
/**
- * Examples that shows how you can display a tree like structure (in this case
- * nested lists with string elements) using nested panels and using a tree
- * component.
+ * Examples that shows how you can display a tree like structure (in this case nested lists with
+ * string elements) using nested panels and using a tree component.
*
* @author Eelco Hillenius
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/nested/RecursivePanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/nested/RecursivePanel.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/nested/RecursivePanel.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/nested/RecursivePanel.java Mon Oct 15 16:10:50 2007
@@ -26,8 +26,8 @@
/**
- * This example list knows how to display sublists. It expects a list where each
- * element is either a string or another list.
+ * This example list knows how to display sublists. It expects a list where each element is either a
+ * string or another list.
*
* @author Eelco Hillenius
*/
@@ -59,8 +59,7 @@
* @param name
* name of the component
* @param list
- * a list where each element is either a string or another
- * list
+ * a list where each element is either a string or another list
*/
public Rows(String name, List list)
{
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page1.java Mon Oct 15 16:10:50 2007
@@ -21,7 +21,6 @@
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-
/**
* Simple bookmarkable page.
*
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2QP.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2QP.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2QP.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Page2QP.java Mon Oct 15 16:10:50 2007
@@ -20,8 +20,8 @@
import org.apache.wicket.request.target.coding.QueryStringUrlCodingStrategy;
/**
- * Simple bookmarkable page that displays page parameters which is mounted with
- * another parameter encoder.
+ * Simple bookmarkable page that displays page parameters which is mounted with another parameter
+ * encoder.
*
* @see QueryStringUrlCodingStrategy
* @author Eelco Hillenius
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page3.java Mon Oct 15 16:10:50 2007
@@ -22,7 +22,6 @@
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-
/**
* Simple bookmarkable page.
*
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page4.java Mon Oct 15 16:10:50 2007
@@ -22,7 +22,6 @@
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-
/**
* Simple bookmarkable page.
*
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/panels/signin/SignInPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/panels/signin/SignInPanel.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/panels/signin/SignInPanel.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/panels/signin/SignInPanel.java Mon Oct 15 16:10:50 2007
@@ -27,12 +27,11 @@
import org.apache.wicket.util.value.ValueMap;
/**
- * Reusable user sign in panel with username and password as well as support for
- * cookie persistence of the both. When the SignInPanel's form is submitted, the
- * abstract method signIn(String, String) is called, passing the username and
- * password submitted. The signIn() method should sign the user in and return
- * null if no error ocurred, or a descriptive String in the event that the sign
- * in fails.
+ * Reusable user sign in panel with username and password as well as support for cookie persistence
+ * of the both. When the SignInPanel's form is submitted, the abstract method signIn(String, String)
+ * is called, passing the username and password submitted. The signIn() method should sign the user
+ * in and return null if no error ocurred, or a descriptive String in the event that the sign in
+ * fails.
*
* @author Jonathan Locke
* @author Juergen Donnerstag
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/EditPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/EditPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/EditPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/EditPage.java Mon Oct 15 16:10:50 2007
@@ -19,7 +19,6 @@
import java.util.List;
import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
import javax.portlet.PortletMode;
import javax.portlet.PortletPreferences;
@@ -55,9 +54,9 @@
return Integer.toString(index);
}
};
-
+
private DropDownChoice ddc;
-
+
public EditPage()
{
Form form = new Form("form")
@@ -70,25 +69,28 @@
{
ExampleApplication selected = (ExampleApplication)ddc.getModelObject();
PortletRequestContext prc = (PortletRequestContext)RequestContext.get();
- PortletPreferences prefs = prc.getPortletRequest().getPreferences();
- prc.getPortletRequest().getPortletSession().setAttribute(WicketExamplesMenuPortlet.EXAMPLE_APPLICATION_ATTR, selected);
+ PortletPreferences prefs = prc.getPortletRequest().getPreferences();
+ prc.getPortletRequest().getPortletSession().setAttribute(
+ WicketExamplesMenuPortlet.EXAMPLE_APPLICATION_ATTR, selected);
try
{
((ActionResponse)prc.getPortletResponse()).setPortletMode(PortletMode.VIEW);
- prefs.setValue(WicketExamplesMenuPortlet.EXAMPLE_APPLICATION_PREF,selected.getFilterPath());
+ prefs.setValue(WicketExamplesMenuPortlet.EXAMPLE_APPLICATION_PREF, selected
+ .getFilterPath());
prefs.store();
}
catch (Exception pe)
{
throw new RuntimeException(pe);
}
- }
+ }
};
List examples = WicketExamplesMenuApplication.getExamples();
ddc = new DropDownChoice("examples", examples, exampleChoiceRenderer);
ddc.setNullValid(false);
PortletRequestContext prc = (PortletRequestContext)RequestContext.get();
- String eaFilterPath = prc.getPortletRequest().getPreferences().getValue(WicketExamplesMenuPortlet.EXAMPLE_APPLICATION_PREF, null);
+ String eaFilterPath = prc.getPortletRequest().getPreferences().getValue(
+ WicketExamplesMenuPortlet.EXAMPLE_APPLICATION_PREF, null);
Model selected = new Model((ExampleApplication)examples.get(0));
if (eaFilterPath != null)
{
@@ -100,11 +102,11 @@
break;
}
}
- }
+ }
ddc.setModel(selected);
form.add(ddc);
form.add(new Button("setButton"));
add(form);
}
-
+
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/ExampleApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/ExampleApplication.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/ExampleApplication.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/ExampleApplication.java Mon Oct 15 16:10:50 2007
@@ -29,8 +29,9 @@
private final String filterQuery;
private final Map initParameters;
private final String description;
-
- public ExampleApplication(String displayName, String filterPath, String filterQuery, Map initParameters, String description)
+
+ public ExampleApplication(String displayName, String filterPath, String filterQuery,
+ Map initParameters, String description)
{
this.displayName = displayName;
this.filterPath = filterPath;
@@ -41,6 +42,7 @@
/**
* Gets displayName.
+ *
* @return displayName
*/
public String getDisplayName()
@@ -50,6 +52,7 @@
/**
* Gets description.
+ *
* @return description
*/
public String getDescription()
@@ -59,6 +62,7 @@
/**
* Gets filterPath.
+ *
* @return filterPath
*/
public String getFilterPath()
@@ -68,6 +72,7 @@
/**
* Gets filterQuery.
+ *
* @return filterQuery
*/
public String getFilterQuery()
@@ -77,13 +82,15 @@
/**
* Gets initParameter.
- * @param name initParameter name
+ *
+ * @param name
+ * initParameter name
* @return initParameter
*/
public String getInitParameter(String name)
{
return (String)initParameters.get(name);
}
-
-
+
+
}
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/HeaderPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/HeaderPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/HeaderPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/HeaderPage.java Mon Oct 15 16:10:50 2007
@@ -36,8 +36,10 @@
public void onClick()
{
this.setResponsePage(MenuPage.class);
- ExampleApplication ea = (ExampleApplication)WicketExamplesMenuApplication.getExamples().get(0);
- PortletSession session = ((PortletRequestContext)RequestContext.get()).getPortletRequest().getPortletSession();
+ ExampleApplication ea = (ExampleApplication)WicketExamplesMenuApplication
+ .getExamples().get(0);
+ PortletSession session = ((PortletRequestContext)RequestContext.get())
+ .getPortletRequest().getPortletSession();
session.setAttribute(WicketExamplesMenuPortlet.EXAMPLE_APPLICATION_ATTR, ea);
}
});
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/MenuPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/MenuPage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/MenuPage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/MenuPage.java Mon Oct 15 16:10:50 2007
@@ -32,23 +32,28 @@
{
public MenuPage()
{
- add(new Loop("examples", WicketExamplesMenuApplication.getExamples().size()-1)
+ add(new Loop("examples", WicketExamplesMenuApplication.getExamples().size() - 1)
{
-
+
@Override
protected void populateItem(LoopItem item)
{
final int index = item.getIteration();
- ExampleApplication ea = (ExampleApplication)WicketExamplesMenuApplication.getExamples().get(index+1);
+ ExampleApplication ea = (ExampleApplication)WicketExamplesMenuApplication
+ .getExamples().get(index + 1);
Link link = new Link("example")
{
@Override
public void onClick()
{
int index = ((LoopItem)getParent()).getIteration();
- ExampleApplication ea = (ExampleApplication)WicketExamplesMenuApplication.getExamples().get(index+1);
- PortletSession session = ((PortletRequestContext)RequestContext.get()).getPortletRequest().getPortletSession();
- session.setAttribute(WicketExamplesMenuPortlet.EXAMPLE_APPLICATION_ATTR, ea);
+ ExampleApplication ea = (ExampleApplication)WicketExamplesMenuApplication
+ .getExamples().get(index + 1);
+ PortletSession session = ((PortletRequestContext)RequestContext.get())
+ .getPortletRequest().getPortletSession();
+ session
+ .setAttribute(WicketExamplesMenuPortlet.EXAMPLE_APPLICATION_ATTR,
+ ea);
}
};
link.add(new Label("name", ea.getDisplayName()));
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuApplication.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuApplication.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuApplication.java Mon Oct 15 16:10:50 2007
@@ -35,14 +35,14 @@
private static ServletContext servletContext;
public static List getExamples()
- {
+ {
if (examples == null)
{
examples = (List)servletContext.getAttribute(WicketExamplesMenuPortlet.EXAMPLES);
}
return examples != null ? examples : Collections.EMPTY_LIST;
}
-
+
/**
* @see org.apache.wicket.Application#getHomePage()
*/
@@ -56,7 +56,7 @@
}
return MenuPage.class;
}
-
+
/**
* @see org.apache.wicket.protocol.http.WebApplication#init()
*/
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuPortlet.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuPortlet.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuPortlet.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuPortlet.java Mon Oct 15 16:10:50 2007
@@ -43,17 +43,21 @@
{
public static final String EXAMPLE_APPLICATION_PREF = "exampleApplication";
public static final String EXAMPLES = WicketExamplesMenuPortlet.class.getName() + ".examples";
- public static final String EXAMPLE_APPLICATION_ATTR = WicketExamplesMenuPortlet.class.getName() + "." + EXAMPLE_APPLICATION_PREF;
+ public static final String EXAMPLE_APPLICATION_ATTR = WicketExamplesMenuPortlet.class.getName() +
+ "." + EXAMPLE_APPLICATION_PREF;
private static final String MENU_APPLICATION_URL_PORTLET_PARAMETER = "_wmu";
- private static final String PROCESS_MENU_APPLICATION = WicketExamplesMenuPortlet.class.getName() + ".processMenuApplication";
- private static final String PROCESS_HEADER_PAGE = WicketExamplesMenuPortlet.class.getName() + ".renderHeaderPage";
- /**
- * Name of portlet init Parameter for the ExampleHeader page
- */
- public static final String PARAM_HEADER_PAGE = "headerPage";
-
+ private static final String PROCESS_MENU_APPLICATION = WicketExamplesMenuPortlet.class
+ .getName() +
+ ".processMenuApplication";
+ private static final String PROCESS_HEADER_PAGE = WicketExamplesMenuPortlet.class.getName() +
+ ".renderHeaderPage";
+ /**
+ * Name of portlet init Parameter for the ExampleHeader page
+ */
+ public static final String PARAM_HEADER_PAGE = "headerPage";
+
private static List examples;
-
+
/**
* @see org.apache.wicket.protocol.http.portlet.WicketPortlet#init(javax.portlet.PortletConfig)
*/
@@ -77,18 +81,22 @@
}
/**
- * @see org.apache.wicket.protocol.http.portlet.WicketPortlet#getWicketConfigParameter(javax.portlet.PortletRequest, java.lang.String, java.lang.String)
+ * @see org.apache.wicket.protocol.http.portlet.WicketPortlet#getWicketConfigParameter(javax.portlet.PortletRequest,
+ * java.lang.String, java.lang.String)
*/
@Override
- protected String getWicketConfigParameter(PortletRequest request, String paramName, String defaultValue)
+ protected String getWicketConfigParameter(PortletRequest request, String paramName,
+ String defaultValue)
{
if (paramName.equals(WICKET_FILTER_PATH))
{
- return ((ExampleApplication)request.getAttribute(EXAMPLE_APPLICATION_ATTR)).getFilterPath();
+ return ((ExampleApplication)request.getAttribute(EXAMPLE_APPLICATION_ATTR))
+ .getFilterPath();
}
else if (paramName.equals(WICKET_FILTER_QUERY))
{
- return ((ExampleApplication)request.getAttribute(EXAMPLE_APPLICATION_ATTR)).getFilterQuery();
+ return ((ExampleApplication)request.getAttribute(EXAMPLE_APPLICATION_ATTR))
+ .getFilterQuery();
}
return super.getWicketConfigParameter(request, paramName, defaultValue);
}
@@ -99,28 +107,33 @@
@Override
protected String getWicketUrlPortletParameter(PortletRequest request)
{
- return request.getAttribute(PROCESS_MENU_APPLICATION) != null ? MENU_APPLICATION_URL_PORTLET_PARAMETER : super.getWicketUrlPortletParameter(request);
+ return request.getAttribute(PROCESS_MENU_APPLICATION) != null
+ ? MENU_APPLICATION_URL_PORTLET_PARAMETER
+ : super.getWicketUrlPortletParameter(request);
}
-
+
/**
- * @see org.apache.wicket.protocol.http.portlet.WicketPortlet#getWicketURL(javax.portlet.PortletRequest, java.lang.String, java.lang.String)
+ * @see org.apache.wicket.protocol.http.portlet.WicketPortlet#getWicketURL(javax.portlet.PortletRequest,
+ * java.lang.String, java.lang.String)
*/
@Override
protected String getWicketURL(PortletRequest request, String pageType, String defaultPage)
- {
+ {
ExampleApplication ea = (ExampleApplication)request.getAttribute(EXAMPLE_APPLICATION_ATTR);
if (request.getAttribute(PROCESS_HEADER_PAGE) != null)
{
- return ea.getInitParameter(PARAM_HEADER_PAGE);
+ return ea.getInitParameter(PARAM_HEADER_PAGE);
}
return super.getWicketURL(request, pageType, ea.getInitParameter(pageType));
}
/**
- * @see org.apache.wicket.protocol.http.portlet.WicketPortlet#processRequest(javax.portlet.PortletRequest, javax.portlet.PortletResponse, java.lang.String, java.lang.String, java.lang.String)
+ * @see org.apache.wicket.protocol.http.portlet.WicketPortlet#processRequest(javax.portlet.PortletRequest,
+ * javax.portlet.PortletResponse, java.lang.String, java.lang.String, java.lang.String)
*/
@Override
- protected void processRequest(PortletRequest request, PortletResponse response, String requestType, String pageType) throws PortletException, IOException
+ protected void processRequest(PortletRequest request, PortletResponse response,
+ String requestType, String pageType) throws PortletException, IOException
{
PortletSession session = request.getPortletSession();
ExampleApplication ea = (ExampleApplication)session.getAttribute(EXAMPLE_APPLICATION_ATTR);
@@ -146,7 +159,8 @@
}
session.setAttribute(EXAMPLE_APPLICATION_ATTR, ea);
}
- if (ea == null || ea.getFilterPath().equals(getWicketFilterPath()) || !PortletMode.VIEW.equals(request.getPortletMode()))
+ if (ea == null || ea.getFilterPath().equals(getWicketFilterPath()) ||
+ !PortletMode.VIEW.equals(request.getPortletMode()))
{
request.setAttribute(PROCESS_MENU_APPLICATION, Boolean.TRUE);
request.setAttribute(EXAMPLE_APPLICATION_ATTR, examples.get(0));
@@ -154,7 +168,8 @@
}
else
{
- if (WicketPortlet.ACTION_REQUEST.equals(requestType) || request.getParameter(PORTLET_RESOURCE_URL_PARAMETER) != null)
+ if (WicketPortlet.ACTION_REQUEST.equals(requestType) ||
+ request.getParameter(PORTLET_RESOURCE_URL_PARAMETER) != null)
{
if (request.getParameter(MENU_APPLICATION_URL_PORTLET_PARAMETER) != null)
{
@@ -181,9 +196,9 @@
}
}
}
-
+
protected List discoverExamples(PortletContext portletContext)
- {
+ {
ArrayList examples = new ArrayList();
InputStream is = portletContext.getResourceAsStream("/WEB-INF/portlet.xml");
if (is != null)
@@ -197,7 +212,7 @@
XmlTag elem;
String name;
int level;
-
+
do
{
elem = (XmlTag)parser.nextTag();
@@ -214,22 +229,22 @@
String filterQuery = null;
String displayName = null;
HashMap initParameters = new HashMap();
-
+
level = 0;
-
+
do
{
elem = (XmlTag)parser.nextTag();
name = elem.getName();
- level = elem.isOpen() ? (level+1) : (level-1);
-
+ level = elem.isOpen() ? (level + 1) : (level - 1);
+
if (level == 1)
{
- if (name.equals("description")||name.equals("display-name"))
+ if (name.equals("description") || name.equals("display-name"))
{
parser.setPositionMarker();
}
-
+
else if (name.equals("init-param"))
{
String initParamName = null;
@@ -238,10 +253,10 @@
{
elem = (XmlTag)parser.nextTag();
name = elem.getName();
- level = elem.isOpen() ? (level+1) : (level-1);
+ level = elem.isOpen() ? (level + 1) : (level - 1);
if (level == 2)
{
- if (name.equals("name")||name.equals("value"))
+ if (name.equals("name") || name.equals("value"))
{
parser.setPositionMarker();
}
@@ -250,11 +265,13 @@
{
if (name.equals("name"))
{
- initParamName = parser.getInputFromPositionMarker(elem.getPos()).toString();
+ initParamName = parser.getInputFromPositionMarker(
+ elem.getPos()).toString();
}
else if (name.equals("value"))
{
- initParamValue = parser.getInputFromPositionMarker(elem.getPos()).toString();
+ initParamValue = parser.getInputFromPositionMarker(
+ elem.getPos()).toString();
}
}
}
@@ -266,24 +283,28 @@
}
}
else if (level == 0)
- {
+ {
if (name.equals("description"))
{
- description = parser.getInputFromPositionMarker(elem.getPos()).toString();
+ description = parser.getInputFromPositionMarker(elem.getPos())
+ .toString();
}
else if (name.equals("display-name"))
{
- displayName = parser.getInputFromPositionMarker(elem.getPos()).toString();
+ displayName = parser.getInputFromPositionMarker(elem.getPos())
+ .toString();
}
}
}
while (level > -1);
- filterPath = buildWicketFilterPath((String)initParameters.get(WICKET_FILTER_PATH_PARAM));
+ filterPath = buildWicketFilterPath((String)initParameters
+ .get(WICKET_FILTER_PATH_PARAM));
if (displayName != null && filterPath != null && description != null)
{
filterQuery = buildWicketFilterQuery(filterPath);
validateDefaultPages(initParameters, filterPath, filterQuery);
- ExampleApplication exampleApplication = new ExampleApplication(displayName, filterPath, filterQuery, initParameters, description);
+ ExampleApplication exampleApplication = new ExampleApplication(displayName,
+ filterPath, filterQuery, initParameters, description);
if (exampleApplication.getFilterPath().equals(getWicketFilterPath()))
{
examples.add(0, exampleApplication);
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java Mon Oct 15 16:10:50 2007
@@ -35,7 +35,8 @@
/**
* Constructor.
*/
- public AjaxDataTablePage() {
+ public AjaxDataTablePage()
+ {
List columns = new ArrayList();
columns.add(new AbstractColumn(new Model("Actions"))
Modified: wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java?rev=584966&r1=584965&r2=584966&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java (original)
+++ wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java Mon Oct 15 16:10:50 2007
@@ -91,6 +91,7 @@
/**
* sets selected contact
+ *
* @param selected
*/
public void setSelected(Contact selected)