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

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

Revision: 5430
          http://gridarta.svn.sourceforge.net/gridarta/?rev=5430&view=rev
Author:   akirschbaum
Date:     2008-10-03 21:09:52 +0000 (Fri, 03 Oct 2008)

Log Message:
-----------
Extract ArchetypeFactory from GridartaObjectsFactory.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CFJavaEditor.java
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/crossfire/src/cfeditor/DefaultGridartaObjectsFactory.java
    trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/daimonin/src/daieditor/DaimoninEditor.java
    trunk/daimonin/src/daieditor/DefaultGridartaObjectsFactory.java
    trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
    trunk/src/app/net/sf/gridarta/AbstractMainControl.java
    trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java
    trunk/src/app/net/sf/gridarta/gameobject/AbstractArchetypeSet.java
    trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java

Added Paths:
-----------
    trunk/crossfire/src/cfeditor/gameobject/DefaultArchetypeFactory.java
    trunk/daimonin/src/daieditor/gameobject/DefaultArchetypeFactory.java
    trunk/src/app/net/sf/gridarta/gameobject/ArchetypeFactory.java

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

--- trunk/crossfire/src/cfeditor/CFJavaEditor.java	2008-10-03 20:36:54 UTC (rev 5429)
+++ trunk/crossfire/src/cfeditor/CFJavaEditor.java	2008-10-03 21:09:52 UTC (rev 5430)
@@ -143,7 +143,7 @@
         // Create the application and give it the parameters
         final CMainControl mainControl;
         try {
-            mainControl = new CMainControl(new DefaultGridartaObjectsFactory());
+            mainControl = new CMainControl();
         } catch (final RuntimeException ex) {
             log.fatal(ex.getMessage(), ex);
             System.exit(1);

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-10-03 20:36:54 UTC (rev 5429)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-10-03 21:09:52 UTC (rev 5430)
@@ -23,6 +23,7 @@
 import cfeditor.gameobject.ArchetypeParser;
 import cfeditor.gameobject.ArchetypeSet;
 import cfeditor.gameobject.ArchetypeSetLoader;
+import cfeditor.gameobject.DefaultArchetypeFactory;
 import cfeditor.gameobject.DefaultGameObjectFactory;
 import cfeditor.gameobject.GameObject;
 import cfeditor.gameobject.anim.AnimationObjects;
@@ -46,12 +47,12 @@
 import net.sf.gridarta.CommonConstants;
 import net.sf.gridarta.EditTypes;
 import net.sf.gridarta.GlobalSettings;
-import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.MapImageCache;
 import net.sf.gridarta.MapManager;
 import net.sf.gridarta.archtype.ArchetypeTypeSet;
 import net.sf.gridarta.filter.FilterControl;
 import net.sf.gridarta.gameobject.AbstractArchetypeParser;
+import net.sf.gridarta.gameobject.ArchetypeFactory;
 import net.sf.gridarta.gameobject.GameObjectFactory;
 import net.sf.gridarta.gameobject.anim.AnimationObject;
 import net.sf.gridarta.gameobject.match.GameObjectMatcher;
@@ -114,16 +115,22 @@
 
     /**
      * Constructs the main controller and its model and view.
-     * @param gridartaObjectsFactory the gridarta objects factory to use
      * @throws RuntimeException If the controller cannot be initialized.
      */
-    public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
-        super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), false, ConfigFileUtils.getHomeFile("thumbnails"), null, "CrossfireEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, }, PREFS_VALIDATOR_AUTO_DEFAULT, IGUIConstants.SCRIPTS_DIR);
+    public CMainControl() {
+        super(new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), false, ConfigFileUtils.getHomeFile("thumbnails"), null, "CrossfireEditor.jar", pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, Archetype.TYPE_EVENT_CONNECTOR, false, 0, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, }, PREFS_VALIDATOR_AUTO_DEFAULT, IGUIConstants.SCRIPTS_DIR);
     }
 
     /** {@inheritDoc} */
     @NotNull
     @Override
