Author: linus
Date: 2010-06-13 02:11:19-0700
New Revision: 18446

Added:
   trunk/tools/checkstyle/checkstyle5_argouml.xml
Modified:
   trunk/modules/dev/.checkstyle
   trunk/modules/dev/.project
   trunk/src/argouml-app/.checkstyle
   trunk/src/argouml-app/.project
   trunk/src/argouml-core-diagrams-sequence2/.checkstyle
   trunk/src/argouml-core-diagrams-sequence2/.project
   trunk/src/argouml-core-diagrams-uml2/.checkstyle
   trunk/src/argouml-core-diagrams-uml2/.project
   trunk/src/argouml-core-model-euml/.checkstyle
   trunk/src/argouml-core-model-euml/.project
   trunk/src/argouml-core-model-mdr/.checkstyle
   trunk/src/argouml-core-model-mdr/.project
   trunk/src/argouml-core-model/.checkstyle
   trunk/src/argouml-core-model/.project
   trunk/src/argouml-core-umlpropertypanels/.checkstyle
   trunk/src/argouml-core-umlpropertypanels/.project

Log:
Modified the Eclipse setup to use version 5 of checkstyle (and eclipse-cs).
Sofar only the rules that are the same from the previous checkstyle 
configuration
are included.

Modified: trunk/modules/dev/.checkstyle
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/.checkstyle?view=diff&pathrev=18446&r1=18445&r2=18446
==============================================================================
--- trunk/modules/dev/.checkstyle       (original)
+++ trunk/modules/dev/.checkstyle       2010-06-13 02:11:19-0700
@@ -1,10 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
-    <local-check-config name="ArgoUML conventions" 
location="/argouml-core-tools/checkstyle/checkstyle_argouml.xml" type="project" 
description="The Checkstyle configuration used in the ArgoUML project.">
-        <property name="checkstyle.header.file" 
value="${workspace_loc}/argouml-core-tools/checkstyle/java.header"/>
-        <additional-data name="protect-config-file" value="false"/>
-    </local-check-config>
-    <fileset name="all" enabled="true" check-config-name="ArgoUML conventions" 
local="true">
-        <file-match-pattern match-pattern="." include-pattern="true"/>
-    </fileset>
-</fileset-config>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="ArgoUML conventions" 
location="/argouml-core-tools/checkstyle/checkstyle5_argouml.xml" 
type="project" description="The Checkstyle configuration used in the ArgoUML 
project.">
+    <property name="checkstyle.header.file" 
value="${workspace_loc}/argouml-core-tools/checkstyle/java.header"/>
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="ArgoUML checks" 
local="false">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+  <filter name="WriteProtectedFiles" enabled="true"/>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src_generated"/>
+  </filter>
+  <filter name="NonSrcDirs" enabled="true"/>
+</fileset-config>

Modified: trunk/modules/dev/.project
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/.project?view=diff&pathrev=18446&r1=18445&r2=18446
==============================================================================
--- trunk/modules/dev/.project  (original)
+++ trunk/modules/dev/.project  2010-06-13 02:11:19-0700
@@ -26,7 +26,7 @@
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       
<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
+                       <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
@@ -35,6 +35,6 @@
                <nature>de.mvmsoft.checkclipse.CheckclipseNature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
                <nature>org.eclipse.pde.PluginNature</nature>
-               
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+               <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
        </natures>
 </projectDescription>

Modified: trunk/src/argouml-app/.checkstyle
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/.checkstyle?view=diff&pathrev=18446&r1=18445&r2=18446
==============================================================================
--- trunk/src/argouml-app/.checkstyle   (original)
+++ trunk/src/argouml-app/.checkstyle   2010-06-13 02:11:19-0700
@@ -1,10 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
-    <local-check-config name="ArgoUML conventions" 
location="/argouml-core-tools/checkstyle/checkstyle_argouml.xml" type="project" 
description="The Checkstyle configuration used in the ArgoUML project.">
-        <property name="checkstyle.header.file" 
value="${workspace_loc}/argouml-core-tools/checkstyle/java.header"/>
-        <additional-data name="protect-config-file" value="false"/>
-    </local-check-config>
-    <fileset name="all" enabled="true" check-config-name="ArgoUML conventions" 
local="true">
-        <file-match-pattern match-pattern="." include-pattern="true"/>
-    </fileset>
-</fileset-config>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="ArgoUML conventions" 
location="/argouml-core-tools/checkstyle/checkstyle5_argouml.xml" 
type="project" description="The Checkstyle configuration used in the ArgoUML 
project.">
+    <property name="checkstyle.header.file" 
value="${workspace_loc}/argouml-core-tools/checkstyle/java.header"/>
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="ArgoUML checks" 
local="false">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+  <filter name="WriteProtectedFiles" enabled="true"/>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src_generated"/>
+  </filter>
+  <filter name="NonSrcDirs" enabled="true"/>
+</fileset-config>

