Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[5194] trunk
|
From: <aki...@us...> - 2008-09-18 11:57:49
|
Revision: 5194
http://gridarta.svn.sourceforge.net/gridarta/?rev=5194&view=rev
Author: akirschbaum
Date: 2008-09-18 18:57:57 +0000 (Thu, 18 Sep 2008)
Log Message:
-----------
Move ArchTab.appendFaceSource() to common code base.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gameobject/Archetype.java
trunk/crossfire/src/cfeditor/gameobject/GameObject.java
trunk/crossfire/src/cfeditor/gui/ArchTab.java
trunk/daimonin/src/daieditor/gameobject/Archetype.java
trunk/daimonin/src/daieditor/gameobject/GameObject.java
trunk/daimonin/src/daieditor/gui/ArchTab.java
trunk/src/app/net/sf/gridarta/gameobject/Archetype.java
trunk/src/app/net/sf/gridarta/gameobject/GameObject.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/ArchTab.java
trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
Modified: trunk/crossfire/src/cfeditor/gameobject/Archetype.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/Archetype.java 2008-09-18 18:48:00 UTC (rev 5193)
+++ trunk/crossfire/src/cfeditor/gameobject/Archetype.java 2008-09-18 18:57:57 UTC (rev 5194)
@@ -115,6 +115,4 @@
int SUBTYPE_EVENT_CONNECTOR_TRIGGER = 10;
- String getFaceObjName();
-
} // class Archetype
Modified: trunk/crossfire/src/cfeditor/gameobject/GameObject.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/GameObject.java 2008-09-18 18:48:00 UTC (rev 5193)
+++ trunk/crossfire/src/cfeditor/gameobject/GameObject.java 2008-09-18 18:57:57 UTC (rev 5194)
@@ -107,6 +107,7 @@
gameObjectChanged();
}
+ /** {@inheritDoc} */
@NotNull
public FaceSource getFaceObjSource() {
return faceObjSource;
Modified: trunk/crossfire/src/cfeditor/gui/ArchTab.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/ArchTab.java 2008-09-18 18:48:00 UTC (rev 5193)
+++ trunk/crossfire/src/cfeditor/gui/ArchTab.java 2008-09-18 18:57:57 UTC (rev 5194)
@@ -23,7 +23,6 @@
import cfeditor.gameobject.GameObject;
import cfeditor.map.MapArchObject;
import net.sf.gridarta.archtype.ArchetypeTypeSet;
-import net.sf.gridarta.gameobject.FaceSource;
import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
import net.sf.gridarta.gui.gameobjecttexteditor.GameObjectTextEditor;
import org.jetbrains.annotations.NotNull;
@@ -40,38 +39,4 @@
super(archetypeTypeSet, gameObjectAttributesModel, gameObjectTextEditor);
}
- /** {@inheritDoc} */
- @Override
- protected void appendFaceSource(@NotNull final StringBuilder sb, @NotNull final GameObject gameObject) {
- final String faceName = gameObject.getFaceObjName();
- if (faceName != null) {
- final FaceSource desc = gameObject.getFaceObjSource();
- sb.append(faceName).append(" (");
- switch (desc) {
- case FACE_NOT_FOUND:
- sb.append("face not found");
- break;
-
- case FACE:
- sb.append("face");
- break;
-
- case ARCHETYPE_FACE:
- sb.append("archetype face");
- break;
-
- case ANIM:
- sb.append("anim");
- break;
-
- case ARCHETYPE_ANIM:
- sb.append("archetype anim");
- break;
- }
- sb.append(')');
- } else {
- sb.append(">no face<");
- }
- }
-
} // class ArchTab
Modified: trunk/daimonin/src/daieditor/gameobject/Archetype.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/Archetype.java 2008-09-18 18:48:00 UTC (rev 5193)
+++ trunk/daimonin/src/daieditor/gameobject/Archetype.java 2008-09-18 18:57:57 UTC (rev 5194)
@@ -103,8 +103,6 @@
boolean isLowestPart();
- String getFaceObjName();
-
boolean hasFaceObject();
} // class Archetype
Modified: trunk/daimonin/src/daieditor/gameobject/GameObject.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/GameObject.java 2008-09-18 18:48:00 UTC (rev 5193)
+++ trunk/daimonin/src/daieditor/gameobject/GameObject.java 2008-09-18 18:57:57 UTC (rev 5194)
@@ -155,6 +155,7 @@
return getAttributeInt("is_turnable") != 0 || getAttributeInt("is_animated") != 0;
}
+ /** {@inheritDoc} */
@NotNull
public FaceSource getFaceObjSource() {
return faceObjSource;
Modified: trunk/daimonin/src/daieditor/gui/ArchTab.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/ArchTab.java 2008-09-18 18:48:00 UTC (rev 5193)
+++ trunk/daimonin/src/daieditor/gui/ArchTab.java 2008-09-18 18:57:57 UTC (rev 5194)
@@ -23,7 +23,6 @@
import daieditor.gameobject.GameObject;
import daieditor.map.MapArchObject;
import net.sf.gridarta.archtype.ArchetypeTypeSet;
-import net.sf.gridarta.gameobject.FaceSource;
import net.sf.gridarta.gui.gameobjectattributespanel.GameObjectAttributesModel;
import net.sf.gridarta.gui.gameobjecttexteditor.GameObjectTextEditor;
import org.jetbrains.annotations.NotNull;
@@ -40,38 +39,4 @@
super(archetypeTypeSet, gameObjectAttributesModel, gameObjectTextEditor);
}
- /** {@inheritDoc} */
- @Override
- protected void appendFaceSource(@NotNull final StringBuilder sb, @NotNull final GameObject gameObject) {
- final String faceName = gameObject.getFaceObjName();
- if (faceName != null) {
- final FaceSource desc = gameObject.getFaceObjSource();
- sb.append(faceName).append(" (");
- switch (desc) {
- case FACE_NOT_FOUND:
- sb.append("face not found");
- break;
-
- case FACE:
- sb.append("face");
- break;
-
- case ARCHETYPE_FACE:
- sb.append("archetype face");
- break;
-
- case ANIM:
- sb.append("anim");
- break;
-
- case ARCHETYPE_ANIM:
- sb.append("archetype anim");
- break;
- }
- sb.append(')');
- } else {
- sb.append(">no face<");
- }
- }
-
} // class ArchTab
Modified: trunk/src/app/net/sf/gridarta/gameobject/Archetype.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/Archetype.java 2008-09-18 18:48:00 UTC (rev 5193)
+++ trunk/src/app/net/sf/gridarta/gameobject/Archetype.java 2008-09-18 18:57:57 UTC (rev 5194)
@@ -297,4 +297,7 @@
*/
void postParseArchetype();
+ @Nullable
+ String getFaceObjName();
+
} // interface Archetype
Modified: trunk/src/app/net/sf/gridarta/gameobject/GameObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gameobject/GameObject.java 2008-09-18 18:48:00 UTC (rev 5193)
+++ trunk/src/app/net/sf/gridarta/gameobject/GameObject.java 2008-09-18 18:57:57 UTC (rev 5194)
@@ -1570,4 +1570,7 @@
}
}
+ @NotNull
+ public abstract FaceSource getFaceObjSource();
+
} // interface GameObject
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/ArchTab.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/ArchTab.java 2008-09-18 18:48:00 UTC (rev 5193)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/ArchTab.java 2008-09-18 18:57:57 UTC (rev 5194)
@@ -31,6 +31,7 @@
import net.sf.gridarta.archtype.ArchetypeType;
import net.sf.gridarta.archtype.ArchetypeTypeSet;
import net.sf.gridarta.gameobject.Archetype;
+import net.sf.gridarta.gameobject.FaceSource;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gui.gameobjecttexteditor.GameObjectTextEditor;
import net.sf.gridarta.map.MapArchObject;
@@ -45,7 +46,7 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @author Andreas Kirschbaum
*/
-public abstract class ArchTab<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends AbstractGameObjectAttributesTab<G, A, R> {
+public class ArchTab<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends AbstractGameObjectAttributesTab<G, A, R> {
/** The action factory. */
private static final ActionFactory ACTION_FACTORY = ActionFactory.getFactory("net.sf.gridarta");
@@ -342,8 +343,38 @@
directionButtons[direction < directionButtons.length ? direction : 0].setSelected(true);
}
- protected abstract void appendFaceSource(@NotNull final StringBuilder sb, @NotNull final G gameObject);
+ protected void appendFaceSource(@NotNull final StringBuilder sb, @NotNull final G gameObject) {
+ final String faceName = gameObject.getFaceObjName();
+ if (faceName != null) {
+ final FaceSource desc = gameObject.getFaceObjSource();
+ sb.append(faceName).append(" (");
+ switch (desc) {
+ case FACE_NOT_FOUND:
+ sb.append("face not found");
+ break;
+ case FACE:
+ sb.append("face");
+ break;
+
+ case ARCHETYPE_FACE:
+ sb.append("archetype face");
+ break;
+
+ case ANIM:
+ sb.append("anim");
+ break;
+
+ case ARCHETYPE_ANIM:
+ sb.append("archetype anim");
+ break;
+ }
+ sb.append(')');
+ } else {
+ sb.append(">no face<");
+ }
+ }
+
/** Action method for direction. */
public void direction0() {
direction(0);
Modified: trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-09-18 18:48:00 UTC (rev 5193)
+++ trunk/src/test/net/sf/gridarta/map/DefaultMapModelTest.java 2008-09-18 18:57:57 UTC (rev 5194)
@@ -56,6 +56,7 @@
import net.sf.gridarta.gameobject.ArchetypeSet;
import net.sf.gridarta.gameobject.GameObject;
import net.sf.gridarta.gameobject.GameObjectFactory;
+import net.sf.gridarta.gameobject.FaceSource;
import net.sf.gridarta.gameobject.anim.AbstractAnimationObject;
import net.sf.gridarta.gameobject.anim.AnimationObject;
import net.sf.gridarta.gameobject.anim.AnimationObjects;
@@ -886,6 +887,12 @@
}
/** {@inheritDoc} */
+ @Nullable
+ public String getFaceObjName() {
+ throw new AssertionError();
+ }
+
+ /** {@inheritDoc} */
public TestGameObject createClone(final int posx, final int posy) {
throw new AssertionError();
}
@@ -926,6 +933,12 @@
throw new AssertionError();
}
+ /** {@inheritDoc} */
+ @NotNull
+ public FaceSource getFaceObjSource() {
+ throw new AssertionError();
+ }
+
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
