TouchInstinct
/
checkstyle
306
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed XML element "set-property" to "property"

This commit is contained in:
Rick Giles 2002-11-18 10:03:05 +00:00
parent bac2f07937
commit cf7e4c19e3
8 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
docs/checkstyle_checks.xml
View File

@ -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>
-->

10
docs/configuration.dtd
View File

@ -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
>

2
src/checkstyle/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java
View File

@ -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");

6
src/testinputs/com/puppycrawl/tools/checkstyle/configs/conflict_configuration.xml
View File

@ -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>

4
src/testinputs/com/puppycrawl/tools/checkstyle/configs/fromglobal_configuration.xml
View File

@ -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>

14
src/testinputs/com/puppycrawl/tools/checkstyle/configs/override_default_configuration.xml
View File

@ -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>

14
src/testinputs/com/puppycrawl/tools/checkstyle/configs/property_configuration.xml
View File

@ -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>

2
src/testinputs/com/puppycrawl/tools/checkstyle/configs/rightcurlycheck_configuration.xml
View File

@ -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>