diff --git a/pmd-plsql/etc/grammar/PldocAST.jjt b/pmd-plsql/etc/grammar/PldocAST.jjt index ce715a5cba..ef72a2617e 100644 --- a/pmd-plsql/etc/grammar/PldocAST.jjt +++ b/pmd-plsql/etc/grammar/PldocAST.jjt @@ -1096,13 +1096,15 @@ ASTSqlStatement SqlStatement(String initiator, String terminator) : /** * 2011-05-15 - SRT - Added to cope with wrapped objects A wrapped function looks like this (always terminated by one or more equals signs "="):- + +
   "  CREATE OR REPLACE FUNCTION "TESTUSER"."GET_DATE_STRING"
 / ** Return SYSDATE formatted using the provided template.
  *
  *
- *  @param p_date_format normal TO_CHARE/TO_DATE date template
- *  @return formatted datestring
- *  @see http://www.oracle-base.com/articles/10g/WrapAndDBMS_DDL_10gR2.php#dbms_ddl
+ *  @param p_date_format normal TO_CHARE/TO_DATE date template
+ *  @return formatted datestring
+ *  @see http://www.oracle-base.com/articles/10g/WrapAndDBMS_DDL_10gR2.php#dbms_ddl
  * /
 wrapped
 a000000
@@ -1128,6 +1130,7 @@ abcd
 v04omzJ0zOfHdMAzuHQlw+fAsr2ym9YI8I521pRTbnFVAHOOUw4JqPkIyj7wj4VwyL17nhYb
 3qPVuL6SvhZTmEBnRtaErHpzaDuIpqZ0G4s=
   "
+  
*/ @@ -1159,7 +1162,7 @@ void WrappedObject() : // ============================================================================ /** - * 2006-05-24 - Matthias Hendler - added MERGE, EXECUTE choice and LOOKAHEAD at + * 2006-05-24 - Matthias Hendler - added MERGE, EXECUTE choice and LOOKAHEAD at <LOOP> */ ASTUnlabelledStatement UnlabelledStatement() : {} @@ -2263,7 +2266,7 @@ ASTNumericLiteral NumericLiteral() : } } -/** This cannot be a token because these are valid labels '<< next_msg >>", '<<"OUTER LOOP">>' +/** This cannot be a token because these are valid labels '<< next_msg >>", '<<"OUTER LOOP">>' */ ASTLabel Label() : { @@ -4951,7 +4954,7 @@ ASTKEYWORD_UNRESERVED KEYWORD_UNRESERVED (): {} //SRT 2011-04-17 - END */ /** - * 2006-05-20 - Matthias Hendler - added and + * 2006-05-20 - Matthias Hendler - added <OLD> and <PARENT> */ ASTID ID(): {} { @@ -5152,7 +5155,7 @@ ASTID ID(): {} } /** - * 2006-05-20 - Matthias Hendler - added , , , + * 2006-05-20 - Matthias Hendler - added <OLD>, <NEW>, <LOOP>, <INT> */ ASTUnqualifiedID UnqualifiedID(): {} { @@ -5185,7 +5188,7 @@ ASTUnqualifiedID UnqualifiedID(): {} } /** - * 2006-05-20 - Matthias Hendler - added + * 2006-05-20 - Matthias Hendler - added <LIMIT> */ ASTQualifiedID QualifiedID(): {} { diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ExecutableCode.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ExecutableCode.java index 39ccb0de6b..6d810bf267 100644 --- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ExecutableCode.java +++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/ast/ExecutableCode.java @@ -13,7 +13,7 @@ public interface ExecutableCode extends Node { /** * Gets the name of the executable: named thus to match - * {@link net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration}. + * {@link ASTMethodDeclaration}. * * @return a String representing the name of the method */ diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/dfa/DataFlowFacade.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/dfa/DataFlowFacade.java index dd2a7d04fb..cec8d75ecd 100644 --- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/dfa/DataFlowFacade.java +++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/dfa/DataFlowFacade.java @@ -18,10 +18,10 @@ import net.sourceforge.pmd.lang.plsql.ast.ASTTypeMethod; import net.sourceforge.pmd.lang.plsql.ast.PLSQLParserVisitorAdapter; /** + * TODO What about initializers? This only processes methods and + * constructors. + * * @author raik - *

