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

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

Revision: 4956
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4956&view=rev
Author:   akirschbaum
Date:     2008-08-21 20:48:52 +0000 (Thu, 21 Aug 2008)

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

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainControl.java
    trunk/crossfire/src/cfeditor/gameobject/GameObject.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/daimonin/src/daieditor/gameobject/GameObject.java

Modified: trunk/crossfire/src/cfeditor/CMainControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-21 20:45:17 UTC (rev 4955)
+++ trunk/crossfire/src/cfeditor/CMainControl.java	2008-08-21 20:48:52 UTC (rev 4956)
@@ -174,7 +174,7 @@
      */
     public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
         super(gridartaObjectsFactory, new DefaultRendererFactory(), "cfeditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), false, CResourceLoader.getHomeFile("thumbnails"), null);
-        GameObject.setArchetypeSet(archetypeSet, SystemIcons.getNofaceTileIcon());
+        GameObject.init(animationObjects, archetypeSet, SystemIcons.getNofaceTileIcon());
         gameObjectAttributesDialogFactory.setParent(mainView);
         new About("cfeditor", mainView);
         new UndoControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);

Modified: trunk/crossfire/src/cfeditor/gameobject/GameObject.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/GameObject.java	2008-08-21 20:45:17 UTC (rev 4955)
+++ trunk/crossfire/src/cfeditor/gameobject/GameObject.java	2008-08-21 20:48:52 UTC (rev 4956)
@@ -26,6 +26,8 @@
 import javax.swing.JList;
 import net.sf.gridarta.MapManager;
 import net.sf.gridarta.gameobject.ArchetypeSet;
+import net.sf.gridarta.gameobject.anim.AnimationObject;
+import net.sf.gridarta.gameobject.anim.AnimationObjects;
 import net.sf.gridarta.gameobject.scripts.AbstractScriptArchEditor;
 import net.sf.gridarta.gui.gameobjectattributespanel.ScriptTab;
 import net.sf.gridarta.utils.StringUtils;
@@ -73,7 +75,7 @@
     @Nullable
     private static ImageIcon noFace = null;
 
-    public static void setArchetypeSet(@Nullable final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final ImageIcon noFace) {
+    public static void init(@Nullable final AnimationObjects<? extends AnimationObject> animationObjects, @Nullable final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final ImageIcon noFace) {
         GameObject.archetypeSet = archetypeSet;
         GameObject.noFace = noFace;
     }

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 20:45:17 UTC (rev 4955)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2008-08-21 20:48:52 UTC (rev 4956)
@@ -234,7 +234,7 @@
      */
     public CMainControl(@NotNull final GridartaObjectsFactory<GameObject, MapArchObject, Archetype, CMapViewBasic> gridartaObjectsFactory) {
         super(gridartaObjectsFactory, new DefaultRendererFactory(), "daieditor", new GlobalSettingsImpl(), new AnimationObjects(), new FaceObjects(), new DefaultMapControlFactory(gridartaObjectsFactory), true, null, GUIUtils.getSysIcon(IGUIConstants.TILE_NORTH));
-        GameObject.setAnimationObjects(animationObjects, SystemIcons.getNofaceTileIcon());
+        GameObject.init(animationObjects, archetypeSet, SystemIcons.getNofaceTileIcon());
         gameObjectAttributesDialogFactory.setParent(mainView);
         new About("daieditor", mainView);
         new UndoControl<GameObject, MapArchObject, Archetype, CMapViewBasic>(mapManager);

Modified: trunk/daimonin/src/daieditor/gameobject/GameObject.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/GameObject.java	2008-08-21 20:45:17 UTC (rev 4955)
+++ trunk/daimonin/src/daieditor/gameobject/GameObject.java	2008-08-21 20:48:52 UTC (rev 4956)
@@ -99,7 +99,7 @@
     @Nullable
     private static ImageIcon noFace = null;
 
-    public static void setAnimationObjects(@Nullable final AnimationObjects<? extends AnimationObject> animationObjects, @NotNull final ImageIcon noFace) {
+    public static void init(@Nullable final AnimationObjects<? extends AnimationObject> animationObjects, @Nullable final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final ImageIcon noFace) {
         GameObject.animationObjects = animationObjects;
         GameObject.noFace = noFace;
     }


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