pmd-devel — PMD Development

[Pmd-devel] pmd/src/net/sourceforge/pmd/ant PMDTask.java,1.14,1.15

[Tom C. <tom...@us...>]

Update of /cvsroot/pmd/pmd/src/net/sourceforge/pmd/ant
In directory usw-pr-cvs1:/tmp/cvs-serv13904/src/net/sourceforge/pmd/ant

Modified Files:
	PMDTask.java 
Log Message:
Moved fail on error catcher past report writing

Index: PMDTask.java
===================================================================
RCS file: /cvsroot/pmd/pmd/src/net/sourceforge/pmd/ant/PMDTask.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** PMDTask.java	2 Jul 2002 18:50:24 -0000	1.14
--- PMDTask.java	3 Jul 2002 13:02:57 -0000	1.15
***************
*** 86,92 ****
              buf.append(ctx.getReport().render());
              buf.append(System.getProperty("line.separator"));
-             if (failOnError) {
-                 throw new BuildException("Stopping build since PMD found problems in the code");
-             }
          }
          try {
--- 86,89 ----
***************
*** 96,99 ****
--- 93,100 ----
          } catch (IOException ioe) {
              throw new BuildException(ioe.getMessage());
+         }
+ 
+         if (failOnError && !ctx.getReport().isEmpty()) {
+             throw new BuildException("Stopping build since PMD found problems in the code");
          }
      }

[Pmd-devel] pmd/rulesets basic.xml,1.5,1.6

[David Dixon-P. <dp...@us...>]

Update of /cvsroot/pmd/pmd/rulesets
In directory usw-pr-cvs1:/tmp/cvs-serv8698

Modified Files:
	basic.xml 
Log Message:
Short Method Name added.



Index: basic.xml
===================================================================
RCS file: /cvsroot/pmd/pmd/rulesets/basic.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** basic.xml	2 Jul 2002 19:16:42 -0000	1.5
--- basic.xml	3 Jul 2002 12:51:12 -0000	1.6
***************
*** 153,156 ****
--- 153,173 ----
    </rule>
  
+   <rule name="ShortMethodNameRule"
+         message="Avoid using short method names."
+         class="net.sourceforge.pmd.rules.ShortMethodNameRule">
+      <description>
+ Short Method Names: Detects when method names less than 4 characters
+ long are used.
+      </description>
+      <example>
+ <![CDATA[
+ public class ShortMethod {
+   public void a( int i ) { // Violation
+   }
+ }
+ ]]>
+      </example>
+   </rule>
+ 
    <rule name="IfElseStmtsMustUseBracesRule"
          message="Avoid using 'if...else' statements without curly braces"

[Pmd-devel] pmd/regress/test/net/sourceforge/pmd/rules ShortMethodNameRuleTest.java,NONE,1.1

[David Dixon-P. <dp...@us...>]

Update of /cvsroot/pmd/pmd/regress/test/net/sourceforge/pmd/rules
In directory usw-pr-cvs1:/tmp/cvs-serv7564

Added Files:
	ShortMethodNameRuleTest.java 
Log Message:
Test for ShortMethodNameRule.



--- NEW FILE: ShortMethodNameRuleTest.java ---
package test.net.sourceforge.pmd.rules;

import test.net.sourceforge.pmd.*;

import net.sourceforge.pmd.*;
import net.sourceforge.pmd.rules.ShortMethodNameRule;
import net.sourceforge.pmd.reports.Report;

import junit.framework.*;

public class ShortMethodNameRuleTest
    extends RuleTst
{
    public ShortMethodNameRuleTest( String name ) {
	super( name );
    }

    public void testShortMethodName0() throws Throwable {
	Report report = process("ShortMethodName0.java",
				new ShortMethodNameRule() );
	assertEquals( 0, report.size() );
    }

    public void testShortMethodName1() throws Throwable {
	Report report = process("ShortMethodName1.java",
				new ShortMethodNameRule() );
	assertEquals( 1, report.size() );
    }

    public void testShortMethodName2() throws Throwable {
	Report report = process("ShortMethodName2.java",
				new ShortMethodNameRule() );
	assertEquals( 2, report.size() );
    }

    public void testShortMethodName3() throws Throwable {
	Report report = process("ShortMethodName3.java",
				new ShortMethodNameRule() );
	assertEquals( 1, report.size() );
    }
}

[Pmd-devel] pmd/src/net/sourceforge/pmd/rules ShortMethodNameRule.java,NONE,1.1

[David Dixon-P. <dp...@us...>]

Update of /cvsroot/pmd/pmd/src/net/sourceforge/pmd/rules
In directory usw-pr-cvs1:/tmp/cvs-serv7252

