Skip to content

Commit bd20bf3

Browse files
rbrirbri
committed
checkstyle update and fixes
1 parent 95247d8 commit bd20bf3

File tree

9 files changed

+89
-18
lines changed

9 files changed

+89
-18
lines changed

‎checkstyle.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
<!-- Checks for Javadoc comments. -->
131131
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
132132
<module name="JavadocMethod">
133-
<property name="scope" value="protected"/>
133+
<property name="accessModifiers" value="public, protected"/>
134134
</module>
135135
<module name="JavadocType">
136136
<property name="scope" value="protected"/>
@@ -222,7 +222,10 @@
222222
<module name="SimplifyBooleanReturn"/>
223223
<module name="SimplifyBooleanExpression"/>
224224

225-
<module name="UnnecessaryParentheses"/>
225+
<module name="UnnecessaryParentheses">
226+
<property name="tokens" value="EXPR, IDENT, NUM_DOUBLE, NUM_FLOAT, NUM_INT, NUM_LONG, STRING_LITERAL, LITERAL_NULL, LITERAL_FALSE, LITERAL_TRUE, ASSIGN, BAND_ASSIGN, BOR_ASSIGN, BSR_ASSIGN, BXOR_ASSIGN, DIV_ASSIGN, MINUS_ASSIGN, MOD_ASSIGN, PLUS_ASSIGN, SL_ASSIGN, SR_ASSIGN, STAR_ASSIGN, LAMBDA, TEXT_BLOCK_LITERAL_BEGIN, UNARY_MINUS, UNARY_PLUS, INC, DEC, LNOT, BNOT, POST_INC, POST_DEC"/>
227+
<!-- LAND, LITERAL_INSTANCEOF, GT, LT, GE, LE, EQUAL, NOT_EQUAL -->
228+
</module>
226229
<module name="UnnecessarySemicolonAfterOuterTypeDeclaration"/>
227230
<module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
228231
<module name="UnnecessarySemicolonInEnumeration"/>

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<plugin>
4646
<groupId>org.owasp</groupId>
4747
<artifactId>dependency-check-maven</artifactId>
48-
<version>6.3.1</version>
48+
<version>6.5.0</version>
4949
<configuration>
5050
<failBuildOnCVSS>0</failBuildOnCVSS>
5151
</configuration>
@@ -143,7 +143,7 @@
143143
<plugin>
144144
<groupId>org.apache.maven.plugins</groupId>
145145
<artifactId>maven-checkstyle-plugin</artifactId>
146-
<version>3.1.1</version>
146+
<version>3.1.2</version>
147147
<configuration>
148148
<configLocation>checkstyle.xml</configLocation>
149149
<suppressionsLocation>checkstyle_suppressions.xml</suppressionsLocation>
@@ -155,7 +155,7 @@
155155
<dependency>
156156
<groupId>com.puppycrawl.tools</groupId>
157157
<artifactId>checkstyle</artifactId>
158-
<version>8.38</version>
158+
<version>9.2</version>
159159
</dependency>
160160
</dependencies>
161161
</plugin>

