diff --git a/core/pom.xml b/core/pom.xml
index f9bed30..c8b0f5c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -50,7 +50,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.3</version>
+        <version>2.6</version>
         <configuration>
           <configLocation>${basedir}/src/build/conf/checkstyle.xml</configLocation>
           <enableRulesSummary>false</enableRulesSummary>          
@@ -58,7 +58,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>        
-        <version>2.6.1</version>
+        <version>2.7</version>
         <configuration>
           <source>${jdk.version}</source>
           <verbose>false</verbose>
@@ -74,11 +74,11 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.4.3</version>
+        <version>2.7.1</version>
       </plugin>
       <plugin>
         <artifactId>maven-changelog-plugin</artifactId>
-        <version>2.1</version>
+        <version>2.2</version>
         <!--
           configuration> <connectionType>connection</connectionType>
           </configuration
@@ -86,7 +86,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-jxr-plugin</artifactId>        
-        <version>2.1</version>
+        <version>2.2</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -103,11 +103,11 @@
       </plugin>
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.1.2</version>
+        <version>2.3.1</version>
       </plugin>
       <plugin>
         <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.4</version>
+        <version>2.5</version>
         <configuration>
           <sourceEncoding>ascii</sourceEncoding>
           <targetJdk>${jdk.version}</targetJdk>
@@ -121,7 +121,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.1</version>
+        <version>2.3.1</version>
         <configuration>
           <!-- http://wiki.hudson-ci.org/display/HUDSON/FindBugs+Plugin -->
           <findbugsXmlOutput>true</findbugsXmlOutput>
@@ -134,7 +134,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.3</version>
+        <version>2.4</version>
         <configuration>
           <formats>
             <format>xml</format>
diff --git a/core/src/build/conf/checkstyle.xml b/core/src/build/conf/checkstyle.xml
index dba0289..cea0dbd 100644
--- a/core/src/build/conf/checkstyle.xml
+++ b/core/src/build/conf/checkstyle.xml
@@ -34,12 +34,16 @@
 
     <!-- Checks that a package.html file exists for each package.     -->
     <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
-    <module name="PackageHtml"/>
+    <module name="JavadocPackage"/>
 
     <!-- Checks that property files contain the same keys.         -->
     <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
     <module name="Translation"/>
 
+    <module name="FileLength">
+      <property name="max" value="4000"/>
+    </module>
+    <module name="FileTabCharacter"/>
 
     <module name="TreeWalker">
 
@@ -48,7 +52,6 @@
         <module name="JavadocMethod">
         	<property name="scope" value="protected"/>
         	<property name="allowUndeclaredRTE" value="true"/>
-        	<property name="allowMissingPropertyJavadoc" value="true" />
         </module>
         <module name="JavadocType">
         	<property name="scope" value="public"/>        
@@ -100,9 +103,6 @@
 
         <!-- Checks for Size Violations.                    -->
         <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="FileLength">
-        	<property name="max" value="4000"/>
-        </module>
         <module name="LineLength">
             <property name="max" value="120"/>
         </module>
@@ -119,7 +119,6 @@
         <module name="OperatorWrap"/>
         <module name="ParenPad"/>
         <module name="TypecastParenPad"/>
-        <module name="TabCharacter"/>
         <module name="WhitespaceAfter"/>
         <module name="WhitespaceAround"/>
 
diff --git a/extras/pom.xml b/extras/pom.xml
index b19570e..bfd67ef 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -63,7 +63,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.3</version>
+        <version>2.6</version>
         <configuration>
           <configLocation>${basedir}/src/build/conf/checkstyle.xml</configLocation>
           <enableRulesSummary>false</enableRulesSummary>
@@ -71,7 +71,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>        
-        <version>2.6.1</version>
+        <version>2.7</version>
         <configuration>
           <source>${jdk.version}</source>
           <verbose>false</verbose>
