From eab33874f3cd217d1946e7f0c0fd4edadbdaba8e Mon Sep 17 00:00:00 2001
From: Glenn Adams <gadams@apache.org>
Date: Sat, 14 Apr 2012 17:11:40 +0000
Subject: Bugzilla #53083: Update to use of checkstyle-5.5 as default
 configuration. Remove checkstyle-4.0 configuration. Also, import environment
 build properties before local properties, so that latter can refer to former.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1326154 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml          |   6 +-
 checkstyle-4.0.xml | 190 -----------------------------------------------------
 status.xml         |   3 +
 3 files changed, 6 insertions(+), 193 deletions(-)
 delete mode 100644 checkstyle-4.0.xml

diff --git a/build.xml b/build.xml
index f84f83a84..3cd62f862 100644
--- a/build.xml
+++ b/build.xml
@@ -54,9 +54,9 @@ list of possible build targets.
 <project default="all" basedir="." name="fop">
 <!-- See build.properties and build-local.properties for overriding build settings. -->
 <!-- build-local.properties is not stored in SVN and overrides values from build.properties -->
+  <property environment="env"/>
   <property file="${basedir}/build-local.properties"/>
   <property file="${basedir}/build.properties"/>
-  <property environment="env"/>
   <fileset dir="${basedir}" id="dist.bin">
     <include name="conf/**"/>
     <include name="examples/**"/>
@@ -1019,9 +1019,9 @@ NOTE:
 <!-- =================================================================== -->
 <!-- Checkstyle                                                          -->
 <!-- =================================================================== -->
-  <property name="checkstyle.location" value="${lib-tools}/checkstyle-all-5.1.jar" />
+  <property name="checkstyle.location" value="${lib-tools}/checkstyle-5.5-all.jar" />
   <property name="checkstyle.noframes.xslt" value="${basedir}/checkstyle-noframes.xsl" />
-  <property name="checkstyle.config" value="${basedir}/checkstyle-5.1.xml" />
+  <property name="checkstyle.config" value="${basedir}/checkstyle-5.5.xml" />
   <path id="checkstyle-classpath">
     <path refid="libs-build-classpath"/>
     <pathelement location="${checkstyle.location}"/>
