Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta: [1526] trunk
|
From: <aki...@us...> - 2007-01-09 22:53:20
|
Revision: 1526
http://svn.sourceforge.net/gridarta/?rev=1526&view=rev
Author: akirschbaum
Date: 2007-01-09 14:53:11 -0800 (Tue, 09 Jan 2007)
Log Message:
-----------
Add final modifier.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/CMainControl.java
trunk/crossfire/src/cfeditor/CSettings.java
trunk/crossfire/src/cfeditor/MapViewIFrame.java
trunk/crossfire/src/cfeditor/filter/SimpleFilterConfig.java
trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java
trunk/crossfire/src/cfeditor/gui/ArchComboBox.java
trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java
trunk/crossfire/src/cfeditor/gui/ReplaceDialog.java
trunk/crossfire/src/cfeditor/gui/prefs/GUIPrefs.java
trunk/crossfire/src/cfeditor/parameter/DoubleParameterView.java
trunk/crossfire/src/cfeditor/parameter/IntegerParameterView.java
trunk/daimonin/src/daieditor/CMainControl.java
trunk/daimonin/src/daieditor/CMapViewBasic.java
trunk/daimonin/src/daieditor/MapViewIFrame.java
trunk/daimonin/src/daieditor/ProcessRunner.java
trunk/daimonin/src/daieditor/gameobject/match/AndGameObjectMatcher.java
trunk/daimonin/src/daieditor/gameobject/match/MutableOrGameObjectMatcher.java
trunk/daimonin/src/daieditor/gameobject/match/OrGameObjectMatcher.java
trunk/daimonin/src/daieditor/gameobject/match/ViewGameObjectMatcherManager.java
trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java
trunk/daimonin/src/daieditor/gui/InsertionObjectChooser.java
trunk/daimonin/src/daieditor/gui/ReplaceDialog.java
trunk/daimonin/src/daieditor/gui/map/MapPreviewAccessory.java
trunk/daimonin/src/daieditor/gui/map/tools/DeletionTool.java
trunk/daimonin/src/daieditor/gui/map/tools/ToolPalette.java
trunk/daimonin/src/daieditor/gui/prefs/GUIPrefs.java
trunk/daimonin/src/daieditor/gui/prefs/MapValidatorPrefs.java
trunk/daimonin/src/daieditor/gui/prefs/NetPrefs.java
trunk/daimonin/src/daieditor/map/validation/DefaultErrorCollector.java
trunk/src/app/net/sf/gridarta/gameobject/Collector.java
trunk/src/app/net/sf/gridarta/gameobject/NotInsideContainerException.java
trunk/src/app/net/sf/gridarta/gui/AbstractGameObjectAttributesDialog.java
trunk/src/app/net/sf/gridarta/gui/map/MapCursor.java
trunk/src/app/net/sf/gridarta/gui/map/MapGrid.java
trunk/src/app/net/sf/gridarta/map/AbstractMapArchObject.java
trunk/src/app/net/sf/gridarta/map/AbstractMapControl.java
trunk/src/app/net/sf/gridarta/map/AbstractMapModel.java
trunk/src/app/net/sf/gridarta/map/MapModelEvent.java
Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/crossfire/src/cfeditor/CMainControl.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -197,7 +197,7 @@
private final MapCursorControl mapCursorControl;
/** The MainControlListeners to inform of changes. */
- private EventListenerList listenerList = new EventListenerList();
+ private final EventListenerList listenerList = new EventListenerList();
/** Actions used by this instance. */
private final MainActions mainActions = new MainActions(this);
Modified: trunk/crossfire/src/cfeditor/CSettings.java
===================================================================
--- trunk/crossfire/src/cfeditor/CSettings.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/crossfire/src/cfeditor/CSettings.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -52,7 +52,7 @@
private final Properties properties = new Properties();
/** The file that is used to store the settings or null if none specified. */
- private String strFile;
+ private final String strFile;
/** The shared hashtable that maps filenames to settings instances. */
private static final Map<String, CSettings> hashFromNameToInstance = new HashMap<String, CSettings>();
Modified: trunk/crossfire/src/cfeditor/MapViewIFrame.java
===================================================================
--- trunk/crossfire/src/cfeditor/MapViewIFrame.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/crossfire/src/cfeditor/MapViewIFrame.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -219,7 +219,7 @@
}
/** The Action to select this Window. */
- private WindowAction windowAction = new WindowAction();
+ private final WindowAction windowAction = new WindowAction();
public void modelChanged() {
view.modelChanged();
Modified: trunk/crossfire/src/cfeditor/filter/SimpleFilterConfig.java
===================================================================
--- trunk/crossfire/src/cfeditor/filter/SimpleFilterConfig.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/crossfire/src/cfeditor/filter/SimpleFilterConfig.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -16,7 +16,7 @@
*/
public class SimpleFilterConfig extends BasicFilterConfig {
- private Map<String, Object> properties = new HashMap<String, Object>();
+ private final Map<String, Object> properties = new HashMap<String, Object>();
public void setProperty(final String name, final Object value) {
properties.put(name, value);
Modified: trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/crossfire/src/cfeditor/gameobject/scripts/ScriptedEvent.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -60,7 +60,7 @@
private String pluginName; // name of plugin ("Python" expected)
- private String eventType; // name of event type (e.g. "say", "death", "attack"...)
+ private final String eventType; // name of event type (e.g. "say", "death", "attack"...)
private String options; // plugin options
Modified: trunk/crossfire/src/cfeditor/gui/ArchComboBox.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/ArchComboBox.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/crossfire/src/cfeditor/gui/ArchComboBox.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -275,7 +275,7 @@
private Object value = null;
- private GameObject[] archList; /*the current list*/
+ private final GameObject[] archList; /*the current list*/
private String currentFilter = "";
Modified: trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/crossfire/src/cfeditor/gui/CloseableTabbedPane.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -128,7 +128,7 @@
//--- Data field(s) ---
- private Icon icon;
+ private final Icon icon;
@SuppressWarnings({"InstanceVariableNamingConvention"})
private int x = 0;
Modified: trunk/crossfire/src/cfeditor/gui/ReplaceDialog.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/ReplaceDialog.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/crossfire/src/cfeditor/gui/ReplaceDialog.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -71,7 +71,7 @@
private static ReplaceDialog instance = null;
/** Dialog. */
- private JDialog dialog;
+ private final JDialog dialog;
private final CMainControl mainControl;
Modified: trunk/crossfire/src/cfeditor/gui/prefs/GUIPrefs.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/prefs/GUIPrefs.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/crossfire/src/cfeditor/gui/prefs/GUIPrefs.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -69,7 +69,7 @@
private Locale[] locales;
/** LocaleComparator. */
- private LocaleComparator comp = new LocaleComparator();
+ private final LocaleComparator comp = new LocaleComparator();
/**
* Create a GUIPrefs pane.
Modified: trunk/crossfire/src/cfeditor/parameter/DoubleParameterView.java
===================================================================
--- trunk/crossfire/src/cfeditor/parameter/DoubleParameterView.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/crossfire/src/cfeditor/parameter/DoubleParameterView.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -26,11 +26,11 @@
private static final Logger log = Logger.getLogger(DoubleParameterView.class);
- private JSpinner value;
+ private final JSpinner value;
- private JButton config;
+ private final JButton config;
- private DoubleParameter parameter;
+ private final DoubleParameter parameter;
public JComponent getConfigComponent(final Object config, final PluginParameter parameter) {
return this.config;
Modified: trunk/crossfire/src/cfeditor/parameter/IntegerParameterView.java
===================================================================
--- trunk/crossfire/src/cfeditor/parameter/IntegerParameterView.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/crossfire/src/cfeditor/parameter/IntegerParameterView.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -26,11 +26,11 @@
private static final Logger log = Logger.getLogger(IntegerParameterView.class);
- private JSpinner value;
+ private final JSpinner value;
- private JButton config;
+ private final JButton config;
- private IntegerParameter parameter;
+ private final IntegerParameter parameter;
public JComponent getConfigComponent(final Object config, final PluginParameter parameter) {
return this.config;
Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/daimonin/src/daieditor/CMainControl.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -288,10 +288,10 @@
public static final boolean PREFS_VALIDATOR_AUTO_DEFAULT = false;
/** The GameObjectMatcher for show only. */
- private MutableOrGameObjectMatcher moaomShow = new MutableOrGameObjectMatcher(true);
+ private final MutableOrGameObjectMatcher moaomShow = new MutableOrGameObjectMatcher(true);
/** The GameObjectMatcher for alpha. */
- private MutableOrGameObjectMatcher moaomAlpha = new MutableOrGameObjectMatcher(false);
+ private final MutableOrGameObjectMatcher moaomAlpha = new MutableOrGameObjectMatcher(false);
/** The ViewGameObjectMatcherManager for show only. */
private final ViewGameObjectMatcherManager vaommShow = new ViewGameObjectMatcherManager(moaomShow);
@@ -304,7 +304,7 @@
private final MapCursorControl mapCursorControl;
/** The MainControlListeners to inform of changes. */
- private EventListenerList listenerList = new EventListenerList();
+ private final EventListenerList listenerList = new EventListenerList();
/** Actions used by this instance. */
private final MainActions mainActions = new MainActions(this);
@@ -997,7 +997,7 @@
private JFileChooser fileChooser;
/** MapPreviewAccessory. */
- private MapPreviewAccessory mapPreviewAccessory = new MapPreviewAccessory();
+ private final MapPreviewAccessory mapPreviewAccessory = new MapPreviewAccessory();
/** Create the JFileChooser for opening a file. */
private void createFileChooser() {
@@ -1799,7 +1799,7 @@
}
/** List with recents. */
- private LinkedList<Recent> recents = new LinkedList<Recent>();
+ private final LinkedList<Recent> recents = new LinkedList<Recent>();
/**
* Adds a file to the recent files.
@@ -1934,7 +1934,7 @@
public final class Recent extends AbstractAction {
/** Title = map name. */
- private String title;
+ private final String title;
/** Filename = map filename (openable path, usually absolute, canonical or relative to user.dir). */
private final String filename;
Modified: trunk/daimonin/src/daieditor/CMapViewBasic.java
===================================================================
--- trunk/daimonin/src/daieditor/CMapViewBasic.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/daimonin/src/daieditor/CMapViewBasic.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -108,10 +108,10 @@
@NotNull private final MapGrid mapGrid;
/** The MapSquares that are known to contain errors. */
- private Map<MapSquare<? extends net.sf.gridarta.gameobject.GameObject, ? extends net.sf.gridarta.map.MapArchObject>, ValidationError> erraneousMapSquares = new HashMap<MapSquare<? extends net.sf.gridarta.gameobject.GameObject, ? extends net.sf.gridarta.map.MapArchObject>, ValidationError>();
+ private final Map<MapSquare<? extends net.sf.gridarta.gameobject.GameObject, ? extends net.sf.gridarta.map.MapArchObject>, ValidationError> erraneousMapSquares = new HashMap<MapSquare<? extends net.sf.gridarta.gameobject.GameObject, ? extends net.sf.gridarta.map.MapArchObject>, ValidationError>();
/** The ArchObjects that are known to contain errors. */
- private Map<net.sf.gridarta.gameobject.GameObject,ValidationError> erraneousArchObjects = new HashMap<net.sf.gridarta.gameobject.GameObject,ValidationError>();
+ private final Map<net.sf.gridarta.gameobject.GameObject,ValidationError> erraneousArchObjects = new HashMap<net.sf.gridarta.gameobject.GameObject,ValidationError>();
/**
* Constructs a level view.
Modified: trunk/daimonin/src/daieditor/MapViewIFrame.java
===================================================================
--- trunk/daimonin/src/daieditor/MapViewIFrame.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/daimonin/src/daieditor/MapViewIFrame.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -204,7 +204,7 @@
}
/** The Action to select this Window. */
- private WindowAction windowAction = new WindowAction();
+ private final WindowAction windowAction = new WindowAction();
/** {@inheritDoc} */
@Override public void setFrameIcon(final Icon icon) {
Modified: trunk/daimonin/src/daieditor/ProcessRunner.java
===================================================================
--- trunk/daimonin/src/daieditor/ProcessRunner.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/daimonin/src/daieditor/ProcessRunner.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -68,7 +68,7 @@
* The i18n key.
* @serial include
*/
- private String key;
+ private final String key;
/**
* The command.
@@ -107,19 +107,19 @@
* Action for start.
* @serial include
*/
- private Action controlStart = ACTION_FACTORY.createAction(false, "controlStart", this);
+ private final Action controlStart = ACTION_FACTORY.createAction(false, "controlStart", this);
/**
* Action for stop.
* @serial include
*/
- private Action controlStop = ACTION_FACTORY.createAction(false, "controlStop", this);
+ private final Action controlStop = ACTION_FACTORY.createAction(false, "controlStop", this);
/**
* Action for clearing the log.
* @serial include
*/
- private Action controlClear = ACTION_FACTORY.createAction(false, "controlClear", this);
+ private final Action controlClear = ACTION_FACTORY.createAction(false, "controlClear", this);
/** The lock object for thread synchronization. */
private final Object lock = new Object();
@@ -285,7 +285,7 @@
private final Appender appender;
/** Title. */
- private String title;
+ private final String title;
/**
* Create a CopyOutput.
@@ -346,7 +346,7 @@
private static class Appender implements Runnable {
/** Strings to append. */
- private Queue<String> texts = new ConcurrentLinkedQueue<String>();
+ private final Queue<String> texts = new ConcurrentLinkedQueue<String>();
/** JTextArea to append to. */
private final JTextArea textArea;
Modified: trunk/daimonin/src/daieditor/gameobject/match/AndGameObjectMatcher.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/match/AndGameObjectMatcher.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/daimonin/src/daieditor/gameobject/match/AndGameObjectMatcher.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -33,7 +33,7 @@
public class AndGameObjectMatcher implements GameObjectMatcher {
/** List of Matchers to And. */
- private List<GameObjectMatcher> matchers = new ArrayList<GameObjectMatcher>();
+ private final List<GameObjectMatcher> matchers = new ArrayList<GameObjectMatcher>();
/**
* Create an AndGameObjectMatcher.
Modified: trunk/daimonin/src/daieditor/gameobject/match/MutableOrGameObjectMatcher.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/match/MutableOrGameObjectMatcher.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/daimonin/src/daieditor/gameobject/match/MutableOrGameObjectMatcher.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -38,7 +38,7 @@
private final boolean defaultState;
/** The GameObjectMatchers to OR. */
- private List<GameObjectMatcher> gameObjectMatchers = new ArrayList<GameObjectMatcher>();
+ private final List<GameObjectMatcher> gameObjectMatchers = new ArrayList<GameObjectMatcher>();
/**
* Create a MMutableOrGameObjectMatcher.
Modified: trunk/daimonin/src/daieditor/gameobject/match/OrGameObjectMatcher.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/match/OrGameObjectMatcher.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/daimonin/src/daieditor/gameobject/match/OrGameObjectMatcher.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -33,7 +33,7 @@
public class OrGameObjectMatcher implements GameObjectMatcher {
/** List of Matchers to Or. */
- private List<GameObjectMatcher> matchers = new ArrayList<GameObjectMatcher>();
+ private final List<GameObjectMatcher> matchers = new ArrayList<GameObjectMatcher>();
/**
* Create an OrGameObjectMatcher.
Modified: trunk/daimonin/src/daieditor/gameobject/match/ViewGameObjectMatcherManager.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/match/ViewGameObjectMatcherManager.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/daimonin/src/daieditor/gameobject/match/ViewGameObjectMatcherManager.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -41,7 +41,7 @@
private final List<GameObjectMatcherToggleAction> actions = new ArrayList<GameObjectMatcherToggleAction>();
/** The Reset Action. */
- private Action resetAction = new ResetAction(Collections.unmodifiableList(actions));
+ private final Action resetAction = new ResetAction(Collections.unmodifiableList(actions));
/**
* Create a ViewArchObjectMatcher.
Modified: trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/daimonin/src/daieditor/gui/GameObjectAttributesPanel.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -130,13 +130,13 @@
/** The buttons for the direction panel.
* @see #directionButtonGroup
*/
- private JToggleButton[] directionButtons = new JToggleButton[9];
+ private final JToggleButton[] directionButtons = new JToggleButton[9];
/**
* The ButtonGroup for the direction buttons.
* @see #directionButtons
*/
- private ButtonGroup directionButtonGroup = new ButtonGroup();
+ private final ButtonGroup directionButtonGroup = new ButtonGroup();
private final GSplitPane splitPane;
Modified: trunk/daimonin/src/daieditor/gui/InsertionObjectChooser.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/InsertionObjectChooser.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/daimonin/src/daieditor/gui/InsertionObjectChooser.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -265,13 +265,13 @@
/** The buttons for the direction panel.
* @see #directionButtonGroup
*/
- private JToggleButton[] directionButtons = new JToggleButton[9];
+ private final JToggleButton[] directionButtons = new JToggleButton[9];
/**
* The ButtonGroup for the direction buttons.
* @see #directionButtons
*/
- private ButtonGroup directionButtonGroup = new ButtonGroup();
+ private final ButtonGroup directionButtonGroup = new ButtonGroup();
private final InsertionObjectChooser ioc;
Modified: trunk/daimonin/src/daieditor/gui/ReplaceDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/ReplaceDialog.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/daimonin/src/daieditor/gui/ReplaceDialog.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -74,7 +74,7 @@
private static ReplaceDialog instance = null;
/** Dialog. */
- private JDialog dialog;
+ private final JDialog dialog;
private final CMainControl mainControl;
Modified: trunk/daimonin/src/daieditor/gui/map/MapPreviewAccessory.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/MapPreviewAccessory.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/daimonin/src/daieditor/gui/map/MapPreviewAccessory.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -69,19 +69,19 @@
private static final String PREFS_AUTOGEN_PREVIEW = "autogenPreviews";
/** Cache with icons. */
- private Map<File, WeakReference<ImageIcon>> icons = new WeakHashMap<File, WeakReference<ImageIcon>>();
+ private final Map<File, WeakReference<ImageIcon>> icons = new WeakHashMap<File, WeakReference<ImageIcon>>();
/** Cache with previews. */
- private Map<File, WeakReference<ImageIcon>> previews = new WeakHashMap<File, WeakReference<ImageIcon>>();
+ private final Map<File, WeakReference<ImageIcon>> previews = new WeakHashMap<File, WeakReference<ImageIcon>>();
/** The preview label. */
- private JLabel preview = new JLabel();
+ private final JLabel preview = new JLabel();
/** ToggleAction for autogen preview. */
- private ToggleAction autogenPreview = (ToggleAction) ACTION_FACTORY.createToggle(false, "autogenPreviews", this);
+ private final ToggleAction autogenPreview = (ToggleAction) ACTION_FACTORY.createToggle(false, "autogenPreviews", this);
/** Action for generating preview. */
- private Action genPreview = ACTION_FACTORY.createAction(false, "genPreview", this);
+ private final Action genPreview = ACTION_FACTORY.createAction(false, "genPreview", this);
/** Wether to auto generate previews. */
private boolean autogenPreviews;
Modified: trunk/daimonin/src/daieditor/gui/map/tools/DeletionTool.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/tools/DeletionTool.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/daimonin/src/daieditor/gui/map/tools/DeletionTool.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -25,7 +25,7 @@
@NotNull private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("daieditor.gui.map.tools");
/** The ToggleAction for toggling the deleteBelow status. */
- private ToggleAction deleteBelowAction = (ToggleAction) ACTION_FACTORY.createToggle(true, "deleteBelow", this);
+ private final ToggleAction deleteBelowAction = (ToggleAction) ACTION_FACTORY.createToggle(true, "deleteBelow", this);
/** The position for deletion. */
private boolean deleteBelow;
Modified: trunk/daimonin/src/daieditor/gui/map/tools/ToolPalette.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/tools/ToolPalette.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/daimonin/src/daieditor/gui/map/tools/ToolPalette.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -24,13 +24,13 @@
private final JTabbedPane mouseTabs = new JTabbedPane();
/** The ToolSelector for lmb. */
- private ToolSelector lmbSelector = new ToolSelector("selection");
+ private final ToolSelector lmbSelector = new ToolSelector("selection");
/** The ToolSelector for mmb. */
- private ToolSelector mmbSelector = new ToolSelector("deletion");
+ private final ToolSelector mmbSelector = new ToolSelector("deletion");
/** The ToolSelector for rmb. */
- private ToolSelector rmbSelector = new ToolSelector("insertion");
+ private final ToolSelector rmbSelector = new ToolSelector("insertion");
/** Create a ToolPalette. */
public ToolPalette() {
Modified: trunk/daimonin/src/daieditor/gui/prefs/GUIPrefs.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/prefs/GUIPrefs.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/daimonin/src/daieditor/gui/prefs/GUIPrefs.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -70,7 +70,7 @@
private Locale[] locales;
/** LocaleComparator. */
- private LocaleComparator comp = new LocaleComparator();
+ private final LocaleComparator comp = new LocaleComparator();
/**
* Create a GUIPrefs pane.
Modified: trunk/daimonin/src/daieditor/gui/prefs/MapValidatorPrefs.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/prefs/MapValidatorPrefs.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/daimonin/src/daieditor/gui/prefs/MapValidatorPrefs.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -59,7 +59,7 @@
private final DelegatingMapValidator validators;
/** Checkboxes to enabled the individual validator checks. */
- private Map<Validator, JCheckBox> checkBoxes = new HashMap<Validator, JCheckBox>();
+ private final Map<Validator, JCheckBox> checkBoxes = new HashMap<Validator, JCheckBox>();
/** Check box to set whether map files should be really checked. */
private JCheckBox autoValidate;
Modified: trunk/daimonin/src/daieditor/gui/prefs/NetPrefs.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/prefs/NetPrefs.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/daimonin/src/daieditor/gui/prefs/NetPrefs.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -68,13 +68,13 @@
private static final Preferences PREFS = userNodeForPackage(CMainControl.class);
/** JComboBox for selecting the proxy type. */
- private JComboBox proxyType = createProxyType();
+ private final JComboBox proxyType = createProxyType();
/** TextField for server executable. */
- private JTextField proxyHost = new JTextField(PREFS.get(NET_PREFS_KEY_HOST, ""));
+ private final JTextField proxyHost = new JTextField(PREFS.get(NET_PREFS_KEY_HOST, ""));
/** TextField for client executable. */
- private JSpinner proxyPort = new JSpinner(new SpinnerNumberModel(PREFS.getInt(NET_PREFS_KEY_PORT, 3128), 1, 65535, 1));
+ private final JSpinner proxyPort = new JSpinner(new SpinnerNumberModel(PREFS.getInt(NET_PREFS_KEY_PORT, 3128), 1, 65535, 1));
/** Create a NetPrefs pane. */
public NetPrefs() {
Modified: trunk/daimonin/src/daieditor/map/validation/DefaultErrorCollector.java
===================================================================
--- trunk/daimonin/src/daieditor/map/validation/DefaultErrorCollector.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/daimonin/src/daieditor/map/validation/DefaultErrorCollector.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -32,7 +32,7 @@
public class DefaultErrorCollector implements ErrorCollector, Iterable<ValidationError> {
/** Errors. */
- private List<ValidationError> errors = new ArrayList<ValidationError>();
+ private final List<ValidationError> errors = new ArrayList<ValidationError>();
/** Create a DefaultErrorCollector. */
public DefaultErrorCollector() {
Modified: trunk/src/app/net/sf/gridarta/gameobject/Collector.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/Collector.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/src/app/net/sf/gridarta/gameobject/Collector.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -20,7 +20,7 @@
private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("net.sf.gridarta");
/** The Collectables. */
- private List<Collectable> collectables = new ArrayList<Collectable>();
+ private final List<Collectable> collectables = new ArrayList<Collectable>();
/** The Component to show the progress dialog on. */
private JFrame parent;
Modified: trunk/src/app/net/sf/gridarta/gameobject/NotInsideContainerException.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/NotInsideContainerException.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/src/app/net/sf/gridarta/gameobject/NotInsideContainerException.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -12,7 +12,7 @@
/**
* The expected container if != null or null if expected to be in any container.
*/
- @Nullable private GameObjectContainer container;
+ @Nullable private final GameObjectContainer container;
/**
* The GameObject that was not inside a / the Container but should have been.
Modified: trunk/src/app/net/sf/gridarta/gui/AbstractGameObjectAttributesDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/AbstractGameObjectAttributesDialog.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/src/app/net/sf/gridarta/gui/AbstractGameObjectAttributesDialog.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -103,7 +103,7 @@
/** Reference to MainControl. */
protected final MainControl mainControl;
- protected List<DialogAttrib<?>> dialogAttribs = new ArrayList<DialogAttrib<?>>();
+ protected final List<DialogAttrib<?>> dialogAttribs = new ArrayList<DialogAttrib<?>>();
private JComboBox typesel; // selection box for type
@@ -123,10 +123,10 @@
private final CardLayout cardLayout = new CardLayout();
/** The Action for switching to the summary. */
- private Action summaryAction = ACTION_FACTORY.createAction(false, "attribSummary", this);
+ private final Action summaryAction = ACTION_FACTORY.createAction(false, "attribSummary", this);
/** The Action for switching to the edit. */
- private Action editAction = ACTION_FACTORY.createAction(false, "attribEdit", this);
+ private final Action editAction = ACTION_FACTORY.createAction(false, "attribEdit", this);
/** The Button for toggling the summary. */
private JButton summaryEditButton;
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapCursor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapCursor.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapCursor.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -60,7 +60,7 @@
private boolean dragging;
/** Grid where cursor is bound to. */
- private MapGrid mapGrid;
+ private final MapGrid mapGrid;
/** Used to test if coordinates are on the map. Created by MapGrid. */
private final Rectangle mapRec;
Modified: trunk/src/app/net/sf/gridarta/gui/map/MapGrid.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapGrid.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapGrid.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -45,10 +45,10 @@
private int[][] gridFlags;
/** Left upper coordinates of rectangle that is beeing processed. */
- private Point cornerMin = new Point();
+ private final Point cornerMin = new Point();
/** Right lower coordinates of rectangle that is beeing processed. */
- private Point cornerMax = new Point();
+ private final Point cornerMax = new Point();
/** Size of <code>gridFlags[][]</code>. */
private Size2D gridSize;
@@ -84,7 +84,7 @@
public static final int GRID_FLAG_CURSOR = 1 << 7;
/** The MapGridListeners to inform of changes. */
- private EventListenerList listenerList = new EventListenerList();
+ private final EventListenerList listenerList = new EventListenerList();
/** Set to size of grid size. Used to test if coordinates are on the map. */
private final Rectangle mapRec = new Rectangle();
Modified: trunk/src/app/net/sf/gridarta/map/AbstractMapArchObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/AbstractMapArchObject.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/src/app/net/sf/gridarta/map/AbstractMapArchObject.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -77,7 +77,7 @@
private int darkness;
/** The registered event listeners. */
- private EventListenerList listenerList = new EventListenerList();
+ private final EventListenerList listenerList = new EventListenerList();
/**
* The transaction depth.
Modified: trunk/src/app/net/sf/gridarta/map/AbstractMapControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/AbstractMapControl.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/src/app/net/sf/gridarta/map/AbstractMapControl.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -37,7 +37,7 @@
private static final Logger log = Logger.getLogger(AbstractMapControl.class);
/** The registered event listeners. */
- private EventListenerList listenerList = new EventListenerList();
+ private final EventListenerList listenerList = new EventListenerList();
/**
* Set if the map has changed since last save.
Modified: trunk/src/app/net/sf/gridarta/map/AbstractMapModel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/AbstractMapModel.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/src/app/net/sf/gridarta/map/AbstractMapModel.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -43,7 +43,7 @@
protected MapSquare<G, A>[][] mapGrid;
/** The registered event listeners. */
- private EventListenerList listenerList = new EventListenerList();
+ private final EventListenerList listenerList = new EventListenerList();
/**
* The transaction depth.
Modified: trunk/src/app/net/sf/gridarta/map/MapModelEvent.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/MapModelEvent.java 2007-01-09 22:14:15 UTC (rev 1525)
+++ trunk/src/app/net/sf/gridarta/map/MapModelEvent.java 2007-01-09 22:53:11 UTC (rev 1526)
@@ -50,7 +50,7 @@
@Nullable private final G[] gameObjects;
/** The type of this event. */
- @NotNull private Type type;
+ @NotNull private final Type type;
/**
* Create a MapModelEvent.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
