Author: frankbille
Date: Wed May 14 00:57:46 2008
New Revision: 656137
URL: http://svn.apache.org/viewvc?rev=656137&view=rev
Log:
Fixed some warnings identified by the inspector build in teamcity:
http://wicketstuff.org/teamcity/viewLog.html?buildId=211&buildTypeId=bt18&tab=Inspection
Mostly javadoc fixes
Modified:
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/WicketApplication.java
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/basic/DateLabel.java
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/form/DateTextField.java
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesSession.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuPortlet.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTargetUrlCodingStrategy.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
Modified:
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/WicketApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/WicketApplication.java?rev=656137&r1=656136&r2=656137&view=diff
==============================================================================
---
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/WicketApplication.java
(original)
+++
wicket/trunk/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/WicketApplication.java
Wed May 14 00:57:46 2008
@@ -5,7 +5,7 @@
/**
* Application object for your web application. If you want to run this
application without deploying, run the Start class.
*
- * @see wicket.myproject.Start#main(String[])
+ * @see ${packageName}.Start#main(String[])
*/
public class WicketApplication extends WebApplication
{
@@ -17,7 +17,7 @@
}
/**
- * @see wicket.Application#getHomePage()
+ * @see org.apache.wicket.Application#getHomePage()
*/
public Class<HomePage> getHomePage()
{
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/basic/DateLabel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/basic/DateLabel.java?rev=656137&r1=656136&r2=656137&view=diff
==============================================================================
---
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/basic/DateLabel.java
(original)
+++
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/basic/DateLabel.java
Wed May 14 00:57:46 2008
@@ -197,8 +197,8 @@
/**
* Construct with a converter.
*
- * @param The
- * component id
+ * @param id
+ * The component id
* @param converter
* The converter to use
*/
@@ -210,10 +210,10 @@
/**
* Construct with a converter.
*
- * @param The
- * component id
- * @param The
- * model
+ * @param id
+ * The component id
+ * @param model
+ * The model
* @param converter
* The converter to use
*/
@@ -247,6 +247,7 @@
/**
* Returns the specialized converter.
*/
+ @Override
public IConverter getConverter(Class clazz)
{
return converter;
@@ -270,6 +271,7 @@
this.before = before;
}
+ @Override
protected void onComponentTagBody(MarkupStream markupStream,
ComponentTag openTag)
{
String s = getModelObjectAsString();
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/form/DateTextField.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/form/DateTextField.java?rev=656137&r1=656136&r2=656137&view=diff
==============================================================================
---
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/form/DateTextField.java
(original)
+++
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/markup/html/form/DateTextField.java
Wed May 14 00:57:46 2008
@@ -195,10 +195,10 @@
/**
* Construct with a converter.
*
- * @param The
- * component id
- * @param The
- * model
+ * @param id
+ * The component id
+ * @param model
+ * The model
* @param converter
* The converter to use
*/
@@ -217,6 +217,7 @@
* @return The specialized converter.
* @see org.apache.wicket.Component#getConverter(java.lang.Class)
*/
+ @Override
public final IConverter getConverter(Class clazz)
{
return converter;
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java?rev=656137&r1=656136&r2=656137&view=diff
==============================================================================
---
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
(original)
+++
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/YuiLib.java
Wed May 14 00:57:46 2008
@@ -23,9 +23,9 @@
import org.apache.wicket.markup.html.resources.JavascriptResourceReference;
/**
- * Use the [EMAIL PROTECTED] #load(IHeaderResponse, boolean)} method to
initialize the YUI library using the
- * YUI loader. It is OK to call this multiple times.
- *
+ * Use the [EMAIL PROTECTED] #load(IHeaderResponse)} method to initialize the
YUI library using the YUI loader.
+ * It is OK to call this multiple times.
+ *
* @author eelcohillenius
*/
public final class YuiLib implements IClusterable
@@ -37,7 +37,7 @@
/**
* Load the YUI loader script. After that, you can declare YUI
dependencies using
* YAHOO.util.YUILoader.
- *
+ *
* @param response
* header response
*/
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java?rev=656137&r1=656136&r2=656137&view=diff
==============================================================================
---
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
(original)
+++
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/AbstractCalendar.java
Wed May 14 00:57:46 2008
@@ -47,7 +47,7 @@
*
* @author eelcohillenius
*
- * @see CalendarPopup
+ * @see DatePicker
*/
// TODO provide localization strings (base them on the messages of
// JsDatePicker?)
@@ -111,6 +111,7 @@
private static final long serialVersionUID = 1L;
+ @Override
protected Object load()
{
@@ -258,7 +259,7 @@
* properties for the javascript widget. See <a
* href="http://developer.yahoo.com/yui/calendar/";>the widget's
documentation</a> for the
* available options. If you want to override/ remove properties, you
obviously should call
- * [EMAIL PROTECTED] super#setWidgetProperties(Properties)} first.
+ * <code>super.configureWidgetProperties(properties)</code>.
*
* @param widgetProperties
* the current widget properties
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java?rev=656137&r1=656136&r2=656137&view=diff
==============================================================================
---
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java
(original)
+++
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DateField.java
Wed May 14 00:57:46 2008
@@ -101,6 +101,7 @@
/**
* @see org.apache.wicket.markup.html.form.FormComponent#getInput()
*/
+ @Override
public String getInput()
{
// since we override convertInput, we can let this method
return a value
@@ -136,6 +137,7 @@
*
* @see org.apache.wicket.markup.html.form.FormComponent#convertInput()
*/
+ @Override
protected void convertInput()
{
setConvertedInput(dateField.getConvertedInput());
@@ -145,6 +147,7 @@
* @deprecated replaced by [EMAIL PROTECTED] #newDateTextField(String,
PropertyModel)}
*/
// TODO remove after deprecation release
+ @Deprecated
protected final DateTextField newDateTextField(PropertyModel
dateFieldModel)
{
throw new UnsupportedOperationException();
@@ -153,8 +156,8 @@
/**
* create a new [EMAIL PROTECTED] DateTextField} instance to be added
to this panel.
*
- * @param the
- * id to be used when creating the component
+ * @param id
+ * The id to be used when creating the component
* @param dateFieldModel
* model that should be used by the [EMAIL PROTECTED]
DateTextField}
* @return a new date text field instance
@@ -167,6 +170,7 @@
/**
* @see org.apache.wicket.Component#onBeforeRender()
*/
+ @Override
protected void onBeforeRender()
{
dateField.setRequired(isRequired());
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java?rev=656137&r1=656136&r2=656137&view=diff
==============================================================================
---
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
(original)
+++
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
Wed May 14 00:57:46 2008
@@ -59,15 +59,15 @@
* only be used with components that either implement [EMAIL PROTECTED]
ITextFormatProvider} or that use
* [EMAIL PROTECTED] DateConverter} configured with an instance of [EMAIL
PROTECTED] SimpleDateFormat} (like Wicket's
* default configuration has).<br/>
- *
+ *
* To use, simply add a new instance to your component, which would typically
a TextField, like
* [EMAIL PROTECTED] DateTextField}.<br/>
- *
+ *
* The CalendarNavigator can be configured by overriding [EMAIL PROTECTED]
#configure(Map)} and setting the
* property or by returning <code>true</code> for [EMAIL PROTECTED]
#enableMonthYearSelection()}.
- *
- * @see http://developer.yahoo.com/yui/calendar/
- *
+ *
+ * @see <a
href="http://developer.yahoo.com/yui/calendar/";>http://developer.yahoo.com/yui/calendar/</a>
+ *
* @author eelcohillenius
*/
public class DatePicker extends AbstractBehavior implements IHeaderContributor
@@ -123,6 +123,7 @@
/**
* @see
org.apache.wicket.behavior.AbstractBehavior#bind(org.apache.wicket.Component)
*/
+ @Override
public void bind(Component component)
{
this.component = component;
@@ -133,6 +134,7 @@
/**
* @see
org.apache.wicket.behavior.AbstractBehavior#onRendered(org.apache.wicket.Component)
*/
+ @Override
public void onRendered(Component component)
{
super.onRendered(component);
@@ -170,6 +172,7 @@
/**
* @see
org.apache.wicket.markup.html.IHeaderContributor#renderHead(org.apache.wicket.markup.html.IHeaderResponse)
*/
+ @Override
public void renderHead(IHeaderResponse response)
{
YuiLib.load(response);
@@ -285,7 +288,7 @@
* Check that this behavior can get a date format out of the component
it is coupled to. It
* checks whether [EMAIL PROTECTED] #getDatePattern()} produces a
non-null value. If that method returns
* null, and exception will be thrown
- *
+ *
* @param component
* the component this behavior is being coupled to
* @throws UnableToDetermineFormatException
@@ -301,7 +304,7 @@
/**
* Set widget property if the array is null and has a length greater
than 0.
- *
+ *
* @param widgetProperties
* @param key
* @param array
@@ -316,7 +319,7 @@
/**
* Whether to position the date picker relative to the trigger icon.
- *
+ *
* @return If true, the date picker is aligned with the left position
of the icon, and with the
* top right under. If false, the date picker will skip
positioning and will let you do
* the positioning yourself. Returns true by default.
@@ -330,7 +333,7 @@
* Append javascript to the initialization function for the YUI widget.
Can be used by
* subclasses to conveniently extend configuration without having to
write a separate
* contribution.
- *
+ *
* @param markupId
* The markup id of the calendar component
* @param javascriptId
@@ -350,10 +353,9 @@
* properties for the javascript widget. See <a
* href="http://developer.yahoo.com/yui/calendar/";>the widget's
documentation</a> for the
* available options. If you want to override/ remove properties, you
should call
- * [EMAIL PROTECTED] super#setWidgetProperties(Properties)} first. If
you don't call that, be aware that
- * you will have to call [EMAIL PROTECTED] #localize(Map)} manually if
you like localized strings to be
- * added.
- *
+ * super.configure(properties) first. If you don't call that, be aware
that you will have to
+ * call [EMAIL PROTECTED] #localize(Map)} manually if you like
localized strings to be added.
+ *
* @param widgetProperties
* the current widget properties
*/
@@ -378,6 +380,7 @@
* @deprecated Please use [EMAIL PROTECTED] #configure(Map)} instead.
*/
// TODO remove this very ugly named method
+ @Deprecated
protected final void configureWidgetProperties(Map widgetProperties)
{
throw new UnsupportedOperationException("");
@@ -386,7 +389,7 @@
/**
* Filter all empty elements (workaround for [EMAIL PROTECTED]
DateFormatSymbols} returning arrays with
* empty elements).
- *
+ *
* @param array
* array to filter
* @return filtered array (without null or empty string elements)
@@ -410,7 +413,7 @@
/**
* Gets the id of the component that the calendar widget will get
attached to.
- *
+ *
* @return The DOM id of the component
*/
protected final String getComponentMarkupId()
@@ -420,7 +423,7 @@
/**
* Gets the date pattern to use for putting selected values in the
coupled component.
- *
+ *
* @return The date pattern
*/
protected String getDatePattern()
@@ -450,7 +453,7 @@
/**
* Gets the escaped DOM id that the calendar widget will get attached
to. All non word
* characters (\W) will be removed from the string.
- *
+ *
* @return The DOM id of the calendar widget - same as the component's
markup id + 'Dp'}
*/
protected final String getEscapedComponentMarkupId()
@@ -460,7 +463,7 @@
/**
* Gets the id of the icon that triggers the popup.
- *
+ *
* @return The id of the icon
*/
protected final String getIconId()
@@ -470,7 +473,7 @@
/**
* Gets the style of the icon that triggers the popup.
- *
+ *
* @return The style of the icon, e.g. 'cursor: point' etc.
*/
protected String getIconStyle()
@@ -480,7 +483,7 @@
/**
* Gets the url for the popup button. Users can override to provide
their own icon URL.
- *
+ *
* @return the url to use for the popup button/ icon
*/
protected CharSequence getIconUrl()
@@ -490,7 +493,7 @@
/**
* Gets the locale that should be used to configure this widget.
- *
+ *
* @return By default the locale of the bound component.
*/
protected Locale getLocale()
@@ -515,7 +518,7 @@
*
href="http://developer.yahoo.com/yui/examples/calendar/japan/1.html";>Japanese</a>
examples
* for more info.
* </p>
- *
+ *
* @param widgetProperties
* the current widget properties
*/
@@ -546,7 +549,7 @@
* calling the associated component's onchange Javascript event
handler. You can for instance
* attach an [EMAIL PROTECTED] AjaxEventBehavior} to that component to
get a call back to the server. The
* default is true.
- *
+ *
* @return if true, notifies the associated component when a date is
selected
*/
protected boolean notifyComponentOnDateSelected()
@@ -557,7 +560,7 @@
/**
* Makes a copy of the provided array and for each element copy the
substring 0..len to the new
* array
- *
+ *
* @param array
* array to copy from
* @param len
@@ -592,7 +595,7 @@
/**
* Indicates whether plain text is rendered or two select boxes are
used to allow direct
* selection of month and year.
- *
+ *
* @return <code>true</code> if select boxes should be rendered to
allow month and year
* selection.<br/><code>false</code> to render just plain text.
*/
@@ -603,7 +606,7 @@
/**
* Indicates whether the calendar should be hidden after a date was
selected.
- *
+ *
* @return <code>true</code> (default) if the calendar should be hidden
after the date
* selection <br/><code>false</code> if the calendar should
remain visible after the
* date selection.
@@ -615,7 +618,7 @@
/**
* Indicates whether the calendar should be rendered after it has been
loaded.
- *
+ *
* @return <code>true</code> if the calendar should be rendered after
it has been loaded.<br/><code>false</code>
* (default) if it's initially hidden.
*/
@@ -630,16 +633,16 @@
* and initialized. To refer to the actual Calendar DOM object, use
<code>${calendar}</code>
* in your code.<br/>See <a
href="http://developer.yahoo.com/yui/calendar/";>the widget's
* documentation</a> for more information about the YUI Calendar.<br/>
Example:
- *
+ *
* <pre>
* protected String getAdditionalJavascript()
* {
* return "${calendar}.addRenderer(\"10/3\",
${calendar}.renderCellStyleHighlight1);";
* }
* </pre>
- *
+ *
* @return a String containing additional Javascript code
- *
+ *
*/
protected String getAdditionalJavascript()
{
@@ -649,6 +652,7 @@
/**
* @see
org.apache.wicket.behavior.AbstractBehavior#isEnabled(org.apache.wicket.Component)
*/
+ @Override
public boolean isEnabled(Component component)
{
return component.isEnabled() && component.isEnableAllowed();
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java?rev=656137&r1=656136&r2=656137&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesApplication.java
Wed May 14 00:57:46 2008
@@ -55,7 +55,7 @@
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page< ? >> getHomePage()
+ public Class<? extends Page<?>> getHomePage()
{
return Index.class;
}
@@ -67,7 +67,7 @@
@Override
public Session newSession(Request request, Response response)
{
- return new RolesSession(this, request);
+ return new RolesSession(request);
}
@Override
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesSession.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesSession.java?rev=656137&r1=656136&r2=656137&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesSession.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/authorization/RolesSession.java
Wed May 14 00:57:46 2008
@@ -17,7 +17,6 @@
package org.apache.wicket.examples.authorization;
import org.apache.wicket.Request;
-import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.WebSession;
/**
@@ -33,13 +32,11 @@
/**
* Construct.
*
- * @param application
* @param request
- * @param response
*/
- public RolesSession(WebApplication application, Request request)
+ public RolesSession(Request request)
{
- super(application, request);
+ super(request);
}
/**
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuPortlet.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuPortlet.java?rev=656137&r1=656136&r2=656137&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuPortlet.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/portlet/menu/WicketExamplesMenuPortlet.java
Wed May 14 00:57:46 2008
@@ -44,13 +44,12 @@
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;
+ "." + 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_MENU_APPLICATION =
WicketExamplesMenuPortlet.class.getName() +
+ ".processMenuApplication";
private static final String PROCESS_HEADER_PAGE =
WicketExamplesMenuPortlet.class.getName() +
- ".renderHeaderPage";
+ ".renderHeaderPage";
/**
* Name of portlet init Parameter for the ExampleHeader page
*/
@@ -86,17 +85,15 @@
*/
@Override
protected String getWicketConfigParameter(PortletRequest request,
String paramName,
- String defaultValue)
+ 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);
}
@@ -108,8 +105,7 @@
protected String getWicketUrlPortletParameter(PortletRequest request)
{
return request.getAttribute(PROCESS_MENU_APPLICATION) != null
- ? MENU_APPLICATION_URL_PORTLET_PARAMETER
- : super.getWicketUrlPortletParameter(request);
+ ? MENU_APPLICATION_URL_PORTLET_PARAMETER :
super.getWicketUrlPortletParameter(request);
}
/**
@@ -128,12 +124,12 @@
}
/**
- * @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(PortletRequest,
+ * PortletResponse, String, String)
*/
@Override
protected void processRequest(PortletRequest request, PortletResponse
response,
- String requestType, String pageType) throws
PortletException, IOException
+ String requestType, String pageType) throws PortletException,
IOException
{
PortletSession session = request.getPortletSession();
ExampleApplication ea =
(ExampleApplication)session.getAttribute(EXAMPLE_APPLICATION_ATTR);
@@ -160,7 +156,7 @@
session.setAttribute(EXAMPLE_APPLICATION_ATTR, ea);
}
if (ea == null ||
ea.getFilterPath().equals(getWicketFilterPath()) ||
-
!PortletMode.VIEW.equals(request.getPortletMode()))
+ !PortletMode.VIEW.equals(request.getPortletMode()))
{
request.setAttribute(PROCESS_MENU_APPLICATION,
Boolean.TRUE);
request.setAttribute(EXAMPLE_APPLICATION_ATTR,
examples.get(0));
@@ -169,7 +165,7 @@
else
{
if (WicketPortlet.ACTION_REQUEST.equals(requestType) ||
-
request.getParameter(PORTLET_RESOURCE_URL_PARAMETER) != null)
+
request.getParameter(PORTLET_RESOURCE_URL_PARAMETER) != null)
{
if
(request.getParameter(MENU_APPLICATION_URL_PORTLET_PARAMETER) != null)
{
@@ -266,12 +262,12 @@
if (name.equals("name"))
{
initParamName = parser.getInputFromPositionMarker(
-
elem.getPos()).toString();
+
elem.getPos()).toString();
}
else if (name.equals("value"))
{
initParamValue = parser.getInputFromPositionMarker(
-
elem.getPos()).toString();
+
elem.getPos()).toString();
}
}
}
@@ -287,24 +283,23 @@
if
(name.equals("description"))
{
description =
parser.getInputFromPositionMarker(elem.getPos())
-
.toString();
+
.toString();
}
else if
(name.equals("display-name"))
{
displayName =
parser.getInputFromPositionMarker(elem.getPos())
-
.toString();
+
.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);
+ filterPath,
filterQuery, initParameters, description);
if
(exampleApplication.getFilterPath().equals(getWicketFilterPath()))
{
examples.add(0,
exampleApplication);
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTargetUrlCodingStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTargetUrlCodingStrategy.java?rev=656137&r1=656136&r2=656137&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTargetUrlCodingStrategy.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/CapturingBookmarkablePageRequestTargetUrlCodingStrategy.java
Wed May 14 00:57:46 2008
@@ -24,9 +24,8 @@
/**
* @author jbq
*/
-public class CapturingBookmarkablePageRequestTargetUrlCodingStrategy
- extends
- BookmarkablePageRequestTargetUrlCodingStrategy
+public class CapturingBookmarkablePageRequestTargetUrlCodingStrategy extends
+ BookmarkablePageRequestTargetUrlCodingStrategy
{
Class capturedPageClass;
Class displayedPageClass;
@@ -35,11 +34,11 @@
* Construct.
*
* @param mountPath
- * @param bookmarkablePageClass
- * @param pageMapName
+ * @param capturedPageClass
+ * @param displayedPageClass
*/
public CapturingBookmarkablePageRequestTargetUrlCodingStrategy(String
mountPath,
- Class capturedPageClass, Class displayedPageClass)
+ Class capturedPageClass, Class displayedPageClass)
{
super(mountPath, capturedPageClass, null);
this.displayedPageClass = displayedPageClass;
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?rev=656137&r1=656136&r2=656137&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
Wed May 14 00:57:46 2008
@@ -161,8 +161,8 @@
/**
* Callback for close button that contains a method that is invoked
after the button has been
* clicked. If no callback instance is specified using
- * <code>[EMAIL PROTECTED]
#setCloseButtonCallback(ModalWindow.CloseButtonCallback)}</code>, no ajax
- * request will be fired. Clicking the button will just close the
window.
+ * <code>[EMAIL PROTECTED]
ModalWindow#setCloseButtonCallback(ModalWindow.CloseButtonCallback)}</code>,
+ * no ajax request will be fired. Clicking the button will just close
the window.
*
* @author Matej Knopp
*/
@@ -723,6 +723,7 @@
/**
* @see org.apache.wicket.Component#onBeforeRender()
*/
+ @Override
protected void onBeforeRender()
{
// if user is refreshing whole page, the window will not be
shown
@@ -740,6 +741,7 @@
/**
* @see
org.apache.wicket.markup.html.panel.Panel#onComponentTag(org.apache.wicket.markup.ComponentTag)
*/
+ @Override
protected void onComponentTag(ComponentTag tag)
{
super.onComponentTag(tag);
@@ -771,6 +773,7 @@
/**
* @see
org.apache.wicket.MarkupContainer#remove(org.apache.wicket.Component)
*/
+ @Override
public void remove(Component component)
{
super.remove(component);
@@ -804,6 +807,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
protected void respond(AjaxRequestTarget target)
{
shown = false;
@@ -829,6 +833,7 @@
}
}
+ @Override
protected CharSequence getCallbackScript()
{
return super.getCallbackScript();
@@ -842,6 +847,7 @@
{
private static final long serialVersionUID = 1L;
+ @Override
protected void respond(AjaxRequestTarget target)
{
if (closeButtonCallback == null ||
@@ -854,6 +860,7 @@
/**
* @see
org.apache.wicket.ajax.AbstractDefaultAjaxBehavior#getAjaxCallDecorator()
*/
+ @Override
protected IAjaxCallDecorator getAjaxCallDecorator()
{
return new
CancelEventIfNoAjaxDecorator(super.getAjaxCallDecorator());
@@ -862,6 +869,7 @@
/**
* @see
org.apache.wicket.ajax.AbstractDefaultAjaxBehavior#getCallbackScript()
*/
+ @Override
protected CharSequence getCallbackScript()
{
return super.getCallbackScript();
@@ -1039,12 +1047,14 @@
private PageCreator pageCreator = null;
private CloseButtonCallback closeButtonCallback = null;
private WindowClosedCallback windowClosedCallback = null;
-
+
+ @Override
protected void onDetach()
{
super.onDetach();
- if (this.title != null) {
- this.title.detach();
+ if (title != null)
+ {
+ title.detach();
}
}
}
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java?rev=656137&r1=656136&r2=656137&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
Wed May 14 00:57:46 2008
@@ -81,7 +81,7 @@
private static final long serialVersionUID = 1L;
/** collection containing all available choices */
- private final IModel<Collection< ? extends T>> choicesModel;
+ private final IModel<Collection<? extends T>> choicesModel;
/**
* choice render used to render the choices in both available and
selected collections
@@ -147,7 +147,7 @@
* @param allowOrder
* Allow user to move selections up and down
*/
- public Palette(String id, IModel<Collection< ? extends T>> choicesModel,
+ public Palette(String id, IModel<Collection<? extends T>> choicesModel,
IChoiceRenderer<T> choiceRenderer, int rows, boolean allowOrder)
{
this(id, null, choicesModel, choiceRenderer, rows, allowOrder);
@@ -169,7 +169,7 @@
* Allow user to move selections up and down
*/
public Palette(String id, IModel<Collection<T>> model,
- IModel<Collection< ? extends T>> choicesModel,
IChoiceRenderer<T> choiceRenderer, int rows,
+ IModel<Collection<? extends T>> choicesModel,
IChoiceRenderer<T> choiceRenderer, int rows,
boolean allowOrder)
{
super(id, model);
@@ -413,7 +413,7 @@
}
/**
- * @see
org.apache.wicket.extensions.markup.html.form.palette.component#getAdditionalAttributes()
+ * @see
org.apache.wicket.extensions.markup.html.form.palette.component.Selection#getAdditionalAttributes()
*/
protected Map getAdditionalAttributesForSelection(Object choice)
{
@@ -440,7 +440,7 @@
}
/**
- * @see
org.apache.wicket.extensions.markup.html.form.palette.component#getAdditionalAttributes()
+ * @see
org.apache.wicket.extensions.markup.html.form.palette.component.Selection#getAdditionalAttributes()
*/
protected Map getAdditionalAttributesForChoices(Object choice)
{