@@ -87,11 +87,11 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.4.3</version>
+        <version>2.7.1</version>
       </plugin>
       <plugin>
         <artifactId>maven-changelog-plugin</artifactId>
-        <version>2.1</version>
+        <version>2.2</version>
         <!--
           configuration> <connectionType>connection</connectionType>
           </configuration
@@ -99,7 +99,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-jxr-plugin</artifactId>        
-        <version>2.1</version>
+        <version>2.2</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -116,11 +116,11 @@
       </plugin>
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.1.2</version>
+        <version>2.3.1</version>
       </plugin>
       <plugin>
         <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.4</version>
+        <version>2.5</version>
         <configuration>
           <sourceEncoding>ascii</sourceEncoding>
           <targetJdk>${jdk.version}</targetJdk>
@@ -134,7 +134,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.1</version>
+        <version>2.3.1</version>
         <configuration>
           <!-- http://wiki.hudson-ci.org/display/HUDSON/FindBugs+Plugin -->
           <findbugsXmlOutput>true</findbugsXmlOutput>
@@ -147,7 +147,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.3</version>
+        <version>2.4</version>
         <configuration>
           <formats>
             <format>xml</format>
diff --git a/extras/src/build/conf/checkstyle.xml b/extras/src/build/conf/checkstyle.xml
index d9242f7..cea0dbd 100644
--- a/extras/src/build/conf/checkstyle.xml
+++ b/extras/src/build/conf/checkstyle.xml
@@ -34,20 +34,24 @@
 
     <!-- Checks that a package.html file exists for each package.     -->
     <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
-    <module name="PackageHtml"/>
+    <module name="JavadocPackage"/>
 
     <!-- Checks that property files contain the same keys.         -->
     <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
     <module name="Translation"/>
 
+    <module name="FileLength">
+      <property name="max" value="4000"/>
+    </module>
+    <module name="FileTabCharacter"/>
 
     <module name="TreeWalker">
 
         <!-- Checks for Javadoc comments.                     -->
         <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-         <module name="JavadocMethod">
-        	<property name="scope" value="protected"/>  
-        	<property name="allowMissingPropertyJavadoc" value="true" />      
+        <module name="JavadocMethod">
+        	<property name="scope" value="protected"/>
+        	<property name="allowUndeclaredRTE" value="true"/>
         </module>
         <module name="JavadocType">
         	<property name="scope" value="public"/>        
@@ -99,7 +103,6 @@
 
         <!-- Checks for Size Violations.                    -->
         <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="FileLength"/>
         <module name="LineLength">
             <property name="max" value="120"/>
         </module>
@@ -116,7 +119,6 @@
         <module name="OperatorWrap"/>
         <module name="ParenPad"/>
         <module name="TypecastParenPad"/>
-        <module name="TabCharacter"/>
         <module name="WhitespaceAfter"/>
         <module name="WhitespaceAround"/>
 
@@ -145,23 +147,25 @@
         <module name="EmptyStatement"/>
         <module name="EqualsHashCode"/>
         <module name="HiddenField">
-        	<property name="ignoreConstructorParameter" value="true"/>
-        	<property name="ignoreSetter" value="true"/>        	        	
+          <property name="ignoreSetter" value="true" />
+          <property name="ignoreConstructorParameter" value="true" />
         </module>
         <module name="IllegalInstantiation"/>
         <module name="InnerAssignment"/>
-        <!-- In 2.0 roll this back out
-        <module name="MagicNumber">        	        	
-    		<property name="ignoreNumbers" value="0, 0.5, 2, 1, -1" />        	
+        <!-- 2.0:  Lots of enums are defined using constants, so until 2.0 this needs to stay disabled. -->
+        <!-- 
+        <module name="MagicNumber">        	            	    
+    		<property name="ignoreNumbers" value="0, 0.5, 2, 1, -1, 1000, 2, 3, 4, 5, 6, 7, 8" />
         </module>
