From cf7e4c19e3bcb4a3cdf686529e62f2b468fb9837 Mon Sep 17 00:00:00 2001
From: Rick Giles <rickgiles>
Date: Mon, 18 Nov 2002 10:03:05 +0000
Subject: [PATCH] renamed XML element "set-property" to "property"

---
 docs/checkstyle_checks.xml                    | 20 +++++++++----------
 docs/configuration.dtd                        | 10 +++++-----
 .../tools/checkstyle/ConfigurationLoader.java |  2 +-
 .../configs/conflict_configuration.xml        |  6 +++---
 .../configs/fromglobal_configuration.xml      |  4 ++--
 .../override_default_configuration.xml        | 14 ++++++-------
 .../configs/property_configuration.xml        | 14 ++++++-------
 .../configs/rightcurlycheck_configuration.xml |  2 +-
 8 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/docs/checkstyle_checks.xml b/docs/checkstyle_checks.xml
index 7da03b9f1..a8edaf98b 100644
--- a/docs/checkstyle_checks.xml
+++ b/docs/checkstyle_checks.xml
@@ -4,7 +4,7 @@
 -->
 <configuration>
     <global>
- <set-property name="tabWidth" value="4"/>
+ <property name="tabWidth" value="4"/>
     </global>
  <check classname="com.puppycrawl.tools.checkstyle.checks.AvoidStarImport"/>
 
@@ -23,7 +23,7 @@
     <check classname="com.puppycrawl.tools.checkstyle.checks.JavadocTypeCheck"/>
 
     <check classname="com.puppycrawl.tools.checkstyle.checks.JavadocMethodCheck">
-        <set-property name="checkUnusedThrows" value="true"/>
+        <property name="checkUnusedThrows" value="true"/>
     </check>
 
     <check classname="com.puppycrawl.tools.checkstyle.checks.JavadocVariableCheck"/>
@@ -34,7 +34,7 @@
     <check classname="com.puppycrawl.tools.checkstyle.checks.MemberNameCheck"/>
 
     <check classname="com.puppycrawl.tools.checkstyle.checks.MethodLeftCurlyCheck">
-        <set-property name="option" value="nl"/>
+        <property name="option" value="nl"/>
     </check>
 
     <check classname="com.puppycrawl.tools.checkstyle.checks.MethodLengthCheck"/>
@@ -49,13 +49,13 @@
         <tokens>
            DOT
         </tokens>
-        <set-property name="allowLineBreaks" value="true"/>
+        <property name="allowLineBreaks" value="true"/>
     </check>
     <check classname="com.puppycrawl.tools.checkstyle.checks.NoWhitespaceBeforeCheck">
         <tokens>
            DOT
         </tokens>
-        <set-property name="allowLineBreaks" value="true"/>
+        <property name="allowLineBreaks" value="true"/>
     </check>
 
  
@@ -66,10 +66,10 @@
         <tokens>
             ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN
         </tokens>
-        <set-property name="option" value="eol"/>
+        <property name="option" value="eol"/>
     </check>
     <check classname="com.puppycrawl.tools.checkstyle.checks.OtherLeftCurlyCheck">
-        <set-property name="option" value="nlow"/>
+        <property name="option" value="nlow"/>
     </check>
     <check classname="com.puppycrawl.tools.checkstyle.checks.PackageNameCheck"/>
     <check classname="com.puppycrawl.tools.checkstyle.checks.ParameterNameCheck"/>
@@ -81,7 +81,7 @@
     <check classname="com.puppycrawl.tools.checkstyle.checks.RegexpHeaderCheck"/>
 
     <check classname="com.puppycrawl.tools.checkstyle.checks.RightCurlyCheck">
-        <set-property name="option" value="alone"/>
+        <property name="option" value="alone"/>
     </check>
 
     <check classname="com.puppycrawl.tools.checkstyle.checks.SimplifyBooleanExpressionCheck"/>
@@ -90,7 +90,7 @@
     <check classname="com.puppycrawl.tools.checkstyle.checks.TabCharacterCheck"/>
 
     <check classname="com.puppycrawl.tools.checkstyle.checks.TypeLeftCurlyCheck">
-        <set-property name="option" value="nl"/>
+        <property name="option" value="nl"/>
     </check>
 
     <check classname="com.puppycrawl.tools.checkstyle.checks.TypeNameCheck"/>
@@ -102,7 +102,7 @@
 
     <!--
     <check classname="com.puppycrawl.tools.checkstyle.checks.GenericIllegalRegexpCheck">
-        <set-property name="format" value="System.out.println"/>
+        <property name="format" value="System.out.println"/>
     </check>
     -->
 
diff --git a/docs/configuration.dtd b/docs/configuration.dtd
index 1e5296ee1..39ceda285 100644
--- a/docs/configuration.dtd
+++ b/docs/configuration.dtd
@@ -2,13 +2,13 @@
  DTD for a checkstyle configuration.
  -->
 <!ELEMENT configuration (global*, check*)>
-<!ELEMENT global (set-property*)>
-<!ELEMENT check (tokens?, set-property?)>
+<!ELEMENT global (property*)>
+<!ELEMENT check (tokens?, property?)>
 <!ELEMENT tokens (#PCDATA)>
 <!ELEMENT set-property EMPTY>
 
 <!ATTLIST check classname CDATA #REQUIRED>
-<!ATTLIST set-property name CDATA #REQUIRED
-                       value CDATA #IMPLIED
-                       from-global CDATA #IMPLIED
+<!ATTLIST property name CDATA #REQUIRED
+                   value CDATA #IMPLIED
+                   from-global CDATA #IMPLIED
 >
\ No newline at end of file
diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java
index 7944b0bff..471f296f9 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java
@@ -136,7 +136,7 @@ class ConfigurationLoader
             mCurrent = new CheckConfiguration();
             mCurrent.setClassname(aAtts.getValue("classname"));
         }
