Fixed invalid default rule set.

jshiell · Dec 17, 2012 · ed418e9 · ed418e9
1 parent 48fac70
commit ed418e9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/CheckStyle-IDEA.ipr b/CheckStyle-IDEA.ipr
@@ -29,15 +29,13 @@
   <component name="CheckStyle-IDEA">
     <option name="configuration">
       <map>
-        <entry key="active-configuration" value="CLASSPATH:/sun_checks.xml:The default CheckStyle rules." />
+        <entry key="active-configuration" value="CLASSPATH:/sun_checks.xml:The default CheckStyle rules" />
         <entry key="check-nonjava-files" value="false" />
         <entry key="check-test-classes" value="false" />
-        <entry key="location-0" value="FILE:$PROJECT_DIR$/test-configs/checkstyle-with-header.xml:Header 2" />
-        <entry key="location-1" value="CLASSPATH:/sun_checks.xml:The default CheckStyle rules" />
+        <entry key="location-0" value="FILE:$PROJECT_DIR$/test-configs/test-item/sun_checks.xml:Test1" />
+        <entry key="location-1" value="FILE:$PROJECT_DIR$/test-configs/checkstyle-with-header.xml:Header 2" />
         <entry key="location-2" value="FILE:$PROJECT_DIR$/test-configs/checkstyle-with-header.xml:Header test" />
-        <entry key="location-3" value="file:$PROJECT_DIR$/../checkstyle-idea-boo/sun_checks.xml:Test #9" />
-        <entry key="location-4" value="CLASSPATH:/sun_checks.xml:The default CheckStyle rules." />
-        <entry key="location-5" value="FILE:$PROJECT_DIR$/test-configs/test-item/sun_checks.xml:Test1" />
+        <entry key="location-3" value="CLASSPATH:/sun_checks.xml:The default CheckStyle rules" />
         <entry key="thirdparty-classpath" value="" />
       </map>
     </option>

diff --git a/README b/README
@@ -149,6 +149,7 @@ LICENCE file.
 Version History
 ---------------
 
+3.9.1 - Fixed: Default rules are invalid with CS5.6.
 3.9   - Fixed: Match on leading project path causes tokenisation silliness (#9).
 3.9   - New: Updated CheckStyle to 5.6.
 3.8.4 - Fixed: IDE error on pre-check-in scan (#39).

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -11,13 +11,14 @@
 </p>
         ]]>
     </description>
-    <version>3.9</version>
+    <version>3.9.1</version>
     <idea-version since-build="111.41"/>
     <vendor url="http://infernus.org/" email="james@infernus.org">James Shiell</vendor>
 
     <change-notes>
         <![CDATA[
 <ul>
+    <li>3.9.1: Fixed: Default rules are invalid with CS5.6.</li>
     <li>3.9: Fixed: Match on leading project path causes tokenisation silliness (#9).</li>
     <li>3.9: New: Updated CheckStyle to 5.6.</li>
     <li>3.8.4: Fixed: IDE error on pre-check-in scan (#39).</li>

diff --git a/src/main/resources/sun_checks.xml b/src/main/resources/sun_checks.xml
@@ -156,7 +156,6 @@
         <!-- Checks for common coding problems               -->
         <!-- See http://checkstyle.sf.net/config_coding.html -->
         <module name="AvoidInlineConditionals"/>
-        <module name="DoubleCheckedLocking"/>    <!-- MY FAVOURITE -->
         <module name="EmptyStatement"/>
         <module name="EqualsHashCode"/>
         <module name="HiddenField"/>