Thread: [Gridarta-commit] SF.net SVN: gridarta:[4868] trunk (Page 9)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4868
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4868&view=rev
Author:   akirschbaum
Date:     2008-08-15 21:29:39 +0000 (Fri, 15 Aug 2008)

Log Message:
-----------
Remove access to autojoinLists field in CrossfireObjectsFactory/DaimoninObjectsFactory.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java
    trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
    trunk/src/app/net/sf/gridarta/AbstractMainControl.java
    trunk/src/app/net/sf/gridarta/CopyBuffer.java
    trunk/src/app/net/sf/gridarta/DefaultMapManager.java
    trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java
    trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java

Modified: trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java
===================================================================

--- trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java	2008-08-15 21:18:29 UTC (rev 4867)
+++ trunk/crossfire/src/cfeditor/CrossfireObjectsFactory.java	2008-08-15 21:29:39 UTC (rev 4868)
@@ -154,7 +154,7 @@
 
     /** {@inheritDoc} */
     @NotNull
-    public MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapControl(@Nullable final List<GameObject> objects, @NotNull final MapArchObject mapArchObject, @NotNull final Component parent) {
+    public MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapControl(@Nullable final List<GameObject> objects, @NotNull final MapArchObject mapArchObject, @NotNull final Component parent, @NotNull final AutojoinLists<GameObject, MapArchObject, Archetype> autojoinLists) {
         return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, parent, autojoinLists, mapImageCache, objects, mapArchObject, false, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserModel, mapActions);
     }
 

Modified: trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java
===================================================================
--- trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java	2008-08-15 21:18:29 UTC (rev 4867)
+++ trunk/daimonin/src/daieditor/DaimoninObjectsFactory.java	2008-08-15 21:29:39 UTC (rev 4868)
@@ -158,7 +158,7 @@
 
     /** {@inheritDoc} */
     @NotNull