Added Files:
	ShortMethodNameRule.java 
Log Message:
ShortMethodNameRule has been implemented.



--- NEW FILE: ShortMethodNameRule.java ---
package net.sourceforge.pmd.rules;

import net.sourceforge.pmd.AbstractRule;
import net.sourceforge.pmd.RuleContext;
import net.sourceforge.pmd.RuleViolation;

import net.sourceforge.pmd.ast.*;

public class ShortMethodNameRule
    extends AbstractRule
{
    public ShortMethodNameRule() { }

    public Object visit(ASTMethodDeclarator decl, Object data) {
	RuleContext ctx = (RuleContext) data;
	String image = decl.getImage();

	if (image.length() <= 3) {
	    RuleViolation violation =
		createRuleViolation( ctx, decl.getBeginLine(),
				     "Avoid short method names like " +
				     decl.getImage() );
	    ctx.getReport().addRuleViolation( violation );
	}

	return null;
    }
}

[Pmd-devel] pmd/src/net/sourceforge/pmd/ast JavaParser.java,1.3,1.4

[David Dixon-P. <dp...@us...>]

Update of /cvsroot/pmd/pmd/src/net/sourceforge/pmd/ast
In directory usw-pr-cvs1:/tmp/cvs-serv6841

Modified Files:
	JavaParser.java 
Log Message:
Reran JavaCC/JJTree for the new ShortMethodName rule.



Index: JavaParser.java
===================================================================
RCS file: /cvsroot/pmd/pmd/src/net/sourceforge/pmd/ast/JavaParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JavaParser.java	28 Jun 2002 16:41:15 -0000	1.3
--- JavaParser.java	3 Jul 2002 12:47:07 -0000	1.4
***************
*** 1283,1289 ****
    ASTMethodDeclarator jjtn000 = new ASTMethodDeclarator(this, JJTMETHODDECLARATOR);
    boolean jjtc000 = true;