-        else if ("set-property".equals(aQName)) {
+        else if ("property".equals(aQName)) {
             final String name = aAtts.getValue("name");
             String value = aAtts.getValue("value");
             
diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/configs/conflict_configuration.xml b/src/testinputs/com/puppycrawl/tools/checkstyle/configs/conflict_configuration.xml
index 6bb66403b..403180042 100644
--- a/src/testinputs/com/puppycrawl/tools/checkstyle/configs/conflict_configuration.xml
+++ b/src/testinputs/com/puppycrawl/tools/checkstyle/configs/conflict_configuration.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <configuration>
     <global>
-        <set-property name="option" value="nl"/>
+        <property name="option" value="nl"/>
     </global>
     <check classname="com.puppycrawl.tools.checkstyle.checks.RightCurlyCheck">
-        <set-property name="option" value="alone"/>
-        <set-property name="checkstyle.tab.width" value="4"/>
+        <property name="option" value="alone"/>
+        <property name="checkstyle.tab.width" value="4"/>
     </check>
 </configuration>
diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/configs/fromglobal_configuration.xml b/src/testinputs/com/puppycrawl/tools/checkstyle/configs/fromglobal_configuration.xml
index 1a4cdd7e5..43ae4a68f 100644
--- a/src/testinputs/com/puppycrawl/tools/checkstyle/configs/fromglobal_configuration.xml
+++ b/src/testinputs/com/puppycrawl/tools/checkstyle/configs/fromglobal_configuration.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <configuration>
     <global>
-        <set-property name="rightcurlycheck.option" value="alone"/>
+        <property name="rightcurlycheck.option" value="alone"/>
     </global>
     <check classname="com.puppycrawl.tools.checkstyle.checks.RightCurlyCheck">
-        <set-property name="option" from-global="rightcurlycheck.option"/>
+        <property name="option" from-global="rightcurlycheck.option"/>
     </check>
 </configuration>
diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/configs/override_default_configuration.xml b/src/testinputs/com/puppycrawl/tools/checkstyle/configs/override_default_configuration.xml
index 8eba00e65..825b67d0e 100644
--- a/src/testinputs/com/puppycrawl/tools/checkstyle/configs/override_default_configuration.xml
+++ b/src/testinputs/com/puppycrawl/tools/checkstyle/configs/override_default_configuration.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <configuration>
     <global>
-        <set-property name="checkstyle.tab.width" value="4"/>
-        <set-property name="checkstyle.require.packagehtml" value="true"/>
-        <set-property name="checkstyle.cache.file" value="cache"/>
-        <set-property name="checkstyle.basedir" value="basedir"/>
-        <set-property name="checkstyle.locale.language" value="language"/>
-        <set-property name="checkstyle.locale.country" value="country"/>
-        <set-property name="notdefault" value="true"/>
+        <property name="checkstyle.tab.width" value="4"/>
+        <property name="checkstyle.require.packagehtml" value="true"/>
+        <property name="checkstyle.cache.file" value="cache"/>
+        <property name="checkstyle.basedir" value="basedir"/>
+        <property name="checkstyle.locale.language" value="language"/>
+        <property name="checkstyle.locale.country" value="country"/>
+        <property name="notdefault" value="true"/>
     </global>
 </configuration>
diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/configs/property_configuration.xml b/src/testinputs/com/puppycrawl/tools/checkstyle/configs/property_configuration.xml
index 46c66d058..db897eda3 100644
--- a/src/testinputs/com/puppycrawl/tools/checkstyle/configs/property_configuration.xml
+++ b/src/testinputs/com/puppycrawl/tools/checkstyle/configs/property_configuration.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <configuration>
     <global>
-    <set-property name="checkstyle.tab.width" value="4"/>
-    <set-property name="checkstyle.require.packagehtml" value="true"/>
-    <set-property name="checkstyle.cache.file" value="cache"/>
-    <set-property name="checkstyle.basedir" value="basedir"/>
-    <set-property name="checkstyle.locale.language" value="language"/>
-    <set-property name="checkstyle.locale.country" value="country"/>
-    <set-property name="notdefault" value="true"/>
+    <property name="checkstyle.tab.width" value="4"/>
+    <property name="checkstyle.require.packagehtml" value="true"/>
+    <property name="checkstyle.cache.file" value="cache"/>
+    <property name="checkstyle.basedir" value="basedir"/>
+    <property name="checkstyle.locale.language" value="language"/>
+    <property name="checkstyle.locale.country" value="country"/>
+    <property name="notdefault" value="true"/>
     </global>
 </configuration>
diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/configs/rightcurlycheck_configuration.xml b/src/testinputs/com/puppycrawl/tools/checkstyle/configs/rightcurlycheck_configuration.xml
index 00c1af33f..a42878ebf 100644
--- a/src/testinputs/com/puppycrawl/tools/checkstyle/configs/rightcurlycheck_configuration.xml
+++ b/src/testinputs/com/puppycrawl/tools/checkstyle/configs/rightcurlycheck_configuration.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
     <check classname="com.puppycrawl.tools.checkstyle.checks.RightCurlyCheck">
-        <set-property name="option" value="alone"/>
+        <property name="option" value="alone"/>
     </check>
 </configuration>