Author: pete
Date: Mon Nov 29 17:24:40 2010
New Revision: 1040197
URL: http://svn.apache.org/viewvc?rev=1040197&view=rev
Log:
declare inner classes static where possible to avoid unwanted references to
outer class
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/TesterTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/ClassStringResourceLoaderTest.java
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java?rev=1040197&r1=1040196&r2=1040197&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/MultipartFormInputStream.java
Mon Nov 29 17:24:40 2010
@@ -785,9 +785,8 @@ public class MultipartFormInputStream
/**
* Thrown to indicate that the input stream fails to follow the
required syntax.
*/
- public class MalformedStreamException extends IOException
+ public static class MalformedStreamException extends IOException
{
-
private static final long serialVersionUID = 1L;
/**
@@ -814,9 +813,8 @@ public class MultipartFormInputStream
/**
* Thrown upon attempt of setting an invalid boundary token.
*/
- public class IllegalBoundaryException extends IOException
+ public static class IllegalBoundaryException extends IOException
{
-
private static final long serialVersionUID = 1L;
/**
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/TesterTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/TesterTest.java?rev=1040197&r1=1040196&r2=1040197&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/TesterTest.java
(original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/TesterTest.java Mon Nov
29 17:24:40 2010
@@ -73,7 +73,7 @@ public class TesterTest extends TestCase
}
}
- private class MyPage extends WebPage
+ private static class MyPage extends WebPage
{
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java?rev=1040197&r1=1040196&r2=1040197&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
Mon Nov 29 17:24:40 2010
@@ -48,7 +48,7 @@ public class MarkupCacheTest extends Wic
assertEquals(Markup.NO_MARKUP, markup);
}
- private class MarkupCachingAssumingComponent extends Panel
+ private static class MarkupCachingAssumingComponent extends Panel
implements
IMarkupResourceStreamProvider
{
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java?rev=1040197&r1=1040196&r2=1040197&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java
Mon Nov 29 17:24:40 2010
@@ -24,7 +24,7 @@ import junit.framework.TestCase;
*/
public class ModelDetachTest extends TestCase
{
- class Detachable implements IDetachable
+ static class Detachable implements IDetachable
{
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/model/StringResourceModelTest.java?rev=1040197&r1=1040196&r2=1040197&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
Mon Nov 29 17:24:40 2010
@@ -232,7 +232,7 @@ public class StringResourceModelTest ext
/**
* Inner class used for testing.
*/
- public class WeatherStation implements Serializable
+ public static class WeatherStation implements Serializable
{
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/ClassStringResourceLoaderTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/ClassStringResourceLoaderTest.java?rev=1040197&r1=1040196&r2=1040197&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/ClassStringResourceLoaderTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/loader/ClassStringResourceLoaderTest.java
Mon Nov 29 17:24:40 2010
@@ -51,7 +51,7 @@ public class ClassStringResourceLoaderTe
/**
*
*/
- public class MyValidator extends AbstractValidator
+ public static class MyValidator extends AbstractValidator
{
private static final long serialVersionUID = 1L;