Modified: trunk/src/argouml-app/.project
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/.project?view=diff&pathrev=18446&r1=18445&r2=18446
==============================================================================
--- trunk/src/argouml-app/.project      (original)
+++ trunk/src/argouml-app/.project      2010-06-13 02:11:19-0700
@@ -36,7 +36,7 @@
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       
<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
+                       <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
@@ -45,6 +45,6 @@
                <nature>de.mvmsoft.checkclipse.CheckclipseNature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
                <nature>org.eclipse.pde.PluginNature</nature>
-               
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+               <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
        </natures>
 </projectDescription>

Modified: trunk/src/argouml-core-diagrams-sequence2/.checkstyle
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/.checkstyle?view=diff&pathrev=18446&r1=18445&r2=18446
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/.checkstyle       (original)
+++ trunk/src/argouml-core-diagrams-sequence2/.checkstyle       2010-06-13 
02:11:19-0700
@@ -1,10 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
-    <local-check-config name="ArgoUML conventions" 
location="/argouml-core-tools/checkstyle/checkstyle_argouml.xml" type="project" 
description="The Checkstyle configuration used in the ArgoUML project.">
-        <property name="checkstyle.header.file" 
value="${workspace_loc}/argouml-core-tools/checkstyle/java.header"/>
-        <additional-data name="protect-config-file" value="false"/>
-    </local-check-config>
-    <fileset name="all" enabled="true" check-config-name="ArgoUML conventions" 
local="true">
-        <file-match-pattern match-pattern="." include-pattern="true"/>
-    </fileset>
-</fileset-config>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="ArgoUML conventions" 
location="/argouml-core-tools/checkstyle/checkstyle5_argouml.xml" 
type="project" description="The Checkstyle configuration used in the ArgoUML 
project.">
+    <property name="checkstyle.header.file" 
value="${workspace_loc}/argouml-core-tools/checkstyle/java.header"/>
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="ArgoUML checks" 
local="false">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+  <filter name="WriteProtectedFiles" enabled="true"/>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src_generated"/>
+  </filter>
+  <filter name="NonSrcDirs" enabled="true"/>
+</fileset-config>

Modified: trunk/src/argouml-core-diagrams-sequence2/.project
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/.project?view=diff&pathrev=18446&r1=18445&r2=18446
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/.project  (original)
+++ trunk/src/argouml-core-diagrams-sequence2/.project  2010-06-13 02:11:19-0700
@@ -26,7 +26,7 @@
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       
<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
+                       <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
@@ -35,6 +35,6 @@
                <nature>de.mvmsoft.checkclipse.CheckclipseNature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
                <nature>org.eclipse.pde.PluginNature</nature>
-               
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+               <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
        </natures>
 </projectDescription>

Modified: trunk/src/argouml-core-diagrams-uml2/.checkstyle
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/.checkstyle?view=diff&pathrev=18446&r1=18445&r2=18446
==============================================================================
--- trunk/src/argouml-core-diagrams-uml2/.checkstyle    (original)
+++ trunk/src/argouml-core-diagrams-uml2/.checkstyle    2010-06-13 02:11:19-0700
@@ -1,10 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
-    <local-check-config name="ArgoUML conventions" 
location="/argouml-core-tools/checkstyle/checkstyle_argouml.xml" type="project" 
description="The Checkstyle configuration used in the ArgoUML project.">
-        <property name="checkstyle.header.file" 
value="${workspace_loc}/argouml-core-tools/checkstyle/java.header"/>
-        <additional-data name="protect-config-file" value="false"/>
-    </local-check-config>
-    <fileset name="all" enabled="true" check-config-name="ArgoUML conventions" 
local="true">
-        <file-match-pattern match-pattern="." include-pattern="true"/>
-    </fileset>
-</fileset-config>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="ArgoUML conventions" 
location="/argouml-core-tools/checkstyle/checkstyle5_argouml.xml" 
type="project" description="The Checkstyle configuration used in the ArgoUML 
project.">
+    <property name="checkstyle.header.file" 
value="${workspace_loc}/argouml-core-tools/checkstyle/java.header"/>
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="ArgoUML checks" 
local="false">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+  <filter name="WriteProtectedFiles" enabled="true"/>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src_generated"/>
+  </filter>
+  <filter name="NonSrcDirs" enabled="true"/>
+</fileset-config>

