Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta: [1247] trunk
|
From: <chr...@us...> - 2006-12-23 22:39:35
|
Revision: 1247
http://svn.sourceforge.net/gridarta/?rev=1247&view=rev
Author: christianhujer
Date: 2006-12-23 14:39:35 -0800 (Sat, 23 Dec 2006)
Log Message:
-----------
Hardened policy: fields and inner classes that may be declared static must be declared static.
Removed some unused fields.
Made a field static.
Made several inner classes static.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CFilterControl.java
trunk/crossfire/src/cfeditor/CGUIUtils.java
trunk/crossfire/src/cfeditor/CMapViewBasic.java
trunk/crossfire/src/cfeditor/CScriptModel.java
trunk/crossfire/src/cfeditor/filter/SimpleFilterConfig.java
trunk/crossfire/src/cfeditor/gui/ArchComboBox.java
trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java
trunk/crossfire/src/cfeditor/parameter/DoubleParameter.java
trunk/crossfire/src/cfeditor/parameter/DoubleParameterView.java
trunk/crossfire/src/cfeditor/parameter/IntegerParameter.java
trunk/crossfire/src/cfeditor/parameter/IntegerParameterView.java
trunk/crossfire/src/cfeditor/parameter/MapParameterView.java
trunk/daimonin/src/daieditor/ScriptArchData.java
trunk/gridarta.ipr
Modified: trunk/crossfire/src/cfeditor/CFilterControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CFilterControl.java 2006-12-23 22:29:52 UTC (rev 1246)
+++ trunk/crossfire/src/cfeditor/CFilterControl.java 2006-12-23 22:39:35 UTC (rev 1247)
@@ -47,8 +47,6 @@
public static final int MAX_HIGHLIGHT = 3;
- private final boolean filterOut = false;
-
private static final NamedFilterList filterList = NamedFilterList.getDefaultList();
private final NamedFilterConfig filterOutConfig;
Modified: trunk/crossfire/src/cfeditor/CGUIUtils.java
===================================================================
--- trunk/crossfire/src/cfeditor/CGUIUtils.java 2006-12-23 22:29:52 UTC (rev 1246)
+++ trunk/crossfire/src/cfeditor/CGUIUtils.java 2006-12-23 22:39:35 UTC (rev 1247)
@@ -161,7 +161,7 @@
}
/** Grayscale filter to make grayscaled images. */
- private final class CGrayScaleFilter extends RGBImageFilter {
+ private static final class CGrayScaleFilter extends RGBImageFilter {
/**
* Converts a single input pixel in the default RGB ColorModel
Modified: trunk/crossfire/src/cfeditor/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMapViewBasic.java 2006-12-23 22:29:52 UTC (rev 1246)
+++ trunk/crossfire/src/cfeditor/CMapViewBasic.java 2006-12-23 22:39:35 UTC (rev 1247)
@@ -613,7 +613,7 @@
// ignore
}
- public final class CPaintOp implements EditOperation {
+ public static final class CPaintOp implements EditOperation {
final Rectangle fillRect;
Modified: trunk/crossfire/src/cfeditor/CScriptModel.java
===================================================================
--- trunk/crossfire/src/cfeditor/CScriptModel.java 2006-12-23 22:29:52 UTC (rev 1246)
+++ trunk/crossfire/src/cfeditor/CScriptModel.java 2006-12-23 22:39:35 UTC (rev 1247)
@@ -56,7 +56,7 @@
this.ctrl = ctrl;
}
- private final class Parameter {
+ private static final class Parameter {
private String name;
Modified: trunk/crossfire/src/cfeditor/filter/SimpleFilterConfig.java
===================================================================
--- trunk/crossfire/src/cfeditor/filter/SimpleFilterConfig.java 2006-12-23 22:29:52 UTC (rev 1246)
+++ trunk/crossfire/src/cfeditor/filter/SimpleFilterConfig.java 2006-12-23 22:39:35 UTC (rev 1247)
@@ -16,8 +16,6 @@
*/
public class SimpleFilterConfig extends BasicFilterConfig {
- private final boolean enabled = true;
-
private Map<String, Object> properties = new HashMap<String, Object>();
public void setProperty(final String name, final Object value) {
Modified: trunk/crossfire/src/cfeditor/gui/ArchComboBox.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/ArchComboBox.java 2006-12-23 22:29:52 UTC (rev 1246)
+++ trunk/crossfire/src/cfeditor/gui/ArchComboBox.java 2006-12-23 22:39:35 UTC (rev 1247)
@@ -370,7 +370,7 @@
class MyCellRenderer extends DefaultListCellRenderer {
- public final String sizeTester = "**Sizetester**";
+ public static final String SIZE_TESTER = "**Sizetester**";
private static final long serialVersionUID = 1L;
@@ -383,7 +383,7 @@
final boolean isSelected, // is the cell selected
final boolean cellHasFocus) { // the list and the cell have the focus
- if (sizeTester.equals(value)) {
+ if (SIZE_TESTER.equals(value)) {
return editor.getEditorComponent();
}
/* The DefaultListCellRenderer class will take care of
Modified: trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java 2006-12-23 22:29:52 UTC (rev 1246)
+++ trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java 2006-12-23 22:39:35 UTC (rev 1247)
@@ -124,7 +124,7 @@
* the idea for this class stems from limewire's CancelSearchIconProxy
* class, thanks for going open source guys.
*/
- protected class ClosingIcon implements Icon {
+ protected static class ClosingIcon implements Icon {
//--- Data field(s) ---
Modified: trunk/crossfire/src/cfeditor/parameter/DoubleParameter.java
===================================================================
--- trunk/crossfire/src/cfeditor/parameter/DoubleParameter.java 2006-12-23 22:29:52 UTC (rev 1246)
+++ trunk/crossfire/src/cfeditor/parameter/DoubleParameter.java 2006-12-23 22:39:35 UTC (rev 1247)
@@ -13,7 +13,7 @@
public class DoubleParameter extends PluginParameter {
- private class DoubleConfig {
+ private static class DoubleConfig {
/* we do not use the Double.MAX or JTextField will be *very* large. So
* we fall back to [0, 1] range (useful for randoms)*/
Modified: trunk/crossfire/src/cfeditor/parameter/DoubleParameterView.java
===================================================================
--- trunk/crossfire/src/cfeditor/parameter/DoubleParameterView.java 2006-12-23 22:29:52 UTC (rev 1246)
+++ trunk/crossfire/src/cfeditor/parameter/DoubleParameterView.java 2006-12-23 22:39:35 UTC (rev 1247)
@@ -31,7 +31,7 @@
* since Java 5.0 but we need this workaround for java 4.x users.
* @author tchize
*/
- private class TooltipSpinner extends JSpinner {
+ private static class TooltipSpinner extends JSpinner {
private static final long serialVersionUID = 1L;
Modified: trunk/crossfire/src/cfeditor/parameter/IntegerParameter.java
===================================================================
--- trunk/crossfire/src/cfeditor/parameter/IntegerParameter.java 2006-12-23 22:29:52 UTC (rev 1246)
+++ trunk/crossfire/src/cfeditor/parameter/IntegerParameter.java 2006-12-23 22:39:35 UTC (rev 1247)
@@ -13,7 +13,7 @@
public class IntegerParameter extends PluginParameter {
- private class IntegerConfig {
+ private static class IntegerConfig {
int min = Integer.MIN_VALUE;
Modified: trunk/crossfire/src/cfeditor/parameter/IntegerParameterView.java
===================================================================
--- trunk/crossfire/src/cfeditor/parameter/IntegerParameterView.java 2006-12-23 22:29:52 UTC (rev 1246)
+++ trunk/crossfire/src/cfeditor/parameter/IntegerParameterView.java 2006-12-23 22:39:35 UTC (rev 1247)
@@ -31,7 +31,7 @@
* since Java 5.0 but we need this workaround for java 4.x users.
* @author tchize
*/
- private class TooltipSpinner extends JSpinner {
+ private static class TooltipSpinner extends JSpinner {
private static final long serialVersionUID = -797350272052837471L;
Modified: trunk/crossfire/src/cfeditor/parameter/MapParameterView.java
===================================================================
--- trunk/crossfire/src/cfeditor/parameter/MapParameterView.java 2006-12-23 22:29:52 UTC (rev 1246)
+++ trunk/crossfire/src/cfeditor/parameter/MapParameterView.java 2006-12-23 22:39:35 UTC (rev 1247)
@@ -71,7 +71,7 @@
return this.config;
}
- public class MyCellRenderer extends DefaultListCellRenderer {
+ public static class MyCellRenderer extends DefaultListCellRenderer {
private static final long serialVersionUID = 1L;
@@ -96,7 +96,7 @@
}
}
- public class MyComboBoxModel extends DefaultComboBoxModel {
+ public static class MyComboBoxModel extends DefaultComboBoxModel {
private final Object currentMap = new Object();
Modified: trunk/daimonin/src/daieditor/ScriptArchData.java
===================================================================
--- trunk/daimonin/src/daieditor/ScriptArchData.java 2006-12-23 22:29:52 UTC (rev 1246)
+++ trunk/daimonin/src/daieditor/ScriptArchData.java 2006-12-23 22:39:35 UTC (rev 1247)
@@ -572,7 +572,7 @@
}
/** Inner class which stores information about one scripted event. */
- private final class ScriptedEvent {
+ private static final class ScriptedEvent {
private final GameObject event; // Our event object
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2006-12-23 22:29:52 UTC (rev 1246)
+++ trunk/gridarta.ipr 2006-12-23 22:39:35 UTC (rev 1247)
@@ -1354,7 +1354,7 @@
<inspection_tool class="AnonymousClassComplexity" level="WARNING" enabled="false">
<option name="m_limit" value="3" />
</inspection_tool>
- <inspection_tool class="InnerClassMayBeStatic" level="WARNING" enabled="true" />
+ <inspection_tool class="InnerClassMayBeStatic" level="ERROR" enabled="true" />
<inspection_tool class="RedundantFieldInitialization" level="WARNING" enabled="false" />
<inspection_tool class="StaticSuite" level="WARNING" enabled="false" />
<inspection_tool class="StringBufferToStringInConcatenation" level="ERROR" enabled="true" />
@@ -1576,7 +1576,7 @@
<option name="m_limit" value="30" />
</inspection_tool>
<inspection_tool class="SynchronizeOnLock" level="WARNING" enabled="false" />
- <inspection_tool class="FieldMayBeStatic" level="WARNING" enabled="true" />
+ <inspection_tool class="FieldMayBeStatic" level="ERROR" enabled="true" />
<inspection_tool class="ClassMayBeInterface" level="WARNING" enabled="false" />
<inspection_tool class="AbstractClassWithoutAbstractMethods" level="WARNING" enabled="false" />
<inspection_tool class="DefaultNotLastCaseInSwitch" level="WARNING" enabled="false" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
