| Package | Class | # |
|---|---|---|
| "); + out.print(node.getPackageName()); + out.print(" | "); + if (node.hasViolations()) { + out.print(""); + out.print(node.getClassName()); + out.print(""); + } else { + out.print(node.getClassName()); + } + out.print(" | "); + out.print(node.getViolationCount()); + out.print(" |
| Method | Violation |
|---|---|
| "); + out.print(violation.getMethodName()); + out.print(" | ");
+ out.print(" |
| Method | Violation | ||||||
|---|---|---|---|---|---|---|---|
| |||||||
|
| Method | Violation | ||||||
|---|---|---|---|---|---|---|---|
|
| Package | Class | # |
|---|---|---|
| Aggregate | - | 3 |
| net | - | 3 |
| net.sf | - | 3 |
| net.sf.pmd | - | 3 |
| net.sf.pmd.other | - | 1 |
| net.sf.pmd.other | YAHTMLSampleClass2 | 1 |
| net.sf.pmd.test | - | 2 |
| net.sf.pmd.test | YAHTMLSampleClass1 | 2 |
+ *
+ * ClassOrInterfaceBody ::= "{" {@linkplain ASTClassOrInterfaceBodyDeclaration ClassOrInterfaceBodyDeclaration}* "}"
+ *
+ *
+ */
public class ASTClassOrInterfaceBody extends AbstractJavaNode {
public ASTClassOrInterfaceBody(int id) {
super(id);
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceDeclaration.java
index 74851a3547..9f1ed15a26 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceDeclaration.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTClassOrInterfaceDeclaration.java
@@ -13,17 +13,17 @@ import net.sourceforge.pmd.util.CollectionUtil;
/**
- * Represents class and interface declarations.
+ * Represents class and interface declarations. This is a {@linkplain Node#isFindBoundary() find boundary}
+ * for tree traversal methods.
*
*
*
- * ClassOrInterfaceDeclaration ::=
- * ( "class" | "interface" )
- * <IDENTIFIER>
- * [ TypeParameters ]
- * [ ExtendsList ]
- * [ ImplementsList ]
- * ClassOrInterfaceBody
+ * ClassOrInterfaceDeclaration ::= ( "class" | "interface" )
+ * <IDENTIFIER>
+ * {@linkplain ASTTypeParameters TypeParameters}?
+ * {@linkplain ASTExtendsList ExtendsList}?
+ * {@linkplain ASTImplementsList ImplementsList}?
+ * {@linkplain ASTClassOrInterfaceBody ClassOrInterfaceBody}
*
*
*/
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumConstant.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumConstant.java
index 5c8b9085bb..30c6337921 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumConstant.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTEnumConstant.java
@@ -8,6 +8,17 @@ package net.sourceforge.pmd.lang.java.ast;
import net.sourceforge.pmd.lang.java.qname.JavaTypeQualifiedName;
+/**
+ * Represents an enum constant declaration within an {@linkplain ASTEnumDeclaration enum declaration}.
+ *
+ * TODO since there's no VariableDeclaratorId, this might not play well with the symbol table! + * + *
+ *
+ * EnumConstant ::= <IDENTIFIER> {@linkplain ASTArguments Arguments}? {@linkplain ASTClassOrInterfaceBody ClassOrInterfaceBody}?
+ *
+ *
+ */
public class ASTEnumConstant extends AbstractJavaNode implements JavaQualifiableNode {
private JavaTypeQualifiedName qualifiedName;
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFieldDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFieldDeclaration.java
index 877d327f52..15e396118d 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFieldDeclaration.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTFieldDeclaration.java
@@ -5,10 +5,36 @@
package net.sourceforge.pmd.lang.java.ast;
+import java.util.Iterator;
+
import net.sourceforge.pmd.lang.ast.SignedNode;
import net.sourceforge.pmd.lang.java.multifile.signature.JavaFieldSignature;
-public class ASTFieldDeclaration extends AbstractJavaAccessTypeNode implements Dimensionable, SignedNodeThis statement may define several variables, possibly of different types (see {@link ASTVariableDeclaratorId#getType()}). + * The nodes corresponding to the declared variables are accessible through {@link #iterator()}. + * + *
{@link AccessNode} methods take into account the syntactic context of the + * declaration, e.g. {@link #isPublic()} will always return true if the field is + * declared inside an interface, regardless of whether the {@code public} modifier + * was specified or not. If you want to know whether the modifier was explicitly + * stated, use e.g {@link #isSyntacticallyPublic()}. + * + *
+ *
+ * FieldDeclaration ::= Modifiers {@linkplain ASTType Type} {@linkplain ASTVariableDeclarator VariableDeclarator} ( "," {@linkplain ASTVariableDeclarator VariableDeclarator} )*
+ *
+ * Modifiers ::= "public" | "static" | "protected" | "private"
+ * | "final" | "abstract" | "synchronized"
+ * | "native" | "transient" | "volatile" | "strictfp"
+ * | "default" | {@linkplain ASTAnnotation Annotation}
+ *
+ *
+ */
+public class ASTFieldDeclaration extends AbstractJavaAccessTypeNode implements Dimensionable, SignedNode* ( "final" | Annotation )* Type ( "|" Type )* [ "..." ] VariableDeclaratorId *@@ -63,6 +64,16 @@ public class ASTFormalParameter extends AbstractJavaAccessTypeNode implements Di return getVariableDeclaratorId().isExplicitReceiverParameter(); } + /** + * If true, this formal parameter represents one without explit types. + * This can appear as part of a lambda expression with java11 using "var". + * + * @see ASTVariableDeclaratorId#isTypeInferred() + */ + public boolean isTypeInferred() { + return getTypeNode() == null; + } + @Override public Object jjtAccept(JavaParserVisitor visitor, Object data) { return visitor.visit(this, data); @@ -93,7 +104,9 @@ public class ASTFormalParameter extends AbstractJavaAccessTypeNode implements Di */ @Override public boolean isArray() { - return isVarargs() || getTypeNode().isArray() || getVariableDeclaratorId().isArray(); + return isVarargs() + || getTypeNode() != null && getTypeNode().isArray() + || getVariableDeclaratorId().isArray(); } @Override diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLiteral.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLiteral.java index 16e0d4db5b..2a18732390 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLiteral.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLiteral.java @@ -5,6 +5,7 @@ package net.sourceforge.pmd.lang.java.ast; +import java.math.BigInteger; import java.util.Locale; import java.util.regex.Pattern; @@ -146,11 +147,14 @@ public class ASTLiteral extends AbstractJavaTypeNode { } public int getValueAsInt() { - return (int) getValueAsLong(); // the downcast allows to parse 0x80000000+ numbers as negative instead of a NumberFormatException + // the downcast allows to parse 0x80000000+ numbers as negative instead of a NumberFormatException + return (int) getValueAsLong(); } public long getValueAsLong() { - return Long.parseLong(stripIntValue(), getIntBase()); + // Using BigInteger to allow parsing 0x8000000000000000+ numbers as negative instead of a NumberFormatException + BigInteger bigInt = new BigInteger(stripIntValue(), getIntBase()); + return bigInt.longValue(); } public float getValueAsFloat() { diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclaration.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclaration.java index 58d741a26e..d0089bdb32 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclaration.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLocalVariableDeclaration.java @@ -18,11 +18,11 @@ import net.sourceforge.pmd.Rule; *
This statement may define several variables, possibly of different types (see {@link ASTVariableDeclaratorId#getType()}). * The nodes corresponding to the declared variables are accessible through {@link #iterator()}. * - *
+ *
*
- * LocalVariableDeclaration ::= ( "final" | {@linkplain ASTAnnotation Annotation} )* {@linkplain ASTType Type} {@linkplain ASTVariableDeclarator VariableDeclarator} ( "," {@linkplain ASTVariableDeclarator VariableDeclarator} )*
+ * LocalVariableDeclaration ::= ( "final" | {@linkplain ASTAnnotation Annotation} )* {@linkplain ASTType Type} {@linkplain ASTVariableDeclarator VariableDeclarator} ( "," {@linkplain ASTVariableDeclarator VariableDeclarator} )*
*
- *
+ *
*/
public class ASTLocalVariableDeclaration extends AbstractJavaAccessNode implements Dimensionable, CanSuppressWarnings, Iterable
+ *
+ * VariableDeclarator ::= {@linkplain ASTVariableDeclaratorId VariableDeclaratorId} ( "=" {@linkplain ASTVariableInitializer VariableInitializer} )?
+ *
+ *
+ */
public class ASTVariableDeclarator extends AbstractJavaTypeNode {
public ASTVariableDeclarator(int id) {
super(id);
}
+
public ASTVariableDeclarator(JavaParser p, int id) {
super(p, id);
}
- /**
- * Accept the visitor. *
- */
+
@Override
public Object jjtAccept(JavaParserVisitor visitor, Object data) {
return visitor.visit(this, data);
}
+
+
+ /**
+ * Returns the name of the declared variable.
+ */
+ public String getName() {
+ // first child will be VariableDeclaratorId
+ return jjtGetChild(0).getImage();
+ }
+
+
+ /**
+ * Returns the id of the declared variable.
+ */
+ public ASTVariableDeclaratorId getVariableId() {
+ return (ASTVariableDeclaratorId) jjtGetChild(0);
+ }
+
+
+ /**
+ * Returns true if the declared variable is initialized.
+ * Otherwise, {@link #getInitializer()} returns null.
+ */
+ public boolean hasInitializer() {
+ return jjtGetNumChildren() > 1;
+ }
+
+
+ /**
+ * Returns the initializer, of the variable, or null if it doesn't exist.
+ */
+ public ASTVariableInitializer getInitializer() {
+ return hasInitializer() ? (ASTVariableInitializer) jjtGetChild(1) : null;
+ }
+
+
+ /* only for LocalVarDeclaration and FieldDeclaration */
+ static Iterator1
1
[a-z][A-Za-z]*
1
- The class name 'foo' doesn't match '[A-Z][a-zA-Z0-9]+'
+ The class name 'foo' doesn't match '[A-Z][a-zA-Z0-9]*'
+
+
+ Test property defaults
+ 4
+
+ The field name 'Foo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The final field name 'Hoo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The static field name 'Bar' doesn't match '[a-z][a-zA-Z0-9]*'
+ The constant name 'BOLGaaa_FIELD' doesn't match '[A-Z][A-Z_0-9]*'
+
+
+
+
+ Test default field property
+ [A-Z][A-Z0-9]+
+ 3
+
+ The field name 'Foo' doesn't match '[A-Z][A-Z0-9]+'
+ The final field name 'Hoo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The static field name 'Bar' doesn't match '[a-z][a-zA-Z0-9]*'
+
+
+
+
+ Test final field property
+ [A-Z][A-Z0-9]+
+ 3
+
+ The field name 'Foo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The final field name 'Hoo' doesn't match '[A-Z][A-Z0-9]+'
+ The static field name 'Bar' doesn't match '[a-z][a-zA-Z0-9]*'
+
+
+
+
+ Test static field property
+ [A-Z][A-Z0-9]+
+ 3
+
+ The field name 'Foo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The final field name 'Hoo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The static field name 'Bar' doesn't match '[A-Z][A-Z0-9]+'
+
+
+
+
+ Test constant field property
+ cons_[A-Z][A-Z0-9]+
+ 4
+
+ The field name 'Foo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The final field name 'Hoo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The static field name 'Bar' doesn't match '[a-z][a-zA-Z0-9]*'
+ The constant name 'BOLG_FIELD' doesn't match 'cons_[A-Z][A-Z0-9]+'
+
+
+
+
+ Test enum constant property
+ cons_[A-Z][A-Z0-9]+
+ 2
+
+ The enum constant name 'NET' doesn't match 'cons_[A-Z][A-Z0-9]+'
+ The enum constant name 'ORG' doesn't match 'cons_[A-Z][A-Z0-9]+'
+
+
+
+
+
+ Test public constant property
+ cons_[A-Z][A-Z0-9]+
+ 2
+
+ The public constant name 'DDD' doesn't match 'cons_[A-Z][A-Z0-9]+'
+ The constant name 'cons_BOLG_FIELD' doesn't match '[A-Z][A-Z0-9]+'
+
+
+
+
+
+
+ Interface fields should be treated like constants
+ 3
+
+ The constant name 'Foo' doesn't match '[A-Z][A-Z_0-9]*'
+ The constant name 'Hoo' doesn't match '[A-Z][A-Z_0-9]*'
+ The constant name 'Bar' doesn't match '[A-Z][A-Z_0-9]*'
+
+
+
+
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/FormalParameterNamingConventions.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/FormalParameterNamingConventions.xml
index 60c2f9237b..e7af6d9c9f 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/FormalParameterNamingConventions.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/FormalParameterNamingConventions.xml
@@ -7,11 +7,11 @@
Default is camel case
5
- The method parameter name 'Foo' doesn't match '[a-z][a-zA-Z0-9]+'
- The final method parameter name 'Hoo' doesn't match '[a-z][a-zA-Z0-9]+'
- The lambda parameter name 'Koo' doesn't match '[a-z][a-zA-Z0-9]+'
- The explicitly-typed lambda parameter name 'Voo' doesn't match '[a-z][a-zA-Z0-9]+'
- The explicitly-typed lambda parameter name 'Ooo' doesn't match '[a-z][a-zA-Z0-9]+'
+ The method parameter name 'Foo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The final method parameter name 'Hoo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The lambda parameter name 'Koo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The explicitly-typed lambda parameter name 'Voo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The explicitly-typed lambda parameter name 'Ooo' doesn't match '[a-z][a-zA-Z0-9]*'
i = (s) -> {
+
+ };
+
+ Consumer k = (String s) -> {
+
+ };
+
+ Consumer l = (final String s) -> {
+
+ };
+ }
+ }
+ ]]>
+ [A-Z]+
5
- The method parameter name 'Foo' doesn't match '[a-z][a-zA-Z0-9]+'
+ The method parameter name 'Foo' doesn't match '[a-z][a-zA-Z0-9]*'
The final method parameter name 'Hoo' doesn't match '[A-Z]+'
- The lambda parameter name 'Koo' doesn't match '[a-z][a-zA-Z0-9]+'
- The explicitly-typed lambda parameter name 'Voo' doesn't match '[a-z][a-zA-Z0-9]+'
- The explicitly-typed lambda parameter name 'Ooo' doesn't match '[a-z][a-zA-Z0-9]+'
+ The lambda parameter name 'Koo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The explicitly-typed lambda parameter name 'Voo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The explicitly-typed lambda parameter name 'Ooo' doesn't match '[a-z][a-zA-Z0-9]*'
[A-Z]+
5
- The method parameter name 'Foo' doesn't match '[a-z][a-zA-Z0-9]+'
- The final method parameter name 'Hoo' doesn't match '[a-z][a-zA-Z0-9]+'
+ The method parameter name 'Foo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The final method parameter name 'Hoo' doesn't match '[a-z][a-zA-Z0-9]*'
The lambda parameter name 'Koo' doesn't match '[A-Z]+'
- The explicitly-typed lambda parameter name 'Voo' doesn't match '[a-z][a-zA-Z0-9]+'
- The explicitly-typed lambda parameter name 'Ooo' doesn't match '[a-z][a-zA-Z0-9]+'
+ The explicitly-typed lambda parameter name 'Voo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The explicitly-typed lambda parameter name 'Ooo' doesn't match '[a-z][a-zA-Z0-9]*'
[A-Z]+
5
- The method parameter name 'Foo' doesn't match '[a-z][a-zA-Z0-9]+'
- The final method parameter name 'Hoo' doesn't match '[a-z][a-zA-Z0-9]+'
- The lambda parameter name 'Koo' doesn't match '[a-z][a-zA-Z0-9]+'
+ The method parameter name 'Foo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The final method parameter name 'Hoo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The lambda parameter name 'Koo' doesn't match '[a-z][a-zA-Z0-9]*'
The explicitly-typed lambda parameter name 'Voo' doesn't match '[A-Z]+'
The explicitly-typed lambda parameter name 'Ooo' doesn't match '[A-Z]+'
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/LinguisticNaming.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/LinguisticNaming.xml
new file mode 100644
index 0000000000..68a35fabcf
--- /dev/null
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/LinguisticNaming.xml
@@ -0,0 +1,417 @@
+
+
+
+
+
+ Method Prefix is
+ 1
+ 6
+
+ Linguistics Antipattern - The method 'isValid' indicates linguistically it returns a boolean, but it returns 'int'
+
+
+
+
+ Method Prefix Has
+ 1
+ 6
+
+ Linguistics Antipattern - The method 'hasChild' indicates linguistically it returns a boolean, but it returns 'int'
+
+
+
+
+ Method Prefix Have
+ 1
+ 6
+
+ Linguistics Antipattern - The method 'haveChild' indicates linguistically it returns a boolean, but it returns 'int'
+
+
+
+
+ Method Prefix can
+ 1
+ 6
+
+ Linguistics Antipattern - The method 'canFly' indicates linguistically it returns a boolean, but it returns 'int'
+
+
+
+
+ Method Prefix will
+ 1
+ 6
+
+ Linguistics Antipattern - The method 'willFly' indicates linguistically it returns a boolean, but it returns 'int'
+
+
+
+
+ Method Prefix should
+ 1
+ 6
+
+ Linguistics Antipattern - The method 'shouldFly' indicates linguistically it returns a boolean, but it returns 'long'
+
+
+
+
+ Method Setters
+ 1
+ 6
+
+ Linguistics Antipattern - The setter 'setName' should not return any type except void linguistically
+
+
+
+
+ Method Getters
+ 1
+ 6
+
+ Linguistics Antipattern - The getter 'getName' should not return void linguistically
+
+
+
+
+ Method Prefix to: Transform Method
+ 1
+ 6
+
+ Linguistics Antipattern - The transform method 'toDataType' should not return void linguistically
+
+
+
+
+ Method Contains To: Transformation methods
+ true
+ 1
+ 2
+
+ Linguistics Antipattern - The transform method 'grapeToWine' should not return void linguistically
+
+
+
+
+ Field/Variable Prefix is
+ 2
+ 3,8
+
+ Linguistics Antipattern - The field 'isValid' indicates linguistically it is a boolean, but it is 'int'
+ Linguistics Antipattern - The variable 'isValidLocal' indicates linguistically it is a boolean, but it is 'int'
+
+
+
+
+ Field/Variable Prefix has
+ 2
+ 3,8
+
+ Linguistics Antipattern - The field 'hasMoney' indicates linguistically it is a boolean, but it is 'int'
+ Linguistics Antipattern - The variable 'hasMoneyLocal' indicates linguistically it is a boolean, but it is 'int'
+
+
+
+
+ Field/Variable Prefix can
+ 2
+ 3,8
+
+ Linguistics Antipattern - The field 'canFly' indicates linguistically it is a boolean, but it is 'int'
+ Linguistics Antipattern - The variable 'canFlyLocal' indicates linguistically it is a boolean, but it is 'int'
+
+
+
+
+ Field/Variable Prefix will
+ 2
+ 3,8
+
+ Linguistics Antipattern - The field 'willMove' indicates linguistically it is a boolean, but it is 'int'
+ Linguistics Antipattern - The variable 'willMoveLocal' indicates linguistically it is a boolean, but it is 'int'
+
+
+
+
+ Field/Variable Prefix have
+ 2
+ 3,8
+
+ Linguistics Antipattern - The field 'haveLegs' indicates linguistically it is a boolean, but it is 'int'
+ Linguistics Antipattern - The variable 'haveLegsLocal' indicates linguistically it is a boolean, but it is 'int'
+
+
+
+
+ Field/Variable Prefix should
+ 2
+ 3,8
+
+ Linguistics Antipattern - The field 'shouldClimb' indicates linguistically it is a boolean, but it is 'int'
+ Linguistics Antipattern - The variable 'shouldClimbLocal' indicates linguistically it is a boolean, but it is 'int'
+
+
+
+
+ Multiple fields/local variables
+ 4
+ 2,2,4,4
+
+
+
+ Boolean fields/methods false positive
+ 0
+
+
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/LocalVariableNamingConventions.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/LocalVariableNamingConventions.xml
index 279131ffe3..e54e1fed1d 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/LocalVariableNamingConventions.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/LocalVariableNamingConventions.xml
@@ -7,9 +7,9 @@
Default is camel case
3
- The local variable name 'Foo' doesn't match '[a-z][a-zA-Z0-9]+'
- The final local variable name 'Hoo' doesn't match '[a-z][a-zA-Z0-9]+'
- The exception block parameter name 'E' doesn't match '[a-z][a-zA-Z0-9]+'
+ The local variable name 'Foo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The final local variable name 'Hoo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The exception block parameter name 'E' doesn't match '[a-z][a-zA-Z0-9]*'
3
The local variable name 'Foo' doesn't match '[A-Z][A-Z0-9]+'
- The final local variable name 'Hoo' doesn't match '[a-z][a-zA-Z0-9]+'
- The exception block parameter name 'E' doesn't match '[a-z][a-zA-Z0-9]+'
+ The final local variable name 'Hoo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The exception block parameter name 'E' doesn't match '[a-z][a-zA-Z0-9]*'
[A-Z][A-Z0-9]+
3
- The local variable name 'Foo' doesn't match '[a-z][a-zA-Z0-9]+'
+ The local variable name 'Foo' doesn't match '[a-z][a-zA-Z0-9]*'
The final local variable name 'Hoo' doesn't match '[A-Z][A-Z0-9]+'
- The exception block parameter name 'E' doesn't match '[a-z][a-zA-Z0-9]+'
+ The exception block parameter name 'E' doesn't match '[a-z][a-zA-Z0-9]*'
[A-Z][A-Z0-9]+
3
- The local variable name 'Foo' doesn't match '[a-z][a-zA-Z0-9]+'
- The final local variable name 'Hoo' doesn't match '[a-z][a-zA-Z0-9]+'
+ The local variable name 'Foo' doesn't match '[a-z][a-zA-Z0-9]*'
+ The final local variable name 'Hoo' doesn't match '[a-z][a-zA-Z0-9]*'
The exception block parameter name 'Eff' doesn't match '[A-Z][A-Z0-9]+'
data = Arrays.asList("a", "b");
+ for (String s : data) { }
+ }
+ }
+ ]]>
+ 1
2
- The native method name '__surfunc__' doesn't match '[a-z][a-zA-Z0-9]+'
+ The native method name '__surfunc__' doesn't match '[a-z][a-zA-Z0-9]*'
+ #1255 [java] UnnecessaryFullyQualifiedName false positive: static method on shadowed implicitly imported class
+ 0
+
+
+
+ Nullpointer in isJavaLangImplicit for java.lang.String[] arrays
+ 1
+ 6
+
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UselessParentheses.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UselessParentheses.xml
index 2a2de5804d..777c87bcca 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UselessParentheses.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UselessParentheses.xml
@@ -483,6 +483,22 @@ public class Test {
return (Character.toUpperCase(str1.charAt(0))
+ str1.substring(1)).replace('_', ' ');
}
+}
+ ]]>
+
+
+ Note: Since we actually run two runners one after another, the static {@code BeforeClass} * and {@Code AfterClass} methods will be executed twice and the test class will be instantiated twice, too.
* *In order to use it, you'll need to subclass {@link SimpleAggregatorTst} and * annotate your test class with RunWith:
- * + * *
* @RunWith(PMDTestRunner.class)
* public class MyRuleSetTest extends SimpleAggregatorTst {
@@ -78,7 +78,9 @@ public class PMDTestRunner extends Runner implements Filterable, Sortable {
public Description getDescription() {
Description description = Description.createSuiteDescription(klass);
description.addChild(createChildrenDescriptions(ruleTests, "Rule Tests"));
- description.addChild(createChildrenDescriptions(unitTests, "Unit Tests"));
+ if (ruleTests.hasUnitTests()) {
+ description.addChild(createChildrenDescriptions(unitTests, "Unit Tests"));
+ }
return description;
}
diff --git a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java
index c4eddb7ce1..aede9072d9 100644
--- a/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java
+++ b/pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java
@@ -202,12 +202,12 @@ public abstract class RuleTst {
}
List expected = test.getExpectedLineNumbers();
- if (report.getViolationTree().size() != expected.size()) {
+ if (report.size() != expected.size()) {
throw new RuntimeException("Test setup error: number of execpted line numbers doesn't match "
+ "number of violations for test case '" + test.getDescription() + "'");
}
- Iterator it = report.getViolationTree().iterator();
+ Iterator it = report.iterator();
int index = 0;
while (it.hasNext()) {
RuleViolation violation = it.next();
diff --git a/pmd-test/src/test/java/net/sourceforge/pmd/testframework/RuleTstTest.java b/pmd-test/src/test/java/net/sourceforge/pmd/testframework/RuleTstTest.java
index 3c8a43eaaa..364823dbec 100644
--- a/pmd-test/src/test/java/net/sourceforge/pmd/testframework/RuleTstTest.java
+++ b/pmd-test/src/test/java/net/sourceforge/pmd/testframework/RuleTstTest.java
@@ -12,27 +12,39 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
+import java.util.Arrays;
+
+import org.junit.Assert;
import org.junit.Test;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
import net.sourceforge.pmd.Report;
import net.sourceforge.pmd.Rule;
import net.sourceforge.pmd.RuleContext;
+import net.sourceforge.pmd.RuleViolation;
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.LanguageVersion;
+import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.lang.rule.ParametricRuleViolation;
+import net.sourceforge.pmd.test.lang.ast.DummyNode;
public class RuleTstTest {
+ private LanguageVersion dummyLanguage = LanguageRegistry.findLanguageByTerseName("dummy").getDefaultVersion();
+
+ private Rule rule = mock(Rule.class);
+
+ private RuleTst ruleTester = new RuleTst() {
+ };
@Test
public void shouldCallStartAndEnd() {
- RuleTst ruleTester = new RuleTst() {
- };
- LanguageVersion languageVersion = LanguageRegistry.findLanguageByTerseName("dummy").getDefaultVersion();
Report report = new Report();
- Rule rule = mock(Rule.class);
- when(rule.getLanguage()).thenReturn(languageVersion.getLanguage());
+ when(rule.getLanguage()).thenReturn(dummyLanguage.getLanguage());
when(rule.getName()).thenReturn("test rule");
- ruleTester.runTestFromString("the code", rule, report, languageVersion, false);
+ ruleTester.runTestFromString("the code", rule, report, dummyLanguage, false);
verify(rule).start(any(RuleContext.class));
verify(rule).end(any(RuleContext.class));
@@ -48,4 +60,40 @@ public class RuleTstTest {
verify(rule).getPropertiesByPropertyDescriptor();
verifyNoMoreInteractions(rule);
}
+
+ @Test
+ public void shouldAssertLinenumbersSorted() {
+ when(rule.getLanguage()).thenReturn(dummyLanguage.getLanguage());
+ when(rule.getName()).thenReturn("test rule");
+ Mockito.doAnswer(new Answer() {
+ private RuleViolation createViolation(RuleContext context, int beginLine, String message) {
+ DummyNode node = new DummyNode(1);
+ node.testingOnlySetBeginLine(beginLine);
+ node.testingOnlySetBeginColumn(1);
+ ParametricRuleViolation violation = new ParametricRuleViolation(rule, context, node, message);
+ return violation;
+ }
+
+ @Override
+ public Void answer(InvocationOnMock invocation) throws Throwable {
+ RuleContext context = invocation.getArgumentAt(1, RuleContext.class);
+ // the violations are reported out of order
+ context.getReport().addRuleViolation(createViolation(context, 15, "first reported violation"));
+ context.getReport().addRuleViolation(createViolation(context, 5, "second reported violation"));
+ return null;
+ }
+ }).when(rule).apply(Mockito.anyList(), Mockito.any(RuleContext.class));
+
+ TestDescriptor testDescriptor = new TestDescriptor("the code", "sample test", 2, rule, dummyLanguage);
+ testDescriptor.setReinitializeRule(false);
+ testDescriptor.setExpectedLineNumbers(Arrays.asList(5, 15));
+
+ try {
+ ruleTester.runTest(testDescriptor);
+ // there should be no assertion failures
+ // expected line numbers and actual line numbers match
+ } catch (AssertionError assertionError) {
+ Assert.fail(assertionError.toString());
+ }
+ }
}
diff --git a/pmd-ui/pom.xml b/pmd-ui/pom.xml
index 9311063277..d572e7050e 100644
--- a/pmd-ui/pom.xml
+++ b/pmd-ui/pom.xml
@@ -7,7 +7,7 @@
net.sourceforge.pmd
pmd
- 6.6.0-SNAPSHOT
+ 6.7.0-SNAPSHOT
diff --git a/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/codearea/UniformStyleCollection.java b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/codearea/UniformStyleCollection.java
index 2f844b7d1e..7a713bf57d 100644
--- a/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/codearea/UniformStyleCollection.java
+++ b/pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/codearea/UniformStyleCollection.java
@@ -25,7 +25,7 @@ import net.sourceforge.pmd.util.fxdesigner.util.codearea.NodeStyleSpan.PositionS
/**
* Collection of nodes that share the same style. In case of overlap,
- * the nested ones gain css classes like depth-1, depth-2, etc. A
+ * the nested ones gain css classes like depth-0, depth-1, etc. A
* collection can be overlaid into a single span in one pass using
* {@link #toSpans()}.
*
diff --git a/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/designer.fxml b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/designer.fxml
index a8a67cda20..ac6c5aabb5 100644
--- a/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/designer.fxml
+++ b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/designer.fxml
@@ -60,7 +60,7 @@
-
+
diff --git a/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/editor.fxml b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/editor.fxml
index 26bb538fbc..3981a382ea 100644
--- a/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/editor.fxml
+++ b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/editor.fxml
@@ -37,7 +37,7 @@
-
diff --git a/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/node-info.fxml b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/node-info.fxml
index 7a0559ecad..2561fb159b 100644
--- a/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/node-info.fxml
+++ b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/fxml/node-info.fxml
@@ -34,7 +34,7 @@
-
@@ -47,7 +47,7 @@
-
+
@@ -71,7 +71,7 @@
-
diff --git a/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/less/constants.less b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/less/constants.less
index b85c6a66ff..e7472d9c7e 100644
--- a/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/less/constants.less
+++ b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/less/constants.less
@@ -1,6 +1,52 @@
-/*
- App-wide color constants and such.
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
+/*
+ App-wide color constants and useful mixins.
+
+ Useful resources (TODO add that to a doc page on the site):
+
+ * Less reference (we use Less 1.7.0):
+ http://lesscss.org/features/
+
+ * JavaFX CSS reference:
+ https://docs.oracle.com/javase/8/javafx/api/javafx/scene/doc-files/cssref.html
+
+ * modena.css (base JavaFX stylesheet):
+ http://hg.openjdk.java.net/openjfx/jfx-dev/rt/file/762a57e4b74a/modules/javafx.controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/modena.css
+
+ * Icon gallery:
+ https://fontawesome.com/icons?d=gallery
+
+*/
+
+// This is repeated to use it from Less
+// Prefer using it over -fx-base
@fx-base: #ececec;
+
+// Base colors for background slates
+@app-base-color: darken(@fx-base, 4%);
+@app-darker-slate-color: darken(@fx-base, 14%);
+
+// Darker accent colors
@darker-accent: darken(@fx-base, 10%);
+@darker-accent-focus: darken(@fx-base, 23%);
+// Not reserved to borders, I just ran out of names
+@darker-accent-border: darken(@fx-base, 20%);
+
+@selection-focus-color: fadeout(royalblue, 20%);
+
+// mixin to fix the width of a component
+.fix-width(@width) {
+ -fx-pref-width: @width;
+ -fx-min-width: @width;
+ -fx-max-width: @width;
+}
+
+// mixin to fix the height of a component
+.fix-height(@height) {
+ -fx-pref-height: @height;
+ -fx-min-height: @height;
+ -fx-max-height: @height;
+}
diff --git a/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/less/designer.less b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/less/designer.less
index a6d2724de8..91a3fd565d 100644
--- a/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/less/designer.less
+++ b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/less/designer.less
@@ -1,55 +1,62 @@
-/* Useful links: */
-/* http://hg.openjdk.java.net/openjfx/jfx-dev/rt/file/762a57e4b74a/modules/javafx.controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/modena.css */
-/* https://fontawesome.com/icons?d=gallery */
-/* TODO convert to Less */
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+/*
+ * Base sheet for the whole app
+ */
+
+@import "constants";
+
.list-view, .tree-view, .table-view {
- -fx-selection-bar: royalblue;
- -fx-selection-bar-non-focused: derive(-fx-base, -20%);
+ -fx-selection-bar: @selection-focus-color;
+ -fx-selection-bar-non-focused: @darker-accent-border;
}
.table-view {
- -fx-border-color: derive(-fx-base, -10%);
+ -fx-border-color: @darker-accent;
-fx-padding: -1 0 0 0;
-}
-.table-view .column-header .label {
- -fx-font-weight: normal;
- -fx-border-color: derive(-fx-base, -10%);
- -fx-font-size: 9pt;
- -fx-min-height: 19pt;
- -fx-max-height: 19pt;
-}
+ .column-header {
+ -fx-background-color: @darker-accent;
+ -fx-border-color: @darker-accent-border;
+ -fx-border-style: none solid solid solid;
+ -fx-padding: -1 0 0 0;
-.table-view .column-header {
- -fx-background-color: derive(-fx-base, -10%);
- -fx-border-color: derive(-fx-base, -20%);
- -fx-border-style: none solid solid solid;
- -fx-padding: -1 0 0 0;
-}
+ .label {
+ -fx-font-weight: normal;
+ -fx-border-color: @darker-accent;
+ -fx-font-size: 9pt;
+ -fx-min-height: 19pt;
+ -fx-max-height: 19pt;
+ }
+ }
-.table-view .show-hide-columns-button {
- -fx-background-color: derive(-fx-base, -10%);
- -fx-border-color: derive(-fx-base, -20%);
- -fx-border-style: none solid solid solid;
- -fx-padding: -1 0 0 0;
+ .show-hide-columns-button {
+ -fx-background-color: @darker-accent;
+ -fx-border-color: @darker-accent-border;
+ -fx-border-style: none solid solid solid;
+ -fx-padding: -1 0 0 0;
+ }
}
.text-area {
-fx-background-insets: 0;
-fx-background-color: transparent, white, transparent, white;
- -fx-background-radius: 0, 0, 0, 0;
+ -fx-background-radius: 0;
-fx-box-border: none;
-fx-focus-color: -fx-control-inner-background;
-fx-faint-focus-color: -fx-control-inner-background;
-fx-text-box-border: -fx-control-inner-background;
-fx-border-width: -1;
+
+ .content {
+ -fx-background-color: transparent, white, transparent, white;
+ }
}
-.text-area .content {
- -fx-background-color: transparent, white, transparent, white;
-}
.context-menu.no-scroll-arrows {
@@ -61,137 +68,89 @@
}
.scroll-arrow {
- -fx-padding: 0 0 0 0;
+ -fx-padding: 0;
}
}
-/**************/
-/* Split pane */
-/**************/
-
-#mainHorizontalSplitPane > .split-pane-divider {
- -fx-background-color: derive(-fx-base, -20%);
-}
-
-.split-pane > .split-pane-divider {
- -fx-padding: 0;
- -fx-border-color: transparent;
- -fx-background-color: derive(-fx-base, -10%);
-}
.split-pane {
-fx-padding: 0;
+
+ .split-pane-divider {
+ -fx-padding: 0;
+ -fx-border-color: transparent;
+ -fx-background-color: @darker-accent;
+ }
}
-.secondary-panel {
- -fx-border-style: none;
-}
-
#nodeInfoPanel {
- -fx-pref-width: 300px;
- -fx-max-width: 300px;
- -fx-min-width: 300px;
+ .fix-width(300);
}
-/************/
-/* Toolbars */
-/************/
-
-.info-title-bar .label {
- -fx-padding: 0 0 0 6;
-}
-
-.titled-pane > .title,
+.titled-pane .title,
.info-title-bar {
-fx-font-size: 9pt;
-fx-pref-height: 24.0;
-fx-border-radius: 0.0;
-fx-background-radius: 0.0;
- -fx-background-color: derive(-fx-base, -14%);
+ -fx-background-color: @app-darker-slate-color;
+
+ &.info-title-bar .label {
+ -fx-padding: 0 0 0 6;
+ }
+
}
-.titled-pane.accent-header > .title,
+#main-horizontal-split-pane > .split-pane-divider {
+ -fx-background-color: @darker-accent-focus;
+}
+
+#main-toolbar,
.tool-bar.accent-header,
-.tool-bar.info-title-bar,
-.tool-bar.editor-tools,
-.split-pane.accent-header > .split-pane-divider,
-#main-toolbar, #main-vertical-split-pane > .split-pane-divider {
- -fx-background-color: derive(-fx-base, -14%);
+.split-pane.accent-header > .split-pane-divider {
+ -fx-background-color: @app-darker-slate-color;
}
-.accordion .titled-pane .tool-bar {
- -fx-background-color: derive(-fx-base, -15%);
-}
-
-.accordion .titled-pane .tool-bar .button {
- -fx-padding: 2 5 2 5;
-}
.tool-bar {
- -fx-pref-height: 30px;
- -fx-max-height: 30px;
- -fx-min-height: 30px;
+ .fix-height(30);
-fx-border-color: transparent;
-fx-border-width: .6;
+
+ .button, .choice-box {
+ -fx-background-color: @app-base-color;
+ -fx-border-color: @darker-accent-border;
+ -fx-border-radius: 3;
+ }
+
+ .button {
+ -fx-padding: -3 5 -3 5;
+ }
}
-.tool-bar .button {
- -fx-padding: -3 5 -3 5;
- -fx-background-color: derive(-fx-base, 10%);
- -fx-border-color: derive(-fx-base, -20%);
- -fx-border-radius: 3;
-}
-
+// This is used for buttons that have just an icon and no text
.button.icon-button {
-fx-pref-width: 20;
-fx-pref-height: 20;
}
-.tool-bar .choice-box {
- -fx-background-color: derive(-fx-base, 10%);
- -fx-border-color: derive(-fx-base, -20%);
- -fx-border-radius: 3;
-}
-
-.titled-pane.bar-sep > .title {
- -fx-border-style: none none solid none;
- -fx-border-width: 1;
-}
-
-
/* This is the special button to reduce the lower split pane. */
-.toggle-button:selected.expand-toggle {
- -fx-shape: "M 0 0 h 7 l -3.5 4 z";
-}
-
.toggle-button.expand-toggle {
-fx-background-color: -fx-mark-highlight-color, -fx-mark-color;
-fx-background-insets: 1 0 -1 0, 0;
-fx-padding: 0.25em 0.3125em 0.25em 0.3125em; /* 3 3.75 3 3.75 */
-fx-shape: "M 0 0 h 7 l -3.5 -4 z";
- -fx-min-height: 5;
- -fx-max-height: 5;
- -fx-pref-height: 5;
- -fx-min-width: 10;
- -fx-max-width: 10;
- -fx-pref-width: 10;
+
+ .fix-height(5);
+ .fix-width(10);
+
+ &:selected {
+ // This changes the shape to point upward
+ -fx-shape: "M 0 0 h 7 l -3.5 4 z";
+ }
}
-/************/
-/* Tab pane */
-/************/
-
-.tab-pane {
- -fx-tab-min-height: 20px;
- -fx-tab-max-height: 20px;
-}
-
-.tab .tab-label {
- -fx-background-color: transparent;
- -fx-alignment: CENTER;
- -fx-padding: 0 10 0 10;
-}
.tab {
-fx-background-insets: 0.0;
@@ -199,108 +158,74 @@
-fx-padding: 0 30 0 30;
-fx-border-color: transparent;
-fx-background-color: transparent;
+
+ &:selected {
+ -fx-background-color: @darker-accent-focus;
+
+ .focus-indicator {
+ -fx-focus-color: transparent;
+ -fx-border-color: transparent;
+ }
+ }
+
+ &:focused, &:disabled {
+ -fx-focus-color: transparent;
+ }
+
+ .tab-label {
+ -fx-background-color: transparent;
+ -fx-alignment: CENTER;
+ -fx-padding: 0 10 0 10;
+ }
+
}
-.tab:selected {
- -fx-background-color: derive(-fx-base, -23%);
+.tab-pane {
+ -fx-tab-min-height: 20px;
+ -fx-tab-max-height: 20px;
+
+ .tab-header-area {
+ -fx-padding: 0;
+
+ .tab-header-background {
+ -fx-border-style: none none solid none;
+ -fx-border-insets: 0 0 1pt 0;
+ -fx-border-width: 0 0 1pt 0;
+ -fx-border-color: transparent;
+ -fx-background-color: @app-base-color;
+ }
+
+ }
+
+ &:top .tab-header-area {
+ -fx-background-insets: 0 0 1 0;
+ }
+
+ &:left .tab-header-area {
+ -fx-background-insets: 0 1 0 0;
+ }
}
-.tab:focused {
- -fx-focus-color: transparent;
-}
+// Useful link: http://www.guigarage.com/2015/11/styling-a-javafx-scrollbar/
+.scroll-bar {
-.tab:disabled {
- -fx-background-color: transparent;
-}
-
-.tab-pane.bottom-pane-tab-pane .tab-header-area .tab:selected {
- -fx-border-style: none none solid none;
- -fx-border-insets: 0 0 1pt 0;
- -fx-border-width: 0 0 1pt 0;
- /*-fx-border-color: derive(-fx-base, -10%);*/
-}
-
-
-.tab-pane .tab-header-area .tab-header-background,
-.menu-bar {
- -fx-border-style: none none solid none;
- -fx-border-insets: 0 0 1pt 0;
- -fx-border-width: 0 0 1pt 0;
- -fx-background-color: -fx-base, derive(-fx-base, -4%);
- -fx-border-color: transparent;
-}
-
-.tab-pane .tab-header-background {
- -fx-background-color: derive(-fx-base, -20%), derive(-fx-base, -10%);
-}
-
-.tab-pane:top .tab-header-area {
- -fx-background-insets: 0, 0 0 1 0;
-fx-padding: 0;
+
+ * {
+ -fx-background-color: white;
+ }
+
+ .thumb {
+ -fx-background-color: derive(black, 90%);
+ -fx-background-radius: 2em;
+ }
+
+ .increment-arrow, .decrement-arrow {
+ -fx-shape: " ";
+ }
}
-.tab-pane:left *.tab-header-area {
- -fx-background-insets: 0 1 0 0;
- -fx-padding: 0;
-}
-
-.tab:selected .focus-indicator {
- -fx-focus-color: transparent;
- -fx-border-color: transparent;
-}
-
-/***************/
-/* Scroll bars */
-/***************/
-
-.scroll-bar * {
+// this is the corner when there is a horizontal and vertical scrollbar
+.corner {
-fx-background-color: white;
}
-
-scroll-bar .increment-button,
-scroll-bar .decrement-button {
- -fx-background-radius: 0em;
-}
-
-scroll-bar:horizontal .increment-button,
-scroll-bar:horizontal .decrement-button {
- -fx-padding: 0 0 10 0;
-}
-
-scroll-bar:vertical .increment-button,
-scroll-bar:vertical .decrement-button {
- -fx-padding: 0 10 0 0;
-}
-
-.scroll-bar .decrement-arrow,
-.scroll-bar .increment-arrow {
- -fx-shape: " ";
- -fx-padding: 0;
-}
-
-.scroll-bar .track {
- -fx-border-color: white;
- -fx-background-radius: 0em;
- -fx-border-radius: 2em;
- -fx-padding: -2;
-}
-
-.scroll-bar .thumb {
- -fx-background-color: derive(black, 90%);
- -fx-background-insets: 2, 0, 0;
- -fx-background-radius: 2em;
-}
-
-.scroll-bar:vertical,
-.scroll-bar:vertical > * {
- -fx-min-width: 15px;
- -fx-pref-width: 15px;
- -fx-max-width: 15px;
-}
-
-.scroll-bar:horizontal,
-.scroll-bar:horizontal > * {
- -fx-min-height: 15px;
- -fx-pref-height: 15px;
- -fx-max-height: 15px;
-}
diff --git a/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/less/editor-theme.less b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/less/editor-theme.less
index aaf8d9bc74..0e434691c1 100644
--- a/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/less/editor-theme.less
+++ b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/less/editor-theme.less
@@ -1,15 +1,16 @@
-/* Presets for the editor theme and syntax highlighting. */
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
-/* CSS reference of the code area:
- https://github.com/FXMisc/RichTextFX/wiki/RichTextFX-CSS-Reference-Guide
-
- Less reference (we use Less 1.7.0):
- http://lesscss.org/features/
+/* Presets for the editor theme and syntax highlighting.
+ * CSS reference of the code area:
+ https://github.com/FXMisc/RichTextFX/wiki/RichTextFX-CSS-Reference-Guide
*/
@import "constants";
+// Each color in this stack corresponds to a depth level in XPath colors
@xpath-color-stack:
rgba(249, 248, 113, 0.25),
rgba(255, 199, 95, 0.4),
@@ -37,6 +38,7 @@
.make-depth-classes(@depth: length(@xpath-color-stack) - 1) when (@depth >= 0) {
.make-depth-classes(@depth - 1);
+ // the first style class is depth-0, but CSS arrays indices start at 1
@background: extract(@xpath-color-stack, @depth + 1);
@border: darken(@background, 30%);
@@ -69,17 +71,14 @@
.styled-text-area {
-fx-background-color: @area-background-color;
-fx-border-color: -fx-outer-border, -fx-text-box-border;
- -fx-border-insets: -4 -4 -6 -5, -2 -2 -5 -3;
+ -fx-border-insets: 0, 0;
+ -fx-padding: 0;
.scroll-bar {
* {
-fx-background-color: @area-background-color;
-fx-border-color: @area-background-color;
}
-
- .thumb {
- -fx-background-color: derive(black, 90%);
- }
}
.paragraph-box:has-caret {
diff --git a/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/less/syntax-highlighting.less b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/less/syntax-highlighting.less
index eac07355b1..5c8897f2da 100644
--- a/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/less/syntax-highlighting.less
+++ b/pmd-ui/src/main/resources/net/sourceforge/pmd/util/fxdesigner/less/syntax-highlighting.less
@@ -1,3 +1,7 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
/*
Rules for the syntax highlighters.
This file doesn't include highlight rules, so that highlight is not displayed
diff --git a/pmd-visualforce/pom.xml b/pmd-visualforce/pom.xml
index 0f087891f7..402ba937cf 100644
--- a/pmd-visualforce/pom.xml
+++ b/pmd-visualforce/pom.xml
@@ -7,7 +7,7 @@
net.sourceforge.pmd
pmd
- 6.6.0-SNAPSHOT
+ 6.7.0-SNAPSHOT
diff --git a/pmd-vm/pom.xml b/pmd-vm/pom.xml
index fc4cb766fa..9b004b42ee 100644
--- a/pmd-vm/pom.xml
+++ b/pmd-vm/pom.xml
@@ -7,7 +7,7 @@
net.sourceforge.pmd
pmd
- 6.6.0-SNAPSHOT
+ 6.7.0-SNAPSHOT
diff --git a/pmd-xml/pom.xml b/pmd-xml/pom.xml
index e28df3cb9f..5c879bb41b 100644
--- a/pmd-xml/pom.xml
+++ b/pmd-xml/pom.xml
@@ -7,7 +7,7 @@
net.sourceforge.pmd
pmd
- 6.6.0-SNAPSHOT
+ 6.7.0-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index d215750d9b..34b714999a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
net.sourceforge.pmd
pmd
- 6.6.0-SNAPSHOT
+ 6.7.0-SNAPSHOT
pom
PMD
@@ -765,7 +765,7 @@ Additionally it includes CPD, the copy-paste-detector. CPD finds duplicated code
org.ow2.asm
asm
- 6.1.1
+ 6.2
net.sourceforge.pmd