+    protected ArchetypeFactory<GameObject, MapArchObject, Archetype> newArchetypeFactory() {
+        return new DefaultArchetypeFactory();
+    }
+
+    /** {@inheritDoc} */
+    @NotNull
+    @Override
     protected MapViewFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapViewFactory(@NotNull final net.sf.gridarta.gameobject.face.FaceObjects faceObjects, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView, @NotNull final AbstractMainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final MapImageCache<GameObject, MapArchObject, Archetype, CMapViewBasic> mapImageCache, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette, @NotNull final FilterControl<GameObject, MapArchObject, Archetype, CMapViewBasic> filterControl) {
         return new DefaultMapViewFactory((FaceObjects) faceObjects, selectedSquareView, mainControl, mainView, editTypes, mapImageCache, toolPalette, filterControl);
     }
@@ -338,8 +345,8 @@
     /** {@inheritDoc} */
     @NotNull
     @Override
-    protected net.sf.gridarta.gameobject.ArchetypeSet<GameObject, MapArchObject, Archetype> newArchetypeSet(@NotNull final GlobalSettings globalSettings, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final net.sf.gridarta.gameobject.face.FaceObjects faceObjects, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
-        return new ArchetypeSet(((GlobalSettingsImpl) globalSettings).getImageSet(), gridartaObjectsFactory);
+    protected net.sf.gridarta.gameobject.ArchetypeSet<GameObject, MapArchObject, Archetype> newArchetypeSet(@NotNull final GlobalSettings globalSettings, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final net.sf.gridarta.gameobject.face.FaceObjects faceObjects, @NotNull final ArchetypeFactory<GameObject, MapArchObject, Archetype> archetypeFactory) {
+        return new ArchetypeSet(((GlobalSettingsImpl) globalSettings).getImageSet(), archetypeFactory);
     }
 
 } // class CMainControl

Modified: trunk/crossfire/src/cfeditor/DefaultGridartaObjectsFactory.java
===================================================================
--- trunk/crossfire/src/cfeditor/DefaultGridartaObjectsFactory.java	2008-10-03 20:36:54 UTC (rev 5429)
+++ trunk/crossfire/src/cfeditor/DefaultGridartaObjectsFactory.java	2008-10-03 21:09:52 UTC (rev 5430)
@@ -21,11 +21,9 @@
 
 import cfeditor.gameobject.Archetype;
 import cfeditor.gameobject.GameObject;
-import cfeditor.gameobject.UndefinedArchetype;
 import cfeditor.gui.map.CMapViewBasic;
 import cfeditor.map.MapArchObject;
 import net.sf.gridarta.GridartaObjectsFactory;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * The {@link GridartaObjectsFactory} to create Crossfire related objects.
@@ -33,10 +31,4 @@
  */
 public class DefaultGridartaObjectsFactory implements GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> {
 
-    /** {@inheritDoc} */
-    @NotNull
-    public Archetype newUndefinedArchetype(@NotNull final String archetypeName) {
-        return new UndefinedArchetype(archetypeName);
-    }
-
 } // class DefaultGridartaObjectsFactory

Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java	2008-10-03 20:36:54 UTC (rev 5429)
+++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java	2008-10-03 21:09:52 UTC (rev 5430)
@@ -20,15 +20,14 @@
 package cfeditor.gameobject;
 
 import cfeditor.IGUIConstants;
-import cfeditor.gui.map.CMapViewBasic;
 import cfeditor.map.MapArchObject;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
-import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.gameobject.AbstractArchetypeSet;
+import net.sf.gridarta.gameobject.ArchetypeFactory;
 import net.sf.gridarta.io.GameObjectParser;
 import net.sf.gridarta.utils.IOUtils;
 import net.sf.japi.swing.ActionFactory;
@@ -62,11 +61,10 @@
     /**
      * Create the ArchetypeSet.
      * @param imageSet the image set to use
-     * @param gridartaObjectsFactory the gridarta objects factory instance to
-     * use
+     * @param archetypeFactory the archetype factory instance to use
      */