Modified: trunk/src/argouml-core-diagrams-uml2/.project
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/.project?view=diff&pathrev=18446&r1=18445&r2=18446
==============================================================================
--- trunk/src/argouml-core-diagrams-uml2/.project       (original)
+++ trunk/src/argouml-core-diagrams-uml2/.project       2010-06-13 02:11:19-0700
@@ -26,7 +26,7 @@
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       
<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
+                       <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
@@ -35,6 +35,6 @@
                <nature>de.mvmsoft.checkclipse.CheckclipseNature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
                <nature>org.eclipse.pde.PluginNature</nature>
-               
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+               <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
        </natures>
 </projectDescription>

Modified: trunk/src/argouml-core-model-euml/.checkstyle
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/.checkstyle?view=diff&pathrev=18446&r1=18445&r2=18446
==============================================================================
--- trunk/src/argouml-core-model-euml/.checkstyle       (original)
+++ trunk/src/argouml-core-model-euml/.checkstyle       2010-06-13 02:11:19-0700
@@ -1,10 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
-    <local-check-config name="ArgoUML conventions" 
location="/argouml-core-tools/checkstyle/checkstyle_argouml.xml" type="project" 
description="The Checkstyle configuration used in the ArgoUML project.">
-        <property name="checkstyle.header.file" 
value="${workspace_loc}/argouml-core-tools/checkstyle/java.header"/>
-        <additional-data name="protect-config-file" value="false"/>
-    </local-check-config>
-    <fileset name="all" enabled="true" check-config-name="ArgoUML conventions" 
local="true">
-        <file-match-pattern match-pattern="." include-pattern="true"/>
-    </fileset>
-</fileset-config>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="ArgoUML conventions" 
location="/argouml-core-tools/checkstyle/checkstyle5_argouml.xml" 
type="project" description="The Checkstyle configuration used in the ArgoUML 
project.">
+    <property name="checkstyle.header.file" 
value="${workspace_loc}/argouml-core-tools/checkstyle/java.header"/>
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="ArgoUML checks" 
local="false">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+  <filter name="WriteProtectedFiles" enabled="true"/>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src_generated"/>
+  </filter>
+  <filter name="NonSrcDirs" enabled="true"/>
+</fileset-config>

Modified: trunk/src/argouml-core-model-euml/.project
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/.project?view=diff&pathrev=18446&r1=18445&r2=18446
==============================================================================
--- trunk/src/argouml-core-model-euml/.project  (original)
+++ trunk/src/argouml-core-model-euml/.project  2010-06-13 02:11:19-0700
@@ -26,7 +26,7 @@
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       
<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
+                       <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
@@ -35,6 +35,6 @@
                <nature>de.mvmsoft.checkclipse.CheckclipseNature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
                <nature>org.eclipse.pde.PluginNature</nature>
-               
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+               <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
        </natures>
 </projectDescription>

Modified: trunk/src/argouml-core-model-mdr/.checkstyle
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/.checkstyle?view=diff&pathrev=18446&r1=18445&r2=18446
==============================================================================
--- trunk/src/argouml-core-model-mdr/.checkstyle        (original)
+++ trunk/src/argouml-core-model-mdr/.checkstyle        2010-06-13 02:11:19-0700
@@ -1,10 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
-    <local-check-config name="ArgoUML conventions" 
location="/argouml-core-tools/checkstyle/checkstyle_argouml.xml" type="project" 
description="The Checkstyle configuration used in the ArgoUML project.">
-        <property name="checkstyle.header.file" 
value="${workspace_loc}/argouml-core-tools/checkstyle/java.header"/>
-        <additional-data name="protect-config-file" value="false"/>
-    </local-check-config>
-    <fileset name="all" enabled="true" check-config-name="ArgoUML conventions" 
local="true">
-        <file-match-pattern match-pattern="." include-pattern="true"/>
-    </fileset>
-</fileset-config>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="ArgoUML conventions" 
location="/argouml-core-tools/checkstyle/checkstyle5_argouml.xml" 
type="project" description="The Checkstyle configuration used in the ArgoUML 
project.">
+    <property name="checkstyle.header.file" 
value="${workspace_loc}/argouml-core-tools/checkstyle/java.header"/>
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="ArgoUML checks" 
local="false">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+  <filter name="WriteProtectedFiles" enabled="true"/>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src_generated"/>
+  </filter>
+  <filter name="NonSrcDirs" enabled="true"/>
+</fileset-config>

