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

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

Revision: 4750
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4750&view=rev
Author:   akirschbaum
Date:     2008-08-03 23:19:03 +0000 (Sun, 03 Aug 2008)

Log Message:
-----------
Remove calls to ArchetypeChooserControl.getArchetypeChooserModel().

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/src/app/net/sf/gridarta/gui/objectchoicedisplay/ObjectChoiceDisplay.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-03 23:15:48 UTC (rev 4749)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-03 23:19:03 UTC (rev 4750)
@@ -329,7 +329,7 @@
         final CFilterControl filterControl = new CFilterControl(null, mapManager, defaultNamedFilterList);
         ((CrossfireObjectsFactory) gridartaObjectsFactory).setFilterControl(filterControl);
         scriptControl = new ScriptController(this, filterControl, archetypeSet, mainView);
-        final ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChoiceDisplay = new ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserControl, pickmapChooserControl);        
+        final ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChoiceDisplay = new ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserControl.getArchetypeChooserModel(), pickmapChooserControl);        
         final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl, copyBuffer);
         final LeftPanel<GameObject, MapArchObject, Archetype, CMapViewBasic> leftPanel = new LeftPanel<GameObject, MapArchObject, Archetype, CMapViewBasic>(objectChooser, toolPalette, objectChoiceDisplay);
         mainView.init(gameObjectAttributesPanel, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, objectChooser, leftPanel);

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-03 23:15:48 UTC (rev 4749)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-03 23:19:03 UTC (rev 4750)
@@ -390,7 +390,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_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER);
         gameObjectAttributesPanel = new GameObjectAttributesPanel(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, archetypeChooserControl, pickmapChooserControl);
+        final ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic> objectChoiceDisplay = new ObjectChoiceDisplay<GameObject, MapArchObject, Archetype, CMapViewBasic>(replaceDialogManager, archetypeTypeSet, objectChooser, archetypeChooserControl.getArchetypeChooserModel(), pickmapChooserControl);
         final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette = new ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic>(editTypes, selectedSquareView, objectChooser, pickmapChooserControl, copyBuffer);
         final LeftPanel<GameObject, MapArchObject, Archetype, CMapViewBasic> leftPanel = new LeftPanel<GameObject, MapArchObject, Archetype, CMapViewBasic>(objectChooser, toolPalette, objectChoiceDisplay);
         mainView.init(gameObjectAttributesPanel, selectedSquareView, archetypeTypeSet, mapTileListBottom, gameObjectMatchers, archetypeChooserControl, objectChooser, leftPanel);

Modified: trunk/src/app/net/sf/gridarta/gui/objectchoicedisplay/ObjectChoiceDisplay.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/objectchoicedisplay/ObjectChoiceDisplay.java	2008-08-03 23:15:48 UTC (rev 4749)
+++ trunk/src/app/net/sf/gridarta/gui/objectchoicedisplay/ObjectChoiceDisplay.java	2008-08-03 23:19:03 UTC (rev 4750)
@@ -30,7 +30,7 @@
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.GameObject;
 import net.sf.gridarta.gui.ReplaceDialogManager;
-import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
+import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
 import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModelListener;
 import net.sf.gridarta.gui.archetypechooser.ArchetypePanel;
 import net.sf.gridarta.gui.map.MapCursor;
@@ -76,7 +76,7 @@
      * The archetype chooser control to monitor.
      */
     @NotNull
-    private final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl;
+    private final ArchetypeChooserModel<G, A, R, V> archetypeChooserModel;
 
     private final JLabel archObjNameText = new JLabel();
 
@@ -174,14 +174,14 @@
      * @param replaceDialogManager the replace dialog manager to notify
      * @param archetypeTypeSet the archetype type set
      * @param objectChooser the object chooser to monitor
-     * @param archetypeChooserControl the archetype chooser control to monitor
+     * @param archetypeChooserModel the archetype chooser control to monitor
      * @param pickmapChooserControl the pickmap chooser control to monitor
      */
-    public ObjectChoiceDisplay(@NotNull final ReplaceDialogManager<G, A, R, V> replaceDialogManager, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl) {
+    public ObjectChoiceDisplay(@NotNull final ReplaceDialogManager<G, A, R, V> replaceDialogManager, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final ObjectChooser<G, A, R> objectChooser, @NotNull final ArchetypeChooserModel<G, A, R, V> archetypeChooserModel, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl) {
         this.replaceDialogManager = replaceDialogManager;
         this.archetypeTypeSet = archetypeTypeSet;
         this.objectChooser = objectChooser;
-        this.archetypeChooserControl = archetypeChooserControl;
+        this.archetypeChooserModel = archetypeChooserModel;
         setLayout(new GridBagLayout());
 
         final GridBagConstraints gcl = new GridBagConstraints();
@@ -207,7 +207,7 @@
         add(new JLabel("Tile:"), gcl);
         add(archTileText, gcr);
 
-        archetypeChooserControl.getArchetypeChooserModel().addArchetypeChooserModelListener(archetypeChooserModelListener);
+        archetypeChooserModel.addArchetypeChooserModelListener(archetypeChooserModelListener);
         pickmapChooserControl.addPickmapChooserListener(pickmapChooserListener);
         objectChooser.addObjectChooserListener(objectChooserListener);
         showObjectChooserQuickObject((G) null);
@@ -297,7 +297,7 @@
         if (pickmapActive) {
             updatePickmapInfo(activePickmapView != null ? activePickmapView.getMapCursor() : null);
         } else {
-            showObjectChooserQuickObject(archetypeChooserControl.getArchetypeChooserModel().getSelectedArchetype());
+            showObjectChooserQuickObject(archetypeChooserModel.getSelectedArchetype());
         }
     }
 


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