-         -->
+    	-->        	
+
         <module name="MissingSwitchDefault"/>
         <module name="RedundantThrows"/>
         <module name="SimplifyBooleanExpression"/>
         <module name="SimplifyBooleanReturn"/>
 
         <!-- Checks for class design                         -->
-        <!-- See http://checkstyle.sf.net/config_design.html -->
+        <!-- See http://checkstyle.sf.net/config_design.html -->        
         <!-- For P2d 2.0: <module name="DesignForExtension"/> -->
         <module name="FinalClass"/>
         <module name="HideUtilityClassConstructor"/>
diff --git a/jdk16/pom.xml b/jdk16/pom.xml
index a501cd1..4e11acf 100644
--- a/jdk16/pom.xml
+++ b/jdk16/pom.xml
@@ -59,7 +59,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.3</version>
+        <version>2.6</version>
         <configuration>
           <configLocation>${basedir}/src/build/conf/checkstyle.xml</configLocation>
           <enableRulesSummary>false</enableRulesSummary>
@@ -67,7 +67,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>        
-        <version>2.6.1</version>
+        <version>2.7</version>
         <configuration>
           <source>${jdk.version}</source>
           <verbose>false</verbose>
@@ -83,11 +83,11 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.4.3</version>
+        <version>2.7.1</version>
       </plugin>
       <plugin>
         <artifactId>maven-changelog-plugin</artifactId>
-        <version>2.1</version>
+        <version>2.2</version>
         <!--
           configuration> <connectionType>connection</connectionType>
           </configuration
@@ -95,7 +95,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-jxr-plugin</artifactId>        
-        <version>2.1</version>
+        <version>2.2</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -112,11 +112,11 @@
       </plugin>
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.1.2</version>
+        <version>2.3.1</version>
       </plugin>
       <plugin>
         <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.4</version>
+        <version>2.5</version>
         <configuration>
           <sourceEncoding>ascii</sourceEncoding>
           <targetJdk>${jdk.version}</targetJdk>
@@ -130,7 +130,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.1</version>
+        <version>2.3.1</version>
         <configuration>
           <!-- http://wiki.hudson-ci.org/display/HUDSON/FindBugs+Plugin -->
           <findbugsXmlOutput>true</findbugsXmlOutput>
@@ -143,7 +143,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.3</version>
+        <version>2.4</version>
         <configuration>
           <formats>
             <format>xml</format>
diff --git a/jdk16/src/build/conf/checkstyle.xml b/jdk16/src/build/conf/checkstyle.xml
index dba0289..cea0dbd 100644
--- a/jdk16/src/build/conf/checkstyle.xml
+++ b/jdk16/src/build/conf/checkstyle.xml
@@ -34,12 +34,16 @@
 
     <!-- Checks that a package.html file exists for each package.     -->
     <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
-    <module name="PackageHtml"/>
+    <module name="JavadocPackage"/>
 
     <!-- Checks that property files contain the same keys.         -->
     <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
     <module name="Translation"/>
 
+    <module name="FileLength">
+      <property name="max" value="4000"/>
+    </module>
+    <module name="FileTabCharacter"/>
 
     <module name="TreeWalker">
 
@@ -48,7 +52,6 @@
         <module name="JavadocMethod">
         	<property name="scope" value="protected"/>
         	<property name="allowUndeclaredRTE" value="true"/>
-        	<property name="allowMissingPropertyJavadoc" value="true" />
         </module>
         <module name="JavadocType">
         	<property name="scope" value="public"/>        
@@ -100,9 +103,6 @@
 
         <!-- Checks for Size Violations.                    -->
         <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="FileLength">
-        	<property name="max" value="4000"/>
-        </module>
         <module name="LineLength">
             <property name="max" value="120"/>
         </module>
@@ -119,7 +119,6 @@
         <module name="OperatorWrap"/>
         <module name="ParenPad"/>
         <module name="TypecastParenPad"/>
