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

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

Revision: 4630
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4630&view=rev
Author:   akirschbaum
Date:     2008-07-31 21:44:34 +0000 (Thu, 31 Jul 2008)

Log Message:
-----------
Remove calls to MainControl.getArchetypeTypeSet().

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

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-07-31 21:39:40 UTC (rev 4629)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-07-31 21:44:34 UTC (rev 4630)
@@ -241,7 +241,8 @@
         newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, 0, false, false, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
         pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, new File(globalSettings.getMapDir(), IGUIConstants.PICKMAP_DIR), getMapManager());
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
-        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, archetypeSet, editTypes, selectedSquareView, archetypeChooserControl, pickmapChooserControl, getCopyBuffer());
+        archetypeTypeSet = new ArchetypeTypeSet<GameObject, MapArchObject, Archetype>();
+        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, archetypeSet, archetypeTypeSet, editTypes, selectedSquareView, archetypeChooserControl, pickmapChooserControl, getCopyBuffer());
         mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, editTypes, archetypeSet, getCopyBuffer(), pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, getMapManager());
         SystemIcons.init();
         final StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic> statusBar = new StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager(), archetypeSet, faceObjects);
@@ -263,7 +264,6 @@
             log.error("Cannot create XML parser: " + ex.getMessage());
             throw new MissingResourceException("Cannot create XML parser: " + ex.getMessage(), null, null);
         }
-        archetypeTypeSet = new ArchetypeTypeSet<GameObject, MapArchObject, Archetype>();
         final GameObjectMatchers gameObjectMatchers = new GameObjectMatchers(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath());
         new ArchetypeSetSpellLoader<GameObject, MapArchObject, Archetype>().load(archetypeSet, Archetype.TYPE_SPELL, gameObjectSpells);
         gameObjectSpells.sort();

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-07-31 21:39:40 UTC (rev 4629)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-07-31 21:44:34 UTC (rev 4630)
@@ -299,7 +299,8 @@
         newMapDialogFactory = new NewMapDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPSIZE, IGUIConstants.DEF_MAPDIFFICULTY, true, true, IGUIConstants.DEF_PICKMAP_WIDTH, IGUIConstants.DEF_PICKMAP_HEIGHT);
         pickmapChooserControl = new PickmapChooserControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(newMapDialogFactory, this, new File(globalSettings.getArchDefaultFolder(), IGUIConstants.PICKMAP_DIR), getMapManager());
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
-        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, archetypeSet, editTypes, selectedSquareView, archetypeChooserControl, pickmapChooserControl, getCopyBuffer());
+        archetypeTypeSet = new ArchetypeTypeSet<GameObject, MapArchObject, Archetype>();
+        objectChooser = new DefaultObjectChooser<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, archetypeSet, archetypeTypeSet, editTypes, selectedSquareView, archetypeChooserControl, pickmapChooserControl, getCopyBuffer());
         mainActions = new MainActions<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, editTypes, archetypeSet, getCopyBuffer(), pickmapChooserControl, animationObjects, ACTION_FACTORY, faceObjects, objectChooser, getMapManager());
         SystemIcons.init();
         final StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic> statusBar = new StatusBar<GameObject, MapArchObject, Archetype, CMapViewBasic>(getMapManager(), archetypeSet, faceObjects);
@@ -324,7 +325,6 @@
             log.error("Cannot create XML parser: " + ex.getMessage());
             throw new MissingResourceException("Cannot create XML parser: " + ex.getMessage(), null, null);
         }
-        archetypeTypeSet = new ArchetypeTypeSet<GameObject, MapArchObject, Archetype>();
         final GameObjectMatchers gameObjectMatchers = new GameObjectMatchers(xmlHelper.getDocumentBuilder(), xmlHelper.getXPath());
         gameObjectSpells.sort();
         XMLSpellLoader.load(getConfigurationDirectory(), CommonConstants.SPELL_FILE, xmlHelper.getDocumentBuilder(), numberSpells);

Modified: trunk/src/app/net/sf/gridarta/gui/DefaultObjectChooser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/DefaultObjectChooser.java	2008-07-31 21:39:40 UTC (rev 4629)
+++ trunk/src/app/net/sf/gridarta/gui/DefaultObjectChooser.java	2008-07-31 21:44:34 UTC (rev 4630)
@@ -30,6 +30,7 @@
 import net.sf.gridarta.CopyBuffer;
 import net.sf.gridarta.EditTypes;
 import net.sf.gridarta.MainControl;