diff --git a/checkstyle-4.0.xml b/checkstyle-4.0.xml
deleted file mode 100644
index 764e703ec..000000000
--- a/checkstyle-4.0.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
-<module name="Checker">
-  <module name="TreeWalker">
-    <module name="RegexpHeader">
-      <property name="headerFile" value="${samedir}/checkstyle.header"/>
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="ArrayTypeStyleCheck">
-      <property name="javaStyle" value="true"/>
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="ModifierOrderCheck">
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="RedundantModifierCheck">
-      <property name="severity" value="warning"/>
-      <property name="tokens" value="METHOD_DEF, VARIABLE_DEF"/>
-    </module>
-    <module name="UpperEllCheck">
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="AvoidNestedBlocksCheck">
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="EmptyBlockCheck">
-      <property name="option" value="text"/>
-      <property name="severity" value="warning"/>
-      <property name="tokens" value="LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_IF, LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE, STATIC_INIT"/>
-    </module>
-    <module name="LeftCurlyCheck">
-      <property name="maxLineLength" value="100"/>
-      <property name="option" value="eol"/>
-      <property name="severity" value="warning"/>
-      <property name="tokens" value="CLASS_DEF, CTOR_DEF, INTERFACE_DEF, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF"/>
-    </module>
-    <module name="NeedBracesCheck">
-      <property name="severity" value="warning"/>
-      <property name="tokens" value="LITERAL_DO, LITERAL_ELSE, LITERAL_IF, LITERAL_FOR, LITERAL_WHILE"/>
-    </module>
-    <module name="RightCurlyCheck">
-      <property name="option" value="same"/>
-      <property name="severity" value="warning"/>
-      <property name="tokens" value="LITERAL_CATCH, LITERAL_ELSE, LITERAL_TRY"/>
-    </module>
-    <module name="DoubleCheckedLockingCheck">
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="EmptyStatementCheck">
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="EqualsHashCodeCheck">
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="InnerAssignmentCheck">
-      <property name="severity" value="warning"/>
-      <property name="tokens" value="ASSIGN, BAND_ASSIGN, BOR_ASSIGN, BSR_ASSIGN, BXOR_ASSIGN, DIV_ASSIGN, MINUS_ASSIGN, MOD_ASSIGN, PLUS_ASSIGN, SL_ASSIGN, SR_ASSIGN, STAR_ASSIGN"/>
-    </module>
-    <module name="MissingSwitchDefaultCheck">
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="SimplifyBooleanExpressionCheck">
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="SimplifyBooleanReturnCheck">
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="FinalClassCheck">
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="HideUtilityClassConstructorCheck">
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="VisibilityModifierCheck">
-      <property name="packageAllowed" value="false"/>
-      <property name="protectedAllowed" value="true"/>
-      <property name="publicMemberPattern" value="^serialVersionUID"/>
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="AvoidStarImportCheck">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="JavadocMethodCheck">
-      <property name="allowMissingParamTags" value="false"/>
-      <property name="allowMissingReturnTag" value="false"/>
-      <property name="allowMissingThrowsTags" value="false"/>
-      <property name="allowThrowsTagsForSubclasses" value="false"/>
-      <property name="allowUndeclaredRTE" value="false"/>
-      <property name="scope" value="protected"/>
-      <property name="severity" value="warning"/>
-      <property name="tokens" value="METHOD_DEF, CTOR_DEF"/>
-    </module>
-    <module name="JavadocTypeCheck">
-      <property name="scope" value="protected"/>
-      <property name="severity" value="warning"/>
-      <property name="tokens" value="CLASS_DEF, INTERFACE_DEF"/>
-    </module>
-    <module name="JavadocVariableCheck">
-      <property name="scope" value="protected"/>
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="ConstantNameCheck">
-      <property name="format" value="^[A-Z](_?[A-Z0-9]+)*$"/>
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="LocalFinalVariableNameCheck">
-      <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="LocalVariableNameCheck">
-      <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="MemberNameCheck">
-      <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="MethodNameCheck">
-      <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="PackageNameCheck">
-      <property name="format" value="^[a-z]+(\.[a-zA-Z_][a-zA-Z0-9_]*)*$"/>
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="ParameterNameCheck">
-      <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="StaticVariableNameCheck">
-      <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="TypeNameCheck">
-      <property name="format" value="^[A-Z][a-zA-Z0-9]*$"/>
-      <property name="severity" value="warning"/>
-      <property name="tokens" value="CLASS_DEF, INTERFACE_DEF"/>
-    </module>
-    <module name="FileLengthCheck">
-      <property name="max" value="2000"/>
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="LineLengthCheck">
-      <property name="ignorePattern" value="^$"/>
-      <property name="max" value="100"/>
-      <property name="severity" value="warning"/>
-      <property name="tabWidth" value="4"/>
-    </module>
-    <module name="MethodLengthCheck">
-      <property name="max" value="150"/>
-      <property name="severity" value="warning"/>
-      <property name="tokens" value="METHOD_DEF, CTOR_DEF"/>
-    </module>
-    <module name="ParameterNumberCheck">
-      <property name="max" value="7"/>
-      <property name="severity" value="warning"/>
-      <property name="tokens" value="METHOD_DEF, CTOR_DEF"/>
-    </module>
-    <module name="EmptyForIteratorPadCheck">
-      <property name="option" value="nospace"/>
-      <property name="severity" value="warning"/>
-    </module>
-    <module name="NoWhitespaceAfterCheck">
-      <property name="allowLineBreaks" value="true"/>
-      <property name="severity" value="warning"/>
-      <property name="tokens" value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS"/>
-    </module>
-    <module name="NoWhitespaceBeforeCheck">
-      <property name="allowLineBreaks" value="true"/>
-      <property name="severity" value="warning"/>
-      <property name="tokens" value="SEMI, POST_DEC, POST_INC"/>
-    </module>
-    <module name="OperatorWrapCheck">
-      <property name="option" value="nl"/>
-      <property name="severity" value="warning"/>
-      <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, SL, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN"/>
-    </module>
-    <module name="TabCharacterCheck">
-      <property name="severity" value="error"/>
-    </module>
-    <module name="WhitespaceAfterCheck">
-      <property name="severity" value="warning"/>
-      <property name="tokens" value="COMMA, SEMI"/>
-    </module>
-    <module name="WhitespaceAroundCheck">
-      <property name="severity" value="warning"/>
-      <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN"/>
-    </module>
-  </module>
-</module>
diff --git a/status.xml b/status.xml
index 92f35af8d..7d67c2f67 100644
--- a/status.xml
+++ b/status.xml
@@ -62,6 +62,9 @@
       documents. Example: the fix of marks layering will be such a case when it's done.
     -->
     <release version="FOP Trunk" date="TBD">
+      <action context="Code" dev="GA" type="fix" fixes-bug="53083">
+        Update to use of checkstyle-5.5 as default configuration. Remove checkstyle-4.0 configuration. Also, import environment build properties before local properties, so that latter can refer to former.'
+      </action>
       <action context="Code" dev="GA" type="fix" fixes-bug="52572" due-to="Pascal Sancho">
         Prevent NPE on use of unsupported collapse-with-precedence; fall back to collapse. Fix checkstyle errors from prior commit.
       </action>
-- 
cgit v1.2.3