-        <module name="TabCharacter"/>
         <module name="WhitespaceAfter"/>
         <module name="WhitespaceAround"/>
 
diff --git a/parent/pom.xml b/parent/pom.xml
index c6bee28..bbfe730 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -235,11 +235,11 @@
         </plugin>
         <plugin>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>2.4</version>
+          <version>2.4.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.0.2</version>
+          <version>2.3.2</version>
           <configuration>
             <verbose>true</verbose>
             <fork>true</fork>
@@ -255,15 +255,15 @@
         </plugin>
          <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.4</version>
+          <version>2.5</version>
         </plugin>
         <plugin>
           <artifactId>maven-gpg-plugin</artifactId>
-          <version>1.0</version>
+          <version>1.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>        
-          <version>2.6.1</version>
+          <version>2.7</version>
           <configuration>
             <source>${jdk.version}</source>
             <verbose>false</verbose>
@@ -272,7 +272,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>2.3</version>
+          <version>2.3.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-scm-plugin</artifactId>
@@ -283,16 +283,16 @@
         </plugin>
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
-          <version>2.1</version>
+          <version>2.1.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.5</version>
+          <version>2.8</version>
         </plugin>
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
-          <version>2.0.1</version>
+          <version>2.3.4</version>
           <extensions>true</extensions>
         </plugin>
       </plugins>
diff --git a/swt/pom.xml b/swt/pom.xml
index 5330225..3098742 100644
--- a/swt/pom.xml
+++ b/swt/pom.xml
@@ -73,7 +73,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.3</version>
+        <version>2.6</version>
         <configuration>
           <configLocation>${basedir}/src/build/conf/checkstyle.xml</configLocation>
           <enableRulesSummary>false</enableRulesSummary>
@@ -81,7 +81,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>        
-        <version>2.6.1</version>
+        <version>2.7</version>
         <configuration>
           <source>${jdk.version}</source>
           <verbose>false</verbose>
@@ -97,11 +97,11 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.4.3</version>
+        <version>2.7.1</version>
       </plugin>
       <plugin>
         <artifactId>maven-changelog-plugin</artifactId>
-        <version>2.1</version>
+        <version>2.2</version>
         <!--
           configuration> <connectionType>connection</connectionType>
           </configuration
@@ -109,7 +109,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-jxr-plugin</artifactId>        
-        <version>2.1</version>
+        <version>2.2</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -126,11 +126,11 @@
       </plugin>
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.1.2</version>
+        <version>2.3.1</version>
       </plugin>
       <plugin>
         <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.4</version>
+        <version>2.5</version>
         <configuration>
           <sourceEncoding>ascii</sourceEncoding>
           <targetJdk>${jdk.version}</targetJdk>
@@ -144,7 +144,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.1</version>
+        <version>2.3.1</version>
         <configuration>
           <!-- http://wiki.hudson-ci.org/display/HUDSON/FindBugs+Plugin -->
           <findbugsXmlOutput>true</findbugsXmlOutput>
@@ -157,7 +157,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.3</version>
+        <version>2.4</version>
         <configuration>
           <formats>
             <format>xml</format>
diff --git a/swt/src/build/conf/checkstyle.xml b/swt/src/build/conf/checkstyle.xml
index 0bf098a..f80dab6 100644
--- a/swt/src/build/conf/checkstyle.xml
+++ b/swt/src/build/conf/checkstyle.xml
@@ -3,169 +3,183 @@
     "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
     "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
 
-	<!--
+<!--
 
-		Checkstyle configuration that checks the sun coding conventions from:
+  Checkstyle configuration that checks the sun coding conventions from:
 
