[Gridarta-commit] SF.net SVN: gridarta:[9215] trunk/model/src/app/net/sf/gridarta/model/ archetypetype

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

Revision: 9215
          http://sourceforge.net/p/gridarta/code/9215
Author:   akirschbaum
Date:     2013-05-24 20:08:51 +0000 (Fri, 24 May 2013)
Log Message:
-----------
Remove ArchetypeTypeSet.defineFallbackArchetypeType().

Modified Paths:
--------------
    trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java
    trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParser.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 20:01:25 UTC (rev 9214)
+++ trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java	2013-05-24 20:08:51 UTC (rev 9215)
@@ -41,8 +41,8 @@
      * The default (fallback) {@link ArchetypeType} used for game objects not
      * matching any defined type.
      */
-    @Nullable
-    private ArchetypeType fallbackArchetypeType;
+    @NotNull
+    private ArchetypeType fallbackArchetypeType = new ArchetypeType("", 0, "", true, null, false, null, null, 2, new ArchetypeAttributes(), new ArchetypeAttributesDefinition());
 
     /**
      * Lists with all defined {@link ArchetypeType ArchetypeTypes}.
@@ -135,9 +135,6 @@
             }
         }
 
-        if (fallbackArchetypeType == null) {
-            throw new IllegalStateException();
-        }
         return fallbackArchetypeType;
     }
 
@@ -167,9 +164,6 @@
             return type;
         }
 
-        if (fallbackArchetypeType == null) {
-            throw new IllegalStateException();
-        }
         return fallbackArchetypeType;
     }
 
@@ -187,9 +181,6 @@
             }
         }
 
-        if (fallbackArchetypeType == null) {
-            throw new IllegalStateException();
-        }
         return fallbackArchetypeType;
     }
 
@@ -225,7 +216,11 @@
      */
     public void add(@NotNull final ArchetypeType archetypeType) {
         archetypeTypeList.add(archetypeType);
-        archetypeTypeNames.put(archetypeType.getTypeName(), archetypeType);
+        final String typeName = archetypeType.getTypeName();
+        archetypeTypeNames.put(typeName, archetypeType);
+        if (typeName.equals("Misc")) {
+            fallbackArchetypeType = archetypeType;
+        }
     }
 
     /**
@@ -247,16 +242,6 @@
     }
 
     /**
-     * Initializes the fallback {@link ArchetypeType}.
-     */
-    public void defineFallbackArchetypeType() {
-        fallbackArchetypeType = archetypeTypeNames.get("Misc");
-        if (fallbackArchetypeType == null) {
-            fallbackArchetypeType = new ArchetypeType("", 0, "", true, null, false, null, null, 2, new ArchetypeAttributes(), new ArchetypeAttributesDefinition());
-        }
-    }
-
-    /**
      * {@inheritDoc}
      */
     @NotNull

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 20:01:25 UTC (rev 9214)
+++ trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParser.java	2013-05-24 20:08:51 UTC (rev 9215)
@@ -306,8 +306,6 @@
         if (log.isInfoEnabled()) {
             log.info("Loaded " + archetypeTypeSet.getLength() + " types from '" + filename + "\'");
         }
-
-        archetypeTypeSet.defineFallbackArchetypeType();
     }
 
     /**

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