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

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

Revision: 5032
          http://gridarta.svn.sourceforge.net/gridarta/?rev=5032&view=rev
Author:   akirschbaum
Date:     2008-09-07 09:27:17 +0000 (Sun, 07 Sep 2008)

Log Message:
-----------
Add MapControlFactory.init().

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/map/DefaultMapControlFactory.java
    trunk/daimonin/src/daieditor/map/DefaultMapControlFactory.java
    trunk/src/app/net/sf/gridarta/map/MapControlFactory.java

Modified: trunk/crossfire/src/cfeditor/map/DefaultMapControlFactory.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/DefaultMapControlFactory.java	2008-09-07 09:16:49 UTC (rev 5031)
+++ trunk/crossfire/src/cfeditor/map/DefaultMapControlFactory.java	2008-09-07 09:27:17 UTC (rev 5032)
@@ -96,16 +96,7 @@
         super(gridartaObjectsFactory);
     }
 
-    /**
-     * Initializes the instance.
-     * @param gridartaObjectsFactory the gridarta objects factory to use
-     * @param rendererFactory the renderer factory to use
-     * @param mapActions the map actions to use
-     * @param archetypeChooserModel the archetype chooser model to use
-     * @param mapImageCache the map image cache to use
-     * @param autojoinLists the autojoin lists to use
-     * @param exitTypeGameObjectMatcher the matcher for exit objects
-     */
+    /** {@inheritDoc} */
     public void init(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, @NotNull final RendererFactory<GameObject, MapArchObject, Archetype> rendererFactory, @NotNull final MapActions mapActions, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserModel, @NotNull final MapImageCache<GameObject, MapArchObject, Archetype, CMapViewBasic> mapImageCache, @NotNull final AutojoinLists<GameObject, MapArchObject, Archetype> autojoinLists, @NotNull final GameObjectMatcher exitTypeGameObjectMatcher) {
         this.gridartaObjectsFactory = gridartaObjectsFactory;
         this.rendererFactory = rendererFactory;

Modified: trunk/daimonin/src/daieditor/map/DefaultMapControlFactory.java
===================================================================
--- trunk/daimonin/src/daieditor/map/DefaultMapControlFactory.java	2008-09-07 09:16:49 UTC (rev 5031)
+++ trunk/daimonin/src/daieditor/map/DefaultMapControlFactory.java	2008-09-07 09:27:17 UTC (rev 5032)
@@ -96,16 +96,7 @@
         super(gridartaObjectsFactory);
     }
 
-    /**
-     * Creates a new instance.
-     * @param gridartaObjectsFactory the gridarta objects factory to use
-     * @param rendererFactory the renderer factory to use
-     * @param mapActions the map actions to use
-     * @param archetypeChooserModel the archetype chooser model to use
-     * @param mapImageCache the map image cache to use
-     * @param autojoinLists the autojoin lists to use
-     * @param exitTypeGameObjectMatcher the matcher for exit objects
-     */
+    /** {@inheritDoc} */
     public void init(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory, @NotNull final RendererFactory<GameObject, MapArchObject, Archetype> rendererFactory, @NotNull final MapActions mapActions, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype, CMapViewBasic> archetypeChooserModel, @NotNull final MapImageCache<GameObject, MapArchObject, Archetype, CMapViewBasic> mapImageCache, @NotNull final AutojoinLists<GameObject, MapArchObject, Archetype> autojoinLists, @NotNull final GameObjectMatcher exitTypeGameObjectMatcher) {
         this.gridartaObjectsFactory = gridartaObjectsFactory;
         this.rendererFactory = rendererFactory;

Modified: trunk/src/app/net/sf/gridarta/map/MapControlFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/MapControlFactory.java	2008-09-07 09:16:49 UTC (rev 5031)
+++ trunk/src/app/net/sf/gridarta/map/MapControlFactory.java	2008-09-07 09:27:17 UTC (rev 5032)
@@ -23,10 +23,17 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
+import net.sf.gridarta.AutojoinLists;
+import net.sf.gridarta.GridartaObjectsFactory;
+import net.sf.gridarta.MapActions;
+import net.sf.gridarta.MapImageCache;
 import net.sf.gridarta.Size2D;
 import net.sf.gridarta.gameobject.Archetype;
 import net.sf.gridarta.gameobject.GameObject;
+import net.sf.gridarta.gameobject.match.GameObjectMatcher;
+import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserModel;
 import net.sf.gridarta.gui.map.MapViewBasic;
+import net.sf.gridarta.gui.map.RendererFactory;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -37,6 +44,18 @@
 public interface MapControlFactory<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
 
     /**
+     * Initializes the instance.
+     * @param gridartaObjectsFactory the gridarta objects factory to use
+     * @param rendererFactory the renderer factory to use
+     * @param mapActions the map actions to use
+     * @param archetypeChooserModel the archetype chooser model to use
+     * @param mapImageCache the map image cache to use
+     * @param autojoinLists the autojoin lists to use
+     * @param exitTypeGameObjectMatcher the matcher for exit objects
+     */
+    void init(@NotNull GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull RendererFactory<G, A, R> rendererFactory, @NotNull MapActions mapActions, @NotNull ArchetypeChooserModel<G, A, R, V> archetypeChooserModel, @NotNull MapImageCache<G, A, R, V> mapImageCache, @NotNull AutojoinLists<G, A, R> autojoinLists, @NotNull GameObjectMatcher exitTypeGameObjectMatcher);
+
+    /**
      * Create a new map control instance.
      * @param parent the parent component for error messages
      * @param objects the objects to insert into the new map


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