‎src/main/java/com/gargoylesoftware/css/dom/CSSStyleSheetImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ private static final class SelectorIndex {
404404
private final Map<String, List<SelectorEntry>> keyToSelectors_ = new HashMap<>();
405405

406406
void add(final String key, final SelectorEntry selector) {
407-
List<SelectorEntry> entry = keyToSelectors_.computeIfAbsent(key, k -> new ArrayList<>());
407+
final List<SelectorEntry> entry = keyToSelectors_.computeIfAbsent(key, k -> new ArrayList<>());
408408
entry.add(selector);
409409
}
410410

‎src/main/java/com/gargoylesoftware/css/parser/LexicalUnit.java

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,58 +25,111 @@ public interface LexicalUnit {
2525
* Enum for the various unit types.
2626
*/
2727
enum LexicalUnitType {
28+
/** OPERATOR_COMMA. */
2829
OPERATOR_COMMA,
30+
/** OPERATOR_PLUS. */
2931
OPERATOR_PLUS,
32+
/** OPERATOR_MINUS. */
3033
OPERATOR_MINUS,
34+
/** OPERATOR_MULTIPLY. */
3135
OPERATOR_MULTIPLY,
36+
/** OPERATOR_SLASH. */
3237
OPERATOR_SLASH,
38+
/** OPERATOR_MOD. */
3339
OPERATOR_MOD,
40+
/** OPERATOR_EXP. */
3441
OPERATOR_EXP,
42+
/** OPERATOR_LT. */
3543
OPERATOR_LT,
44+
/** OPERATOR_GT. */
3645
OPERATOR_GT,
46+
/** OPERATOR_LE. */
3747
OPERATOR_LE,
48+
/** OPERATOR_GE. */
3849
OPERATOR_GE,
50+
/** OPERATOR_TILDE. */
3951
OPERATOR_TILDE,
52+
/** INHERIT. */
4053
INHERIT,
54+
/** INTEGER. */
4155
INTEGER,
56+
/** REAL. */
4257
REAL,
58+
/** EM. */
4359
EM,
60+
/** REM. */
4461
REM,
62+
/** EX. */
4563
EX,
64+
/** CH. */
4665
CH,
66+
/** VW. */
4767
VW,
68+
/** VH. */
4869
VH,
70+
/** VMIN. */
4971
VMIN,
72+
/** VMAX. */
5073
VMAX,
74+
/** PIXEL. */
5175
PIXEL,
76+
/** INCH. */
5277
INCH,
78+
/** CENTIMETER. */
5379
CENTIMETER,
80+
/** MILLIMETER. */
5481
MILLIMETER,
82+
/** POINT. */
5583
POINT,
84+
/** PICA. */
5685
PICA,
86+
/** QUATER. */
5787
QUATER,
88+
/** PERCENTAGE. */
5889
PERCENTAGE,
90+
/** URI. */
5991
URI,
92+
/** COUNTER_FUNCTION. */
6093
COUNTER_FUNCTION,
94+
/** COUNTERS_FUNCTION. */
6195
COUNTERS_FUNCTION,
96+
/** RGBCOLOR. */
6297
RGBCOLOR,
98+
/** HSLCOLOR. */
6399
HSLCOLOR,
100+
/** DEGREE. */
64101
DEGREE,
102+
/** GRADIAN. */
65103
GRADIAN,
104+
/** RADIAN. */
66105
RADIAN,
106+
/** TURN. */
67107
TURN,
108+
/** MILLISECOND. */
68109
MILLISECOND,
110+
/** SECOND. */
69111
SECOND,
112+
/** HERTZ. */
70113
HERTZ,
114+
/** KILOHERTZ. */
71115
KILOHERTZ,
116+
/** IDENT. */
72117
IDENT,
118+
/** STRING_VALUE. */
73119
STRING_VALUE,
120+
/** ATTR. */
74121
ATTR,
122+
/** RECT_FUNCTION. */
75123
RECT_FUNCTION,
124+
/** UNICODERANGE. */
76125
UNICODERANGE,
126+
/** SUB_EXPRESSION. */
77127
SUB_EXPRESSION,
128+
/** FUNCTION. */
78129
FUNCTION,
130+
/** FUNCTION_CALC. */
79131
FUNCTION_CALC,
132+
/** DIMENSION. */
80133
DIMENSION
81134
}
82135

‎src/main/java/com/gargoylesoftware/css/parser/condition/Condition.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,25 @@ public interface Condition extends Locatable {
2525
* ConditionType enum.
2626
*/
2727
enum ConditionType {
28+
/** ATTRIBUTE_CONDITION. */
2829
ATTRIBUTE_CONDITION,
30+
/** ID_CONDITION. */
2931
ID_CONDITION,
32+
/** LANG_CONDITION. */
3033
LANG_CONDITION,
34+
/** ONE_OF_ATTRIBUTE_CONDITION. */
3135
ONE_OF_ATTRIBUTE_CONDITION,
36+
/** BEGIN_HYPHEN_ATTRIBUTE_CONDITION. */
3237
BEGIN_HYPHEN_ATTRIBUTE_CONDITION,
38+
/** CLASS_CONDITION. */
3339
CLASS_CONDITION,
40+
/** PREFIX_ATTRIBUTE_CONDITION. */
3441
PREFIX_ATTRIBUTE_CONDITION,
42+
/** PSEUDO_CLASS_CONDITION. */
3543
PSEUDO_CLASS_CONDITION,
44+
/** SUBSTRING_ATTRIBUTE_CONDITION. */
3645
SUBSTRING_ATTRIBUTE_CONDITION,
46+
/** SUFFIX_ATTRIBUTE_CONDITION. */
3747
SUFFIX_ATTRIBUTE_CONDITION
3848
}
3949

‎src/main/java/com/gargoylesoftware/css/parser/selector/Selector.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,17 @@ public interface Selector extends Locatable {
2525
* SelectorType enum.
2626
*/
2727
enum SelectorType {
28+
/** CHILD_SELECTOR. */
2829
CHILD_SELECTOR,
30+
/** DESCENDANT_SELECTOR. */
2931
DESCENDANT_SELECTOR,
32+
/** DIRECT_ADJACENT_SELECTOR. */
3033
DIRECT_ADJACENT_SELECTOR,
34+
/** ELEMENT_NODE_SELECTOR. */
3135
ELEMENT_NODE_SELECTOR,
36+
/** GENERAL_ADJACENT_SELECTOR. */
3237
GENERAL_ADJACENT_SELECTOR,
38+
/** PSEUDO_ELEMENT_SELECTOR. */
3339
PSEUDO_ELEMENT_SELECTOR
3440
}
3541

‎src/test/java/com/gargoylesoftware/css/dom/HSLColorImplTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void constructByLUException() throws Exception {
5959
LexicalUnitImpl.createDivide(lu);
6060

6161
try {
62-
HSLColorImpl color = new HSLColorImpl("hsl", hslLU);
62+
final HSLColorImpl color = new HSLColorImpl("hsl", hslLU);
6363
fail("DOMException expected: " + color);
6464
}
6565
catch (final DOMException e) {
@@ -72,7 +72,7 @@ public void constructByLUException() throws Exception {
7272
LexicalUnitImpl.createPercentage(lu, 30);
7373

7474
try {
75-
HSLColorImpl color = new HSLColorImpl("hsl", hslLU);
75+
final HSLColorImpl color = new HSLColorImpl("hsl", hslLU);
7676
fail("DOMException expected: " + color);
7777
}
7878
catch (final DOMException e) {
@@ -95,7 +95,7 @@ public void constructByLUTooManyValuesException() throws Exception {
9595
LexicalUnitImpl.createComma(lu);
9696

9797
try {
98-
HSLColorImpl color = new HSLColorImpl("hsl", hslLU);
98+
final HSLColorImpl color = new HSLColorImpl("hsl", hslLU);
9999
fail("DOMException expected: " + color);
100100
}
101101
catch (final DOMException e) {
@@ -127,23 +127,23 @@ public void getCssTextFunctionName() throws Exception {
127127
final LexicalUnit hslLu = LexicalUnitImpl.createNumber(null, 45);
128128

129129
try {
130-
HSLColorImpl color = new HSLColorImpl(null, hslLu);
130+
final HSLColorImpl color = new HSLColorImpl(null, hslLu);
131131
fail("DOMException expected: " + color);
132132
}
133133
catch (final DOMException e) {
134134
assertEquals("Color space hsl or hsla is required.", e.getMessage());
135135
}
136136

137137
try {
138-
HSLColorImpl color = new HSLColorImpl("", hslLu);
138+
final HSLColorImpl color = new HSLColorImpl("", hslLu);
139139
fail("DOMException expected: " + color);
140140
}
141141
catch (final DOMException e) {
142142
assertEquals("Color space '' not supported.", e.getMessage());
143143
}
144144

145145
try {
146-
HSLColorImpl color = new HSLColorImpl("xyz", hslLu);
146+
final HSLColorImpl color = new HSLColorImpl("xyz", hslLu);
147147
fail("DOMException expected: " + color);
148148
}
149149
catch (final DOMException e) {

‎src/test/java/com/gargoylesoftware/css/dom/RGBColorImplTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void constructByLUException() throws Exception {
7171
LexicalUnitImpl.createNumber(lu, 30);
7272

7373
try {
74-
RGBColorImpl color = new RGBColorImpl("rgb", rgbLU);
74+
final RGBColorImpl color = new RGBColorImpl("rgb", rgbLU);
7575
fail("DOMException expected: " + color);
7676
}
7777
catch (final DOMException e) {
@@ -94,7 +94,7 @@ public void constructByLUTooManyValuesException() throws Exception {
9494
LexicalUnitImpl.createComma(lu);
9595

9696
try {
97-
RGBColorImpl color = new RGBColorImpl("rgb", rgbLU);
97+
final RGBColorImpl color = new RGBColorImpl("rgb", rgbLU);
9898
fail("DOMException expected: " + color);
9999
}
100100
catch (final DOMException e) {
@@ -126,23 +126,23 @@ public void getCssTextFunctionName() throws Exception {
126126
final LexicalUnit rgbLu = LexicalUnitImpl.createNumber(null, 10);
127127

128128
try {
129-
RGBColorImpl color = new RGBColorImpl(null, rgbLu);
129+
final RGBColorImpl color = new RGBColorImpl(null, rgbLu);
130130
fail("DOMException expected: " + color);
131131
}
132132
catch (final DOMException e) {
133133
assertEquals("Color space rgb or rgba is required.", e.getMessage());
134134
}
135135

136136
try {
137-
RGBColorImpl color = new RGBColorImpl("", rgbLu);
137+
final RGBColorImpl color = new RGBColorImpl("", rgbLu);
138138
fail("DOMException expected: " + color);
139139
}
140140
catch (final DOMException e) {
141141
assertEquals("Color space '' not supported.", e.getMessage());
142142
}
143143

144144
try {
145-
RGBColorImpl color = new RGBColorImpl("xyz", rgbLu);
145+
final RGBColorImpl color = new RGBColorImpl("xyz", rgbLu);
146146
fail("DOMException expected: " + color);
147147
}
148148
catch (final DOMException e) {

‎src/test/java/com/gargoylesoftware/css/parser/CSS3ParserTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import com.gargoylesoftware.css.parser.LexicalUnit.LexicalUnitType;
4848
import com.gargoylesoftware.css.parser.condition.Condition;
4949
import com.gargoylesoftware.css.parser.condition.Condition.ConditionType;
50-
import com.gargoylesoftware.css.parser.condition.LangCondition;
5150
import com.gargoylesoftware.css.parser.condition.PrefixAttributeCondition;
5251
import com.gargoylesoftware.css.parser.condition.PseudoClassCondition;
5352
import com.gargoylesoftware.css.parser.condition.SubstringAttributeCondition;

0 commit comments

Comments
 (0)