-		- the Java Language Specification at
-		http://java.sun.com/docs/books/jls/second_edition/html/index.html -
-		the Sun Code Conventions at http://java.sun.com/docs/codeconv/ - the
-		Javadoc guidelines at
-		http://java.sun.com/j2se/javadoc/writingdoccomments/index.html - the
-		JDK Api documentation http://java.sun.com/j2se/docs/api/index.html -
-		some best practices Checkstyle is very configurable. Be sure to read
-		the documentation at http://checkstyle.sf.net (or in your downloaded
-		distribution). Most Checks are configurable, be sure to consult the
-		documentation. To completely disable a check, just comment it out or
-		delete it from the file. Finally, it is worth reading the
-		documentation.
-	-->
+    - the Java Language Specification at
+      http://java.sun.com/docs/books/jls/second_edition/html/index.html
+
+    - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
+
+    - the Javadoc guidelines at
+      http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
+
+    - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
+
+    - some best practices
+
+  Checkstyle is very configurable. Be sure to read the documentation at
+  http://checkstyle.sf.net (or in your downloaded distribution).
+
+  Most Checks are configurable, be sure to consult the documentation.
+
+  To completely disable a check, just comment it out or delete it from the file.
+
+  Finally, it is worth reading the documentation.
+
+-->
 
 <module name="Checker">
 
-	<!-- Checks that a package.html file exists for each package.     -->
-	<!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
-	<module name="PackageHtml" />
+    <!-- Checks that a package.html file exists for each package.     -->
+    <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
+    <module name="JavadocPackage"/>
 
