You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2010/11/24 16:53:36 UTC
svn commit: r1038654 - in /wicket/trunk:
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/
wicket-jmx/src/main/java/org/apache/wicket/jmx/
wicket-request/src/main/java/org/apache/wicket/request/mapper/info/ wic...
Author: pete
Date: Wed Nov 24 15:53:35 2010
New Revision: 1038654
URL: http://svn.apache.org/viewvc?rev=1038654&view=rev
Log:
cleanup: remove redundant casts
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTextField.java
wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/RequestLogger.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java
wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlDateConverter.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/Streams.java
wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/calldecorator/CancelEventIfNoAjaxDecorator.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/model/ResourceModel.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9a.java
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTextField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTextField.java?rev=1038654&r1=1038653&r2=1038654&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTextField.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteTextField.java Wed Nov 24 15:53:35 2010
@@ -63,7 +63,7 @@ public abstract class AutoCompleteTextFi
*/
public AutoCompleteTextField(String id, Class<T> type)
{
- this(id, (IModel<T>)null, type, new AutoCompleteSettings());
+ this(id, null, type, new AutoCompleteSettings());
}
/**
@@ -106,7 +106,7 @@ public abstract class AutoCompleteTextFi
@Deprecated
public AutoCompleteTextField(String id, IModel<T> object, boolean preselect)
{
- this(id, object, (Class<T>)null, new AutoCompleteSettings().setPreselect(preselect));
+ this(id, object, null, new AutoCompleteSettings().setPreselect(preselect));
}
/**
@@ -118,7 +118,7 @@ public abstract class AutoCompleteTextFi
*/
public AutoCompleteTextField(String id, IModel<T> object, AutoCompleteSettings settings)
{
- this(id, object, (Class<T>)null, settings);
+ this(id, object, null, settings);
}
@@ -128,7 +128,7 @@ public abstract class AutoCompleteTextFi
*/
public AutoCompleteTextField(String id, IModel<T> object)
{
- this(id, object, (Class<T>)null, new AutoCompleteSettings());
+ this(id, object, null, new AutoCompleteSettings());
}
/**
@@ -140,7 +140,7 @@ public abstract class AutoCompleteTextFi
@Deprecated
public AutoCompleteTextField(String id, boolean preselect)
{
- this(id, (IModel<T>)null, new AutoCompleteSettings().setPreselect(preselect));
+ this(id, null, new AutoCompleteSettings().setPreselect(preselect));
}
/**
@@ -151,7 +151,7 @@ public abstract class AutoCompleteTextFi
*/
public AutoCompleteTextField(String id, AutoCompleteSettings settings)
{
- this(id, (IModel<T>)null, settings);
+ this(id, null, settings);
}
@@ -160,7 +160,7 @@ public abstract class AutoCompleteTextFi
*/
public AutoCompleteTextField(String id)
{
- this(id, (IModel<T>)null, new AutoCompleteSettings());
+ this(id, null, new AutoCompleteSettings());
}
@@ -190,7 +190,7 @@ public abstract class AutoCompleteTextFi
*/
public AutoCompleteTextField(String id, IModel<T> model, IAutoCompleteRenderer<T> renderer)
{
- this(id, model, (Class<T>)null, renderer, new AutoCompleteSettings());
+ this(id, model, null, renderer, new AutoCompleteSettings());
}
/**
Modified: wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/RequestLogger.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/RequestLogger.java?rev=1038654&r1=1038653&r2=1038654&view=diff
==============================================================================
--- wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/RequestLogger.java (original)
+++ wicket/trunk/wicket-jmx/src/main/java/org/apache/wicket/jmx/RequestLogger.java Wed Nov 24 15:53:35 2010
@@ -126,7 +126,7 @@ public class RequestLogger implements Re
{
if (application instanceof WebApplication)
{
- return ((WebApplication)application).getRequestLogger();
+ return application.getRequestLogger();
}
return null;
}
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java?rev=1038654&r1=1038653&r2=1038654&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/info/PageInfo.java Wed Nov 24 15:53:35 2010
@@ -45,7 +45,7 @@ public class PageInfo
*/
public PageInfo()
{
- this((Integer)null);
+ this(null);
}
/**
Modified: wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java?rev=1038654&r1=1038653&r2=1038654&view=diff
==============================================================================
--- wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java (original)
+++ wicket/trunk/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java Wed Nov 24 15:53:35 2010
@@ -216,7 +216,7 @@ public class SpringBeanLocator implement
*/
public Class< ? > getBeanType()
{
- Class< ? > clazz = beanTypeCache == null ? null : (Class< ? >)beanTypeCache.get();
+ Class< ? > clazz = beanTypeCache == null ? null : beanTypeCache.get();
if (clazz == null)
{
beanTypeCache = new WeakReference<Class< ? >>(clazz = WicketObjects
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlDateConverter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlDateConverter.java?rev=1038654&r1=1038653&r2=1038654&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlDateConverter.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/SqlDateConverter.java Wed Nov 24 15:53:35 2010
@@ -40,7 +40,7 @@ public class SqlDateConverter extends Ab
}
else
{
- return new Date(((java.util.Date)parse(getDateFormat(locale), value, locale)).getTime());
+ return new Date(parse(getDateFormat(locale), value, locale).getTime());
}
}
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/Streams.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/Streams.java?rev=1038654&r1=1038653&r2=1038654&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/Streams.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/io/Streams.java Wed Nov 24 15:53:35 2010
@@ -193,7 +193,7 @@ public final class Streams
});
InputSource is = new InputSource(inputStream);
Document doc = db.parse(is);
- NodeList entries = ((Element)doc.getChildNodes().item(1)).getChildNodes();
+ NodeList entries = doc.getChildNodes().item(1).getChildNodes();
int len = entries.getLength();
for (int i = (len > 0 && entries.item(0).getNodeName().equals("comment")) ? 1 : 0; i < len; i++)
{
Modified: wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java?rev=1038654&r1=1038653&r2=1038654&view=diff
==============================================================================
--- wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java (original)
+++ wicket/trunk/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java Wed Nov 24 15:53:35 2010
@@ -70,7 +70,7 @@ public class VelocityContributor extends
{
if (model instanceof IDetachable)
{
- ((IDetachable)model).detach();
+ model.detach();
}
}
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=1038654&r1=1038653&r2=1038654&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 Wed Nov 24 15:53:35 2010
@@ -2828,7 +2828,7 @@ public abstract class Component
MetaDataEntry<?>[] metaDataArray = key.set(getMetaData(), object);
if (metaDataArray != null && metaDataArray.length > 0)
{
- metaData = (metaDataArray.length > 1) ? (Object)metaDataArray : metaDataArray[0];
+ metaData = (metaDataArray.length > 1) ? metaDataArray : metaDataArray[0];
}
int index = getFlag(FLAG_MODEL_SET) ? 1 : 0;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/calldecorator/CancelEventIfNoAjaxDecorator.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/calldecorator/CancelEventIfNoAjaxDecorator.java?rev=1038654&r1=1038653&r2=1038654&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/calldecorator/CancelEventIfNoAjaxDecorator.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/calldecorator/CancelEventIfNoAjaxDecorator.java Wed Nov 24 15:53:35 2010
@@ -43,7 +43,7 @@ public final class CancelEventIfNoAjaxDe
*/
public CancelEventIfNoAjaxDecorator()
{
- this((IAjaxCallDecorator)null);
+ this(null);
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java?rev=1038654&r1=1038653&r2=1038654&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/ContainerWithAssociatedMarkupHelper.java Wed Nov 24 15:53:35 2010
@@ -79,7 +79,7 @@ public class ContainerWithAssociatedMark
noMoreWicketHeadTagsAllowed = false;
while (nextHeaderMarkup(markupStream) != -1)
{
- Class<?> markupClass = ((WicketTag)markupStream.getTag()).getMarkupClass();
+ Class<?> markupClass = markupStream.getTag().getMarkupClass();
if (markupClass == null)
{
markupClass = markupStream.getContainerClass();
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java?rev=1038654&r1=1038653&r2=1038654&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java Wed Nov 24 15:53:35 2010
@@ -167,7 +167,7 @@ public abstract class Border extends Web
*/
public Border(final String id)
{
- this(id, (IModel<?>)null);
+ this(id, null);
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/model/ResourceModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/ResourceModel.java?rev=1038654&r1=1038653&r2=1038654&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/model/ResourceModel.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/model/ResourceModel.java Wed Nov 24 15:53:35 2010
@@ -73,8 +73,7 @@ public class ResourceModel extends Abstr
public String getObject()
{
// this shouldn't be called always wrapped!
- return Application.get().getResourceSettings().getLocalizer().getString(resourceKey,
- (Component)null, defaultValue);
+ return Application.get().getResourceSettings().getLocalizer().getString(resourceKey, null, defaultValue);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java?rev=1038654&r1=1038653&r2=1038654&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java Wed Nov 24 15:53:35 2010
@@ -208,7 +208,7 @@ public class WebSession extends Session
// if we get here, the redirect already has been done; clear
// the meta data entry; we don't need it any longer is the client
// info object will be cached too
- setMetaData(BROWSER_WAS_POLLED_KEY, (Boolean)null);
+ setMetaData(BROWSER_WAS_POLLED_KEY, null);
}
clientInfo = new WebClientInfo(requestCycle);
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java?rev=1038654&r1=1038653&r2=1038654&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/PageFactoryTest.java Wed Nov 24 15:53:35 2010
@@ -58,7 +58,7 @@ public class PageFactoryTest extends Wic
// MyPage2: PageParameter parameter constructor only
// will call PageParameter constructor with parameter = null
- assertEquals(MyPage2.class, factory.newPage(MyPage2.class, (PageParameters)null).getClass());
+ assertEquals(MyPage2.class, factory.newPage(MyPage2.class, null).getClass());
// MyPage3: Page parameter constructor only
Exception e = null;
@@ -99,7 +99,7 @@ public class PageFactoryTest extends Wic
*/
public void testNewPageClassPageParameters()
{
- assertEquals(MyPage0.class, factory.newPage(MyPage0.class, (PageParameters)null).getClass());
+ assertEquals(MyPage0.class, factory.newPage(MyPage0.class, null).getClass());
// MyPage0: no constructor at all
assertEquals(MyPage0.class, factory.newPage(MyPage0.class, new PageParameters()).getClass());
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=1038654&r1=1038653&r2=1038654&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 Wed Nov 24 15:53:35 2010
@@ -317,8 +317,8 @@ public final class MarkupParserTest exte
markup = new MarkupParser("<div><wicket:remove> <span id=\"test\"/> </wicket:remove></div>").parse();
assertEquals(2, markup.size());
- assertEquals("<div>", ((RawMarkup)markup.get(0)).toString());
- assertEquals("</div>", ((RawMarkup)markup.get(1)).toString());
+ assertEquals("<div>", markup.get(0).toString());
+ assertEquals("</div>", markup.get(1).toString());
try
{
@@ -388,8 +388,7 @@ public final class MarkupParserTest exte
assertEquals("html", ((ComponentTag)markup.get(0)).getName());
assertEquals("html", ((ComponentTag)markup.get(2)).getName());
assertEquals(true, markup.get(1) instanceof RawMarkup);
- assertEquals("<script language=\"JavaScript\">... <x a> ...</script>",
- ((RawMarkup)markup.get(1)).toString());
+ assertEquals("<script language=\"JavaScript\">... <x a> ...</script>", markup.get(1).toString());
}
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java?rev=1038654&r1=1038653&r2=1038654&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java Wed Nov 24 15:53:35 2010
@@ -55,7 +55,7 @@ public class InlinePanelPage_5 extends W
*/
public FragmentWithAssociatedMarkupStream(final String id, final String markupId)
{
- super(id, markupId, (MarkupContainer)null);
+ super(id, markupId, null);
}
@Override
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9a.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9a.java?rev=1038654&r1=1038653&r2=1038654&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9a.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_9a.java Wed Nov 24 15:53:35 2010
@@ -36,6 +36,6 @@ public class HeaderSectionPage_9a extend
public HeaderSectionPage_9a()
{
add(new HeaderSectionPanel_2("panel"));
- ((MarkupContainer)get("panel")).get("cssHref").setVisible(false);
+ get("panel").get("cssHref").setVisible(false);
}
}