Modified: trunk/src/argouml-core-model-mdr/.project
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/.project?view=diff&pathrev=18446&r1=18445&r2=18446
==============================================================================
--- trunk/src/argouml-core-model-mdr/.project   (original)
+++ trunk/src/argouml-core-model-mdr/.project   2010-06-13 02:11:19-0700
@@ -36,7 +36,7 @@
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       
<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
+                       <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
@@ -45,6 +45,6 @@
                <nature>de.mvmsoft.checkclipse.CheckclipseNature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
                <nature>org.eclipse.pde.PluginNature</nature>
-               
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+               <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
        </natures>
 </projectDescription>

Modified: trunk/src/argouml-core-model/.checkstyle
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/.checkstyle?view=diff&pathrev=18446&r1=18445&r2=18446
==============================================================================
--- trunk/src/argouml-core-model/.checkstyle    (original)
+++ trunk/src/argouml-core-model/.checkstyle    2010-06-13 02:11:19-0700
@@ -1,10 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
-    <local-check-config name="ArgoUML conventions" 
location="/argouml-core-tools/checkstyle/checkstyle_argouml.xml" type="project" 
description="The Checkstyle configuration used in the ArgoUML project.">
-        <property name="checkstyle.header.file" 
value="${workspace_loc}/argouml-core-tools/checkstyle/java.header"/>
-        <additional-data name="protect-config-file" value="false"/>
-    </local-check-config>
-    <fileset name="all" enabled="true" check-config-name="ArgoUML conventions" 
local="true">
-        <file-match-pattern match-pattern="." include-pattern="true"/>
-    </fileset>
-</fileset-config>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="ArgoUML conventions" 
location="/argouml-core-tools/checkstyle/checkstyle5_argouml.xml" 
type="project" description="The Checkstyle configuration used in the ArgoUML 
project.">
+    <property name="checkstyle.header.file" 
value="${workspace_loc}/argouml-core-tools/checkstyle/java.header"/>
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="ArgoUML checks" 
local="false">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+  <filter name="WriteProtectedFiles" enabled="true"/>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src_generated"/>
+  </filter>
+  <filter name="NonSrcDirs" enabled="true"/>
+</fileset-config>

Modified: trunk/src/argouml-core-model/.project
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/.project?view=diff&pathrev=18446&r1=18445&r2=18446
==============================================================================
--- trunk/src/argouml-core-model/.project       (original)
+++ trunk/src/argouml-core-model/.project       2010-06-13 02:11:19-0700
@@ -26,7 +26,7 @@
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       
<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
+                       <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
@@ -35,6 +35,6 @@
                <nature>de.mvmsoft.checkclipse.CheckclipseNature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
                <nature>org.eclipse.pde.PluginNature</nature>
-               
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+               <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
        </natures>
 </projectDescription>

Modified: trunk/src/argouml-core-umlpropertypanels/.checkstyle
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/.checkstyle?view=diff&pathrev=18446&r1=18445&r2=18446
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/.checkstyle        (original)
+++ trunk/src/argouml-core-umlpropertypanels/.checkstyle        2010-06-13 
02:11:19-0700
@@ -1,10 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
-    <local-check-config name="ArgoUML conventions" 
location="/argouml-core-tools/checkstyle/checkstyle_argouml.xml" type="project" 
description="The Checkstyle configuration used in the ArgoUML project.">
-        <property name="checkstyle.header.file" 
value="${workspace_loc}/argouml-core-tools/checkstyle/java.header"/>
-        <additional-data name="protect-config-file" value="false"/>
-    </local-check-config>
-    <fileset name="all" enabled="true" check-config-name="ArgoUML conventions" 
local="true">
-        <file-match-pattern match-pattern="." include-pattern="true"/>
-    </fileset>
-</fileset-config>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="ArgoUML conventions" 
location="/argouml-core-tools/checkstyle/checkstyle5_argouml.xml" 
type="project" description="The Checkstyle configuration used in the ArgoUML 
project.">
+    <property name="checkstyle.header.file" 
value="${workspace_loc}/argouml-core-tools/checkstyle/java.header"/>
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="ArgoUML checks" 
local="false">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+  <filter name="WriteProtectedFiles" enabled="true"/>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src_generated"/>
+  </filter>
+  <filter name="NonSrcDirs" enabled="true"/>
+</fileset-config>

