Changeset 7472c1048141217aa45025f0c2b2dca84dea5d9b

Timestamp:

12/30/07 15:09:29 (8 months ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

Christopher Jung <bktheg@web.de> 1199023769 +0100

git-parent:

[69e8dd4d646261e70b6c69e5073d73ce1fdc5047]

git-author:

Christopher Jung <bktheg@web.de> 1199023769 +0100

Message:

Das automatische Registrieren von Rollen ergaenzt

Files:

• src/net/driftingsouls/ds2/server/scripting/roles/interpreter/Interpreter.java (modified) (3 diffs)
• test/java/META-INF/services/net.driftingsouls.ds2.server.scripting.roles.Role (added)
• test/java/net/driftingsouls/ds2/server/scripting/roles/NopRole.java (added)
• test/java/net/driftingsouls/ds2/server/scripting/roles/interpreter/InterpreterTest.java (modified) (2 diffs)

src/net/driftingsouls/ds2/server/scripting/roles/interpreter/Interpreter.java

@@ -21 +21 @@
-import java.util.HashMap;
-import java.util.Map;
+import java.util.ServiceLoader;
-
-import net.driftingsouls.ds2.server.scripting.roles.Role;
@@ -32 +33 @@
-public class Interpreter {
-        private static Map<String,Class<? extends Role>> roles = new HashMap<String,Class<? extends Role>>();
+        
+        static {
+                loadRegisteredRoles();
+        }
+        
+        private static void loadRegisteredRoles() {
+                ServiceLoader<Role> roleLoader = ServiceLoader.load(Role.class);
+                for( Role role : roleLoader ) {
+                        roles.put(role.getClass().getSimpleName(), role.getClass());
+                }
+        }
-        
-        /**
@@ -56 +68 @@
-                synchronized(roles) {
-                        roles.clear();
+                        loadRegisteredRoles();
-                }
-        }

test/java/net/driftingsouls/ds2/server/scripting/roles/interpreter/InterpreterTest.java

@@ -26 +26 @@
-
-import net.driftingsouls.ds2.server.scripting.ScriptParserContext;
+import net.driftingsouls.ds2.server.scripting.roles.NopRole;
-import net.driftingsouls.ds2.server.scripting.roles.Role;
-import net.driftingsouls.ds2.server.scripting.roles.parser.RoleDefinition;
@@ -162 +163 @@
-                assertThat(role.executed, is(true));
-        }
+        
+        /**
+         *  Testet ob die NopRole automatisch im Interpreter registriert wurde
+         */
+        @Test
+        public void testNopRolePresent() {
+                RoleDefinition nopRole = new RoleDefinition() {
+                        public Object getAttribute(String name) {
+                                return null;
+                        }
+                        
+                        public String getRoleName() {
+                                return "NopRole";
+                        }
+                };
+                
+                RoleExecuter roleExec = Interpreter.executerFromDefinition(nopRole);
+                assertThat(roleExec.getRole(), instanceOf(NopRole.class));
+        }
-}