Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[5629] trunk
|
From: <aki...@us...> - 2008-11-01 07:51:39
|
Revision: 5629
http://gridarta.svn.sourceforge.net/gridarta/?rev=5629&view=rev
Author: akirschbaum
Date: 2008-11-01 07:51:36 +0000 (Sat, 01 Nov 2008)
Log Message:
-----------
Extract code into functions.
Modified Paths:
--------------
trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java
trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
Modified: trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java 2008-11-01 07:46:41 UTC (rev 5628)
+++ trunk/crossfire/src/cfeditor/gameobject/ArchetypeSet.java 2008-11-01 07:51:36 UTC (rev 5629)
@@ -26,6 +26,7 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
+import java.io.Writer;
import net.sf.gridarta.gameobject.AbstractArchetypeSet;
import net.sf.gridarta.gameobject.ArchetypeFactory;
import net.sf.gridarta.io.GameObjectParser;
@@ -104,92 +105,9 @@
if (arch.getArchetypeName().equals(net.sf.gridarta.gameobject.ArchetypeParser.STARTARCH_NAME)) {
// process map arch
-
- out.append("Object ").append(arch.getArchetypeName()).append('\n');
-
- // map object hack: x/y is normally a reference for multi
- // part arches - i include this hack until we rework the
- // arch objects with more useful script names
- if (arch.getArchetypeName().equals(net.sf.gridarta.gameobject.ArchetypeParser.STARTARCH_NAME)) {
- out.append("x ").append(Integer.toString(arch.getMultiX())).append('\n');
- out.append("y ").append(Integer.toString(arch.getMultiY())).append('\n');
- }
-
- if (arch.getObjName() != null) {
- out.append("name ").append(arch.getObjName()).append('\n');
- }
- if (arch.getFaceName() != null) {
- out.append("face ").append(arch.getFaceName()).append('\n');
- }
- if (arch.getTypeNo() > 0) {
- out.append("type ").append(Integer.toString(arch.getTypeNo())).append('\n');
- }
-
- out.append(arch.getObjectText());
-
- out.append("end\n");
+ collectStartArch(arch, out);
} else {
- out.append("Object ").append(arch.getArchetypeName()).append('\n');
-
- if (arch.getObjName() != null) {
- out.append("name ").append(arch.getObjName()).append('\n');
- }
- if (arch.getFaceName() != null) {
- out.append("face ").append(arch.getFaceName()).append('\n');
- }
- if (arch.getTypeNo() > 0) {
- out.append("type ").append(Integer.toString(arch.getTypeNo())).append('\n');
- }
-
- // special: add a string-attribute with the display-category
- out.append("editor_folder ").append(arch.getEditorFolder()).append('\n');
-
- // add message text
- if (arch.getMsgText() != null) {
- out.append("msg\n").append(arch.getMsgText()).append("endmsg\n");
- }
-
- out.append(arch.getObjectText());
-
- for (final GameObject inv : arch) {
- gameObjectParser.save(out, inv);
- }
-
- out.append("end\n");
-
- // process the multipart tails:
- for (GameObject tail = arch.getMultiNext(); tail != null; tail = tail.getMultiNext()) {
- out.append("More\n");
-
- out.append("Object ").append(tail.getArchetypeName()).append('\n');
-
- if (tail.getObjName() != null) {
- out.append("name ").append(tail.getObjName()).append('\n');
- }
- if (tail.getFaceName() != null) {
- out.append("face ").append(tail.getFaceName()).append('\n');
- }
- if (tail.getTypeNo() > 0) {
- out.append("type ").append(Integer.toString(tail.getTypeNo())).append('\n');
- }
-
- out.append(tail.getObjectText());
-
- // position of multi relative to head
- if (tail.getMultiX() != 0) {
- out.append("x ").append(Integer.toString(tail.getMultiX())).append('\n');
- }
- if (tail.getMultiY() != 0) {
- out.append("y ").append(Integer.toString(tail.getMultiY())).append('\n');
- }
-
- out.append("end\n");
-
- count++;
- if (count % 100 == 0) {
- progress.setValue(count);
- }
- }
+ collectArch(arch, out);
}
count++;
@@ -214,6 +132,91 @@
}
}
+ private void collectStartArch(@NotNull final Archetype arch, @NotNull final Writer out) throws IOException {
+ out.append("Object ").append(arch.getArchetypeName()).append('\n');
+
+ // map object hack: x/y is normally a reference for multi
+ // part arches - i include this hack until we rework the
+ // arch objects with more useful script names
+ if (arch.getArchetypeName().equals(net.sf.gridarta.gameobject.ArchetypeParser.STARTARCH_NAME)) {
+ out.append("x ").append(Integer.toString(arch.getMultiX())).append('\n');
+ out.append("y ").append(Integer.toString(arch.getMultiY())).append('\n');
+ }
+
+ if (arch.getObjName() != null) {
+ out.append("name ").append(arch.getObjName()).append('\n');
+ }
+ if (arch.getFaceName() != null) {
+ out.append("face ").append(arch.getFaceName()).append('\n');
+ }
+ if (arch.getTypeNo() > 0) {
+ out.append("type ").append(Integer.toString(arch.getTypeNo())).append('\n');
+ }
+
+ out.append(arch.getObjectText());
+
+ out.append("end\n");
+ }
+
+ private void collectArch(@NotNull final Archetype arch, @NotNull final Writer out) throws IOException {
+ out.append("Object ").append(arch.getArchetypeName()).append('\n');
+
+ if (arch.getObjName() != null) {
+ out.append("name ").append(arch.getObjName()).append('\n');
+ }
+ if (arch.getFaceName() != null) {
+ out.append("face ").append(arch.getFaceName()).append('\n');
+ }
+ if (arch.getTypeNo() > 0) {
+ out.append("type ").append(Integer.toString(arch.getTypeNo())).append('\n');
+ }
+
+ // special: add a string-attribute with the display-category
+ out.append("editor_folder ").append(arch.getEditorFolder()).append('\n');
+
+ // add message text
+ if (arch.getMsgText() != null) {
+ out.append("msg\n").append(arch.getMsgText()).append("endmsg\n");
+ }
+
+ out.append(arch.getObjectText());
+
+ for (final GameObject inv : arch) {
+ gameObjectParser.save(out, inv);
+ }
+
+ out.append("end\n");
+
+ // process the multipart tails:
+ for (GameObject tail = arch.getMultiNext(); tail != null; tail = tail.getMultiNext()) {
+ out.append("More\n");
+
+ out.append("Object ").append(tail.getArchetypeName()).append('\n');
+
+ if (tail.getObjName() != null) {
+ out.append("name ").append(tail.getObjName()).append('\n');
+ }
+ if (tail.getFaceName() != null) {
+ out.append("face ").append(tail.getFaceName()).append('\n');
+ }
+ if (tail.getTypeNo() > 0) {
+ out.append("type ").append(Integer.toString(tail.getTypeNo())).append('\n');
+ }
+
+ out.append(tail.getObjectText());
+
+ // position of multi relative to head
+ if (tail.getMultiX() != 0) {
+ out.append("x ").append(Integer.toString(tail.getMultiX())).append('\n');
+ }
+ if (tail.getMultiY() != 0) {
+ out.append("y ").append(Integer.toString(tail.getMultiY())).append('\n');
+ }
+
+ out.append("end\n");
+ }
+ }
+
/** {@inheritDoc} */
@Nullable
public String getImageSet() {
Modified: trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java 2008-11-01 07:46:41 UTC (rev 5628)
+++ trunk/daimonin/src/daieditor/gameobject/ArchetypeSet.java 2008-11-01 07:51:36 UTC (rev 5629)
@@ -26,6 +26,7 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
+import java.io.Writer;
import javax.swing.ImageIcon;
import net.sf.gridarta.gameobject.AbstractArchetypeSet;
import net.sf.gridarta.gameobject.ArchetypeFactory;
@@ -128,104 +129,14 @@
if (arch.getArchetypeName().equals(net.sf.gridarta.gameobject.ArchetypeParser.STARTARCH_NAME)) {
// process map arch
-
- out.append("Object ").append(arch.getArchetypeName()).append('\n');
-
- // map object hack: x/y is normally a reference for multi
- // part arches - i include this hack until we rework the
- // arch objects with more useful script names
- if (arch.getArchetypeName().equals(net.sf.gridarta.gameobject.ArchetypeParser.STARTARCH_NAME)) {
- out.append("x ").append(Integer.toString(arch.getMultiX())).append('\n');
- out.append("y ").append(Integer.toString(arch.getMultiY())).append('\n');
- }
-
- if (arch.getObjName() != null) {
- out.append("name ").append(arch.getObjName()).append('\n');
- }
- //if(arch.getFaceName() != null) {
- // out.append("face ").append(arch.getFaceNAme()).append('\n');
- //}
- if (arch.getTypeNo() > 0) {
- out.append("type ").append(Integer.toString(arch.getTypeNo())).append('\n');
- }
-
- out.append(arch.getObjectText());
-
- out.append("end\n");
+ collectStartArch(arch, out);
} else {
- out.append("Object ").append(arch.getArchetypeName()).append('\n');
+ collectArch(arch, out);
- if (arch.getObjName() != null) {
- out.append("name ").append(arch.getObjName()).append('\n');
+ count++;
+ if (count % 100 == 0) {
+ progress.setValue(count);
}
- //if(arch.getFaceName() != null) {
- // out.append("face ").append(arch.getFaceName()).append('\n');
- //}
- if (arch.getTypeNo() > 0) {
- out.append("type ").append(Integer.toString(arch.getTypeNo())).append('\n');
- }
- if (arch.getMultiShapeID() > 0) {
- out.append("mpart_id ").append(Integer.toString(arch.getMultiShapeID())).append('\n');
- }
- if (arch.getMultiPartNr() > 0) {
- out.append("mpart_nr ").append(Integer.toString(arch.getMultiPartNr())).append('\n');
- }
-
- if (arch.getMsgText() != null) {
- out.append("msg\n").append(arch.getMsgText()).append("endmsg\n");
- }
-
- // special: add a string-attribute with the display-category
- out.append("editor_folder ").append(arch.getEditorFolder()).append('\n');
-
- out.append(arch.getObjectText());
-
- out.append("end\n");
-
- // process the multipart tails:
- for (GameObject tail = arch.getMultiNext(); tail != null; tail = tail.getMultiNext()) {
-
- out.append("More\n");
-
- out.append("Object ").append(tail.getArchetypeName()).append('\n');
-
- if (tail.getObjName() != null) {
- out.append("name ").append(tail.getObjName()).append('\n');
- }
- //if(arch.getFaceName() != null) {
- // out.append("face ").append(arch.getFaceName()).append('\n');
- //}
- if (tail.getTypeNo() > 0) {
- out.append("type ").append(Integer.toString(tail.getTypeNo())).append('\n');
- }
- if (tail.getMultiShapeID() > 0) {
- out.append("mpart_id ").append(Integer.toString(tail.getMultiShapeID())).append('\n');
- }
- if (tail.getMultiPartNr() > 0) {
- out.append("mpart_nr ").append(Integer.toString(tail.getMultiPartNr())).append('\n');
- }
-
- if (tail.getMsgText() != null) {
- out.append("msg\n").append(tail.getMsgText()).append("endmsg\n");
- }
-
- out.append(tail.getObjectText());
-
- // position of multi relative to head
- if (tail.getMultiX() != 0) {
- out.append("x ").append(Integer.toString(tail.getMultiX())).append('\n');
- }
- if (tail.getMultiY() != 0) {
- out.append("y ").append(Integer.toString(tail.getMultiY())).append('\n');
- }
-
- out.append("end\n");
-
- count++;
- if (count % 100 == 0) {
- progress.setValue(count);
- }
- }
}
count++;
@@ -250,4 +161,101 @@
}
}
+ private void collectStartArch(@NotNull final Archetype arch, @NotNull final Writer out) throws IOException {
+ out.append("Object ").append(arch.getArchetypeName()).append('\n');
+
+ // map object hack: x/y is normally a reference for multi
+ // part arches - i include this hack until we rework the
+ // arch objects with more useful script names
+ if (arch.getArchetypeName().equals(net.sf.gridarta.gameobject.ArchetypeParser.STARTARCH_NAME)) {
+ out.append("x ").append(Integer.toString(arch.getMultiX())).append('\n');
+ out.append("y ").append(Integer.toString(arch.getMultiY())).append('\n');
+ }
+
+ if (arch.getObjName() != null) {
+ out.append("name ").append(arch.getObjName()).append('\n');
+ }
+ //if(arch.getFaceName() != null) {
+ // out.append("face ").append(arch.getFaceNAme()).append('\n');
+ //}
+ if (arch.getTypeNo() > 0) {
+ out.append("type ").append(Integer.toString(arch.getTypeNo())).append('\n');
+ }
+
+ out.append(arch.getObjectText());
+
+ out.append("end\n");
+ }
+
+ private void collectArch(@NotNull final Archetype arch, @NotNull final Writer out) throws IOException {
+ out.append("Object ").append(arch.getArchetypeName()).append('\n');
+
+ if (arch.getObjName() != null) {
+ out.append("name ").append(arch.getObjName()).append('\n');
+ }
+ //if(arch.getFaceName() != null) {
+ // out.append("face ").append(arch.getFaceName()).append('\n');
+ //}
+ if (arch.getTypeNo() > 0) {
+ out.append("type ").append(Integer.toString(arch.getTypeNo())).append('\n');
+ }
+ if (arch.getMultiShapeID() > 0) {
+ out.append("mpart_id ").append(Integer.toString(arch.getMultiShapeID())).append('\n');
+ }
+ if (arch.getMultiPartNr() > 0) {
+ out.append("mpart_nr ").append(Integer.toString(arch.getMultiPartNr())).append('\n');
+ }
+
+ if (arch.getMsgText() != null) {
+ out.append("msg\n").append(arch.getMsgText()).append("endmsg\n");
+ }
+
+ // special: add a string-attribute with the display-category
+ out.append("editor_folder ").append(arch.getEditorFolder()).append('\n');
+
+ out.append(arch.getObjectText());
+
+ out.append("end\n");
+
+ // process the multipart tails:
+ for (GameObject tail = arch.getMultiNext(); tail != null; tail = tail.getMultiNext()) {
+
+ out.append("More\n");
+
+ out.append("Object ").append(tail.getArchetypeName()).append('\n');
+
+ if (tail.getObjName() != null) {
+ out.append("name ").append(tail.getObjName()).append('\n');
+ }
+ //if(arch.getFaceName() != null) {
+ // out.append("face ").append(arch.getFaceName()).append('\n');
+ //}
+ if (tail.getTypeNo() > 0) {
+ out.append("type ").append(Integer.toString(tail.getTypeNo())).append('\n');
+ }
+ if (tail.getMultiShapeID() > 0) {
+ out.append("mpart_id ").append(Integer.toString(tail.getMultiShapeID())).append('\n');
+ }
+ if (tail.getMultiPartNr() > 0) {
+ out.append("mpart_nr ").append(Integer.toString(tail.getMultiPartNr())).append('\n');
+ }
+
+ if (tail.getMsgText() != null) {
+ out.append("msg\n").append(tail.getMsgText()).append("endmsg\n");
+ }
+
+ out.append(tail.getObjectText());
+
+ // position of multi relative to head
+ if (tail.getMultiX() != 0) {
+ out.append("x ").append(Integer.toString(tail.getMultiX())).append('\n');
+ }
+ if (tail.getMultiY() != 0) {
+ out.append("y ").append(Integer.toString(tail.getMultiY())).append('\n');
+ }
+
+ out.append("end\n");
+ }
+ }
+
} // class ArchetypeSet
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