-    public MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapControl(@Nullable final List<GameObject> objects, @NotNull final MapArchObject mapArchObject, @NotNull final Component parent) {
+    public MapControl<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapControl(@Nullable final List<GameObject> objects, @NotNull final MapArchObject mapArchObject, @NotNull final Component parent, @NotNull final AutojoinLists<GameObject, MapArchObject, Archetype> autojoinLists) {
         return new DefaultMapControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, parent, autojoinLists, mapImageCache, objects, mapArchObject, false, GameObjectMatchersInstance.getInstance().getMatcher("exit"), archetypeChooserModel, mapActions);
     }
 

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-15 21:18:29 UTC (rev 4867)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-15 21:29:39 UTC (rev 4868)
@@ -108,11 +108,11 @@
      */
     protected AbstractMainControl(@NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull final String key, @NotNull final GlobalSettings globalSettings) {
         this.globalSettings = globalSettings;
-        final DefaultMapManager<G, A, R, V> tmpMapManager = new DefaultMapManager<G, A, R, V>(this, key, gridartaObjectsFactory, globalSettings);
+        final DefaultMapManager<G, A, R, V> tmpMapManager = new DefaultMapManager<G, A, R, V>(this, key, gridartaObjectsFactory, globalSettings, autojoinLists);
         editTypes = new EditTypes<G, A, R, V>(tmpMapManager);
         tmpMapManager.setEditTypes(editTypes);
         mapManager = tmpMapManager;
-        copyBuffer = new CopyBuffer<G, A, R, V>(this, editTypes, gridartaObjectsFactory);
+        copyBuffer = new CopyBuffer<G, A, R, V>(this, editTypes, gridartaObjectsFactory, autojoinLists);
         this.gridartaObjectsFactory = gridartaObjectsFactory;
         globalSettings.readGlobalSettings();
         ScriptedEventEditor.setGlobalSettings(globalSettings);

Modified: trunk/src/app/net/sf/gridarta/CopyBuffer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/CopyBuffer.java	2008-08-15 21:18:29 UTC (rev 4867)
+++ trunk/src/app/net/sf/gridarta/CopyBuffer.java	2008-08-15 21:29:39 UTC (rev 4868)
@@ -73,6 +73,12 @@
     @NotNull
     private final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory;
 
+    /**
+     * The autojoin lists.
+     */
+    @NotNull
+    private final AutojoinLists<G, A, R> autojoinLists;
+
     /** Internal map control to store the cut / copied arches. */
     private MapControl<G, A, R, V> copyMapCtrl = null;
 
@@ -81,11 +87,13 @@
      * @param mainControl main control
      * @param editTypes the edit types instance
      * @param gridartaObjectsFactory the gridarta objects factory instance
+     * @param autojoinLists the autojoin lists
      */
-    public CopyBuffer(final MainControl<G, A, R, V> mainControl, @NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory) {
+    public CopyBuffer(final MainControl<G, A, R, V> mainControl, @NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull final AutojoinLists<G, A, R> autojoinLists) {
         this.mainControl = mainControl; // link main control in
         this.editTypes = editTypes;
         this.gridartaObjectsFactory = gridartaObjectsFactory;
+        this.autojoinLists = autojoinLists;
     }
 
     /**
@@ -95,7 +103,7 @@
     public void init(final A mapArch) {
         assert copyMapCtrl == null;
         mapArch.setMapName("cb");
-        copyMapCtrl = gridartaObjectsFactory.newMapControl(null, mapArch, mainControl.getMainView());
+        copyMapCtrl = gridartaObjectsFactory.newMapControl(null, mapArch, mainControl.getMainView(), autojoinLists);
         copyMapCtrl.setMapFileName("cb");
     }
 

Modified: trunk/src/app/net/sf/gridarta/DefaultMapManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/DefaultMapManager.java	2008-08-15 21:18:29 UTC (rev 4867)
+++ trunk/src/app/net/sf/gridarta/DefaultMapManager.java	2008-08-15 21:29:39 UTC (rev 4868)
@@ -69,6 +69,12 @@
     @NotNull
     private final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory;
 
+    /**
+     * The autojoin lists.
+     */
+    @NotNull
+    private final AutojoinLists<G, A, R> autojoinLists;
+
     /** The edit types. */
     @NotNull
     private EditTypes<G, A, R, V> editTypes = null;
@@ -91,9 +97,11 @@
      * @param key The action factory key.
      * @param gridartaObjectsFactory the gridarta objects factory instance
      * @param globalSettings the global settings instance
+     * @param autojoinLists the autojoin lists
      */
-    public DefaultMapManager(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final String key, @NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull final GlobalSettings globalSettings) {
+    public DefaultMapManager(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final String key, @NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull final GlobalSettings globalSettings, @NotNull final AutojoinLists<G, A, R> autojoinLists) {
         this.globalSettings = globalSettings;
+        this.autojoinLists = autojoinLists;
         actionFactory = ActionFactory.getFactory(key);
         this.mainControl = mainControl;
         this.gridartaObjectsFactory = gridartaObjectsFactory;
@@ -128,7 +136,7 @@
 
     @NotNull
     private MapControl<G, A, R, V> newMap(final List<G> objects, final A mapArchObject, @Nullable final File file, @NotNull final String mapFileName) {
-        final MapControl<G, A, R, V> mapControl = gridartaObjectsFactory.newMapControl(objects, mapArchObject, mainControl.getMainView());
+        final MapControl<G, A, R, V> mapControl = gridartaObjectsFactory.newMapControl(objects, mapArchObject, mainControl.getMainView(), autojoinLists);
         mapControl.setMapFile(file);
         mapControl.setMapFileName(mapFileName);
         return mapControl;

Modified: trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java	2008-08-15 21:18:29 UTC (rev 4867)
+++ trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java	2008-08-15 21:29:39 UTC (rev 4868)
@@ -101,10 +101,11 @@
      * @param objects The objects to insert into the new map.
      * @param mapArchObject The map arch object to use for the new map.
      * @param parent the parent component for error messages
+     * @param autojoinLists the autojoin lists instance
      * @return The new map control instance.
      */
     @NotNull
-    MapControl<G, A, R, V> newMapControl(@Nullable List<G> objects, @NotNull A mapArchObject, @NotNull Component parent);
+    MapControl<G, A, R, V> newMapControl(@Nullable List<G> objects, @NotNull A mapArchObject, @NotNull Component parent, @NotNull AutojoinLists<G, A, R> autojoinLists);
 
     /**
      * Create a new pickmap map control instance.

Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-15 21:18:29 UTC (rev 4867)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-15 21:29:39 UTC (rev 4868)
@@ -386,10 +386,10 @@
         final TestMapArchObject mapArchObject = new TestMapArchObject();
         final TestArchetypeSet archetypeSet = new TestArchetypeSet(gridartaObjectsFactory);
         final ArchetypeChooserModel<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> archetypeChooserModel = new ArchetypeChooserModel<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic>(archetypeSet);
-        final MapManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapManager = new DefaultMapManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic>(mainControl, "test", gridartaObjectsFactory, globalSettings);
+        final AutojoinLists<TestGameObject, TestMapArchObject, TestArchetype> autojoinLists = new AutojoinLists<TestGameObject, TestMapArchObject, TestArchetype>();
+        final MapManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapManager = new DefaultMapManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic>(mainControl, "test", gridartaObjectsFactory, globalSettings, autojoinLists);
         final MapImageCache<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapImageCache = new MapImageCache<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic>(null, mapManager, null, new ImageIcon(), new ImageIcon());
         final MapActions mapActions = new TestMapActions();
-        final AutojoinLists<TestGameObject, TestMapArchObject, TestArchetype> autojoinLists = new AutojoinLists<TestGameObject, TestMapArchObject, TestArchetype>();
         final TestMapControl mapControl = new TestMapControl(gridartaObjectsFactory, autojoinLists, mapImageCache, null, mapArchObject, false, null, archetypeChooserModel, mapActions);
         mapModel = new DefaultMapModel<TestGameObject, TestMapArchObject, TestArchetype>(new JPanel(), autojoinLists, mapControl, null, mapArchObject, null, archetypeChooserModel, mapActions);
 
@@ -845,7 +845,7 @@
 
         /** {@inheritDoc} */
         @NotNull
-        public MapControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> newMapControl(@Nullable final List<TestGameObject> objects, @NotNull final TestMapArchObject mapArchObject, @NotNull final Component parent) {
+        public MapControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> newMapControl(@Nullable final List<TestGameObject> objects, @NotNull final TestMapArchObject mapArchObject, @NotNull final Component parent, @NotNull final AutojoinLists<TestGameObject, TestMapArchObject, TestArchetype> autojoinLists) {
             throw new AssertionError();
         }
 


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




Thread: [Gridarta-commit] SF.net SVN: gridarta:[4868] trunk (Page 9)

gridarta-commit