Modified: trunk/src/argouml-core-umlpropertypanels/.project
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/.project?view=diff&pathrev=18446&r1=18445&r2=18446
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/.project   (original)
+++ trunk/src/argouml-core-umlpropertypanels/.project   2010-06-13 02:11:19-0700
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>argouml-core-umlpropertypanels</name>
-       <comment></comment>
-       <projects>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.jdt.core.javabuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>de.mvmsoft.checkclipse.CheckclipseBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       
<name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.ManifestBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-               <buildCommand>
-                       <name>org.eclipse.pde.SchemaBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>de.mvmsoft.checkclipse.CheckclipseNature</nature>
-               <nature>org.eclipse.jdt.core.javanature</nature>
-               
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
-               <nature>org.eclipse.pde.PluginNature</nature>
-       </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>argouml-core-umlpropertypanels</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.jdt.core.javabuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>de.mvmsoft.checkclipse.CheckclipseBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>de.mvmsoft.checkclipse.CheckclipseNature</nature>
+               <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
+               <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+       </natures>
+</projectDescription>

Added: trunk/tools/checkstyle/checkstyle5_argouml.xml
Url: 
http://argouml.tigris.org/source/browse/argouml/trunk/tools/checkstyle/checkstyle5_argouml.xml?view=markup&pathrev=18446
==============================================================================
--- (empty file)
+++ trunk/tools/checkstyle/checkstyle5_argouml.xml      2010-06-13 02:11:19-0700
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" 
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd";>
+
+<!--
+    This configuration file was written by the eclipse-cs plugin configuration 
editor
+-->
+<!--
+    Checkstyle-Configuration: ArgoUML checks
+    Description: 
+These are the checks that are defined for the argouml project.
+-->
+<module name="Checker">
+  <property name="severity" value="warning"/>
+  <module name="TreeWalker">
+    <module name="FileContentsHolder"/>
+    <module name="ConstantName"/>
+    <module name="DoubleCheckedLocking"/>
+    <module name="EmptyBlock">
+      <property name="option" value="text"/>
+      <property name="tokens" 
value="LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_IF,LITERAL_TRY,LITERAL_WHILE,STATIC_INIT"/>
+    </module>
+    <module name="EqualsHashCode"/>
+    <module name="HiddenField"/>
+    <module name="IllegalImport">
+      <property name="severity" value="error"/>
+    </module>
+    <module name="IllegalInstantiation">
+      <property name="severity" value="error"/>
+    </module>
+    <module name="Indentation">
+      <property name="caseIndent" value="0"/>
+    </module>
+    <module name="InnerAssignment"/>
+    <module name="JavadocType">
+      <property name="scope" value="protected"/>
+    </module>
+    <module name="JavadocMethod">
+      <property name="scope" value="protected"/>
+      <property name="allowUndeclaredRTE" value="true"/>
+      <property name="allowMissingJavadoc" value="true"/>
+      <property name="logLoadErrors" value="true"/>
+      <property name="suppressLoadErrors" value="true"/>
+    </module>
+    <module name="JavadocVariable">
+      <property name="scope" value="protected"/>
+    </module>
+    <module name="LineLength">
+      <property name="ignorePattern" value="^( *\* @see |import |// \$Id:)"/>
+    </module>
+    <module name="LocalFinalVariableName"/>
+    <module name="LocalVariableName"/>
+    <module name="MemberName">
+      <property name="format" value="^[a-z][a-zA-Z0-9]*$|^LOG$"/>
+    </module>
+    <module name="MethodLength"/>
+    <module name="MethodName"/>
+    <module name="NeedBraces"/>
+    <module name="ModifierOrder"/>
+    <module name="NoWhitespaceAfter"/>
+    <module name="NoWhitespaceBefore"/>
+    <module name="NoWhitespaceBefore">
+      <property name="allowLineBreaks" value="true"/>
+      <property name="tokens" value="DOT"/>
+    </module>
+    <module name="OperatorWrap"/>
+    <module name="PackageName"/>
+    <module name="ParameterName"/>
+    <module name="ParameterNumber"/>
+    <module name="RedundantImport"/>
+    <module name="SimplifyBooleanExpression"/>
+    <module name="SimplifyBooleanReturn"/>
+    <module name="StaticVariableName"/>
+    <module name="TypeName"/>
+    <module name="UnusedImports"/>
+    <module name="UpperEll"/>
+    <module name="VisibilityModifier">
+      <property name="publicMemberPattern" value="^$"/>
+    </module>
+    <module name="WhitespaceAfter"/>
+    <module name="WhitespaceAround">
+      <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 name="Translation"/>
+  <module name="FileLength"/>
+  <module name="SuppressionCommentFilter"/>
+</module>

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2620479

To unsubscribe from this discussion, e-mail: 
[[email protected]].

Reply via email to