Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[9212] trunk/model/src
|
From: <aki...@us...> - 2013-05-24 19:37:21
|
Revision: 9212
http://sourceforge.net/p/gridarta/code/9212
Author: akirschbaum
Date: 2013-05-24 19:37:16 +0000 (Fri, 24 May 2013)
Log Message:
-----------
Remove ArchetypeTypeSet.defaultArchetypeType as this field belongs to the parser, not the model.
Modified Paths:
--------------
trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java
trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParser.java
trunk/model/src/test/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest.java
Modified: trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java 2013-05-24 09:24:13 UTC (rev 9211)
+++ trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java 2013-05-24 19:37:16 UTC (rev 9212)
@@ -38,12 +38,6 @@
public class ArchetypeTypeSet implements Iterable<ArchetypeType> {
/**
- * The default {@link ArchetypeType}.
- */
- @Nullable
- private ArchetypeType defaultArchetypeType = null;
-
- /**
* The default (fallback) {@link ArchetypeType} used for game objects not
* matching any defined type.
*/
@@ -161,23 +155,6 @@
}
/**
- * Returns the default archetype type.
- * @return the default archetype type
- */
- @Nullable
- public ArchetypeType getDefaultArchetypeType() {
- return defaultArchetypeType;
- }
-
- /**
- * Sets the default archetype type.
- * @param defaultArchetypeType the default archetype type
- */
- public void setDefaultArchetypeType(@Nullable final ArchetypeType defaultArchetypeType) {
- this.defaultArchetypeType = defaultArchetypeType;
- }
-
- /**
* Finds and returns the type-structure (<code>ArchetypeType</code>) that
* matches the given 'typeName'. These type-names are "artificial" names,
* defined in "types.xml". They appear in the type selection box in the
@@ -289,9 +266,6 @@
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
- if (defaultArchetypeType != null) {
- format(sb, defaultArchetypeType, "default_type");
- }
final Map<String, ArchetypeType> sortedArchetypeTypes = new TreeMap<String, ArchetypeType>(archetypeTypeNames);
for (final ArchetypeType archetypeType : sortedArchetypeTypes.values()) {
format(sb, archetypeType, "type");
Modified: trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParser.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParser.java 2013-05-24 09:24:13 UTC (rev 9211)
+++ trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParser.java 2013-05-24 19:37:16 UTC (rev 9212)
@@ -247,6 +247,12 @@
private final ArchetypeTypeParser archetypeTypeParser;
/**
+ * The default {@link ArchetypeType}.
+ */
+ @Nullable
+ private ArchetypeType defaultArchetypeType;
+
+ /**
* Creates a new instance.
* @param documentBuilder the document builder to use
* @param archetypeTypeSet the archetype type set to update
@@ -537,8 +543,7 @@
* @param ignorelistsDefinition the contents of the "ignorelists" section
*/
private void parseDefaultType(@NotNull final Element defaultTypeElement, @NotNull final ErrorViewCollector errorViewCollector, @NotNull final IgnorelistsDefinition ignorelistsDefinition) {
- final ArchetypeType defaultType = archetypeTypeParser.loadAttributeList(defaultTypeElement, errorViewCollector, null, archetypeTypeSet, ignorelistsDefinition, true);
- archetypeTypeSet.setDefaultArchetypeType(defaultType);
+ defaultArchetypeType = archetypeTypeParser.loadAttributeList(defaultTypeElement, errorViewCollector, null, archetypeTypeSet, ignorelistsDefinition, true);
}
/**
@@ -549,7 +554,7 @@
*/
private void parseTypes(@NotNull final Element typeElement, @NotNull final ErrorViewCollector errorViewCollector, @NotNull final IgnorelistsDefinition ignorelistsDefinition) {
if (!typeElement.getAttribute(XML_TYPE_AVAILABLE).equals("no")) {
- archetypeTypeSet.add(archetypeTypeParser.loadAttributeList(typeElement, errorViewCollector, archetypeTypeSet.getDefaultArchetypeType(), archetypeTypeSet, ignorelistsDefinition, false));
+ archetypeTypeSet.add(archetypeTypeParser.loadAttributeList(typeElement, errorViewCollector, defaultArchetypeType, archetypeTypeSet, ignorelistsDefinition, false));
}
}
Modified: trunk/model/src/test/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest.java 2013-05-24 09:24:13 UTC (rev 9211)
+++ trunk/model/src/test/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest.java 2013-05-24 19:37:16 UTC (rev 9212)
@@ -67,11 +67,6 @@
typesXml.append("<attribute arch=\"f\" value=\"v\" type=\"fixed\"/>\n");
typesXml.append("</type>\n");
final StringBuilder expectedResult = new StringBuilder();
- expectedResult.append("default_type:-1,default\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- expectedResult.append("string/name[name_editor] section=0/General\n");
- expectedResult.append("\n");
expectedResult.append("type:123,name 123\n");
expectedResult.append(":\n");
expectedResult.append(":\n");
@@ -109,12 +104,6 @@
typesXml.append("<attribute arch=\"default_attr2\" editor=\"name2\" type=\"string\">description</attribute>\n");
typesXml.append("</type>\n");
final StringBuilder expectedResult = new StringBuilder();
- expectedResult.append("default_type:-1,default\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- expectedResult.append("string/default_attr1[default] section=0/General\n");
- expectedResult.append("string/default_attr2[default] section=0/General\n");
- expectedResult.append("\n");
expectedResult.append("type:1,name1\n");
expectedResult.append(":\n");
expectedResult.append(":\n");
@@ -195,21 +184,6 @@
typesXml.append("<attribute arch=\"attrF\" editor=\"name3\" type=\"string\">description</attribute>\n");
typesXml.append("</type>\n");
final StringBuilder expectedResult = new StringBuilder();
- expectedResult.append("default_type:-1,default\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- /* attributes */
- expectedResult.append("string/attr1[default] section=0/General\n");
- expectedResult.append("string/attr3[default] section=0/General\n");
- expectedResult.append("string/attr5[default] section=0/General\n");
- expectedResult.append("string/attr7[default] section=0/General\n");
- expectedResult.append("string/attr9[default] section=0/General\n");
- expectedResult.append("string/attrB[default] section=0/General\n");
- expectedResult.append("string/attrD[default] section=0/General\n");
- expectedResult.append("string/attrF[default] section=0/General\n");
- /* defaults */
- /* imports */
- expectedResult.append("\n");
expectedResult.append("type:1,name1\n");
expectedResult.append(":\n");
expectedResult.append(":\n");
@@ -295,12 +269,6 @@
typesXml.append("<description>description1</description>\n");
typesXml.append("</type>\n");
final StringBuilder expectedResult = new StringBuilder();
- expectedResult.append("default_type:-1,default\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- expectedResult.append("string/default_attr1[default] section=0/General\n");
- expectedResult.append("string/default_attr2[default] section=0/General\n");
- expectedResult.append("\n");
expectedResult.append("type:1,name1\n");
expectedResult.append(":\n");
expectedResult.append(":\n");
@@ -339,11 +307,6 @@
typesXml.append("<description>description2</description>\n");
typesXml.append("</type>\n");
final StringBuilder expectedResult = new StringBuilder();
- expectedResult.append("default_type:-1,default\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- expectedResult.append("string/default_attr1[default] section=0/General\n");
- expectedResult.append("\n");
expectedResult.append("type:1,name1\n");
expectedResult.append(":\n");
expectedResult.append(":\n");
@@ -385,10 +348,6 @@
typesXml.append("<attribute arch=\"name1_attr2\" editor=\"name1\" type=\"string\">description</attribute>\n");
typesXml.append("</type>\n");
final StringBuilder expectedResult = new StringBuilder();
- expectedResult.append("default_type:-1,default\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- expectedResult.append("\n");
expectedResult.append("type:1,name1\n");
expectedResult.append(":\n");
expectedResult.append(":\n");
@@ -419,11 +378,6 @@
typesXml.append("<description>description</description>\n");
typesXml.append("</type>\n");
final StringBuilder expectedResult = new StringBuilder();
- expectedResult.append("default_type:-1,default\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- expectedResult.append("text/msg[default] section=2/default\n");
- expectedResult.append("\n");
expectedResult.append("type:1,name1\n");
expectedResult.append(":\n");
expectedResult.append(":\n");
@@ -454,11 +408,6 @@
typesXml.append("<attribute arch_begin=\"msg\" arch_end=\"endmsg\" editor=\"name1\" type=\"text\">msg2</attribute>\n");
typesXml.append("</type>\n");
final StringBuilder expectedResult = new StringBuilder();
- expectedResult.append("default_type:-1,default\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- expectedResult.append("text/msg[default] section=2/default\n");
- expectedResult.append("\n");
expectedResult.append("type:1,name1\n");
expectedResult.append(":\n");
expectedResult.append(":\n");
@@ -491,11 +440,6 @@
typesXml.append("<description>description</description>\n");
typesXml.append("</type>\n");
final StringBuilder expectedResult = new StringBuilder();
- expectedResult.append("default_type:-1,default\n");
- expectedResult.append(":\n");
- expectedResult.append(":\n");
- expectedResult.append("text/msg[default] section=2/default\n");
- expectedResult.append("\n");
expectedResult.append("type:1,name1\n");
expectedResult.append(":\n");
expectedResult.append(":\n");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