+import net.sf.gridarta.archtype.ArchetypeTypeSet;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.ArchetypeSet;
 import net.sf.gridarta.gameobject.GameObject;
@@ -96,12 +97,13 @@
      * Creates a new instance.
      * @param mainControl the main control
      * @param archetypeSet the archetype set
+     * @param archetypeTypeSet the archetype type set
      * @param editTypes the edit types instance
      * @param archetypeChooserControl the archetype chooser control
      * @param pickmapChooserControl the pickmap chooser control
      * @param copyBuffer the copy buffer instance to use
      */
-    public DefaultObjectChooser(final MainControl<G, A, R, V> mainControl, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView, @NotNull final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final CopyBuffer<G, A, R, V> copyBuffer) {
+    public DefaultObjectChooser(final MainControl<G, A, R, V> mainControl, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView, @NotNull final ArchetypeChooserControl<G, A, R, V> archetypeChooserControl, @NotNull final PickmapChooserControl<G, A, R, V> pickmapChooserControl, @NotNull final CopyBuffer<G, A, R, V> copyBuffer) {
         super(new BorderLayout());
         this.archetypeChooserControl = archetypeChooserControl;
         this.pickmapChooserControl = pickmapChooserControl;
@@ -118,7 +120,7 @@
         });
         toolPalette = new ToolPalette<G, A, R, V>(mainControl, editTypes, selectedSquareView, this, pickmapChooserControl, copyBuffer);
 
-        objectChoiceDisplay = new ObjectChoiceDisplay<G, A, R, V>(mainControl, archetypeSet, copyBuffer, this);
+        objectChoiceDisplay = new ObjectChoiceDisplay<G, A, R, V>(mainControl, archetypeSet, archetypeTypeSet, copyBuffer, this);
 
         // archAndPickPane is the panel containing both archpanel and pickmaps
         archAndPickPane.addTab(ACTION_FACTORY.getString("objectChooser.archetypesTabTitle"), archetypeChooserControl.getArchetypePanel());

Modified: trunk/src/app/net/sf/gridarta/gui/ObjectChoiceDisplay.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ObjectChoiceDisplay.java	2008-07-31 21:39:40 UTC (rev 4629)
+++ trunk/src/app/net/sf/gridarta/gui/ObjectChoiceDisplay.java	2008-07-31 21:44:34 UTC (rev 4630)
@@ -27,6 +27,7 @@
 import net.sf.gridarta.CopyBuffer;
 import net.sf.gridarta.MainControl;
 import net.sf.gridarta.archtype.ArchetypeType;
+import net.sf.gridarta.archtype.ArchetypeTypeSet;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.ArchetypeSet;
 import net.sf.gridarta.gameobject.GameObject;
@@ -52,6 +53,10 @@
     @NotNull
     private final ArchetypeSet<G, A, R> archetypeSet;
 
+    /** The archetype type set. */
+    @NotNull
+    private final ArchetypeTypeSet<G, A, R> archetypeTypeSet;
+
     /** The copy buffer instance. */
     @NotNull
     private final CopyBuffer<G, A, R, V> copyBuffer;
@@ -76,9 +81,10 @@
 
     private final JLabel archTileText = new JLabel();
 
-    public ObjectChoiceDisplay(final MainControl<G, A, R, V> mainControl, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final CopyBuffer<G, A, R, V> copyBuffer, @NotNull final ObjectChooser<G, A, R> objectChooser) {
+    public ObjectChoiceDisplay(final MainControl<G, A, R, V> mainControl, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final ArchetypeTypeSet<G, A, R> archetypeTypeSet, @NotNull final CopyBuffer<G, A, R, V> copyBuffer, @NotNull final ObjectChooser<G, A, R> objectChooser) {
         this.mainControl = mainControl;
         this.archetypeSet = archetypeSet;
+        this.archetypeTypeSet = archetypeTypeSet;
         this.copyBuffer = copyBuffer;
         this.objectChooser = objectChooser;
         setLayout(new GridBagLayout());
@@ -151,7 +157,7 @@
 
             archArchNameText.setText(headObject.getArchetypeName());
 
-            final ArchetypeType archetypeType = mainControl.getArchetypeTypeSet().getArchetypeType(headObject.getArchetype());
+            final ArchetypeType archetypeType = archetypeTypeSet.getArchetypeType(headObject.getArchetype());
             archTypeText.setText(archetypeType.getTypeName() + " (" + archetypeType.getTypeNo() + ')');
 
             if (headObject.isMulti()) {


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