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

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

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

Log Message:
-----------
Move code to common code base.

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

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-20 20:12:00 UTC (rev 4923)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-20 20:14:00 UTC (rev 4924)
@@ -62,7 +62,6 @@
 import net.sf.gridarta.XmlHelper;
 import net.sf.gridarta.archtype.ArchetypeAttributeParser;
 import net.sf.gridarta.archtype.ArchetypeTypeParser;
-import net.sf.gridarta.archtype.ArchetypeTypeSet;
 import net.sf.gridarta.archtype.ArchetypeTypeSetParser;
 import net.sf.gridarta.gameobject.anim.AnimationObject;
 import net.sf.gridarta.gameobject.match.GameObjectMatcher;
@@ -201,7 +200,6 @@
      */
     public CMainControl() {
         super(new CrossfireObjectsFactory(), new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory());
-        final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet = new ArchetypeTypeSet<GameObject, MapArchObject, Archetype>();
         final GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory = new GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeTypeSet, archetypeSet, mapManager);
         archetypeChooserControl.init(false, gameObjectAttributesDialogFactory);
         mapViewManager = new MapViewManager<GameObject, MapArchObject, Archetype, CMapViewBasic>();

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:12:00 UTC (rev 4923)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-20 20:14:00 UTC (rev 4924)
@@ -66,7 +66,6 @@
 import net.sf.gridarta.XmlHelper;
 import net.sf.gridarta.archtype.ArchetypeAttributeParser;
 import net.sf.gridarta.archtype.ArchetypeTypeParser;
-import net.sf.gridarta.archtype.ArchetypeTypeSet;
 import net.sf.gridarta.archtype.ArchetypeTypeSetParser;
 import net.sf.gridarta.gameobject.anim.AnimationObject;
 import net.sf.gridarta.gameobject.face.FaceObjectProviders;
@@ -255,7 +254,6 @@
      */
     public CMainControl() {
         super(new DaimoninObjectsFactory(), new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory());
-        final ArchetypeTypeSet<GameObject, MapArchObject, Archetype> archetypeTypeSet = new ArchetypeTypeSet<GameObject, MapArchObject, Archetype>();
         final GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gameObjectAttributesDialogFactory = new GameObjectAttributesDialogFactory<GameObject, MapArchObject, Archetype, CMapViewBasic>(archetypeTypeSet, archetypeSet, mapManager);
         archetypeChooserControl.init(true, gameObjectAttributesDialogFactory);
         final MapViewManager<GameObject, MapArchObject, Archetype, CMapViewBasic> mapViewManager = new MapViewManager<GameObject, MapArchObject, Archetype, CMapViewBasic>();

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 20:12:00 UTC (rev 4923)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-20 20:14:00 UTC (rev 4924)
@@ -28,6 +28,7 @@
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.filechooser.FileFilter;
+import net.sf.gridarta.archtype.ArchetypeTypeSet;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.ArchetypeSet;
 import net.sf.gridarta.gameobject.GameObject;
@@ -162,6 +163,9 @@
     @NotNull
     protected final PickmapChooserControl<G, A, R, V> pickmapChooserControl;
 
+    @NotNull
+    protected final ArchetypeTypeSet<G, A, R> archetypeTypeSet;
+
     /**
      * Creates a new instance.
      * @param gridartaObjectsFactory the gridarta objects factory
@@ -196,6 +200,7 @@
         archetypeChooserControl = new ArchetypeChooserControl<G, A, R, V>(archetypeChooserModel);
         pickmapChooserControl = new PickmapChooserControl<G, A, R, V>(newMapDialogFactory, this, gridartaObjectsFactory, mapControlFactory, globalSettings.getPickmapDir(), mapManager);
         newMapDialogFactory.setPickmapChooserControl(pickmapChooserControl);
+        archetypeTypeSet = new ArchetypeTypeSet<G, A, R>();
     }
 
     /**


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