-    public ArchetypeSet(@Nullable final String imageSet, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
-        super(gridartaObjectsFactory);
+    public ArchetypeSet(@Nullable final String imageSet, @NotNull final ArchetypeFactory<GameObject, MapArchObject, Archetype> archetypeFactory) {
+        super(archetypeFactory);
         this.imageSet = imageSet;
     }
 

Added: trunk/crossfire/src/cfeditor/gameobject/DefaultArchetypeFactory.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/DefaultArchetypeFactory.java	                        (rev 0)
+++ trunk/crossfire/src/cfeditor/gameobject/DefaultArchetypeFactory.java	2008-10-03 21:09:52 UTC (rev 5430)
@@ -0,0 +1,44 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2007 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package cfeditor.gameobject;
+
+import cfeditor.map.MapArchObject;
+import net.sf.gridarta.gameobject.ArchetypeFactory;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A {@link ArchetypeFactory} creating Crossfire objects.
+ * @author Andreas Kirschbaum
+ */
+public class DefaultArchetypeFactory implements ArchetypeFactory<GameObject, MapArchObject, Archetype> {
+
+    /**
+     * Creates a new instance.
+     */
+    public DefaultArchetypeFactory() {
+    }
+
+    /** {@inheritDoc} */
+    @NotNull
+    public Archetype newUndefinedArchetype(@NotNull final String archetypeName) {
+        return new UndefinedArchetype(archetypeName);
+    }
+
+} // class DefaultArchetypeFactory


Property changes on: trunk/crossfire/src/cfeditor/gameobject/DefaultArchetypeFactory.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + LF

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-10-03 20:36:54 UTC (rev 5429)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-10-03 21:09:52 UTC (rev 5430)
@@ -23,6 +23,7 @@
 import daieditor.gameobject.ArchetypeParser;
 import daieditor.gameobject.ArchetypeSet;
 import daieditor.gameobject.ArchetypeSetLoader;
+import daieditor.gameobject.DefaultArchetypeFactory;
 import daieditor.gameobject.DefaultGameObjectFactory;
 import daieditor.gameobject.GameObject;
 import daieditor.gameobject.anim.AnimationObjects;
@@ -51,12 +52,12 @@
 import net.sf.gridarta.CommonConstants;
 import net.sf.gridarta.EditTypes;
 import net.sf.gridarta.GlobalSettings;
-import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.MapImageCache;
 import net.sf.gridarta.MapManager;
 import net.sf.gridarta.archtype.ArchetypeTypeSet;
 import net.sf.gridarta.filter.FilterControl;
 import net.sf.gridarta.gameobject.AbstractArchetypeParser;
+import net.sf.gridarta.gameobject.ArchetypeFactory;
 import net.sf.gridarta.gameobject.GameObjectFactory;
 import net.sf.gridarta.gameobject.anim.AnimationObject;
 import net.sf.gridarta.gameobject.face.FaceObjectProviders;
@@ -161,16 +162,22 @@
 
     /**
      * Constructs the main controller and its model and view.
-     * @param gridartaObjectsFactory the gridarta objects factory to use
      * @throws RuntimeException If the controller cannot be initialized.
      */
-    public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
-        super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "DaimoninEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, }, PREFS_VALIDATOR_AUTO_DEFAULT, IGUIConstants.SCRIPTS_DIR);
+    public CMainControl() {
+        super(new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH), "DaimoninEditor.jar", luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, 0, true, -1, new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, }, PREFS_VALIDATOR_AUTO_DEFAULT, IGUIConstants.SCRIPTS_DIR);
     }
 
     /** {@inheritDoc} */
     @NotNull
     @Override
+    protected ArchetypeFactory<GameObject, MapArchObject, Archetype> newArchetypeFactory() {
+        return new DefaultArchetypeFactory();
+    }
+
+    /** {@inheritDoc} */
+    @NotNull
+    @Override
     protected MapViewFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> newMapViewFactory(@NotNull final net.sf.gridarta.gameobject.face.FaceObjects faceObjects, @NotNull final SelectedSquareView<GameObject, MapArchObject, Archetype, CMapViewBasic> selectedSquareView, @NotNull final AbstractMainControl<GameObject, MapArchObject, Archetype, CMapViewBasic> mainControl, @NotNull final MainView<GameObject, MapArchObject, Archetype, CMapViewBasic> mainView, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final MapImageCache<GameObject, MapArchObject, Archetype, CMapViewBasic> mapImageCache, @NotNull final ToolPalette<GameObject, MapArchObject, Archetype, CMapViewBasic> toolPalette, @NotNull final FilterControl<GameObject, MapArchObject, Archetype, CMapViewBasic> filterControl) {
         return new DefaultMapViewFactory((FaceObjects) faceObjects, selectedSquareView, mainControl, mainView, editTypes, mapImageCache, toolPalette, filterControl);
     }
@@ -549,8 +556,8 @@
     /** {@inheritDoc} */
     @NotNull
     @Override