- * TODO What about initializers? This only processes methods and - * constructors */ public class DataFlowFacade extends PLSQLParserVisitorAdapter { private static final String CLASS_PATH = DataFlowFacade.class.getCanonicalName(); diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/dfa/StatementAndBraceFinder.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/dfa/StatementAndBraceFinder.java index c9d5f8f08a..3b63bb223f 100644 --- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/dfa/StatementAndBraceFinder.java +++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/dfa/StatementAndBraceFinder.java @@ -48,11 +48,11 @@ import net.sourceforge.pmd.lang.plsql.ast.PLSQLNode; import net.sourceforge.pmd.lang.plsql.ast.PLSQLParserVisitorAdapter; /** + * Sublayer of DataFlowFacade. Finds all data flow nodes and stores the + * type information (@see StackObject). At last it uses this information + * to link the nodes. + * * @author raik - *

- * Sublayer of DataFlowFacade. Finds all data flow nodes and stores the - * type information (@see StackObject). At last it uses this information - * to link the nodes. */ public class StatementAndBraceFinder extends PLSQLParserVisitorAdapter { private static final Logger LOGGER = Logger.getLogger(StatementAndBraceFinder.class.getName()); diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/dfa/VariableAccessVisitor.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/dfa/VariableAccessVisitor.java index c923386c4f..5e76f6049b 100644 --- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/dfa/VariableAccessVisitor.java +++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/dfa/VariableAccessVisitor.java @@ -30,10 +30,10 @@ import net.sourceforge.pmd.lang.symboltable.NameDeclaration; import net.sourceforge.pmd.lang.symboltable.NameOccurrence; /** + * Searches for special nodes and computes based on the sequence, the + * type of access of a variable. + * * @author raik, Sven Jacob - *

- * Searches for special nodes and computes based on the sequence, the - * type of access of a variable. */ public class VariableAccessVisitor extends PLSQLParserVisitorAdapter { diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codesize/AbstractNcssCountRule.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codesize/AbstractNcssCountRule.java index b559f31137..01abb29d65 100644 --- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codesize/AbstractNcssCountRule.java +++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codesize/AbstractNcssCountRule.java @@ -32,7 +32,7 @@ import net.sourceforge.pmd.util.NumericConstants; /** * Abstract superclass for NCSS counting methods. Analogous to and cribbed from - * {@link net.sourceforge.pmd.lang.java.rule.codesize.AbstractNcssCountRule}. + * the Java version of the rule. */ public abstract class AbstractNcssCountRule extends AbstractStatisticalPLSQLRule { private static final Logger LOGGER = Logger.getLogger(AbstractNcssCountRule.class.getName()); diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codesize/NPathComplexityRule.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codesize/NPathComplexityRule.java index 91a1bf3ce0..a7dd0ead45 100644 --- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codesize/NPathComplexityRule.java +++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codesize/NPathComplexityRule.java @@ -397,11 +397,11 @@ public class NPathComplexityRule extends AbstractStatisticalPLSQLRule { /** * Calculate the boolean complexity of the given expression. NPath boolean - * complexity is the sum of && and || tokens. This is calculated by summing - * the number of children of the &&'s (minus one) and the children of the + * complexity is the sum of && and || tokens. This is calculated by summing + * the number of children of the &&'s (minus one) and the children of the * ||'s (minus one). - *

- * Note that this calculation applies to Cyclomatic Complexity as well. + * + *

Note that this calculation applies to Cyclomatic Complexity as well.

* * @param expr * control structure expression diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codesize/NcssMethodCountRule.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codesize/NcssMethodCountRule.java index ffd1961e2d..f2bf4525b2 100644 --- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codesize/NcssMethodCountRule.java +++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codesize/NcssMethodCountRule.java @@ -10,8 +10,7 @@ import net.sourceforge.pmd.stat.DataPoint; /** * Non-commented source statement counter for methods. * - * Analogous to and cribbed from - * {@link net.sourceforge.pmd.lang.java.rule.codesize.NcssMethodCountRule}. + *

Analogous to and cribbed from Java version of the rule.

*/ public class NcssMethodCountRule extends AbstractNcssCountRule { diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveLengthRule.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveLengthRule.java index 1967495f30..ce06dde29f 100644 --- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveLengthRule.java +++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveLengthRule.java @@ -13,11 +13,11 @@ import net.sourceforge.pmd.stat.DataPoint; /** * This is a common super class for things which have excessive length. - *

- * i.e. LongMethod and LongClass rules. - *

- * To implement an ExcessiveLength rule, you pass in the Class of node you want - * to check, and this does the rest for you. + * + *

i.e. LongMethod and LongClass rules.

+ * + *

To implement an ExcessiveLength rule, you pass in the Class of node you want + * to check, and this does the rest for you.

*/ public class ExcessiveLengthRule extends AbstractStatisticalPLSQLRule { private static final Logger LOGGER = Logger.getLogger(ExcessiveLengthRule.class.getName()); diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveNodeCountRule.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveNodeCountRule.java index 17e9a7edcf..ceef4bd2d3 100644 --- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveNodeCountRule.java +++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/ExcessiveNodeCountRule.java @@ -11,14 +11,14 @@ import net.sourceforge.pmd.stat.DataPoint; /** * This is a common super class for things which shouldn't have excessive nodes * underneath. - *

- * It expects all "visit" calls to return an Integer. It will sum all the values - * it gets, and use that as its score. - *

- * To use it, override the "visit" for the nodes that need to be counted. On - * those return "new Integer(1)" - *

- * All others will return 0 (or the sum of counted nodes underneath.) + * + *

It expects all "visit" calls to return an Integer. It will sum all the values + * it gets, and use that as its score.

+ * + *

To use it, override the "visit" for the nodes that need to be counted. On + * those return "new Integer(1)"

+ * + *

All others will return 0 (or the sum of counted nodes underneath.)

*/ public class ExcessiveNodeCountRule extends AbstractStatisticalPLSQLRule { diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/ClassScope.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/ClassScope.java index 07750b77bf..07f6f92533 100644 --- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/ClassScope.java +++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/symboltable/ClassScope.java @@ -40,11 +40,11 @@ public class ClassScope extends AbstractScope { } /** - * This is only for anonymous inner classes - *

- * FIXME - should have name like Foo$1, not Anonymous$1 to get this working + * This is only for anonymous inner classes. + * + *

FIXME - should have name like Foo$1, not Anonymous$1 to get this working * right, the parent scope needs to be passed in when instantiating a - * ClassScope + * ClassScope

*/ public ClassScope() { // this.className = getParent().getEnclosingClassScope().getClassName()