Author: pete
Date: Thu Apr 28 14:54:52 2011
New Revision: 1097490
URL: http://svn.apache.org/viewvc?rev=1097490&view=rev
Log:
code cleanup - no functional changes
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/MergedMarkup.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/page/AbstractPageManager.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/MetaInfStaticResourceReference.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/EventDispatcherTest.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxUpdatedImageTest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java?rev=1097490&r1=1097489&r2=1097490&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/authorization/strategies/CompoundAuthorizationStrategy.java
Thu Apr 28 14:54:52 2011
@@ -73,10 +73,8 @@ public class CompoundAuthorizationStrate
*/
public final boolean isActionAuthorized(Component component, Action
action)
{
- int size = strategies.size();
- for (int i = 0; i < size; i++)
+ for (IAuthorizationStrategy strategy : strategies)
{
- IAuthorizationStrategy strategy = strategies.get(i);
if (!strategy.isActionAuthorized(component, action))
{
return false;
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/MergedMarkup.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/MergedMarkup.java?rev=1097490&r1=1097489&r2=1097490&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/MergedMarkup.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/MergedMarkup.java
Thu Apr 28 14:54:52 2011
@@ -360,7 +360,7 @@ public class MergedMarkup extends Markup
hasCloseWicketHead = i;
}
else if ((hasHead == -1) && (element instanceof
ComponentTag) &&
-
TagUtils.isHeadTag((ComponentTag)element))
+ TagUtils.isHeadTag(element))
{
hasHead = i;
}
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/page/AbstractPageManager.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/page/AbstractPageManager.java?rev=1097490&r1=1097489&r2=1097490&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/page/AbstractPageManager.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/page/AbstractPageManager.java
Thu Apr 28 14:54:52 2011
@@ -40,7 +40,7 @@ public abstract class AbstractPageManage
*/
public AbstractPageManager(IPageManagerContext context)
{
- this.context = (IPageManagerContext)Args.notNull(context,
"context");
+ this.context = Args.notNull(context, "context");
}
/**
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java?rev=1097490&r1=1097489&r2=1097490&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/documentvalidation/HtmlDocumentParser.java
Thu Apr 28 14:54:52 2011
@@ -112,7 +112,7 @@ public class HtmlDocumentParser
*/
public int getNextToken()
{
- while (pos < document.length())
+ if (pos < document.length())
{
char ch = document.charAt(pos);
if (ch == '<')
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/MetaInfStaticResourceReference.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/MetaInfStaticResourceReference.java?rev=1097490&r1=1097489&r2=1097490&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/MetaInfStaticResourceReference.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/resource/MetaInfStaticResourceReference.java
Thu Apr 28 14:54:52 2011
@@ -99,7 +99,7 @@ public class MetaInfStaticResourceRefere
META_INF_RESOURCES_SUPPORTED = majorVersion >= 3;
}
- return META_INF_RESOURCES_SUPPORTED.booleanValue();
+ return META_INF_RESOURCES_SUPPORTED;
}
}
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/EventDispatcherTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/EventDispatcherTest.java?rev=1097490&r1=1097489&r2=1097490&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/EventDispatcherTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/EventDispatcherTest.java
Thu Apr 28 14:54:52 2011
@@ -61,13 +61,13 @@ public class EventDispatcherTest extends
public void dispatchEvent(IEventSink sink, IEvent<?> event)
{
Method[] sinkMethods = sink.getClass().getMethods();
- for (int i = 0; i < sinkMethods.length; i++)
+ for (Method sinkMethod : sinkMethods)
{
- if
(sinkMethods[i].isAnnotationPresent(EventCallback.class))
+ if
(sinkMethod.isAnnotationPresent(EventCallback.class))
{
try
{
- sinkMethods[i].invoke(sink);
+ sinkMethod.invoke(sink);
}
catch (Exception e)
{
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxUpdatedImageTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxUpdatedImageTest.java?rev=1097490&r1=1097489&r2=1097490&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxUpdatedImageTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxUpdatedImageTest.java
Thu Apr 28 14:54:52 2011
@@ -36,7 +36,7 @@ public class AjaxUpdatedImageTest
public void wicket1382()
{
WicketTester tester = new WicketTester();
- AjaxyImagesPage page =
(AjaxyImagesPage)tester.startPage(AjaxyImagesPage.class);
+ AjaxyImagesPage page = tester.startPage(AjaxyImagesPage.class);
TagTester tagTester =
tester.getTagById(page.image.getMarkupId());
final String srcAttr = tagTester.getAttribute("src");