-    protected ArchetypeSet newArchetypeSet(@NotNull final GlobalSettings globalSettings, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final net.sf.gridarta.gameobject.face.FaceObjects faceObjects, @NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
-        return new ArchetypeSet(gridartaObjectsFactory);
+    protected ArchetypeSet newArchetypeSet(@NotNull final GlobalSettings globalSettings, @NotNull final EditTypes<GameObject, MapArchObject, Archetype, CMapViewBasic> editTypes, @NotNull final net.sf.gridarta.gameobject.anim.AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final net.sf.gridarta.gameobject.face.FaceObjects faceObjects, @NotNull final ArchetypeFactory<GameObject, MapArchObject, Archetype> archetypeFactory) {
+        return new ArchetypeSet(archetypeFactory);
     }
 
 } // class CMainControl

Modified: trunk/daimonin/src/daieditor/DaimoninEditor.java
===================================================================
--- trunk/daimonin/src/daieditor/DaimoninEditor.java	2008-10-03 20:36:54 UTC (rev 5429)
+++ trunk/daimonin/src/daieditor/DaimoninEditor.java	2008-10-03 21:09:52 UTC (rev 5430)
@@ -122,7 +122,7 @@
 
         // Create the application and give it the parameters
         try {
-            mainControl = new CMainControl(new DefaultGridartaObjectsFactory());
+            mainControl = new CMainControl();
         } catch (final RuntimeException ex) {
             log.fatal(ex.getMessage());
             System.exit(1);

Modified: trunk/daimonin/src/daieditor/DefaultGridartaObjectsFactory.java
===================================================================
--- trunk/daimonin/src/daieditor/DefaultGridartaObjectsFactory.java	2008-10-03 20:36:54 UTC (rev 5429)
+++ trunk/daimonin/src/daieditor/DefaultGridartaObjectsFactory.java	2008-10-03 21:09:52 UTC (rev 5430)
@@ -21,11 +21,9 @@
 
 import daieditor.gameobject.Archetype;
 import daieditor.gameobject.GameObject;
-import daieditor.gameobject.UndefinedArchetype;
 import daieditor.gui.map.CMapViewBasic;
 import daieditor.map.MapArchObject;
 import net.sf.gridarta.GridartaObjectsFactory;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * The {@link GridartaObjectsFactory} to create Daimonin related objects.
@@ -33,10 +31,4 @@
  */
 public class DefaultGridartaObjectsFactory implements GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> {
 
-    /** {@inheritDoc} */
-    @NotNull
-    public Archetype newUndefinedArchetype(@NotNull final String archetypeName) {
-        return new UndefinedArchetype(archetypeName);
-    }
-
 } // class DefaultGridartaObjectsFactory

Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java	2008-10-03 20:36:54 UTC (rev 5429)
+++ trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java	2008-10-03 21:09:52 UTC (rev 5430)
@@ -20,7 +20,6 @@
 package daieditor.gameobject;
 
 import daieditor.IGUIConstants;
-import daieditor.gui.map.CMapViewBasic;
 import daieditor.map.MapArchObject;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -28,8 +27,8 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import javax.swing.ImageIcon;
-import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.gameobject.AbstractArchetypeSet;
+import net.sf.gridarta.gameobject.ArchetypeFactory;
 import net.sf.gridarta.gameobject.face.FaceObjectProviders;
 import net.sf.gridarta.gui.SystemIcons;
 import net.sf.gridarta.io.GameObjectParser;
@@ -52,11 +51,10 @@
 
     /**
      * Create the ArchetypeSet.
-     * @param gridartaObjectsFactory the gridarta objects factory instance to
-     * use
+     * @param archetypeFactory the archetype factory instance to use
      */
-    public ArchetypeSet(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
-        super(gridartaObjectsFactory);
+    public ArchetypeSet(@NotNull final ArchetypeFactory<GameObject, MapArchObject, Archetype> archetypeFactory) {
+        super(archetypeFactory);
     }
 
     /** {@inheritDoc} */

Added: trunk/daimonin/src/daieditor/gameobject/DefaultArchetypeFactory.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/DefaultArchetypeFactory.java	                        (rev 0)
+++ trunk/daimonin/src/daieditor/gameobject/DefaultArchetypeFactory.java	2008-10-03 21:09:52 UTC (rev 5430)
@@ -0,0 +1,44 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2007 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package daieditor.gameobject;
+
+import daieditor.map.MapArchObject;
+import net.sf.gridarta.gameobject.ArchetypeFactory;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A {@link ArchetypeFactory} creating Daimonin objects.
+ * @author Andreas Kirschbaum
+ */
+public class DefaultArchetypeFactory implements ArchetypeFactory<GameObject, MapArchObject, Archetype> {
+
+    /**
+     * Creates a new instance.
+     */
+    public DefaultArchetypeFactory() {
+    }
+
+    /** {@inheritDoc} */
+    @NotNull
+    public Archetype newUndefinedArchetype(@NotNull final String archetypeName) {
+        return new UndefinedArchetype(archetypeName);
+    }
+
+} // class DefaultArchetypeFactory


Property changes on: trunk/daimonin/src/daieditor/gameobject/DefaultArchetypeFactory.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + LF

Modified: trunk/src/app/net/sf/gridarta/AbstractMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-10-03 20:36:54 UTC (rev 5429)
+++ trunk/src/app/net/sf/gridarta/AbstractMainControl.java	2008-10-03 21:09:52 UTC (rev 5430)
@@ -48,6 +48,7 @@
 import net.sf.gridarta.filter.NamedFilterList;
 import net.sf.gridarta.gameobject.AbstractArchetypeParser;
 import net.sf.gridarta.gameobject.Archetype;
+import net.sf.gridarta.gameobject.ArchetypeFactory;
 import net.sf.gridarta.gameobject.ArchetypeSet;
 import net.sf.gridarta.gameobject.GameObject;
 import net.sf.gridarta.gameobject.GameObjectFactory;
@@ -295,7 +296,6 @@
 
     /**
      * Creates a new instance.
-     * @param gridartaObjectsFactory the gridarta objects factory
      * @param rendererFactory the renderer factory
      * @param key The action factory key
      * @param globalSettings the global settings instance
@@ -323,7 +323,7 @@
      * default
      * @param scriptsDir the plugin scripts directory
      */
-    protected AbstractMainControl(@NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final String key, @NotNull final GlobalSettings globalSettings, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, final boolean createDirectionPane, @Nullable final File mapImageCacheDir, @Nullable final ImageIcon compassIcon, @NotNull final String gridartaJarFilename, @NotNull final FileFilter scriptFileFilter, @NotNull final String scriptExtension, @NotNull final String scriptName, final int spellType, @Nullable final String spellFile, final int typeNoEventConnector, final boolean includeFaceText, final int undefinedSpellIndex, @NotNull final int[] lockedItemsTypeNumbers, final boolean autoValidatorDefault, @NotNull final String scriptsDir) {
+    protected AbstractMainControl(@NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final String key, @NotNull final GlobalSettings globalSettings, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, final boolean createDirectionPane, @Nullable final File mapImageCacheDir, @Nullable final ImageIcon compassIcon, @NotNull final String gridartaJarFilename, @NotNull final FileFilter scriptFileFilter, @NotNull final String scriptExtension, @NotNull final String scriptName, final int spellType, @Nullable final String spellFile, final int typeNoEventConnector, final boolean includeFaceText, final int undefinedSpellIndex, @NotNull final int[] lockedItemsTypeNumbers, final boolean autoValidatorDefault, @NotNull final String scriptsDir) {
         this.scriptExtension = scriptExtension;
         this.globalSettings = globalSettings;
         appPrefsModel = createAppPrefsModel();
@@ -342,7 +342,8 @@
         this.rendererFactory = rendererFactory;
         globalSettings.readGlobalSettings();
         ScriptedEventEditor.setGlobalSettings(globalSettings);
-        final ArchetypeSet<G, A, R> archetypeSet = newArchetypeSet(globalSettings, editTypes, animationObjects, faceObjects, gridartaObjectsFactory);
+        final ArchetypeFactory<G, A, R> archetypeFactory = newArchetypeFactory();
+        final ArchetypeSet<G, A, R> archetypeSet = newArchetypeSet(globalSettings, editTypes, animationObjects, faceObjects, archetypeFactory);
         mapReaderFactory.setArchetypeSet(archetypeSet);
         AbstractScriptedEvent.init(archetypeSet);
         PathManager.setGlobalSettings(globalSettings);
@@ -502,6 +503,9 @@
     }
 
     @NotNull
+    protected abstract ArchetypeFactory<G, A, R> newArchetypeFactory();
+
+    @NotNull
     protected abstract MapViewFactory<G, A, R, V> newMapViewFactory(@NotNull final FaceObjects faceObjects, @NotNull final SelectedSquareView<G, A, R, V> selectedSquareView, @NotNull final AbstractMainControl<G, A, R, V> mainControl, @NotNull final MainView<G, A, R, V> mainView, @NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final MapImageCache<G, A, R, V> mapImageCache, @NotNull final ToolPalette<G, A, R, V> toolPalette, @NotNull final FilterControl<G, A, R, V> filterControl);
 
     @NotNull
@@ -565,12 +569,11 @@
      * @param editTypes the edit types instance
      * @param animationObjects the animations to use
      * @param faceObjects the FaceObjects instance to use
-     * @param gridartaObjectsFactory the gridarta objects factory instance to
-     * use
+     * @param archetypeFactory the archetype factory instance to use
      * @return the archetype set instance
      */
     @NotNull
-    protected abstract ArchetypeSet<G, A, R> newArchetypeSet(@NotNull final GlobalSettings globalSettings, @NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, @NotNull final GridartaObjectsFactory<G, A, R, V> gridartaObjectsFactory);
+    protected abstract ArchetypeSet<G, A, R> newArchetypeSet(@NotNull final GlobalSettings globalSettings, @NotNull final EditTypes<G, A, R, V> editTypes, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, @NotNull final ArchetypeFactory<G, A, R> archetypeFactory);
 
     /**
      * Create the cache instance for map images.

Modified: trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java	2008-10-03 20:36:54 UTC (rev 5429)
+++ trunk/src/app/net/sf/gridarta/GridartaObjectsFactory.java	2008-10-03 21:09:52 UTC (rev 5430)
@@ -23,7 +23,6 @@
 import net.sf.gridarta.gameobject.GameObject;
 import net.sf.gridarta.gui.map.MapViewBasic;
 import net.sf.gridarta.map.MapArchObject;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * Encapsulates the differences between the different editor types.
@@ -31,12 +30,4 @@
  */
 public interface GridartaObjectsFactory<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, V extends MapViewBasic<G, A, R, V>> {
 
-    /**
-     * Create a new undefined archetype instance.
-     * @param archetypeName The archetype name.
-     * @return The new undefined archetype instance.
-     */
-    @NotNull
-    R newUndefinedArchetype(@NotNull String archetypeName);
-
 } // interface GridartaObjectsFactory

Modified: trunk/src/app/net/sf/gridarta/gameobject/AbstractArchetypeSet.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/AbstractArchetypeSet.java	2008-10-03 20:36:54 UTC (rev 5429)
+++ trunk/src/app/net/sf/gridarta/gameobject/AbstractArchetypeSet.java	2008-10-03 21:09:52 UTC (rev 5430)
@@ -38,7 +38,6 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.event.EventListenerList;
-import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.gameobject.face.FaceObjectProviders;
 import net.sf.gridarta.gui.SystemIcons;
 import net.sf.gridarta.map.MapArchObject;
@@ -55,9 +54,9 @@
     /** Action Factory. */
     private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("net.sf.gridarta");
 
-    /** The objects factory to use. */
+    /** The archetype factory to use. */
     @NotNull
-    protected final GridartaObjectsFactory<G, A, R, ?> gridartaObjectsFactory;
+    private final ArchetypeFactory<G, A, R> archetypeFactory;
 
     /** The load status of this ArchetypeSet. */
     @NotNull
@@ -104,10 +103,10 @@
 
     /**
      * Create an AbstractArchetypeSet.
-     * @param gridartaObjectsFactory the gridarta objects factory to use
+     * @param archetypeFactory the archetype factory to use
      */
-    protected AbstractArchetypeSet(@NotNull final GridartaObjectsFactory<G, A, R, ?> gridartaObjectsFactory) {
-        this.gridartaObjectsFactory = gridartaObjectsFactory;
+    protected AbstractArchetypeSet(@NotNull final ArchetypeFactory<G, A, R> archetypeFactory) {
+        this.archetypeFactory = archetypeFactory;
     }
 
     /** {@inheritDoc} */
@@ -149,7 +148,7 @@
                 }
             }
 
-            final R newArchetype = gridartaObjectsFactory.newUndefinedArchetype(archetypeName);
+            final R newArchetype = archetypeFactory.newUndefinedArchetype(archetypeName);
             undefinedArchetypes.put(archetypeName, new WeakReference<R>(newArchetype));
             return newArchetype;
         }

Added: trunk/src/app/net/sf/gridarta/gameobject/ArchetypeFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/ArchetypeFactory.java	                        (rev 0)
+++ trunk/src/app/net/sf/gridarta/gameobject/ArchetypeFactory.java	2008-10-03 21:09:52 UTC (rev 5430)
@@ -0,0 +1,39 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2007 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.gameobject;
+
+import net.sf.gridarta.map.MapArchObject;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A factory for creating {@link Archetype} instances.
+ * @author Andreas Kirschbaum
+ */
+public interface ArchetypeFactory<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
+
+    /**
+     * Create a new undefined archetype instance.
+     * @param archetypeName The archetype name.
+     * @return The new undefined archetype instance.
+     */
+    @NotNull
+    R newUndefinedArchetype(@NotNull String archetypeName);
+
+} // interface ArchetypeFactory


