[Gridarta-commit] SF.net SVN: gridarta:[4677] trunk/src

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

Revision: 4677
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4677&view=rev
Author:   akirschbaum
Date:     2008-08-01 22:24:37 +0000 (Fri, 01 Aug 2008)

Log Message:
-----------
Remove call to MainControl.getGridartaObjectsFactory().

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/AbstractMainControl.java
    trunk/src/app/net/sf/gridarta/DefaultMapManager.java
    trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-01 22:21:01 UTC (rev 4676)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-08-01 22:24:37 UTC (rev 4677)
@@ -111,7 +111,7 @@
      */
     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);
+        final DefaultMapManager<G, A, R, V> tmpMapManager = new DefaultMapManager<G, A, R, V>(this, key, gridartaObjectsFactory);
         editTypes = new EditTypes(tmpMapManager);
         tmpMapManager.setEditTypes(editTypes);
         mapManager = tmpMapManager;

Modified: trunk/src/app/net/sf/gridarta/DefaultMapManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/DefaultMapManager.java	2008-08-01 22:21:01 UTC (rev 4676)
+++ trunk/src/app/net/sf/gridarta/DefaultMapManager.java	2008-08-01 22:24:37 UTC (rev 4677)
@@ -57,6 +57,12 @@
     @NotNull
     private final MainControl<G, A, R, V> mainControl;
 
+    /**
+     * The gridarta objects factory instance.
+     */
+    @NotNull
+    private final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory;
+
     /** The edit types. */
     @NotNull
     private EditTypes<G, A, R, V> editTypes = null;
@@ -77,10 +83,12 @@
      * Create a new map manager.
      * @param mainControl the main control
      * @param key The action factory key.
+     * @param gridartaObjectsFactory the gridarta objects factory instance
      */
-    public DefaultMapManager(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final String key) {
+    public DefaultMapManager(@NotNull final MainControl<G, A, R, V> mainControl, @NotNull final String key, @NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory) {
         actionFactory = ActionFactory.getFactory(key);
         this.mainControl = mainControl;
+        this.gridartaObjectsFactory = gridartaObjectsFactory;
     }
 
     /**
@@ -262,7 +270,7 @@
     public MapReader<G, A> decodeMapFile(@NotNull final File file, final boolean isInteractive) {
         final MapReader<G, A> decoder;
         try {
-            decoder = mainControl.getGridartaObjectsFactory().newMapReader(file);
+            decoder = gridartaObjectsFactory.newMapReader(file);
             decoder.decodeMapFile(isInteractive);
         } catch (final IOException e) {
             if (isInteractive) {

Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-01 22:21:01 UTC (rev 4676)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-08-01 22:24:37 UTC (rev 4677)
@@ -389,7 +389,7 @@
         final TestMapArchObject mapArchObject = new TestMapArchObject();
         final TestArchetypeSet archetypeSet = new TestArchetypeSet(gridartaObjectsFactory);
         final ArchetypeChooserControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> archetypeChooserControl = new ArchetypeChooserControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic>(mainControl, archetypeSet, false);
-        final MapManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapManager = new DefaultMapManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic>(mainControl, "test");
+        final MapManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapManager = new DefaultMapManager<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic>(mainControl, "test", gridartaObjectsFactory);
         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>();


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