!   jjtree.openNodeScope(jjtn000);
      try {
!       jj_consume_token(IDENTIFIER);
        FormalParameters();
        label_15:
--- 1283,1290 ----
    ASTMethodDeclarator jjtn000 = new ASTMethodDeclarator(this, JJTMETHODDECLARATOR);
    boolean jjtc000 = true;
!   jjtree.openNodeScope(jjtn000);Token t = null;
      try {
!       t = jj_consume_token(IDENTIFIER);
!                    jjtn000.setImage( t.image );
        FormalParameters();
        label_15:
***************
*** 4891,4942 ****
    }
  
-   final private boolean jj_3R_299() {
-     if (jj_scan_token(PLUS)) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
-   final private boolean jj_3R_212() {
-     if (jj_scan_token(ORASSIGN)) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
-   final private boolean jj_3R_277() {
-     if (jj_3R_238()) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
-   final private boolean jj_3R_265() {
-     Token xsp;
-     xsp = jj_scanpos;
-     if (jj_3R_276()) {
-     jj_scanpos = xsp;
-     if (jj_3R_277()) {
-     jj_scanpos = xsp;
-     if (jj_3R_278()) {
-     jj_scanpos = xsp;
-     if (jj_3R_279()) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
-   final private boolean jj_3R_276() {
-     Token xsp;
-     xsp = jj_scanpos;
-     if (jj_3R_299()) {
-     jj_scanpos = xsp;
-     if (jj_3R_300()) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     if (jj_3R_265()) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
    final private boolean jj_3R_256() {
      if (jj_scan_token(NE)) return true;
--- 4892,4895 ----
***************
*** 5468,5477 ****
    }
  
-   final private boolean jj_3R_249() {
-     if (jj_scan_token(COMMA)) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
    final private boolean jj_3R_284() {
      if (jj_scan_token(THROWS)) return true;
--- 5421,5424 ----
***************
*** 5504,5507 ****
--- 5451,5460 ----
    }
  
+   final private boolean jj_3R_249() {
+     if (jj_scan_token(COMMA)) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
    final private boolean jj_3R_322() {
      if (jj_scan_token(PRIVATE)) return true;
***************
*** 5542,5553 ****
    }
  
-   final private boolean jj_3R_334() {
-     if (jj_scan_token(LBRACKET)) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     if (jj_scan_token(RBRACKET)) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
    final private boolean jj_3_12() {
      if (jj_3R_53()) return true;
--- 5495,5498 ----
***************
*** 5607,5626 ****
    }
  
!   final private boolean jj_3R_289() {
!     if (jj_scan_token(THROWS)) return true;
      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
!     if (jj_3R_324()) return true;
      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
      return false;
    }
  
!   final private boolean jj_3R_286() {
!     if (jj_3R_157()) return true;
      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
      return false;
    }
  
!   final private boolean jj_3R_285() {
!     if (jj_3R_52()) return true;
      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
      return false;
--- 5552,5579 ----
    }
  
!   final private boolean jj_3R_286() {
!     if (jj_3R_157()) return true;
      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
!     return false;
!   }
! 
!   final private boolean jj_3R_285() {
!     if (jj_3R_52()) return true;
      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
      return false;
    }
  
!   final private boolean jj_3R_289() {
!     if (jj_scan_token(THROWS)) return true;
!     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
!     if (jj_3R_324()) return true;
      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
      return false;
    }
  
!   final private boolean jj_3R_334() {
!     if (jj_scan_token(LBRACKET)) return true;
!     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
!     if (jj_scan_token(RBRACKET)) return true;
      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
      return false;
***************
*** 5704,5715 ****
    }
  
-   final private boolean jj_3_10() {
-     if (jj_scan_token(COMMA)) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     if (jj_3R_51()) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
    final private boolean jj_3R_283() {
      if (jj_scan_token(LPAREN)) return true;
--- 5657,5660 ----
***************
*** 5724,5727 ****
--- 5669,5680 ----
    }
  
+   final private boolean jj_3_10() {
+     if (jj_scan_token(COMMA)) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     if (jj_3R_51()) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
    final private boolean jj_3R_291() {
      if (jj_scan_token(SEMICOLON)) return true;
***************
*** 6749,6768 ****
    }
  
!   final private boolean jj_3R_303() {
!     if (jj_scan_token(ABSTRACT)) return true;
      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
      return false;
    }
  
!   final private boolean jj_3R_259() {
!     if (jj_3R_267()) return true;
      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
      return false;
    }
  
!   final private boolean jj_3R_381() {
!     if (jj_scan_token(COLON)) return true;
!     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
!     if (jj_3R_60()) return true;
      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
      return false;
--- 6702,6721 ----
    }
  
!   final private boolean jj_3R_381() {
!     if (jj_scan_token(COLON)) return true;
!     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
!     if (jj_3R_60()) return true;
      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
      return false;
    }
  
!   final private boolean jj_3R_303() {
!     if (jj_scan_token(ABSTRACT)) return true;
      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
      return false;
    }
  
!   final private boolean jj_3R_259() {
!     if (jj_3R_267()) return true;
      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
      return false;
***************
*** 6891,6894 ****
--- 6844,6861 ----
    }
  
+   final private boolean jj_3R_227() {
+     if (jj_scan_token(ASSERT)) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     if (jj_3R_60()) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     Token xsp;
+     xsp = jj_scanpos;
+     if (jj_3R_381()) jj_scanpos = xsp;
+     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     if (jj_scan_token(SEMICOLON)) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
    final private boolean jj_3R_66() {
      if (jj_scan_token(FINAL)) return true;
***************
*** 6914,6931 ****
    }
  
-   final private boolean jj_3R_227() {
-     if (jj_scan_token(ASSERT)) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     if (jj_3R_60()) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     Token xsp;
-     xsp = jj_scanpos;
-     if (jj_3R_381()) jj_scanpos = xsp;
-     else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     if (jj_scan_token(SEMICOLON)) return true;
-     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
-     return false;
-   }
- 
    final private boolean jj_3R_380() {
      if (jj_scan_token(FINALLY)) return true;
--- 6881,6884 ----
***************
*** 8499,8502 ****
--- 8452,8503 ----
    final private boolean jj_3R_278() {
      if (jj_3R_239()) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
+   final private boolean jj_3R_299() {
+     if (jj_scan_token(PLUS)) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
+   final private boolean jj_3R_212() {
+     if (jj_scan_token(ORASSIGN)) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
+   final private boolean jj_3R_277() {
+     if (jj_3R_238()) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
+   final private boolean jj_3R_265() {
+     Token xsp;
+     xsp = jj_scanpos;
+     if (jj_3R_276()) {
+     jj_scanpos = xsp;
+     if (jj_3R_277()) {
+     jj_scanpos = xsp;
+     if (jj_3R_278()) {
+     jj_scanpos = xsp;
+     if (jj_3R_279()) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     return false;
+   }
+ 
+   final private boolean jj_3R_276() {
+     Token xsp;
+     xsp = jj_scanpos;
+     if (jj_3R_299()) {
+     jj_scanpos = xsp;
+     if (jj_3R_300()) return true;
+     if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+     if (jj_3R_265()) return true;
      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
      return false;

[Pmd-devel] pmd/etc Java1.4-c.jjt,1.3,1.4

[David Dixon-P. <dp...@us...>]

Update of /cvsroot/pmd/pmd/etc
In directory usw-pr-cvs1:/tmp/cvs-serv6612

Modified Files:
	Java1.4-c.jjt 
Log Message:
ShortMethodRule:  Added image to MethodDeclarator.



Index: Java1.4-c.jjt
===================================================================
RCS file: /cvsroot/pmd/pmd/etc/Java1.4-c.jjt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Java1.4-c.jjt	28 Jun 2002 16:32:01 -0000	1.3
--- Java1.4-c.jjt	3 Jul 2002 12:46:27 -0000	1.4
***************
*** 544,551 ****
  
  void MethodDeclarator() :
- {}
  {
!   <IDENTIFIER> FormalParameters() ( "[" "]" )*
  }
  
  void FormalParameters() :
--- 544,555 ----
  
  void MethodDeclarator() :
  {
!   Token t = null;
! }
! {
!   t=<IDENTIFIER> { jjtThis.setImage( t.image ); }
!   FormalParameters() ( "[" "]" )*
  }
+ 
  
  void FormalParameters() :

[Pmd-devel] pmd/test-data ShortMethodName0.java,NONE,1.1 ShortMethodName1.java,NONE,1.1 ShortMethodName2.java,NONE,1.1 ShortMethodName3.java,NONE,1.1

[David Dixon-P. <dp...@us...>]

Update of /cvsroot/pmd/pmd/test-data
In directory usw-pr-cvs1:/tmp/cvs-serv6406

Added Files:
	ShortMethodName0.java ShortMethodName1.java 
	ShortMethodName2.java ShortMethodName3.java 
Log Message:
ShortMethodName rule.



--- NEW FILE: ShortMethodName0.java ---
public class ShortMethodName0 {
    public int abcd( int i ) {
	// Should not violate.
    }
}

--- NEW FILE: ShortMethodName1.java ---
public class ShortMethodName1 {
    public int a( int i ) {
	// Should violate.
    }
}

--- NEW FILE: ShortMethodName2.java ---
public class ShortMethodName2 {
    public int a( int i ) {
	// Should violate
    }

    public int b( int i ) {
	// Should violate
    }
}

--- NEW FILE: ShortMethodName3.java ---
public class ShortMethodName3 {
    public int a( int i ) {
	// Should violate
    }

    public int bcde( int i ) {
	// Should not violate
    }
}

[Pmd-devel] pmd/etc build.xml,1.16,1.17 changelog.txt,1.16,1.17

[Tom C. <tom...@us...>]

Update of /cvsroot/pmd/pmd/etc
In directory usw-pr-cvs1:/tmp/cvs-serv30272

Modified Files:
	build.xml changelog.txt 
Log Message:
test

Index: build.xml
===================================================================
RCS file: /cvsroot/pmd/pmd/etc/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** build.xml	2 Jul 2002 18:50:24 -0000	1.16
--- build.xml	2 Jul 2002 19:55:21 -0000	1.17
***************
*** 30,34 ****
      <target name="pmd">
          <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask"/>
!         <pmd reportFile="c:\foo.txt" verbose="true" rulesetfiles="rulesets/basic.xml,rulesets/cougaar.xml" format="html">
              <fileset dir="c:\data\pmd\pmd\src">
              <!--<fileset dir="c:\j2sdk1.4.0\src">-->
--- 30,34 ----
      <target name="pmd">
          <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask"/>
!         <pmd reportFile="c:\foo.html" verbose="true" rulesetfiles="rulesets/basic.xml,rulesets/cougaar.xml" format="html">
              <fileset dir="c:\data\pmd\pmd\src">
              <!--<fileset dir="c:\j2sdk1.4.0\src">-->

Index: changelog.txt
===================================================================
RCS file: /cvsroot/pmd/pmd/etc/changelog.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** changelog.txt	2 Jul 2002 14:17:46 -0000	1.16
--- changelog.txt	2 Jul 2002 19:55:21 -0000	1.17
***************
*** 4,8 ****
  Moved rules into rulesets which are defined in XML files.
  Added a 'failonerror' attribute to the Ant task.
! 
  
  June 27 2002 - 0.2:
--- 4,8 ----
  Moved rules into rulesets which are defined in XML files.
  Added a 'failonerror' attribute to the Ant task.
! foo
  
  June 27 2002 - 0.2:

[Pmd-devel] test

[Tom C. <to...@in...>]

merely a test...

Tom Copeland
InfoEther
703-486-4543 

[Pmd-devel] The code is checked in, so now we need to:

[Tom C. <to...@in...>]

-do a home page
-do a 0.1 release
-add some documentation
-set up a Maven build descriptor

Onwards and upwards....

Tom Copeland
InfoEther
703-486-4543