Property changes on: trunk/src/app/net/sf/gridarta/gameobject/ArchetypeFactory.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + LF

Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-10-03 20:36:54 UTC (rev 5429)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java	2008-10-03 21:09:52 UTC (rev 5430)
@@ -41,7 +41,6 @@
 import net.sf.gridarta.EditTypes;
 import net.sf.gridarta.GlobalSettings;
 import net.sf.gridarta.GlobalSettingsImpl;
-import net.sf.gridarta.GridartaObjectsFactory;
 import net.sf.gridarta.MainControl;
 import net.sf.gridarta.MapImageCache;
 import net.sf.gridarta.MapManager;
@@ -53,6 +52,7 @@
 import net.sf.gridarta.gameobject.AbstractArchetypeParser;
 import net.sf.gridarta.gameobject.AbstractArchetypeSet;
 import net.sf.gridarta.gameobject.Archetype;
+import net.sf.gridarta.gameobject.ArchetypeFactory;
 import net.sf.gridarta.gameobject.ArchetypeSet;
 import net.sf.gridarta.gameobject.FaceSource;
 import net.sf.gridarta.gameobject.GameObject;
@@ -406,7 +406,6 @@
      */
     @Before
     public void setUp() {
-        final GridartaObjectsFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> gridartaObjectsFactory = new TestGridartaObjectsFactory();
         final MapArchObjectFactory<TestMapArchObject> mapArchObjectFactory = new TestMapArchObjectFactory();
         final MapArchObjectParserFactory<TestMapArchObject> mapArchObjectParserFactory = new TestMapArchObjectParserFactory();
         final GameObjectParserFactory<TestGameObject, TestMapArchObject, TestArchetype> gameObjectParserFactory = new TestGameObjectParserFactory();
@@ -416,9 +415,10 @@
         final GlobalSettings globalSettings = new TestGlobalSettings();
         final AnimationObjects<AnimationObject> animationObjects = new TestAnimationObjects();
         final FaceObjects faceObjects = new TestFaceObjects();
-        final TestMainControl mainControl = new TestMainControl(gridartaObjectsFactory, rendererFactory, "test", globalSettings, animationObjects, faceObjects);
+        final TestArchetypeFactory archetypeFactory = new TestArchetypeFactory();
+        final TestMainControl mainControl = new TestMainControl(rendererFactory, "test", globalSettings, animationObjects, faceObjects);
         final TestMapArchObject mapArchObject = new TestMapArchObject();
-        final TestArchetypeSet archetypeSet = new TestArchetypeSet(gridartaObjectsFactory);
+        final TestArchetypeSet archetypeSet = new TestArchetypeSet(archetypeFactory);
         final ArchetypeChooserModel<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> archetypeChooserModel = new ArchetypeChooserModel<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic>(archetypeSet);
         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", mapReaderFactory, mapControlFactory, globalSettings);
@@ -442,15 +442,14 @@
 
         /**
          * Creates a new instance.
-         * @param gridartaObjectsFactory the gridaarta objects factory to use
          * @param rendererFactory the renderer factory to use
          * @param key the action factory key to use
          * @param globalSettings the global settings instance to use
          * @param animationObjects the animation objects instance to use
          * @param faceObjects the face objects instance to use
          */
-        protected TestMainControl(@NotNull final GridartaObjectsFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> gridartaObjectsFactory, @NotNull final RendererFactory<TestGameObject, TestMapArchObject, TestArchetype> rendererFactory, @NotNull final String key, @NotNull final GlobalSettings globalSettings, @NotNull final AnimationObjects<AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects) {
-            super(gridartaObjectsFactory, rendererFactory, key, globalSettings, animationObjects, faceObjects, true, null, null, "test.jar", new TestFileFilter(), ".script", "Script", 0, null, -1, false, 0, new int[] { 13, }, false, "scripts");
+        protected TestMainControl(@NotNull final RendererFactory<TestGameObject, TestMapArchObject, TestArchetype> rendererFactory, @NotNull final String key, @NotNull final GlobalSettings globalSettings, @NotNull final AnimationObjects<AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects) {
+            super(rendererFactory, key, globalSettings, animationObjects, faceObjects, true, null, null, "test.jar", new TestFileFilter(), ".script", "Script", 0, null, -1, false, 0, new int[] { 13, }, false, "scripts");
         }
 
         /** {@inheritDoc} */
@@ -468,8 +467,8 @@
         /** {@inheritDoc} */
         @NotNull
         @Override
-        protected ArchetypeSet<TestGameObject, TestMapArchObject, TestArchetype> newArchetypeSet(@NotNull final GlobalSettings globalSettings, @NotNull final EditTypes<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> editTypes, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, @NotNull final GridartaObjectsFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> gridartaObjectsFactory) {
-            return new TestArchetypeSet(gridartaObjectsFactory);
+        protected ArchetypeSet<TestGameObject, TestMapArchObject, TestArchetype> newArchetypeSet(@NotNull final GlobalSettings globalSettings, @NotNull final EditTypes<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> editTypes, @NotNull final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final FaceObjects faceObjects, @NotNull final ArchetypeFactory<TestGameObject, TestMapArchObject, TestArchetype> archetypeFactory) {
+            return new TestArchetypeSet(archetypeFactory);
         }
 
         /** {@inheritDoc} */
@@ -507,6 +506,13 @@
         /** {@inheritDoc} */
         @NotNull
         @Override
+        protected ArchetypeFactory<TestGameObject, TestMapArchObject, TestArchetype> newArchetypeFactory() {
+            throw new AssertionError();
+        }
+
+        /** {@inheritDoc} */
+        @NotNull
+        @Override
         protected MapViewFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> newMapViewFactory(@NotNull final FaceObjects faceObjects, @NotNull final SelectedSquareView<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> selectedSquareView, @NotNull final AbstractMainControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mainControl, @NotNull final MainView<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mainView, @NotNull final EditTypes<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> editTypes, @NotNull final MapImageCache<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> mapImageCache, @NotNull final ToolPalette<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> toolPalette, @NotNull final FilterControl<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> filterControl) {
             throw new AssertionError();
         }
@@ -941,29 +947,16 @@
     }
 
     /**
-     * An {@link GridartaObjectsFactory} implementation for testing purposes.
-     */
-    private static class TestGridartaObjectsFactory implements GridartaObjectsFactory<TestGameObject, TestMapArchObject, TestArchetype, TestMapViewBasic> {
-
-        /** {@inheritDoc} */
-        @NotNull
-        public TestArchetype newUndefinedArchetype(@NotNull final String archetypeName) {
-            throw new AssertionError();
-        }
-
-    }
-
-    /**
      * An {@link ArchetypeSet} implementation for testing purposes.
      */
     private static class TestArchetypeSet extends AbstractArchetypeSet<TestGameObject, TestMapArchObject, TestArchetype> {
 
         /**
          * Create a new instance.
-         * @param gridartaObjectsFactory the gridarta objects factory to use
+         * @param archetypeFactory the archetype factory to use
          */
-        protected TestArchetypeSet(@NotNull final GridartaObjectsFactory<TestGameObject, TestMapArchObject, TestArchetype, ?> gridartaObjectsFactory) {
-            super(gridartaObjectsFactory);
+        protected TestArchetypeSet(@NotNull final ArchetypeFactory<TestGameObject, TestMapArchObject, TestArchetype> archetypeFactory) {
+            super(archetypeFactory);
         }
 
         /** {@inheritDoc} */
@@ -1286,4 +1279,16 @@
 
     }
 
+    /**
+     * An {@link ArchetypeFactory} implementation for testing purposes.
+     */
+    private static class TestArchetypeFactory implements ArchetypeFactory<TestGameObject, TestMapArchObject, TestArchetype> {
+
+        /** {@inheritDoc} */
+        @NotNull
+        public TestArchetype newUndefinedArchetype(@NotNull final String archetypeName) {
+            throw new AssertionError();
+        }
+
+    }
 } // class DefaultMapModelTest


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:[5430] trunk (Page 19)

gridarta-commit