Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[9213] trunk
|
From: <aki...@us...> - 2013-05-24 19:56:58
|
Revision: 9213
http://sourceforge.net/p/gridarta/code/9213
Author: akirschbaum
Date: 2013-05-24 19:56:48 +0000 (Fri, 24 May 2013)
Log Message:
-----------
Remove redundant field initializations.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/io/ArchetypeParser.java
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/maparchobject/MapArchObject.java
trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/io/ArchetypeParserTest.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/maparchobject/MapArchObject.java
trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/io/ArchetypeParserTest.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/mappropertiesdialog/MapPropertiesDialog.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/io/ArchetypeParser.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/maparchobject/MapArchObject.java
trunk/gridarta.ipr
trunk/model/src/app/net/sf/gridarta/model/archetype/AbstractArchetype.java
trunk/model/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeBuilder.java
trunk/model/src/app/net/sf/gridarta/model/archetypechooser/ArchetypeChooserFolder.java
trunk/model/src/app/net/sf/gridarta/model/archetypechooser/ArchetypeChooserModel.java
trunk/model/src/app/net/sf/gridarta/model/archetypeset/DefaultArchetypeSet.java
trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java
trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
trunk/model/src/app/net/sf/gridarta/model/baseobject/GameObjectContainer.java
trunk/model/src/app/net/sf/gridarta/model/data/NamedTreeNode.java
trunk/model/src/app/net/sf/gridarta/model/exitconnector/AbstractExitConnectorModel.java
trunk/model/src/app/net/sf/gridarta/model/face/DoubleImageFilter.java
trunk/model/src/app/net/sf/gridarta/model/face/FaceObjectProviders.java
trunk/model/src/app/net/sf/gridarta/model/face/FilterFaceProvider.java
trunk/model/src/app/net/sf/gridarta/model/filter/AbstractFilterConfig.java
trunk/model/src/app/net/sf/gridarta/model/filter/FilterParser.java
trunk/model/src/app/net/sf/gridarta/model/filter/NamedFilterConfig.java
trunk/model/src/app/net/sf/gridarta/model/gameobject/AbstractGameObject.java
trunk/model/src/app/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java
trunk/model/src/app/net/sf/gridarta/model/gameobject/MultiArchData.java
trunk/model/src/app/net/sf/gridarta/model/index/AbstractIndex.java
trunk/model/src/app/net/sf/gridarta/model/index/MapsIndexer.java
trunk/model/src/app/net/sf/gridarta/model/io/FlatFileIterator.java
trunk/model/src/app/net/sf/gridarta/model/maparchobject/AbstractMapArchObject.java
trunk/model/src/app/net/sf/gridarta/model/mapgrid/MapGrid.java
trunk/model/src/app/net/sf/gridarta/model/mapmanager/AbstractMapManager.java
trunk/model/src/app/net/sf/gridarta/model/mapmodel/DefaultMapModel.java
trunk/model/src/app/net/sf/gridarta/model/match/ViewGameObjectMatcherManager.java
trunk/model/src/app/net/sf/gridarta/model/resource/AbstractResources.java
trunk/model/src/app/net/sf/gridarta/model/settings/DefaultGlobalSettings.java
trunk/model/src/app/net/sf/gridarta/model/undo/UndoModel.java
trunk/model/src/app/net/sf/gridarta/model/undo/UndoState.java
trunk/model/src/app/net/sf/gridarta/model/validation/checks/MapCheckerScriptChecker.java
trunk/model/src/test/net/sf/gridarta/model/archetype/TestDefaultArchetype.java
trunk/model/src/test/net/sf/gridarta/model/baseobject/AbstractBaseObjectTest.java
trunk/model/src/test/net/sf/gridarta/model/errorview/TestErrorView.java
trunk/model/src/test/net/sf/gridarta/model/io/ArchetypeParserTest.java
trunk/model/src/test/net/sf/gridarta/model/mapcursor/MapCursorTest.java
trunk/model/src/test/net/sf/gridarta/model/match/NamedGameObjectMatcherTest.java
trunk/plugin/src/app/net/sf/gridarta/plugin/BshThread.java
trunk/plugin/src/app/net/sf/gridarta/plugin/Plugin.java
trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/ArchParameter.java
trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/DoubleParameter.java
trunk/preferences/src/app/net/sf/gridarta/preferences/FilePreferencesFactory.java
trunk/src/app/net/sf/gridarta/commands/Collector.java
trunk/src/app/net/sf/gridarta/gui/autovalidator/AutoValidator.java
trunk/src/app/net/sf/gridarta/gui/delayedmapmodel/DelayedMapModelListenerManager.java
trunk/src/app/net/sf/gridarta/gui/dialog/bookmarks/BookmarkActions.java
trunk/src/app/net/sf/gridarta/gui/dialog/bookmarks/ManageBookmarksDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/bookmarks/MapMenuEntryIcons.java
trunk/src/app/net/sf/gridarta/gui/dialog/errorview/ConsoleErrorView.java
trunk/src/app/net/sf/gridarta/gui/dialog/errorview/DefaultErrorView.java
trunk/src/app/net/sf/gridarta/gui/dialog/find/FindDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/find/FindDialogManager.java
trunk/src/app/net/sf/gridarta/gui/dialog/findarchetypes/FindArchetypesDialogManager.java
trunk/src/app/net/sf/gridarta/gui/dialog/findarchetypes/TableModel.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBitmask.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/TypesBoxItemListener.java
trunk/src/app/net/sf/gridarta/gui/dialog/gomap/GoMapDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/newmap/AbstractNewMapDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/ClosingIcon.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginManagerFactory.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginView.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginViewPane.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxModel.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterComboBoxModel.java
trunk/src/app/net/sf/gridarta/gui/dialog/prefs/ResPreferences.java
trunk/src/app/net/sf/gridarta/gui/dialog/replace/ReplaceDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/replace/ReplaceDialogManager.java
trunk/src/app/net/sf/gridarta/gui/dialog/shortcuts/ShortcutsDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/shrinkmapsize/ShrinkMapSizeDialog.java
trunk/src/app/net/sf/gridarta/gui/exitconnector/ExitConnectorController.java
trunk/src/app/net/sf/gridarta/gui/filter/MenuItemCreator.java
trunk/src/app/net/sf/gridarta/gui/mainwindow/GameObjectTextEditorTab.java
trunk/src/app/net/sf/gridarta/gui/map/MapPreviewAccessory.java
trunk/src/app/net/sf/gridarta/gui/map/event/MouseOpEvent.java
trunk/src/app/net/sf/gridarta/gui/map/maptilepane/TilePanel.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewManager.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViews.java
trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFile.java
trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTree.java
trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java
trunk/src/app/net/sf/gridarta/gui/mapmenu/MapMenu.java
trunk/src/app/net/sf/gridarta/gui/mapmenu/MapMenuEntryTreeCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/mapmenu/MapMenuManager.java
trunk/src/app/net/sf/gridarta/gui/mapmenu/TreeDragSource.java
trunk/src/app/net/sf/gridarta/gui/misc/About.java
trunk/src/app/net/sf/gridarta/gui/misc/DefaultFileControl.java
trunk/src/app/net/sf/gridarta/gui/misc/MainViewActions.java
trunk/src/app/net/sf/gridarta/gui/misc/ShiftProcessor.java
trunk/src/app/net/sf/gridarta/gui/misc/StatusBar.java
trunk/src/app/net/sf/gridarta/gui/panel/archetypechooser/ArchetypePanel.java
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/View.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/AbstractGameObjectAttributesTab.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/ErrorListView.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/EventsTab.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/FaceTab.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesControl.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesModel.java
trunk/src/app/net/sf/gridarta/gui/panel/objectchooser/DefaultObjectChooser.java
trunk/src/app/net/sf/gridarta/gui/panel/pickmapchooser/PickmapChooserControl.java
trunk/src/app/net/sf/gridarta/gui/panel/pickmapchooser/PickmapChooserView.java
trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/ModelUpdater.java
trunk/src/app/net/sf/gridarta/gui/panel/tools/DeletionTool.java
trunk/src/app/net/sf/gridarta/gui/panel/tools/SelectionTool.java
trunk/src/app/net/sf/gridarta/gui/scripts/DefaultScriptArchEditor.java
trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java
trunk/src/app/net/sf/gridarta/gui/undo/UndoControl.java
trunk/src/app/net/sf/gridarta/gui/utils/DirectionComponent.java
trunk/src/app/net/sf/gridarta/gui/utils/DirectionLayout.java
trunk/src/app/net/sf/gridarta/gui/utils/GList.java
trunk/src/app/net/sf/gridarta/gui/utils/borderpanel/BorderSplitPane.java
trunk/src/app/net/sf/gridarta/gui/utils/tabbedpanel/Tab.java
trunk/src/app/net/sf/gridarta/gui/utils/tristate/TristateCheckBox.java
trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
trunk/src/app/net/sf/gridarta/mainactions/RandomFillDialog.java
trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
trunk/src/test/net/sf/gridarta/actions/ExitConnectorActionsTest.java
trunk/textedit/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java
trunk/textedit/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java
trunk/textedit/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditUndoActions.java
trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/InputHandler.java
trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/ScrollLayout.java
trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/SyntaxStyle.java
trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/TextAreaPainter.java
trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/actions/Replace.java
trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/CTokenMarker.java
trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/HTMLTokenMarker.java
trunk/utils/src/app/net/sf/gridarta/utils/CopyReader.java
trunk/utils/src/app/net/sf/gridarta/utils/ProcessRunner.java
trunk/utils/src/app/net/sf/gridarta/utils/SystemIcons.java
trunk/utils/src/app/net/sf/gridarta/utils/WrappingStringBuilder.java
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -106,7 +106,7 @@
* @serial
*/
@Nullable
- private Window dialog = null;
+ private Window dialog;
/**
* The message text.
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/io/ArchetypeParser.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/io/ArchetypeParser.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/io/ArchetypeParser.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -69,7 +69,7 @@
/**
* The multi-shape ID of the currently parsed archetype.
*/
- private int multiShapeID = 0;
+ private int multiShapeID;
/**
* Creates an ArchetypeParser.
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/maparchobject/MapArchObject.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/maparchobject/MapArchObject.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/maparchobject/MapArchObject.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -47,79 +47,79 @@
* No save map.
* @serial
*/
- private boolean noSave = false;
+ private boolean noSave;
/**
* No magic spells.
* @serial
*/
- private boolean noMagic = false;
+ private boolean noMagic;
/**
* No prayers.
* @serial
*/
- private boolean noPriest = false;
+ private boolean noPriest;
/**
* No harmful spells allowed.
* @serial
*/
- private boolean noHarm = false;
+ private boolean noHarm;
/**
* No summoning allowed.
* @serial
*/
- private boolean noSummon = false;
+ private boolean noSummon;
/**
* Check map reset status after re-login.
* @serial
*/
- private boolean fixedLogin = false;
+ private boolean fixedLogin;
/**
* Unique map.
* @serial
*/
- private boolean unique = false;
+ private boolean unique;
/**
* Fixed reset time.
* @serial
*/
- private boolean fixedResetTime = false;
+ private boolean fixedResetTime;
/**
* Players cannot save on this map.
* @serial
*/
- private boolean playerNoSave = false;
+ private boolean playerNoSave;
/**
* Player vs Player combat allowed.
* @serial
*/
- private boolean pvp = false;
+ private boolean pvp;
/**
* The tileset id. 0 means no available tileset id
* @serial
*/
- private int tilesetId = 0;
+ private int tilesetId;
/**
* The tileset x coordinate.
* @serial
*/
- private int tilesetX = 0;
+ private int tilesetX;
/**
* The tileset y coordinate.
* @serial
*/
- private int tilesetY = 0;
+ private int tilesetY;
/**
* The name of the background music. Set to empty string if unset.
Modified: trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/io/ArchetypeParserTest.java
===================================================================
--- trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/io/ArchetypeParserTest.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/io/ArchetypeParserTest.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -61,7 +61,7 @@
* The loaded archetypes.
*/
@Nullable
- private ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet = null;
+ private ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet;
/**
* Checks that mpart_id fields are parsed correctly.
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -107,7 +107,7 @@
* loading large and/or multiple maps.
*/
@Nullable
- private SoftReference<BufferedImage> backBufferRef = null;
+ private SoftReference<BufferedImage> backBufferRef;
/**
* The map view settings instance.
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -98,7 +98,7 @@
* @serial
*/
@Nullable
- private Window dialog = null;
+ private Window dialog;
/**
* The {@link GridBagConstraints} for label fields before text input
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -143,7 +143,7 @@
* The {@link SmoothFaces} instance.
*/
@Nullable
- private SmoothFaces smoothFaces = null;
+ private SmoothFaces smoothFaces;
/**
* {@inheritDoc}
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/maparchobject/MapArchObject.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/maparchobject/MapArchObject.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/maparchobject/MapArchObject.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -53,55 +53,55 @@
* If set, this entire map is unique.
* @serial
*/
- private boolean unique = false;
+ private boolean unique;
/**
* If set, this entire map is a template map.
* @serial
*/
- private boolean template = false;
+ private boolean template;
/**
* If set, this entire map is no smooth.
* @serial
*/
- private boolean noSmooth = false;
+ private boolean noSmooth;
/**
* Weather variable: temperature.
* @serial
*/
- private int temperature = 0;
+ private int temperature;
/**
* Weather variable: pressure.
* @serial
*/
- private int pressure = 0;
+ private int pressure;
/**
* Weather variable: humidity (water in the air).
* @serial
*/
- private int humidity = 0;
+ private int humidity;
/**
* Weather variable: wind speed.
* @serial
*/
- private int windSpeed = 0;
+ private int windSpeed;
/**
* Weather variable: wind direction.
* @serial
*/
- private int windDirection = 0;
+ private int windDirection;
/**
* Weather variable: sky settings.
* @serial
*/
- private int sky = 0;
+ private int sky;
/**
* The item spec for the shop, if there is one.
@@ -121,19 +121,19 @@
* The greed of the shop.
* @serial
*/
- private double shopGreed = 0.0;
+ private double shopGreed;
/**
* The minimum price the shop will trade for.
* @serial
*/
- private int shopMin = 0;
+ private int shopMin;
/**
* The maximum price the shop will trade for.
* @serial
*/
- private int shopMax = 0;
+ private int shopMax;
/**
* The region the map is in.
Modified: trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/io/ArchetypeParserTest.java
===================================================================
--- trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/io/ArchetypeParserTest.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/io/ArchetypeParserTest.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -59,7 +59,7 @@
* The loaded archetypes.
*/
@Nullable
- private ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet = null;
+ private ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet;
/**
* Checks that inventory game objects are recognized.
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/mappropertiesdialog/MapPropertiesDialog.java
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/mappropertiesdialog/MapPropertiesDialog.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/mappropertiesdialog/MapPropertiesDialog.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -114,7 +114,7 @@
* @serial
*/
@Nullable
- private Window dialog = null;
+ private Window dialog;
/**
* The message text.
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/io/ArchetypeParser.java
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/io/ArchetypeParser.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/io/ArchetypeParser.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -61,7 +61,7 @@
/**
* The multi-shape ID of the currently parsed archetype.
*/
- private int multiShapeID = 0;
+ private int multiShapeID;
/**
* Creates an ArchetypeParser.
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/maparchobject/MapArchObject.java
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/maparchobject/MapArchObject.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/maparchobject/MapArchObject.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -47,79 +47,79 @@
* No save map.
* @serial
*/
- private boolean noSave = false;
+ private boolean noSave;
/**
* No magic spells.
* @serial
*/
- private boolean noMagic = false;
+ private boolean noMagic;
/**
* No prayers.
* @serial
*/
- private boolean noPriest = false;
+ private boolean noPriest;
/**
* No harmful spells allowed.
* @serial
*/
- private boolean noHarm = false;
+ private boolean noHarm;
/**
* No summoning allowed.
* @serial
*/
- private boolean noSummon = false;
+ private boolean noSummon;
/**
* Check map reset status after re-login.
* @serial
*/
- private boolean fixedLogin = false;
+ private boolean fixedLogin;
/**
* Permanent death with revivable corpses.
* @serial
*/
- private boolean permDeath = false;
+ private boolean permDeath;
/**
* Permanent death with corpses temporarily available.
* @serial
*/
- private boolean ultraDeath = false;
+ private boolean ultraDeath;
/**
* Permanent death with instant character deletion.
* @serial
*/
- private boolean ultimateDeath = false;
+ private boolean ultimateDeath;
/**
* Player vs Player combat allowed.
* @serial
*/
- private boolean pvp = false;
+ private boolean pvp;
/**
* The tileset id. 0 means no available tileset id
* @serial
*/
- private int tilesetId = 0;
+ private int tilesetId;
/**
* The tileset x coordinate.
* @serial
*/
- private int tilesetX = 0;
+ private int tilesetX;
/**
* The tileset y coordinate.
* @serial
*/
- private int tilesetY = 0;
+ private int tilesetY;
/**
* The name of the background music. Set to empty string if unset.
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/gridarta.ipr 2013-05-24 19:56:48 UTC (rev 9213)
@@ -688,6 +688,7 @@
<option name="ignoreObjectConstruction" value="false" />
<option name="ignoreTypeCasts" value="false" />
</inspection_tool>
+ <inspection_tool class="RedundantFieldInitialization" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="RedundantImplements" enabled="true" level="WARNING" enabled_by_default="true">
<option name="ignoreSerializable" value="false" />
<option name="ignoreCloneable" value="false" />
Modified: trunk/model/src/app/net/sf/gridarta/model/archetype/AbstractArchetype.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/archetype/AbstractArchetype.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/archetype/AbstractArchetype.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -54,14 +54,14 @@
* objects.
* @serial
*/
- private int multiX = 0;
+ private int multiX;
/**
* The y-distance of this part to the head part. Set to zero for single-part
* objects.
* @serial
*/
- private int multiY = 0;
+ private int multiY;
/**
* Set if this part of a multi-part object is the lowest part. The lowest
@@ -75,20 +75,20 @@
* The multi shape id.
* @serial
*/
- private int multiShapeID = 0;
+ private int multiShapeID;
/**
* The multi part id.
* @serial
*/
- private int multiPartNr = 0;
+ private int multiPartNr;
/**
* The location in the archetype selector.
* @serial
*/
@Nullable
- private String editorFolder = null;
+ private String editorFolder;
/**
* If this flag is set, this Archetype is not a "real" Archetype but comes
@@ -97,7 +97,7 @@
* for editor and server.
* @serial
*/
- private boolean artifact = false;
+ private boolean artifact;
/**
* Creates a new instance.
Modified: trunk/model/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeBuilder.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeBuilder.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeBuilder.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -50,14 +50,14 @@
* The {@link ErrorViewCollector} for reporting errors.
*/
@Nullable
- private ErrorViewCollector errorViewCollector = null;
+ private ErrorViewCollector errorViewCollector;
/**
* The {@link Archetype} being built. Set to <code>null</code> when not
* building an archetype.
*/
@Nullable
- private R archetype = null;
+ private R archetype;
/**
* Collected attributes.
Modified: trunk/model/src/app/net/sf/gridarta/model/archetypechooser/ArchetypeChooserFolder.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/archetypechooser/ArchetypeChooserFolder.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/archetypechooser/ArchetypeChooserFolder.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -61,7 +61,7 @@
* It must be part of {@link #archetypes}.
*/
@Nullable
- private R selectedArchetype = null;
+ private R selectedArchetype;
/**
* The registered listeners.
Modified: trunk/model/src/app/net/sf/gridarta/model/archetypechooser/ArchetypeChooserModel.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/archetypechooser/ArchetypeChooserModel.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/archetypechooser/ArchetypeChooserModel.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -53,14 +53,14 @@
* #panels}. Set to <code>null</code> only if no panels do exist.
*/
@Nullable
- private ArchetypeChooserPanel<G, A, R> selectedPanel = null;
+ private ArchetypeChooserPanel<G, A, R> selectedPanel;
/**
* The default direction for game objects created from archetypes. Set to
* <code>null</code> for default direction.
*/
@Nullable
- private Integer direction = null;
+ private Integer direction;
/**
* The registered listeners.
Modified: trunk/model/src/app/net/sf/gridarta/model/archetypeset/DefaultArchetypeSet.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/archetypeset/DefaultArchetypeSet.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/archetypeset/DefaultArchetypeSet.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -70,7 +70,7 @@
* @val <code>false</code> when Archetypes were loaded from individual
* .arc-files
*/
- private boolean loadedFromArchive = false;
+ private boolean loadedFromArchive;
/**
* The archetypes used for game objects which reference undefined
Modified: trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -42,7 +42,7 @@
* matching any defined type.
*/
@Nullable
- private ArchetypeType fallbackArchetypeType = null;
+ private ArchetypeType fallbackArchetypeType;
/**
* Lists with all {@link ArchetypeType ArchetypeTypes}. Contains all but the
Modified: trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -68,7 +68,7 @@
* @serial
*/
@Nullable
- private String faceObjName = null;
+ private String faceObjName;
/**
* The state where the face comes from.
@@ -82,7 +82,7 @@
* @serial
*/
@Nullable
- private ImageIcon normalFace = null;
+ private ImageIcon normalFace;
/**
* The {@link FaceObjectProviders} for looking up faces.
@@ -106,19 +106,19 @@
* @serial
*/
@Nullable
- private StringBuilder msgText = null;
+ private StringBuilder msgText;
/**
* The map x position if on map.
* @serial
*/
- private int mapX = 0;
+ private int mapX;
/**
* The map y position if on map.
* @serial
*/
- private int mapY = 0;
+ private int mapY;
/**
* Data for multi-part objects. Stays <code>null</code> for single-part
@@ -126,7 +126,7 @@
* @serial
*/
@Nullable
- private MultiArchData<G, A, R, T> multi = null;
+ private MultiArchData<G, A, R, T> multi;
/**
* Edit Type.
@@ -146,20 +146,20 @@
* @serial
*/
@Nullable
- private String faceName = null;
+ private String faceName;
/**
* The object type.
* @serial
*/
- private int typeNo = 0;
+ private int typeNo;
/**
* The object's animation animation.
* @serial
*/
@Nullable
- private String animName = null;
+ private String animName;
/**
* The direction determines to which direction the GameObject's face is
@@ -167,7 +167,7 @@
* animated objects might even have 8 or 9 (8 + still) facings.
* @serial
*/
- private int direction = 0;
+ private int direction;
/**
* The map lore.
Modified: trunk/model/src/app/net/sf/gridarta/model/baseobject/GameObjectContainer.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/baseobject/GameObjectContainer.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/baseobject/GameObjectContainer.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -123,7 +123,7 @@
/** Current element (last element returned by {@link #next()}). */
@Nullable
- private G current = null;
+ private G current;
@Override
public boolean hasNext() {
Modified: trunk/model/src/app/net/sf/gridarta/model/data/NamedTreeNode.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/data/NamedTreeNode.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/data/NamedTreeNode.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -58,7 +58,7 @@
* @serial
*/
@Nullable
- private NamedTreeNode<?>[] childNodeArray = null;
+ private NamedTreeNode<?>[] childNodeArray;
/**
* The parent node, which may be <code>null</code> for the root node.
Modified: trunk/model/src/app/net/sf/gridarta/model/exitconnector/AbstractExitConnectorModel.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/exitconnector/AbstractExitConnectorModel.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/exitconnector/AbstractExitConnectorModel.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -39,7 +39,7 @@
* location has been remembered.
*/
@Nullable
- private ExitLocation exitLocation = null;
+ private ExitLocation exitLocation;
/**
* Whether the exit's name should be set when pasted.
Modified: trunk/model/src/app/net/sf/gridarta/model/face/DoubleImageFilter.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/face/DoubleImageFilter.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/face/DoubleImageFilter.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -42,12 +42,12 @@
/**
* The image width.
*/
- private int width = 0;
+ private int width;
/**
* The destination image's pixels.
*/
- private int[] raster = null;
+ private int[] raster;
/**
* Creates a new instance.
Modified: trunk/model/src/app/net/sf/gridarta/model/face/FaceObjectProviders.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/face/FaceObjectProviders.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/face/FaceObjectProviders.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -130,7 +130,7 @@
* The face provider for normal faces.
*/
@Nullable
- private FaceProvider normalFaceProvider = null;
+ private FaceProvider normalFaceProvider;
/**
* The face provider for alpha faces.
Modified: trunk/model/src/app/net/sf/gridarta/model/face/FilterFaceProvider.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/face/FilterFaceProvider.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/face/FilterFaceProvider.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -37,7 +37,7 @@
* The FaceProvider to get the original icon from.
*/
@Nullable
- private FaceProvider parent = null;
+ private FaceProvider parent;
/**
* The Filter to apply.
Modified: trunk/model/src/app/net/sf/gridarta/model/filter/AbstractFilterConfig.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/filter/AbstractFilterConfig.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/filter/AbstractFilterConfig.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -40,7 +40,7 @@
/**
* Whether the filter is enabled.
*/
- private boolean enabled = false;
+ private boolean enabled;
/**
* The registered listeners.
Modified: trunk/model/src/app/net/sf/gridarta/model/filter/FilterParser.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/filter/FilterParser.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/filter/FilterParser.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -36,7 +36,7 @@
* The {@link Element} instance being converted.
*/
@Nullable
- private Element element = null;
+ private Element element;
/**
* The {@link FilterConfigVisitor} for converting {@link FilterConfig}
Modified: trunk/model/src/app/net/sf/gridarta/model/filter/NamedFilterConfig.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/filter/NamedFilterConfig.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/filter/NamedFilterConfig.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -39,7 +39,7 @@
* (<code>false></code>).
*/
// TODO fix potential concurrency issues
- private boolean inverted = false;
+ private boolean inverted;
@NotNull
private final Map<String, FilterConfig<?, ?>> map = new HashMap<String, FilterConfig<?, ?>>();
Modified: trunk/model/src/app/net/sf/gridarta/model/gameobject/AbstractGameObject.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/gameobject/AbstractGameObject.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/gameobject/AbstractGameObject.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -58,7 +58,7 @@
* @serial
*/
@Nullable
- private GameObjectContainer<G, A, R> container = null;
+ private GameObjectContainer<G, A, R> container;
/**
* Creates a new instance.
Modified: trunk/model/src/app/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -110,21 +110,21 @@
* @serial
*/
@Nullable
- private ImageIcon transFace = null;
+ private ImageIcon transFace;
/**
* The double face.
* @serial
*/
@Nullable
- private ImageIcon doubleFace = null;
+ private ImageIcon doubleFace;
/**
* The transparent double face.
* @serial
*/
@Nullable
- private ImageIcon transDoubleFace = null;
+ private ImageIcon transDoubleFace;
/**
* Creates a new instance.
Modified: trunk/model/src/app/net/sf/gridarta/model/gameobject/MultiArchData.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/gameobject/MultiArchData.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/gameobject/MultiArchData.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -49,25 +49,25 @@
* The maximum coordinate of any part; it is never negative.
* @serial
*/
- private int maxX = 0;
+ private int maxX;
/**
* The maximum coordinate of any part; it is never negative.
* @serial
*/
- private int maxY = 0;
+ private int maxY;
/**
* The minimum coordinate of any part; it is never positive.
* @serial
*/
- private int minX = 0;
+ private int minX;
/**
* The minimum coordinate of any part; it is never positive.
* @serial
*/
- private int minY = 0;
+ private int minY;
/**
* The shape ID of this object.
Modified: trunk/model/src/app/net/sf/gridarta/model/index/AbstractIndex.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/index/AbstractIndex.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/index/AbstractIndex.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -79,12 +79,12 @@
* Whether the state ({@link #timestamps} or {@link #names}) was modified
* since last save.
*/
- private boolean modified = false;
+ private boolean modified;
/**
* Whether a transaction is active.
*/
- private boolean transaction = false;
+ private boolean transaction;
/**
* The values to delete at the end of the current transaction. Empty if no
Modified: trunk/model/src/app/net/sf/gridarta/model/index/MapsIndexer.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/index/MapsIndexer.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/index/MapsIndexer.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -96,14 +96,14 @@
* The currently indexed maps directory.
*/
@Nullable
- private File mapsDirectory = null;
+ private File mapsDirectory;
/**
* The maps directory to index. If <code>null</code>, {@link #mapsDirectory}
* is valid.
*/
@Nullable
- private File newMapsDirectory = null;
+ private File newMapsDirectory;
/**
* The object for synchronizing access to {@link #state}.
Modified: trunk/model/src/app/net/sf/gridarta/model/io/FlatFileIterator.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/io/FlatFileIterator.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/io/FlatFileIterator.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -47,7 +47,7 @@
/**
* The current index into {@link #files}.
*/
- private int pos = 0;
+ private int pos;
/**
* Creates a new instance.
Modified: trunk/model/src/app/net/sf/gridarta/model/maparchobject/AbstractMapArchObject.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/maparchobject/AbstractMapArchObject.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/maparchobject/AbstractMapArchObject.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -85,44 +85,44 @@
/**
* The x coordinate for entering the map.
*/
- private int enterX = 0;
+ private int enterX;
/**
* The y coordinate for entering the map.
*/
- private int enterY = 0;
+ private int enterY;
/**
* If set, this is an outdoor map.
*/
- private boolean outdoor = false;
+ private boolean outdoor;
/**
* The number of ticks that need to elapse before this map will be reset.
*/
- private int resetTimeout = 0;
+ private int resetTimeout;
/**
* The number of ticks that must elapse after tha map has not been used
* before it gets swapped out.
*/
- private int swapTime = 0;
+ private int swapTime;
/**
* The map difficulty. If zero, server calculates something.
*/
- private int difficulty = 0;
+ private int difficulty;
/**
* If nonzero, the map reset time will not be updated when someone enters /
* exits the map.
*/
- private boolean fixedReset = false;
+ private boolean fixedReset;
/**
* The light / darkness of map (overall). Zero means fully bright.
*/
- private int darkness = 0;
+ private int darkness;
/**
* The map tile paths used for map tiling. 0 = north, 1 = east, 2 = south, 3
@@ -143,19 +143,19 @@
* nesting level.
* @invariant transactionDepth >= 0
*/
- private int transactionDepth = 0;
+ private int transactionDepth;
/**
* The thread that performs the current transaction.
* @invariant transactionDepth > 0 || transactionThread == null
*/
@Nullable
- private transient Thread transactionThread = null;
+ private transient Thread transactionThread;
/**
* Set if any attribute has changed inside the current transaction.
*/
- private boolean attributeHasChanged = false;
+ private boolean attributeHasChanged;
/**
* Creates a new instance.
Modified: trunk/model/src/app/net/sf/gridarta/model/mapgrid/MapGrid.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/mapgrid/MapGrid.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/mapgrid/MapGrid.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -76,14 +76,14 @@
/**
* If set, {@link #cachedSelectedRec} is up-to-date.
*/
- private boolean cachedSelectedRecValid = false;
+ private boolean cachedSelectedRecValid;
/**
* The return value for {@link #getSelectedRec()}. Only valid if {@link
* #cachedSelectedRecValid} is set.
*/
@Nullable
- private Rectangle cachedSelectedRec = null;
+ private Rectangle cachedSelectedRec;
/**
* Selection - marks all selected squares.
@@ -164,14 +164,14 @@
* nesting level.
* @invariant transactionDepth >= 0
*/
- private int transactionDepth = 0;
+ private int transactionDepth;
/**
* The thread that performs the current transaction.
* @invariant transactionDepth > 0 || transactionThread == null
*/
@Nullable
- private Thread transactionThread = null;
+ private Thread transactionThread;
/**
* Creates a new instance.
Modified: trunk/model/src/app/net/sf/gridarta/model/mapmanager/AbstractMapManager.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/mapmanager/AbstractMapManager.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/mapmanager/AbstractMapManager.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -96,7 +96,7 @@
* The current top map we are working with.
*/
@Nullable
- private MapControl<G, A, R> currentMapControl = null;
+ private MapControl<G, A, R> currentMapControl;
/**
* Create a new map manager.
Modified: trunk/model/src/app/net/sf/gridarta/model/mapmodel/DefaultMapModel.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/mapmodel/DefaultMapModel.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/mapmodel/DefaultMapModel.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -117,14 +117,14 @@
* nesting level.
* @invariant transactionDepth >= 0
*/
- private int transactionDepth = 0;
+ private int transactionDepth;
/**
* The thread that performs the current transaction.
* @invariant transactionDepth > 0 || transactionThread == null
*/
@Nullable
- private transient Thread transactionThread = null;
+ private transient Thread transactionThread;
/**
* The ArrayList with changed squares.
@@ -161,7 +161,7 @@
* Contains the edit types that have already been (requested and) calculated
* (edit types get calculated only when needed to save time).
*/
- private int activeEditType = 0;
+ private int activeEditType;
/**
* The {@link GameObjectFactory} for creating {@link GameObject
@@ -187,7 +187,7 @@
* been saved.
*/
@Nullable
- private File mapFile = null;
+ private File mapFile;
/**
* Set if the map has changed since last save.
Modified: trunk/model/src/app/net/sf/gridarta/model/match/ViewGameObjectMatcherManager.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/match/ViewGameObjectMatcherManager.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/match/ViewGameObjectMatcherManager.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -149,7 +149,7 @@
/**
* Selected state.
*/
- private boolean selected = false;
+ private boolean selected;
/**
* A {@link MutableOrGameObjectMatcher} to add / remove {@link
Modified: trunk/model/src/app/net/sf/gridarta/model/resource/AbstractResources.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/resource/AbstractResources.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/resource/AbstractResources.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -61,12 +61,12 @@
/**
* Whether the resources have been loaded.
*/
- private boolean loaded = false;
+ private boolean loaded;
/**
* Whether the resources have been loaded from individual files.
*/
- private boolean loadedFromFiles = false;
+ private boolean loadedFromFiles;
/**
* Creates a new instance.
Modified: trunk/model/src/app/net/sf/gridarta/model/settings/DefaultGlobalSettings.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/settings/DefaultGlobalSettings.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/settings/DefaultGlobalSettings.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -175,7 +175,7 @@
/**
* Time for an automated documentation popup.
*/
- private boolean autoPopupDocumentation = false;
+ private boolean autoPopupDocumentation;
/**
* The the default directory for saving maps.
Modified: trunk/model/src/app/net/sf/gridarta/model/undo/UndoModel.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/undo/UndoModel.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/undo/UndoModel.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -63,7 +63,7 @@
* 0</code>, "undo" is not possible; if <code>undoStackIndex ==
* undoStack.size()</code>, "redo" is not possible.
*/
- private int undoStackIndex = 0;
+ private int undoStackIndex;
/**
* The type for recording undo information.
Modified: trunk/model/src/app/net/sf/gridarta/model/undo/UndoState.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/undo/UndoState.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/undo/UndoState.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -51,7 +51,7 @@
* operation started.
*/
@Nullable
- private SavedSquares<G, A, R> savedSquares = null;
+ private SavedSquares<G, A, R> savedSquares;
/**
* Create a new instance.
Modified: trunk/model/src/app/net/sf/gridarta/model/validation/checks/MapCheckerScriptChecker.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/validation/checks/MapCheckerScriptChecker.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/app/net/sf/gridarta/model/validation/checks/MapCheckerScriptChecker.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -107,7 +107,7 @@
* until created.
*/
@Nullable
- private File tmpFile = null;
+ private File tmpFile;
/**
* Creates a new instance.
@@ -408,7 +408,7 @@
* Otherwise points to <code>{@link #args}[0]</code>.
*/
@Nullable
- private File cachedCommand = null;
+ private File cachedCommand;
/**
* Returns the command to execute. Returns or updates {@link
Modified: trunk/model/src/test/net/sf/gridarta/model/archetype/TestDefaultArchetype.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/archetype/TestDefaultArchetype.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/test/net/sf/gridarta/model/archetype/TestDefaultArchetype.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -40,7 +40,7 @@
/**
* The return value of {@link #usesDirection()}.
*/
- private boolean usesDirection = false;
+ private boolean usesDirection;
/**
* Creates a new instance.
Modified: trunk/model/src/test/net/sf/gridarta/model/baseobject/AbstractBaseObjectTest.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/baseobject/AbstractBaseObjectTest.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/test/net/sf/gridarta/model/baseobject/AbstractBaseObjectTest.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -52,7 +52,7 @@
* The {@link SystemIcons} instance.
*/
@Nullable
- private SystemIcons systemIcons = null;
+ private SystemIcons systemIcons;
/**
* Checks that setting the face name does work.
Modified: trunk/model/src/test/net/sf/gridarta/model/errorview/TestErrorView.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/errorview/TestErrorView.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/test/net/sf/gridarta/model/errorview/TestErrorView.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -37,12 +37,12 @@
/**
* Whether errors have been collected.
*/
- private boolean hasErrors = false;
+ private boolean hasErrors;
/**
* Whether warnings have been collected.
*/
- private boolean hasWarnings = false;
+ private boolean hasWarnings;
/**
* {@inheritDoc}
Modified: trunk/model/src/test/net/sf/gridarta/model/io/ArchetypeParserTest.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/io/ArchetypeParserTest.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/test/net/sf/gridarta/model/io/ArchetypeParserTest.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -52,7 +52,7 @@
* The loaded archetypes.
*/
@Nullable
- private ArchetypeSet<TestGameObject, TestMapArchObject, TestArchetype> archetypeSet = null;
+ private ArchetypeSet<TestGameObject, TestMapArchObject, TestArchetype> archetypeSet;
/**
* Checks that a missing "object" line is detected.
Modified: trunk/model/src/test/net/sf/gridarta/model/mapcursor/MapCursorTest.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/mapcursor/MapCursorTest.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/test/net/sf/gridarta/model/mapcursor/MapCursorTest.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -483,12 +483,12 @@
/**
* The number of calls to {@link #mapCursorChangedPos(Point)}.
*/
- private int changedPosCounter = 0;
+ private int changedPosCounter;
/**
* The number of calls to {@link #mapCursorChangedMode()}.
*/
- private int changedModeCounter = 0;
+ private int changedModeCounter;
@Override
public void mapCursorChangedPos(@Nullable final Point location) {
Modified: trunk/model/src/test/net/sf/gridarta/model/match/NamedGameObjectMatcherTest.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/match/NamedGameObjectMatcherTest.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/model/src/test/net/sf/gridarta/model/match/NamedGameObjectMatcherTest.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -48,7 +48,7 @@
* The {@link SystemIcons} instance.
*/
@Nullable
- private SystemIcons systemIcons = null;
+ private SystemIcons systemIcons;
/**
* Checks that a {@link NamedGameObjectMatcher} works correctly when not
Modified: trunk/plugin/src/app/net/sf/gridarta/plugin/BshThread.java
===================================================================
--- trunk/plugin/src/app/net/sf/gridarta/plugin/BshThread.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/plugin/src/app/net/sf/gridarta/plugin/BshThread.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -45,7 +45,7 @@
/**
* Whether the plugin has been executed successfully.
*/
- private boolean success = false;
+ private boolean success;
/**
* Creates a new instance.
Modified: trunk/plugin/src/app/net/sf/gridarta/plugin/Plugin.java
===================================================================
--- trunk/plugin/src/app/net/sf/gridarta/plugin/Plugin.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/plugin/src/app/net/sf/gridarta/plugin/Plugin.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -93,17 +93,17 @@
/**
* Whether this plugin is run whenever the editor starts.
*/
- private boolean autoBoot = false;
+ private boolean autoBoot;
/**
* Whether this plugin is a filter.
*/
- private boolean filter = false;
+ private boolean filter;
/**
* Whether this plugin is a stand-alone plugin.
*/
- private boolean script = false;
+ private boolean script;
/**
* The {@link ChangeListener ChangeListeners} to inform about changes.
@@ -116,12 +116,12 @@
* plugin has no associated location.
*/
@Nullable
- private File file = null;
+ private File file;
/**
* Whether the plugin contents has been modified since last save.
*/
- private boolean modified = false;
+ private boolean modified;
/**
* Creates a new instance.
Modified: trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/ArchParameter.java
===================================================================
--- trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/ArchParameter.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/ArchParameter.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -44,7 +44,7 @@
@NotNull
private final ArchetypeSet<G, A, R> archetypeSet;
- private String valueString = null;
+ private String valueString;
/**
* Creates a new instance.
Modified: trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/DoubleParameter.java
===================================================================
--- trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/DoubleParameter.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/DoubleParameter.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -38,7 +38,7 @@
/**
* The minimal allowed value.
*/
- private double min = 0.0;
+ private double min;
/**
* The maximal allowed value. We do not use the {@link Double#MAX_VALUE} or
Modified: trunk/preferences/src/app/net/sf/gridarta/preferences/FilePreferencesFactory.java
===================================================================
--- trunk/preferences/src/app/net/sf/gridarta/preferences/FilePreferencesFactory.java 2013-05-24 19:37:16 UTC (rev 9212)
+++ trunk/preferences/src/app/net/sf/gridarta/preferences/FilePreferencesFactory.java 2013-05-24 19:56:48 UTC (rev 9213)
@@ -35,12 +35,12 @@
/**
* The user preferences as returned by {@link #userRoot()}.
*/
- private static Preferences userRoot = null;
+ private static Preferences userRoot;
/**
* The system preferences as returned by {@link #userRoot()}.
*/
- private static Preferences systemRoot = null;
+ private static Preferences systemRoot;
/**
* Initialize the module. This function must be called before an instance is
Modified: trunk/src/app/net/sf/gridarta/commands/Collector.java
===================================================================
--- trunk/src/app/net...
[truncated message content] |
