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

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

Revision: 4781
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4781&view=rev
Author:   akirschbaum
Date:     2008-08-06 20:30:52 +0000 (Wed, 06 Aug 2008)

Log Message:
-----------
Rename field names.

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-06 20:29:10 UTC (rev 4780)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-06 20:30:52 UTC (rev 4781)
@@ -216,7 +216,7 @@
     private final GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory;
 
     @NotNull
-    private final GameObjectAttributesControl gameObjectAttributesPanel;
+    private final GameObjectAttributesControl gameObjectAttributesControl;
 
     /**
      * Constructs the main controller and its model and view.
@@ -327,7 +327,7 @@
         // Initialize the main view
         final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER);
         final GameObjectAttributesModel<GameObject, MapArchObject, Archetype> gameObjectAttributesModel = new GameObjectAttributesModel<GameObject, MapArchObject, Archetype>();
-        gameObjectAttributesPanel = new GameObjectAttributesControl(gameObjectAttributesModel, this, objectChooser, archetypeTypeSet, mapManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
+        gameObjectAttributesControl = new GameObjectAttributesControl(gameObjectAttributesModel, this, objectChooser, archetypeTypeSet, mapManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
         PluginParameterFactory.init(archetypeSet, gameObjectAttributesModel, objectChooser, mapManager);
         final NamedFilterList defaultNamedFilterList = new NamedFilterList(gameObjectMatchers.getFilters());
         final CFilterControl filterControl = new CFilterControl(null, mapManager, defaultNamedFilterList);
@@ -336,7 +336,7 @@
         final ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChoiceDisplay = new ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserModel, pickmapChooserControl);
         final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl, copyBuffer);
         final LeftPanel leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
-        mainView.init(gameObjectAttributesPanel, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, objectChooser, leftPanel);
+        mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, objectChooser, leftPanel);
         mapActions.updateMenuState();
         scriptControl.getView().setMenu((JMenu) ACTION_FACTORY.find(mainView.getJMenuBar(), "plugins"));
         final ArchetypeParser archetypeParser = new ArchetypeParser(gridartaObjectsFactory, archetypeChooserControl, animationObjects, archetypeSet);
@@ -743,7 +743,7 @@
     /** Notifies that the application is about to exit. */
     void appExitNotify() {
         mainView.appExitNotify(); // notify main view
-        gameObjectAttributesPanel.appExitNotify();
+        gameObjectAttributesControl.appExitNotify();
     }
 
     /** {@inheritDoc} */

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-06 20:29:10 UTC (rev 4780)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-06 20:30:52 UTC (rev 4781)
@@ -276,7 +276,7 @@
     private final GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory;
 
     @NotNull
-    private final GameObjectAttributesControl gameObjectAttributesPanel;
+    private final GameObjectAttributesControl gameObjectAttributesControl;
 
     /**
      * Constructs the main controller and its model and view.
@@ -393,11 +393,11 @@
         // Initialize the main view
         final LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic> lockedItemsControl = new LockedItemsControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager, Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER);
         final GameObjectAttributesModel<GameObject, MapArchObject, Archetype> gameObjectAttributesModel = new GameObjectAttributesModel<GameObject, MapArchObject, Archetype>();
-        gameObjectAttributesPanel = new GameObjectAttributesControl(gameObjectAttributesModel, this, objectChooser, archetypeTypeSet, mapManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
+        gameObjectAttributesControl = new GameObjectAttributesControl(gameObjectAttributesModel, this, objectChooser, archetypeTypeSet, mapManager, animationObjects, lockedItemsControl, monsterMatcher, selectedSquareControl, selectedSquareView, mainView);
         final ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChoiceDisplay = new ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserModel, pickmapChooserControl);
         final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl, copyBuffer);
         final LeftPanel leftPanel = new LeftPanel(objectChooser, toolPalette, objectChoiceDisplay);
-        mainView.init(gameObjectAttributesPanel, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, objectChooser, leftPanel);
+        mainView.init(gameObjectAttributesControl, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, objectChooser, leftPanel);
         mapActions.updateMenuState();
         final ArchetypeParser archetypeParser = new ArchetypeParser(archetypeChooserControl, animationObjects, archetypeSet);
         gridartaObjectsFactory.init(faceObjects, archetypeChooserModel, selectedSquareView, this, editTypes, mapImageCache, mapActions, archetypeParser, archetypeSet, autojoinLists, toolPalette);
@@ -935,7 +935,7 @@
     /** Notifies that the application is about to exit. */
     void appExitNotify() {
         mainView.appExitNotify(); // notify main view
-        gameObjectAttributesPanel.appExitNotify();
+        gameObjectAttributesControl.appExitNotify();
     }
 
     /** {@inheritDoc} */


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