Author: pete
Date: Mon Nov 29 19:30:44 2010
New Revision: 1040239
URL: http://svn.apache.org/viewvc?rev=1040239&view=rev
Log:
optimization + readability: remove redundant local variables and fields
Modified:
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ContactsDatabase.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/StyleDateConverter.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadInfo.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelFactory.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/ContactsDatabase.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Packages.java
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/page/PageAccessSynchronizer.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbstractRequestWrapperFactory.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectInputStream.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/CreditCardValidator.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorRequestTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/ComponentResolvingPage.java
Modified:
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ContactsDatabase.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ContactsDatabase.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ContactsDatabase.java
(original)
+++
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ContactsDatabase.java
Mon Nov 29 19:30:44 2010
@@ -85,8 +85,7 @@ public class ContactsDatabase
*/
public List<Contact> find(int first, int count, String sortProperty,
boolean sortAsc)
{
- List<Contact> sublist = getIndex(sortProperty,
sortAsc).subList(first, first + count);
- return sublist;
+ return getIndex(sortProperty, sortAsc).subList(first, first +
count);
}
/**
Modified:
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
(original)
+++
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
Mon Nov 29 19:30:44 2010
@@ -295,11 +295,9 @@ public class Home extends WebPage
* @see
org.apache.wicket.markup.html.form.IChoiceRenderer#getDisplayValue(Object)
*/
@Override
- public Object getDisplayValue(Locale object)
+ public Object getDisplayValue(Locale locale)
{
- Locale locale = object;
- String display = locale.getDisplayName(getLocale());
- return display;
+ return locale.getDisplayName(getLocale());
}
}
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/StyleDateConverter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/StyleDateConverter.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/StyleDateConverter.java
(original)
+++
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/datetime/StyleDateConverter.java
Mon Nov 29 19:30:44 2010
@@ -117,8 +117,6 @@ public class StyleDateConverter extends
@Override
protected DateTimeFormatter getFormat()
{
- DateTimeFormatter dtf =
DateTimeFormat.forPattern(getDatePattern()).withLocale(getLocale())
- .withPivotYear(2000);
- return dtf;
+ return
DateTimeFormat.forPattern(getDatePattern()).withLocale(getLocale()).withPivotYear(2000);
}
}
\ No newline at end of file
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/ChoicePage.java
Mon Nov 29 19:30:44 2010
@@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
@@ -75,9 +74,7 @@ public class ChoicePage extends BasePage
@Override
public List<String> getObject()
{
- Set<String> keys = modelsMap.keySet();
- List<String> list = new ArrayList<String>(keys);
- return list;
+ return new
ArrayList<String>(modelsMap.keySet());
}
};
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/TodoList.java
Mon Nov 29 19:30:44 2010
@@ -333,9 +333,8 @@ public class TodoList extends BasePage
void onRemoveCompletedTodos(AjaxRequestTarget target)
{
List<TodoItem> ready = new ArrayList<TodoItem>();
- for (TodoItem todoItem : items)
+ for (TodoItem todo : items)
{
- TodoItem todo = todoItem;
if (todo.isChecked())
{
ready.add(todo);
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
Mon Nov 29 19:30:44 2010
@@ -91,28 +91,22 @@ public class DropDownChoicePage extends
*
* @see
org.apache.wicket.markup.html.form.IChoiceRenderer#getDisplayValue(java.lang.Object)
*/
- public Object getDisplayValue(Integer object)
+ public Object getDisplayValue(Integer value)
{
// Use an ugly switch statement. Usually you
would hide this in
// your business
// object or in a utility.
- String stringrep;
- int value = object;
switch (value)
{
case 1 :
- stringrep = "One";
- break;
+ return "One";
case 2 :
- stringrep = "Two";
- break;
+ return "Two";
case 3 :
- stringrep = "Three";
- break;
+ return "Three";
default :
throw new
IllegalStateException(value + " is not mapped!");
}
- return stringrep;
}
/**
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
Mon Nov 29 19:30:44 2010
@@ -254,8 +254,7 @@ public class FormInput extends WicketExa
@Override
public Object getDisplayValue(Locale locale)
{
- String display = locale.getDisplayName(getLocale());
- return display;
+ return locale.getDisplayName(getLocale());
}
}
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
Mon Nov 29 19:30:44 2010
@@ -405,10 +405,9 @@ public class SourcesPage extends WebPage
@Override
protected CharSequence getURL()
{
- CharSequence url =
urlFor(SourcesPage.class,
-
SourcesPage.generatePageParameters(getPageTargetClass(),
-
item.getModel().getObject()));
- return url;
+ return
urlFor(SourcesPage.class,
+
SourcesPage.generatePageParameters(getPageTargetClass(),
+
item.getModel().getObject()));
}
@Override
Modified:
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
(original)
+++
wicket/trunk/wicket-examples/src/test/java/org/apache/wicket/examples/WicketWebTestCase.java
Mon Nov 29 19:30:44 2010
@@ -61,9 +61,8 @@ public abstract class WicketWebTestCase
TestSuite suite = new TestSuite();
suite.addTestSuite(clazz);
- JettyTestCaseDecorator deco = new JettyTestCaseDecorator(suite);
- return deco;
+ return new JettyTestCaseDecorator(suite);
}
/**
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadInfo.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadInfo.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadInfo.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadInfo.java
Mon Nov 29 19:30:44 2010
@@ -140,9 +140,8 @@ public class UploadInfo implements IClus
long totalTime = ((getElapsedSeconds() * 100) /
Math.max(percentageComplete, 1));
long remainingTime = (totalTime - getElapsedSeconds());
- long remainingTimeInMillis = remainingTime * 1000;
- return remainingTimeInMillis;
+ return remainingTime * 1000; // convert seconds to milliseconds
and return
}
/**
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelFactory.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelFactory.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelFactory.java
Mon Nov 29 19:30:44 2010
@@ -88,9 +88,7 @@ public final class BreadCrumbPanelFactor
{
try
{
- Constructor<? extends BreadCrumbPanel> ctor =
panelClass.getConstructor(new Class[] {
- String.class, IBreadCrumbModel.class });
- return ctor;
+ return panelClass.getConstructor(String.class,
IBreadCrumbModel.class);
}
catch (SecurityException e)
{
Modified:
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
(original)
+++
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/AjaxLazyLoadPanelTesterTest.java
Mon Nov 29 19:30:44 2010
@@ -17,7 +17,6 @@
package org.apache.wicket.extensions.markup.html;
import org.apache.wicket.Component;
-import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
@@ -36,8 +35,6 @@ import org.apache.wicket.util.tester.Tes
public class AjaxLazyLoadPanelTesterTest extends WicketTestCase
{
- private MarkupContainer ajaxLazyLoadPanel;
-
/**
* Test
*/
@@ -49,7 +46,7 @@ public class AjaxLazyLoadPanelTesterTest
public Panel getTestPanel(String panelId)
{
- AjaxLazyLoadPanel ajaxLazyLoadPanel1 = new
AjaxLazyLoadPanel(panelId)
+ return new AjaxLazyLoadPanel(panelId)
{
private static final long
serialVersionUID = 1L;
@@ -59,8 +56,6 @@ public class AjaxLazyLoadPanelTesterTest
return new Label(markupId,
"lazy panel test").setRenderBodyOnly(true);
}
};
- ajaxLazyLoadPanel = ajaxLazyLoadPanel1;
- return (Panel)ajaxLazyLoadPanel;
}
});
Modified:
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/ContactsDatabase.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/ContactsDatabase.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/ContactsDatabase.java
(original)
+++
wicket/trunk/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/ContactsDatabase.java
Mon Nov 29 19:30:44 2010
@@ -88,8 +88,7 @@ public class ContactsDatabase
*/
public List<Contact> find(int first, int count, String sortProperty,
boolean sortAsc)
{
- List<Contact> sublist = getIndex(sortProperty,
sortAsc).subList(first, first + count);
- return sublist;
+ return getIndex(sortProperty, sortAsc).subList(first, first +
count);
}
protected List<Contact> getIndex(String prop, boolean asc)
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
Mon Nov 29 19:30:44 2010
@@ -870,8 +870,7 @@ public class IntHashMap<V> implements Cl
*/
public Entry<V> next()
{
- Entry<V> nextEntry = nextEntry();
- return nextEntry;
+ return nextEntry();
}
}
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimeConverter.java
Mon Nov 29 19:30:44 2010
@@ -60,9 +60,9 @@ public class SqlTimeConverter extends Ab
}
@Override
- public String convertToString(final Time value, Locale locale)
+ public String convertToString(final Time time, Locale locale)
{
- if (value == null)
+ if (time == null)
{
return null;
}
@@ -70,7 +70,6 @@ public class SqlTimeConverter extends Ab
{
locale = Locale.getDefault();
}
- Time time = value;
DateFormat format =
DateFormat.getTimeInstance(DateFormat.SHORT, locale);
return format.format(time);
}
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlTimestampConverter.java
Mon Nov 29 19:30:44 2010
@@ -106,9 +106,9 @@ public class SqlTimestampConverter exten
* java.util.Locale)
*/
@Override
- public String convertToString(final Timestamp value, Locale locale)
+ public String convertToString(final Timestamp timestamp, Locale locale)
{
- if (value == null)
+ if (timestamp == null)
{
return null;
}
@@ -118,7 +118,6 @@ public class SqlTimestampConverter exten
locale = Locale.getDefault();
}
- Timestamp timestamp = value;
DateFormat format = DateFormat.getDateTimeInstance(dateFormat,
timeFormat, locale);
return format.format(timestamp);
}
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Packages.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Packages.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Packages.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Packages.java
Mon Nov 29 19:30:44 2010
@@ -126,9 +126,7 @@ public final class Packages
*/
public static String extractPackageName(final Class<?> forClass)
{
- String classname = forClass.getName();
- String parent = parent(classname);
- return parent;
+ return parent(forClass.getName());
}
/**
Modified:
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java
(original)
+++
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java
Mon Nov 29 19:30:44 2010
@@ -46,10 +46,6 @@ public class Initializer implements IIni
{
private static final Logger log =
LoggerFactory.getLogger(Initializer.class);
- private String velocityPropertiesFile = "velocity.properties";
-
- private String velocityPropertiesFolder;
-
/**
* @see
org.apache.wicket.IInitializer#init(org.apache.wicket.Application)
*/
@@ -77,12 +73,13 @@ public class Initializer implements IIni
private Properties getVelocityProperties(Application application)
{
+ String velocityPropertiesFile = "velocity.properties";
+
if (application instanceof WebApplication)
{
WebApplication webapp = (WebApplication)application;
ServletContext servletContext =
webapp.getServletContext();
- ServletContext sc = servletContext;
- velocityPropertiesFolder =
sc.getInitParameter("velocityPropertiesFolder");
+ String propertiesFolder =
servletContext.getInitParameter("velocityPropertiesFolder");
String propsFile =
servletContext.getInitParameter("velocity.properties");
if (null != propsFile)
@@ -90,10 +87,10 @@ public class Initializer implements IIni
velocityPropertiesFile = propsFile;
}
- if (null != velocityPropertiesFolder)
+ if (null != propertiesFolder)
{
- WebApplicationPath webPath = new
WebApplicationPath(sc);
- webPath.add(velocityPropertiesFolder);
+ WebApplicationPath webPath = new
WebApplicationPath(servletContext);
+ webPath.add(propertiesFolder);
IResourceStream stream =
webPath.find(Initializer.class, velocityPropertiesFile);
InputStream is = null;
try
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Mon Nov
29 19:30:44 2010
@@ -584,11 +584,10 @@ public abstract class Component
{
Object[] array = new Object[currentLength + 1];
Object[] current = (Object[])data;
- int before = position;
int after = currentLength - position;
- if (before > 0)
+ if (position > 0)
{
- System.arraycopy(current, 0, array, 0, before);
+ System.arraycopy(current, 0, array, 0,
position);
}
array[position] = object;
if (after > 0)
@@ -2460,9 +2459,6 @@ public abstract class Component
* Renders the component at the current position in the given markup
stream. The method
* onComponentTag() is called to allow the component to mutate the
start tag. The method
* onComponentTagBody() is then called to permit the component to
render its body.
- *
- * @param markupStream
- * The markup stream
*/
public final void renderComponent()
{
@@ -2681,12 +2677,11 @@ public abstract class Component
{
// Get the two models
IModel<?> thisModel = getDefaultModel();
- IModel<?> thatModel = model;
// If both models are non-null they could be the same
- if (thisModel != null && thatModel != null)
+ if (thisModel != null && model != null)
{
- return getInnermostModel(thisModel) ==
getInnermostModel(thatModel);
+ return getInnermostModel(thisModel) ==
getInnermostModel(model);
}
return false;
@@ -2785,7 +2780,6 @@ public abstract class Component
generatedMarkupId = comp.generatedMarkupId;
setMetaData(MARKUP_ID_KEY, comp.getMetaData(MARKUP_ID_KEY));
setOutputMarkupId(comp.getOutputMarkupId());
- return;
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
Mon Nov 29 19:30:44 2010
@@ -1492,9 +1492,8 @@ public class Form<T> extends WebMarkupCo
{
visitChildren(Form.class, new IVisitor<Form<?>, Void>()
{
- public void component(final Form<?> component, final
IVisit<Void> visit)
+ public void component(final Form<?> form, final
IVisit<Void> visit)
{
- Form<?> form = component;
if (form.isEnabledInHierarchy() &&
form.isVisibleInHierarchy())
{
form.internalMarkFormComponentsValid();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainer.java
Mon Nov 29 19:30:44 2010
@@ -252,7 +252,7 @@ public class HtmlHeaderContainer extends
*/
protected IHeaderResponse newHeaderResponse()
{
- IHeaderResponse headerResponse = new HeaderResponse()
+ return new HeaderResponse()
{
@Override
protected Response getRealResponse()
@@ -260,7 +260,6 @@ public class HtmlHeaderContainer extends
return HtmlHeaderContainer.this.getResponse();
}
};
- return headerResponse;
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/loader/InheritedMarkupMarkupLoader.java
Mon Nov 29 19:30:44 2010
@@ -28,8 +28,6 @@ import org.apache.wicket.markup.MarkupRe
import org.apache.wicket.markup.MergedMarkup;
import org.apache.wicket.markup.WicketTag;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Merge the 2+ markups involved in markup inheritance. From a users
perspective there is only one
@@ -39,9 +37,6 @@ import org.slf4j.LoggerFactory;
*/
public class InheritedMarkupMarkupLoader implements IMarkupLoader
{
- /** Log for reporting. */
- private static final Logger log =
LoggerFactory.getLogger(InheritedMarkupMarkupLoader.class);
-
/**
* Constructor.
*/
@@ -118,11 +113,11 @@ public class InheritedMarkupMarkupLoader
private Markup getBaseMarkup(final MarkupContainer container, final
Markup markup,
final boolean enforceReload)
{
- // get the base markup
- Markup baseMarkup = MarkupFactory.get().getMarkup(container,
-
markup.getMarkupResourceStream().getMarkupClass().getSuperclass(),
enforceReload);
- return baseMarkup;
+ final Class<?> location =
markup.getMarkupResourceStream().getMarkupClass().getSuperclass();
+
+ // get the base markup
+ return MarkupFactory.get().getMarkup(container, location,
enforceReload);
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/page/PageAccessSynchronizer.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/page/PageAccessSynchronizer.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/page/PageAccessSynchronizer.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/page/PageAccessSynchronizer.java
Mon Nov 29 19:30:44 2010
@@ -185,8 +185,7 @@ public class PageAccessSynchronizer
public IManageablePage getPage(int id)
{
lockPage(id);
- IManageablePage page = super.getPage(id);
- return page;
+ return super.getPage(id);
}
@Override
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbstractRequestWrapperFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbstractRequestWrapperFactory.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbstractRequestWrapperFactory.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbstractRequestWrapperFactory.java
Mon Nov 29 19:30:44 2010
@@ -24,8 +24,6 @@ import javax.servlet.http.HttpServletReq
import org.apache.wicket.util.lang.Generics;
import org.apache.wicket.util.string.Strings;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Abstract base class for HttpServletRequestWrapper
@@ -34,9 +32,6 @@ import org.slf4j.LoggerFactory;
*/
public abstract class AbstractRequestWrapperFactory
{
- /** Logger */
- private static final Logger log =
LoggerFactory.getLogger(AbstractRequestWrapperFactory.class);
-
/**
* {...@link Pattern} for a comma delimited string that support
whitespace characters
*/
@@ -69,12 +64,11 @@ public abstract class AbstractRequestWra
*/
public HttpServletRequest getWrapper(final HttpServletRequest request)
{
- HttpServletRequest xRequest = request;
if (isEnabled() && needsWrapper(request))
{
return newRequestWrapper(request);
}
- return xRequest;
+ return request;
}
/**
@@ -112,7 +106,7 @@ public abstract class AbstractRequestWra
throw new IllegalArgumentException("Illegal
pattern syntax '" + pattern + "'", e);
}
}
- return patternsList.toArray(new Pattern[0]);
+ return patternsList.toArray(new Pattern[patternsList.size()]);
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/https/HttpsMapper.java
Mon Nov 29 19:30:44 2010
@@ -119,12 +119,6 @@ public class HttpsMapper implements IReq
*/
public Url mapHandler(IRequestHandler requestHandler)
{
- final IRequestHandler httpsHandler =
checker.checkSecureOutgoing(requestHandler,
- httpsConfig);
-
- requestHandler = httpsHandler;
-
- return delegate.mapHandler(requestHandler);
+ return
delegate.mapHandler(checker.checkSecureOutgoing(requestHandler, httpsConfig));
}
-
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java
Mon Nov 29 19:30:44 2010
@@ -103,8 +103,7 @@ public class MountedMapper extends Abstr
// to the mounted URL
if (redirectFromHomePage() && checkHomePage(url))
{
- UrlInfo info = new UrlInfo(null,
getContext().getHomePageClass(), newPageParameters());
- return info;
+ return new UrlInfo(null,
getContext().getHomePageClass(), newPageParameters());
}
// check if the URL is long enough and starts with the proper
segments
else if (url.getSegments().size() >= mountSegments.length &&
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectInputStream.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectInputStream.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectInputStream.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/io/WicketObjectInputStream.java
Mon Nov 29 19:30:44 2010
@@ -379,8 +379,7 @@ public final class WicketObjectInputStre
@Override
public String readUTF() throws IOException
{
- String s = in.readUTF();
- return s;
+ return in.readUTF();
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/TagTester.java
Mon Nov 29 19:30:44 2010
@@ -321,9 +321,8 @@ public class TagTester
{
int openPos = openTag.getPos();
int closePos = closeTag.getPos() + closeTag.getLength();
- String value = parser.getInput(openPos, closePos).toString();
- return value;
+ return parser.getInput(openPos, closePos).toString();
}
/**
@@ -337,9 +336,8 @@ public class TagTester
{
int openPos = openTag.getPos() + openTag.getLength();
int closePos = closeTag.getPos();
- String value = parser.getInput(openPos, closePos).toString();
- return value;
+ return parser.getInput(openPos, closePos).toString();
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java
Mon Nov 29 19:30:44 2010
@@ -198,7 +198,6 @@ public abstract class AbstractValidator<
*/
protected Map<String, Object> variablesMap(IValidatable<T> validatable)
{
- final Map<String, Object> resourceModel = new HashMap<String,
Object>(1);
- return resourceModel;
+ return new HashMap<String, Object>(1);
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/CreditCardValidator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/CreditCardValidator.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/CreditCardValidator.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/CreditCardValidator.java
Mon Nov 29 19:30:44 2010
@@ -37,9 +37,6 @@ public class CreditCardValidator extends
{
private static final long serialVersionUID = 1L;
- /** The credit card number, which should be validated. */
- private String creditCardNumber = null;
-
/** The ID which represents the credit card institute. */
private int cardId = -1;
@@ -71,10 +68,11 @@ public class CreditCardValidator extends
@Override
protected void onValidate(IValidatable<String> validatable)
{
- creditCardNumber = validatable.getValue();
+ final String value = validatable.getValue();
+
try
{
- if (!isLengthAndPrefixCorrect(creditCardNumber))
+ if (!isLengthAndPrefixCorrect(value))
{
error(validatable);
}
@@ -591,8 +589,7 @@ public class CreditCardValidator extends
*/
private boolean isChecksumCorrect(String creditCardNumber)
{
- String input = creditCardNumber;
- String numberToCheck = input.replaceAll("[ -]", "");
+ String numberToCheck = creditCardNumber.replaceAll("[ -]", "");
int nulOffset = '0';
int sum = 0;
for (int i = 1; i <= numberToCheck.length(); i++)
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorRequestTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorRequestTest.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorRequestTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorRequestTest.java
Mon Nov 29 19:30:44 2010
@@ -23,6 +23,8 @@ import org.apache.wicket.markup.Componen
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.handler.IPageAndComponentProvider;
import org.apache.wicket.request.handler.ListenerInterfaceRequestHandler;
import org.apache.wicket.request.handler.ListenerInvocationNotAllowedException;
import org.apache.wicket.request.handler.PageAndComponentProvider;
@@ -31,7 +33,7 @@ import org.apache.wicket.util.resource.S
/**
- * @see https://issues.apache.org/jira/browse/WICKET-3098
+ * See issue <a
href="https://issues.apache.org/jira/browse/WICKET-3098";>WICKET-3098</a>
*/
public class BehaviorRequestTest extends WicketTestCase
{
@@ -66,11 +68,12 @@ public class BehaviorRequestTest extends
private String urlForBehavior(IBehavior behaviorUnderTest)
{
- int index = page.container.getBehaviorId(behaviorUnderTest);
- String enabledBehaviorUrl = tester.urlFor(
- new ListenerInterfaceRequestHandler(new
PageAndComponentProvider(page, page.container),
- IBehaviorListener.INTERFACE, index)).toString();
- return enabledBehaviorUrl;
+ final int index =
page.container.getBehaviorId(behaviorUnderTest);
+ final IPageAndComponentProvider provider = new
PageAndComponentProvider(page, page.container);
+ final IRequestHandler handler =
+ new ListenerInterfaceRequestHandler(provider,
IBehaviorListener.INTERFACE, index);
+
+ return tester.urlFor(handler).toString();
}
public static class TestPage extends WebPage implements
IMarkupResourceStreamProvider
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupParserTest.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
Mon Nov 29 19:30:44 2010
@@ -178,13 +178,13 @@ public final class MarkupParserTest exte
}
private MarkupResourceStream newMarkupResourceStream(final
IResourceStreamLocator locator,
- final Class c, final String style, final String variation,
final Locale locale,
+ final Class cls, final String style, final String variation,
final Locale locale,
final String extension)
{
- IResourceStream resource = locator.locate(c,
c.getName().replace('.', '/'), style,
- variation, locale, extension, false);
- MarkupResourceStream res = new MarkupResourceStream(resource,
null, null);
- return res;
+ final String path = cls.getName().replace('.', '/');
+ final IResourceStream resource = locator.locate(cls, path,
style, variation, locale, extension, false);
+
+ return new MarkupResourceStream(resource, null, null);
}
/**
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/ComponentResolvingPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/ComponentResolvingPage.java?rev=1040239&r1=1040238&r2=1040239&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/ComponentResolvingPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/internal/ComponentResolvingPage.java
Mon Nov 29 19:30:44 2010
@@ -51,7 +51,7 @@ public class ComponentResolvingPage exte
{
if ("test".equals(tag.getId()))
{
- Label label = new Label("test", "TEST")
+ return new Label("test", "TEST")
{
private static final long serialVersionUID = 1L;
@@ -62,8 +62,6 @@ public class ComponentResolvingPage exte
super.onDetach();
}
};
-
- return label;
}
return null;
}
