From 28cc0b5748d61934088be7160e317672255581c2 Mon Sep 17 00:00:00 2001 From: Iurii Chernyi Date: Tue, 23 Mar 2010 01:00:14 +0000 Subject: [PATCH] a minor readability change in the eclipse plugin --- .../org/wesnoth/wml/core/SchemaFactory.java | 25 ++++++++++--------- .../org/wesnoth/wml/schema/SchemaChild.java | 2 ++ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/resources/eclipse_plugin/src/org/wesnoth/wml/core/SchemaFactory.java b/resources/eclipse_plugin/src/org/wesnoth/wml/core/SchemaFactory.java index eb321d49dbf..3621a413ab7 100644 --- a/resources/eclipse_plugin/src/org/wesnoth/wml/core/SchemaFactory.java +++ b/resources/eclipse_plugin/src/org/wesnoth/wml/core/SchemaFactory.java @@ -4,6 +4,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.wesnoth.wml.schema.SchemaAttribute; +import org.wesnoth.wml.schema.SchemaChild; import org.wesnoth.wml.schema.SchemaTag; import org.wesnoth.wml.schema.impl.SchemaAttributeChildImpl; import org.wesnoth.wml.schema.impl.SchemaAttributeImpl; @@ -44,29 +45,29 @@ public class SchemaFactory { SchemaAttributeImpl integer = new SchemaAttributeImpl("integer"); schemaAttributesMap.put("integer", integer); - campaign.addAttribute(new SchemaAttributeChildImpl("abbrev",identifier,true)); + campaign.addAttribute(new SchemaAttributeChildImpl("abbrev",identifier,SchemaChild.REQUIRED)); - campaign.addAttribute(new SchemaAttributeChildImpl("define",identifier,true)); + campaign.addAttribute(new SchemaAttributeChildImpl("define",identifier,SchemaChild.REQUIRED)); - campaign.addAttribute(new SchemaAttributeChildImpl("description",tstring,true)); + campaign.addAttribute(new SchemaAttributeChildImpl("description",tstring,SchemaChild.REQUIRED)); - campaign.addAttribute(new SchemaAttributeChildImpl("difficulties",string,true)); + campaign.addAttribute(new SchemaAttributeChildImpl("difficulties",string,SchemaChild.REQUIRED)); - campaign.addAttribute(new SchemaAttributeChildImpl("difficulty_descriptions",string,true)); + campaign.addAttribute(new SchemaAttributeChildImpl("difficulty_descriptions",string,SchemaChild.REQUIRED)); - campaign.addAttribute(new SchemaAttributeChildImpl("extra_defines",string,false)); + campaign.addAttribute(new SchemaAttributeChildImpl("extra_defines",string,SchemaChild.OPTIONAL)); - campaign.addAttribute(new SchemaAttributeChildImpl("first_scenario",identifier,true)); + campaign.addAttribute(new SchemaAttributeChildImpl("first_scenario",identifier,SchemaChild.REQUIRED)); - campaign.addAttribute(new SchemaAttributeChildImpl("icon",path,false)); + campaign.addAttribute(new SchemaAttributeChildImpl("icon",path,SchemaChild.OPTIONAL)); - campaign.addAttribute(new SchemaAttributeChildImpl("id",string,true)); + campaign.addAttribute(new SchemaAttributeChildImpl("id",string,SchemaChild.REQUIRED)); - campaign.addAttribute(new SchemaAttributeChildImpl("image",path,false)); + campaign.addAttribute(new SchemaAttributeChildImpl("image",path,SchemaChild.OPTIONAL)); - campaign.addAttribute(new SchemaAttributeChildImpl("name",tstring,true)); + campaign.addAttribute(new SchemaAttributeChildImpl("name",tstring,SchemaChild.REQUIRED)); - campaign.addAttribute(new SchemaAttributeChildImpl("rank",integer,true)); + campaign.addAttribute(new SchemaAttributeChildImpl("rank",integer,SchemaChild.REQUIRED)); schemaTagsMap.put("campaign", campaign); diff --git a/resources/eclipse_plugin/src/org/wesnoth/wml/schema/SchemaChild.java b/resources/eclipse_plugin/src/org/wesnoth/wml/schema/SchemaChild.java index a9113b0acbf..4702915bbbe 100644 --- a/resources/eclipse_plugin/src/org/wesnoth/wml/schema/SchemaChild.java +++ b/resources/eclipse_plugin/src/org/wesnoth/wml/schema/SchemaChild.java @@ -1,6 +1,8 @@ package org.wesnoth.wml.schema; public interface SchemaChild { + public static boolean REQUIRED = true; + public static boolean OPTIONAL = false; boolean isRequired(); String getName(); }