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

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

Revision: 4859
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4859&view=rev
Author:   akirschbaum
Date:     2008-08-15 20:07:57 +0000 (Fri, 15 Aug 2008)

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

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/gameobject/anim/AnimationObjects.java
    trunk/daimonin/src/daieditor/gameobject/anim/AnimationObjects.java
    trunk/src/app/net/sf/gridarta/gameobject/anim/AbstractAnimationObjects.java

Modified: trunk/crossfire/src/cfeditor/gameobject/anim/AnimationObjects.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/anim/AnimationObjects.java	2008-08-15 20:05:46 UTC (rev 4858)
+++ trunk/crossfire/src/cfeditor/gameobject/anim/AnimationObjects.java	2008-08-15 20:07:57 UTC (rev 4859)
@@ -25,7 +25,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import net.sf.gridarta.gameobject.anim.AbstractAnimationObjects;
-import net.sf.gridarta.gameobject.anim.DuplicateAnimationException;
 import net.sf.japi.swing.misc.Progress;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
@@ -47,11 +46,6 @@
     private final List<AnimationObject> animObjects = new ArrayList<AnimationObject>();
 
     /** {@inheritDoc} */
-    public void addAnimationObject(final String animName, final String list) throws DuplicateAnimationException {
-        addAnimationObject(animName, list, null);
-    }
-
-    /** {@inheritDoc} */
     public void loadAnimTree(final File animTreeFile) throws FileNotFoundException, IOException {
     }
 

Modified: trunk/daimonin/src/daieditor/gameobject/anim/AnimationObjects.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/anim/AnimationObjects.java	2008-08-15 20:05:46 UTC (rev 4858)
+++ trunk/daimonin/src/daieditor/gameobject/anim/AnimationObjects.java	2008-08-15 20:07:57 UTC (rev 4859)
@@ -30,7 +30,6 @@
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import net.sf.gridarta.gameobject.anim.AbstractAnimationObjects;
-import net.sf.gridarta.gameobject.anim.DuplicateAnimationException;
 import net.sf.gridarta.io.IOUtils;
 import net.sf.japi.swing.ActionFactory;
 import net.sf.japi.swing.misc.Progress;
@@ -49,11 +48,6 @@
     private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("daieditor");
 
     /** {@inheritDoc} */
-    public void addAnimationObject(final String animName, final String list) throws DuplicateAnimationException {
-        addAnimationObject(animName, list, null);
-    }
-
-    /** {@inheritDoc} */
     public void loadAnimTree(final File animTreeFile) throws FileNotFoundException, IOException {
         final BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(animTreeFile), IOUtils.MAP_ENCODING));
         try {

Modified: trunk/src/app/net/sf/gridarta/gameobject/anim/AbstractAnimationObjects.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/anim/AbstractAnimationObjects.java	2008-08-15 20:05:46 UTC (rev 4858)
+++ trunk/src/app/net/sf/gridarta/gameobject/anim/AbstractAnimationObjects.java	2008-08-15 20:07:57 UTC (rev 4859)
@@ -66,6 +66,11 @@
         }
     }
 
+    /** {@inheritDoc} */
+    public void addAnimationObject(final String animName, final String list) throws DuplicateAnimationException {
+        addAnimationObject(animName, list, null);
+    }
+
     /**
      * Adds a new animation object. If <code>path == null</code> path will be
      * read from {@link #animMap}.


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