Author: nbubna
Date: Wed Aug 8 12:58:47 2007
New Revision: 564005
URL: http://svn.apache.org/viewvc?view=rev&rev=564005
Log:
inner classes should be static unless there's good reason to do otherwise
(FindBugs)
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/EasyFactoryConfiguration.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/OldXmlFactoryConfigurationRuleSet.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfigurationRuleSet.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/SortTool.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ImportSupport.java
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ToolboxRuleSet.java
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/EasyFactoryConfiguration.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/EasyFactoryConfiguration.java?view=diff&rev=564005&r1=564004&r2=564005
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/EasyFactoryConfiguration.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/EasyFactoryConfiguration.java
Wed Aug 8 12:58:47 2007
@@ -202,7 +202,7 @@
}
- public class EasyData
+ public static class EasyData
{
private Data datum;
private Configuration parent;
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/OldXmlFactoryConfigurationRuleSet.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/OldXmlFactoryConfigurationRuleSet.java?view=diff&rev=564005&r1=564004&r2=564005
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/OldXmlFactoryConfigurationRuleSet.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/OldXmlFactoryConfigurationRuleSet.java
Wed Aug 8 12:58:47 2007
@@ -59,7 +59,7 @@
digester.addRule("toolbox/data", new SetNextDataRule());
}
- protected class DeprecationRule extends Rule
+ protected static class DeprecationRule extends Rule
{
public void begin(String ns, String ln, Attributes attributes)
throws Exception
@@ -73,7 +73,7 @@
}
- protected class ScopeRule extends Rule
+ protected static class ScopeRule extends Rule
{
public void body(String namespace, String element, String value)
throws Exception
@@ -102,7 +102,7 @@
}
}
- protected class ParameterRule extends Rule
+ protected static class ParameterRule extends Rule
{
public void begin(String ns, String ln, Attributes attributes)
throws Exception
@@ -114,7 +114,7 @@
}
}
- protected class SetNextDataRule extends Rule
+ protected static class SetNextDataRule extends Rule
{
public void end() throws Exception
{
@@ -124,7 +124,7 @@
}
}
- protected abstract class BooleanConfigRule extends Rule
+ protected static abstract class BooleanConfigRule extends Rule
{
public void body(String ns, String name, String text) throws Exception
{
@@ -143,7 +143,7 @@
public abstract void setBoolean(FactoryConfiguration parent, Boolean
value);
}
- protected class CreateSessionRule extends BooleanConfigRule
+ protected static class CreateSessionRule extends BooleanConfigRule
{
public void setBoolean(FactoryConfiguration factory, Boolean b)
{
@@ -151,7 +151,7 @@
}
}
- protected class XhtmlRule extends BooleanConfigRule
+ protected static class XhtmlRule extends BooleanConfigRule
{
public void setBoolean(FactoryConfiguration factory, Boolean b)
{
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfigurationRuleSet.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfigurationRuleSet.java?view=diff&rev=564005&r1=564004&r2=564005
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfigurationRuleSet.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/config/XmlFactoryConfigurationRuleSet.java
Wed Aug 8 12:58:47 2007
@@ -125,7 +125,7 @@
/**
* Rule for adding configuration properties
*/
- public class DataValueInBodyRule extends Rule
+ public static class DataValueInBodyRule extends Rule
{
public void body(String namespace, String element, String value)
throws Exception
@@ -138,7 +138,7 @@
}
}
- public class PropertyAttributeRule extends Rule
+ public static class PropertyAttributeRule extends Rule
{
public void begin(String namespace, String element, Attributes
attributes)
throws Exception
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/SortTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/SortTool.java?view=diff&rev=564005&r1=564004&r2=564005
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/SortTool.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/generic/SortTool.java
Wed Aug 8 12:58:47 2007
@@ -198,7 +198,7 @@
/**
* Does all of the comparisons
*/
- public class PropertiesComparator implements Comparator
+ public static class PropertiesComparator implements Comparator
{
private static final int TYPE_ASCENDING = 1;
private static final int TYPE_DESCENDING = -1;
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ImportSupport.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ImportSupport.java?view=diff&rev=564005&r1=564004&r2=564005
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ImportSupport.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ImportSupport.java
Wed Aug 8 12:58:47 2007
@@ -423,7 +423,7 @@
/** Wraps responses to allow us to retrieve results as Strings. */
- protected class ImportResponseWrapper extends HttpServletResponseWrapper
+ protected static class ImportResponseWrapper extends
HttpServletResponseWrapper
{
/*
* We provide either a Writer or an OutputStream as requested.
Modified:
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ToolboxRuleSet.java
URL:
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ToolboxRuleSet.java?view=diff&rev=564005&r1=564004&r2=564005
==============================================================================
---
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ToolboxRuleSet.java
(original)
+++
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/view/ToolboxRuleSet.java
Wed Aug 8 12:58:47 2007
@@ -106,7 +106,7 @@
/**
*
*/
- protected class ParameterRule extends Rule
+ protected static class ParameterRule extends Rule
{
public void begin(String ns, String ln, Attributes attributes)
throws Exception