-	<!-- Checks that property files contain the same keys.         -->
-	<!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-	<module name="Translation" />
+    <!-- Checks that property files contain the same keys.         -->
+    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+    <module name="Translation"/>
+
+    <module name="FileLength">
+      <property name="max" value="4000"/>
+    </module>
+    <module name="FileTabCharacter"/>
+
+    <module name="TreeWalker">
+
+        <!-- Checks for Javadoc comments.                     -->
+        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+        <module name="JavadocMethod">
+        	<property name="scope" value="protected"/>
+        	<property name="allowUndeclaredRTE" value="true"/>
+        </module>
+        <module name="JavadocType">
+        	<property name="scope" value="public"/>        
+        </module>
+        <module name="JavadocVariable">
+            <property name="scope" value="protected" />
+        </module>
+        <module name="JavadocStyle"/>
 
 
-	<module name="TreeWalker">
-
-		<!-- Checks for Javadoc comments.                     -->
-		<!-- See http://checkstyle.sf.net/config_javadoc.html -->
-		<module name="JavadocMethod">
-			<property name="scope" value="protected" />
-			<property name="allowMissingPropertyJavadoc" value="true" />
-		</module>
-		<module name="JavadocType">
-			<property name="scope" value="public" />
-		</module>
-		<module name="JavadocVariable">
-			<property name="scope" value="protected" />
-		</module>
-		<module name="JavadocStyle" />
+        <!-- Checks for Naming Conventions.                  -->
+        <!-- See http://checkstyle.sf.net/config_naming.html -->
+        <module name="ConstantName"/>
+        <module name="LocalFinalVariableName"/>
+        <module name="LocalVariableName"/>
+        <module name="MemberName"/>
+        <module name="MethodName"/>
+        <module name="PackageName"/>
+        <module name="ParameterName"/>
+        <module name="StaticVariableName"/>
+        <module name="TypeName"/>
 
 
-		<!-- Checks for Naming Conventions.                  -->
-		<!-- See http://checkstyle.sf.net/config_naming.html -->
-		<module name="ConstantName" />
-		<module name="LocalFinalVariableName" />
-		<module name="LocalVariableName" />
-		<module name="MemberName" />
-		<module name="MethodName" />
-		<module name="PackageName" />
-		<module name="ParameterName" />
-		<module name="StaticVariableName" />
-		<module name="TypeName" />
+        <!-- Checks for Headers                                -->
+        <!-- See http://checkstyle.sf.net/config_header.html   -->
+        <!-- <module name="Header">                            -->
+            <!-- The follow property value demonstrates the ability     -->
+            <!-- to have access to ANT properties. In this case it uses -->
+            <!-- the ${basedir} property to allow Checkstyle to be run  -->
+            <!-- from any directory within a project. See property      -->
+            <!-- expansion,                                             -->
+            <!-- http://checkstyle.sf.net/config.html#properties        -->
+            <!-- <property                                              -->
+            <!--     name="headerFile"                                  -->
+            <!--     value="${basedir}/java.header"/>                   -->
+        <!-- </module> -->
+
+        <!-- Following interprets the header file as regular expressions. -->
+        <!-- <module name="RegexpHeader"/>                                -->
 
 
-		<!-- Checks for Headers                                -->
-		<!-- See http://checkstyle.sf.net/config_header.html   -->
-		<!-- <module name="Header">                            -->
-		<!-- The follow property value demonstrates the ability     -->
-		<!-- to have access to ANT properties. In this case it uses -->
-		<!-- the ${basedir} property to allow Checkstyle to be run  -->
-		<!-- from any directory within a project. See property      -->
-		<!-- expansion,                                             -->
-		<!-- http://checkstyle.sf.net/config.html#properties        -->
-		<!-- <property                                              -->
-		<!--     name="headerFile"                                  -->
-		<!--     value="${basedir}/java.header"/>                   -->
-		<!-- </module> -->
-
-		<!-- Following interprets the header file as regular expressions. -->
-		<!-- <module name="RegexpHeader"/>                                -->
+        <!-- Checks for imports                              -->
+        <!-- See http://checkstyle.sf.net/config_import.html -->
+        <module name="AvoidStarImport"/>
+        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>
 
 
-		<!-- Checks for imports                              -->
-		<!-- See http://checkstyle.sf.net/config_import.html -->
-		<module name="AvoidStarImport" />
-		<module name="IllegalImport" /> <!-- defaults to sun.* packages -->
-		<module name="RedundantImport" />
-		<module name="UnusedImports" />
+        <!-- Checks for Size Violations.                    -->
+        <!-- See http://checkstyle.sf.net/config_sizes.html -->
+        <module name="LineLength">
+            <property name="max" value="120"/>
+        </module>
+        <module name="MethodLength"/>
+        <module name="ParameterNumber"/>
 
 
-		<!-- Checks for Size Violations.                    -->
-		<!-- See http://checkstyle.sf.net/config_sizes.html -->
-		<module name="FileLength" />
-		<module name="LineLength">
-			<property name="max" value="120" />
-		</module>
-		<module name="MethodLength" />
-		<module name="ParameterNumber" />
+        <!-- Checks for whitespace                               -->
+        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+        <module name="EmptyForIteratorPad"/>
+        <module name="MethodParamPad"/>
+        <module name="NoWhitespaceAfter"/>
+        <module name="NoWhitespaceBefore"/>
+        <module name="OperatorWrap"/>
+        <module name="ParenPad"/>
+        <module name="TypecastParenPad"/>
+        <module name="WhitespaceAfter"/>
+        <module name="WhitespaceAround"/>
 
 
-		<!-- Checks for whitespace                               -->
-		<!-- See http://checkstyle.sf.net/config_whitespace.html -->
-		<module name="EmptyForIteratorPad" />
-		<module name="MethodParamPad" />
-		<module name="NoWhitespaceAfter" />
-		<module name="NoWhitespaceBefore" />
-		<module name="OperatorWrap" />
-		<module name="ParenPad" />
-		<module name="TypecastParenPad" />
-		<module name="TabCharacter" />
-		<module name="WhitespaceAfter" />
-		<module name="WhitespaceAround" />
+        <!-- Modifier Checks                                    -->
+        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+        <module name="ModifierOrder"/>
+        <module name="RedundantModifier"/>
 
 
-		<!-- Modifier Checks                                    -->
-		<!-- See http://checkstyle.sf.net/config_modifiers.html -->
-		<module name="ModifierOrder" />
-		<module name="RedundantModifier" />
+        <!-- Checks for blocks. You know, those {}'s         -->
+        <!-- See http://checkstyle.sf.net/config_blocks.html -->
+        <module name="AvoidNestedBlocks"/>
+        <module name="EmptyBlock"/>
+        <module name="LeftCurly"/>
+        <module name="NeedBraces"/>
+        <module name="RightCurly">
+            <property name="option" value="alone"/>
+        </module>
 
 
-		<!-- Checks for blocks. You know, those {}'s         -->
-		<!-- See http://checkstyle.sf.net/config_blocks.html -->
-		<module name="AvoidNestedBlocks" />
-		<module name="EmptyBlock" />
-		<module name="LeftCurly" />
-		<module name="NeedBraces" />
-		<module name="RightCurly">
-			<property name="option" value="alone" />
-		</module>
+        <!-- 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">
+          <property name="ignoreSetter" value="true" />
+          <property name="ignoreConstructorParameter" value="true" />
+        </module>
+        <module name="IllegalInstantiation"/>
+        <module name="InnerAssignment"/>
+        <!-- 2.0:  Lots of enums are defined using constants, so until 2.0 this needs to stay disabled. -->
+        <!-- 
+        <module name="MagicNumber">        	            	    
+    		<property name="ignoreNumbers" value="0, 0.5, 2, 1, -1, 1000, 2, 3, 4, 5, 6, 7, 8" />
+        </module>
+    	-->        	
+
+        <module name="MissingSwitchDefault"/>
+        <module name="RedundantThrows"/>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+
+        <!-- Checks for class design                         -->
+        <!-- See http://checkstyle.sf.net/config_design.html -->        
+        <!-- For P2d 2.0: <module name="DesignForExtension"/> -->
+        <module name="FinalClass"/>
+        <module name="HideUtilityClassConstructor"/>
+        <module name="InterfaceIsType"/>
+        <!-- For P2d 2.0: <module name="VisibilityModifier"/> -->
 
 
-		<!-- 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">
-			<property name="ignoreConstructorParameter" value="true" />
-			<property name="ignoreSetter" value="true" />
-		</module>
-		<module name="IllegalInstantiation" />
-		<module name="InnerAssignment" />
-		<module name="MagicNumber">
-			<!--  Graphics operations refer to point indexes in an array. -->
-			<property name="ignoreNumbers" value="0, 0.5, 2, 1, -1, 1000, 3, 4, 5, 6, 7, 8" />
-		</module>
-		<module name="MissingSwitchDefault" />
-		<module name="RedundantThrows" />
-		<module name="SimplifyBooleanExpression" />
-		<module name="SimplifyBooleanReturn" />
+        <!-- Miscellaneous other checks.                   -->
+        <!-- See http://checkstyle.sf.net/config_misc.html -->
+        <module name="ArrayTypeStyle"/>
+        <module name="FinalParameters"/>
+        <module name="TodoComment"/>
+        <module name="UpperEll"/>
 
-		<!-- Checks for class design                         -->
-		<!-- See http://checkstyle.sf.net/config_design.html -->
-		<!-- For P2d 2.0: <module name="DesignForExtension"/> -->
-		<module name="FinalClass" />
-		<module name="HideUtilityClassConstructor" />
-		<module name="InterfaceIsType" />
-		<!-- For P2d 2.0: <module name="VisibilityModifier"/> -->
-
-
-		<!-- Miscellaneous other checks.                   -->
-		<!-- See http://checkstyle.sf.net/config_misc.html -->
-		<module name="ArrayTypeStyle" />
-		<module name="FinalParameters" />
-		<module name="TodoComment" />
-		<module name="UpperEll" />
-
-	</module>
+    </module>
 
 </module>