[Gridarta-commit] SF.net SVN: gridarta:[4704] trunk

[<aki...@us...>]

Revision: 4704
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4704&view=rev
Author:   akirschbaum
Date:     2008-08-02 08:28:01 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
Convert fields to local variables.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/daimonin/src/daieditor/CMainControl.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-02 08:26:53 UTC (rev 4703)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-02 08:28:01 UTC (rev 4704)
@@ -167,11 +167,6 @@
     /** The main view. */
     private final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView;
 
-    private final ArchetypeParser archetypeParser;
-
-    /** The Animation Objects. */
-    private final AnimationObjects<AnimationObject> animationObjects;
-
     /** The Face Objects. */
     private final FaceObjects faceObjects = new FaceObjects();
 
@@ -205,9 +200,6 @@
     /** The treasure lists. */
     private final CFTreasureListTree<GameObject, MapArchObject, Archetype> treasureListTree;
 
-    /** The filter control. */
-    private final CFilterControl filterControl;
-
     /** The factory for creating new maps or pickmaps. */
     private final NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapDialogFactory;
 
@@ -229,7 +221,7 @@
         globalSettings.readGlobalSettings();
         ScriptArchEditor.setGlobalSettings(globalSettings, this);
         ScriptedEventEditor.setGlobalSettings(globalSettings);
-        animationObjects = new cfeditor.gameobject.anim.AnimationObjects();
+        final AnimationObjects<AnimationObject> animationObjects = new cfeditor.gameobject.anim.AnimationObjects();
         archetypeSet = new ArchetypeSet(this, globalSettings, editTypes, animationObjects, faceObjects, ((GlobalSettingsImpl) globalSettings).getImageSet(), gridartaObjectsFactory);
         GameObject.setArchetypeSet(archetypeSet);
         ScriptedEvent.setArchetypeSet(archetypeSet);
@@ -329,13 +321,13 @@
         gameObjectAttributesPanel = new GameObjectAttributesPanel(this, archetypeTypeSet, mapManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
         PluginParameterFactory.init(archetypeSet, gameObjectAttributesPanel, objectChooser, mapManager);
         final NamedFilterList defaultNamedFilterList = new NamedFilterList(gameObjectMatchers.getFilters());
-        filterControl = new CFilterControl(null, mapManager, defaultNamedFilterList);
+        final CFilterControl filterControl = new CFilterControl(null, mapManager, defaultNamedFilterList);
         ((CrossfireObjectsFactory) gridartaObjectsFactory).setFilterControl(filterControl);
         scriptControl = new ScriptController(this, filterControl, archetypeSet, mainView);
         mainView.init(gameObjectAttributesPanel, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, objectChooser);
         mapActions.updateMenuState();
         scriptControl.getView().setMenu((JMenu) ACTION_FACTORY.find(mainView.getJMenuBar(), "plugins"));
-        archetypeParser = new ArchetypeParser(gridartaObjectsFactory, archetypeChooserControl, animationObjects, archetypeSet);
+        final ArchetypeParser archetypeParser = new ArchetypeParser(gridartaObjectsFactory, archetypeChooserControl, animationObjects, archetypeSet);
         gridartaObjectsFactory.init(faceObjects, objectChooser, archetypeChooserControl, selectedSquareView, this, editTypes, mapImageCache, mapActions, archetypeParser, archetypeSet, autojoinLists);
         archetypeSet.loadArchetypes(archetypeParser);
 

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-02 08:26:53 UTC (rev 4703)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-02 08:28:01 UTC (rev 4704)
@@ -208,11 +208,6 @@
     /** Bit field of edit types to show transparent. */
     private int alphaType;
 
-    private final ArchetypeParser archetypeParser;
-
-    /** The Animation Objects. */
-    private final AnimationObjects<AnimationObject> animationObjects;
-
     /** The Face Objects. */
     private final FaceObjects faceObjects = new FaceObjects();
 
@@ -285,7 +280,7 @@
         globalSettings.readGlobalSettings();
         ScriptArchEditor.setGlobalSettings(globalSettings, this);
         ScriptedEventEditor.setGlobalSettings(globalSettings);
-        animationObjects = new daieditor.gameobject.anim.AnimationObjects();
+        final AnimationObjects<AnimationObject> animationObjects = new daieditor.gameobject.anim.AnimationObjects();
         GameObject.setAnimationObjects(animationObjects);
         archetypeSet = new ArchetypeSet(this, globalSettings, editTypes, animationObjects, faceObjects, gridartaObjectsFactory);
         GameObject.setArchetypeSet(archetypeSet);
@@ -391,7 +386,7 @@
         gameObjectAttributesPanel = new GameObjectAttributesPanel(this, archetypeTypeSet, mapManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
         mainView.init(gameObjectAttributesPanel, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, objectChooser);
         mapActions.updateMenuState();
-        archetypeParser = new ArchetypeParser(archetypeChooserControl, animationObjects, archetypeSet);
+        final ArchetypeParser archetypeParser = new ArchetypeParser(archetypeChooserControl, animationObjects, archetypeSet);
         gridartaObjectsFactory.init(faceObjects, objectChooser, archetypeChooserControl, selectedSquareView, this, editTypes, mapImageCache, mapActions, archetypeParser, archetypeSet, autojoinLists);
         archetypeSet.loadArchetypes(archetypeParser);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.