Skip to content

Commit fc007ef

Browse files
rbrirbri
committed
fix a bunch of warnings
1 parent 4cd344d commit fc007ef

24 files changed

+57
-82
lines changed

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,11 @@ public CSSCharsetRuleImpl(
4949
}
5050

5151
/**
52-
* Sets the css text.
53-
* @param cssText the new css text
54-
* @throws DOMException in case of error
52+
* {@inheritDoc}
5553
*/
54+
@Override
5655
public void setCssText(final String cssText) throws DOMException {
57-
try {
58-
final InputSource is = new InputSource(new StringReader(cssText));
56+
try (InputSource is = new InputSource(new StringReader(cssText))) {
5957
final CSSOMParser parser = new CSSOMParser();
6058
final AbstractCSSRuleImpl r = parser.parseRule(is);
6159

@@ -116,8 +114,9 @@ public String toString() {
116114
}
117115

118116
/**
119-
* @return the current css text
117+
* {@inheritDoc}
120118
*/
119+
@Override
121120
public String getCssText() {
122121
final StringBuilder sb = new StringBuilder();
123122

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public CSSFontFaceRuleImpl(final CSSStyleSheetImpl parentStyleSheet, final Abstr
4545
/**
4646
* {@inheritDoc}
4747
*/
48+
@Override
4849
public String getCssText() {
4950
final StringBuilder sb = new StringBuilder();
5051
sb.append("@font-face {");
@@ -58,13 +59,11 @@ public String getCssText() {
5859
}
5960

6061
/**
61-
* Sets the css text.
62-
* @param cssText the new css text
63-
* @throws DOMException in case of error
62+
* {@inheritDoc}
6463
*/
64+
@Override
6565
public void setCssText(final String cssText) throws DOMException {
66-
try {
67-
final InputSource is = new InputSource(new StringReader(cssText));
66+
try (InputSource is = new InputSource(new StringReader(cssText))) {
6867
final CSSOMParser parser = new CSSOMParser();
6968
final AbstractCSSRuleImpl r = parser.parseRule(is);
7069

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public CSSImportRuleImpl(
5555
/**
5656
* {@inheritDoc}
5757
*/
58+
@Override
5859
public String getCssText() {
5960
final StringBuilder sb = new StringBuilder();
6061
sb.append("@import");
@@ -73,13 +74,11 @@ public String getCssText() {
7374
}
7475

7576
/**
76-
* Sets the css text.
77-
* @param cssText the new css text
78-
* @throws DOMException in case of error
77+
* {@inheritDoc}
7978
*/
79+
@Override
8080
public void setCssText(final String cssText) throws DOMException {
81-
try {
82-
final InputSource is = new InputSource(new StringReader(cssText));
81+
try (InputSource is = new InputSource(new StringReader(cssText))) {
8382
final CSSOMParser parser = new CSSOMParser();
8483
final AbstractCSSRuleImpl r = parser.parseRule(is);
8584

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public CSSMediaRuleImpl(
5454
/**
5555
* {@inheritDoc}
5656
*/
57+
@Override
5758
public String getCssText() {
5859
final StringBuilder sb = new StringBuilder("@media ");
5960

@@ -68,13 +69,11 @@ public String getCssText() {
6869
}
6970

7071
/**
71-
* Sets the css text.
72-
* @param cssText the new css text
73-
* @throws DOMException in case of error
72+
* {@inheritDoc}
7473
*/
74+
@Override
7575
public void setCssText(final String cssText) throws DOMException {
76-
try {
77-
final InputSource is = new InputSource(new StringReader(cssText));
76+
try (InputSource is = new InputSource(new StringReader(cssText))) {
7877
final CSSOMParser parser = new CSSOMParser();
7978
final AbstractCSSRuleImpl r = parser.parseRule(is);
8079

@@ -129,8 +128,7 @@ public CSSRuleListImpl getCssRules() {
129128
public void insertRule(final String rule, final int index) throws DOMException {
130129
final CSSStyleSheetImpl parentStyleSheet = getParentStyleSheet();
131130

132-
try {
133-
final InputSource is = new InputSource(new StringReader(rule));
131+
try (InputSource is = new InputSource(new StringReader(rule))) {
134132
final CSSOMParser parser = new CSSOMParser();
135133
parser.setParentStyleSheet(parentStyleSheet);
136134
parser.setErrorHandler(ThrowCssExceptionErrorHandler.INSTANCE);

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public CSSPageRuleImpl(
5252
/**
5353
* {@inheritDoc}
5454
*/
55+
@Override
5556
public String getCssText() {
5657
final StringBuilder sb = new StringBuilder();
5758

@@ -72,13 +73,11 @@ public String getCssText() {
7273
}
7374

7475
/**
75-
* Sets the css text.
76-
* @param cssText the new css text
77-
* @throws DOMException in case of error
76+
* {@inheritDoc}
7877
*/
78+
@Override
7979
public void setCssText(final String cssText) throws DOMException {
80-
try {
81-
final InputSource is = new InputSource(new StringReader(cssText));
80+
try (InputSource is = new InputSource(new StringReader(cssText))) {
8281
final CSSOMParser parser = new CSSOMParser();
8382
final AbstractCSSRuleImpl r = parser.parseRule(is);
8483

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*/
2828
public class CSSRuleListImpl implements Serializable {
2929

30-
private List<AbstractCSSRuleImpl> rules_ = new ArrayList<AbstractCSSRuleImpl>();
30+
private List<AbstractCSSRuleImpl> rules_ = new ArrayList<>();
3131

3232
/**
3333
* @return the rules

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class CSSStyleDeclarationImpl implements Serializable {
3535
private static final String PRIORITY_IMPORTANT = "important";
3636

3737
private AbstractCSSRuleImpl parentRule_;
38-
private List<Property> properties_ = new ArrayList<Property>();
38+
private List<Property> properties_ = new ArrayList<>();
3939

4040
/**
4141
* Ctor.
@@ -77,8 +77,7 @@ public String getCssText() {
7777
* @throws DOMException in case of error
7878
*/
7979
public void setCssText(final String cssText) throws DOMException {
80-
try {
81-
final InputSource is = new InputSource(new StringReader(cssText));
80+
try (InputSource is = new InputSource(new StringReader(cssText))) {
8281
final CSSOMParser parser = new CSSOMParser();
8382
properties_.clear();
8483
parser.parseStyleDeclaration(this, is);

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public void setSelectors(final SelectorList selectors) {
6565
/**
6666
* {@inheritDoc}
6767
*/
68+
@Override
6869
public String getCssText() {
6970
final CSSStyleDeclarationImpl style = getStyle();
7071
if (null == style) {
@@ -82,13 +83,11 @@ public String getCssText() {
8283
}
8384

8485
/**
85-
* Sets the css text.
86-
* @param cssText the new css text
87-
* @throws DOMException in case of error
86+
* {@inheritDoc}
8887
*/
88+
@Override
8989
public void setCssText(final String cssText) throws DOMException {
90-
try {
91-
final InputSource is = new InputSource(new StringReader(cssText));
90+
try (InputSource is = new InputSource(new StringReader(cssText))) {
9291
final CSSOMParser parser = new CSSOMParser();
9392
final AbstractCSSRuleImpl r = parser.parseRule(is);
9493

@@ -130,8 +129,7 @@ public String getSelectorText() {
130129
* @throws DOMException in clase of error
131130
*/
132131
public void setSelectorText(final String selectorText) throws DOMException {
133-
try {
134-
final InputSource is = new InputSource(new StringReader(selectorText));
132+
try (InputSource is = new InputSource(new StringReader(selectorText))) {
135133
final CSSOMParser parser = new CSSOMParser();
136134
selectors_ = parser.parseSelectors(is);
137135
}

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ public CSSRuleListImpl getCssRules() {
131131
* @throws DOMException in case of error
132132
*/
133133
public void insertRule(final String rule, final int index) throws DOMException {
134-
try {
135-
final InputSource is = new InputSource(new StringReader(rule));
134+
try (InputSource is = new InputSource(new StringReader(rule))) {
136135
final CSSOMParser parser = new CSSOMParser();
137136
parser.setParentStyleSheet(this);
138137
parser.setErrorHandler(ThrowCssExceptionErrorHandler.INSTANCE);
@@ -260,8 +259,7 @@ public void setTitle(final String title) {
260259
* @param mediaText the new media text
261260
*/
262261
public void setMediaText(final String mediaText) {
263-
final InputSource source = new InputSource(new StringReader(mediaText));
264-
try {
262+
try (InputSource source = new InputSource(new StringReader(mediaText))) {
265263
final CSSOMParser parser = new CSSOMParser();
266264
final MediaQueryList sml = parser.parseMedia(source);
267265
media_ = new MediaListImpl(sml);
@@ -402,7 +400,7 @@ private static final class SelectorIndex {
402400
void add(final String key, final SelectorEntry selector) {
403401
List<SelectorEntry> entry = keyToSelectors_.get(key);
404402
if (entry == null) {
405-
entry = new ArrayList<SelectorEntry>();
403+
entry = new ArrayList<>();
406404
keyToSelectors_.put(key, entry);
407405
}
408406
entry.add(selector);
@@ -522,7 +520,7 @@ static final class SelectorEntriesIterator implements Iterator<SelectorEntry> {
522520
final String elementName,
523521
final String[] classes) {
524522

525-
iterators_ = new LinkedList<Iterator<SelectorEntry>>();
523+
iterators_ = new LinkedList<>();
526524

527525
List<SelectorEntry> selectors = index.elementSelectors_.get(null);
528526
if (!selectors.isEmpty()) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class CSSStyleSheetListImpl {
3333
*/
3434
public List<CSSStyleSheetImpl> getCSSStyleSheets() {
3535
if (cssStyleSheets_ == null) {
36-
cssStyleSheets_ = new ArrayList<CSSStyleSheetImpl>();
36+
cssStyleSheets_ = new ArrayList<>();
3737
}
3838
return cssStyleSheets_;
3939
}

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public CSSUnknownRuleImpl(
5050
/**
5151
* {@inheritDoc}
5252
*/
53+
@Override
5354
public String getCssText() {
5455
if (null == text_) {
5556
return "";
@@ -58,13 +59,11 @@ public String getCssText() {
5859
}
5960

6061
/**
61-
* Sets the css text.
62-
* @param cssText the new css text
63-
* @throws DOMException in case of error
62+
* {@inheritDoc}
6463
*/
64+
@Override
6565
public void setCssText(final String cssText) throws DOMException {
66-
try {
67-
final InputSource is = new InputSource(new StringReader(cssText));
66+
try (InputSource is = new InputSource(new StringReader(cssText))) {
6867
final CSSOMParser parser = new CSSOMParser();
6968
final AbstractCSSRuleImpl r = parser.parseRule(is);
7069

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ else if (value.getLexicalUnitType() == LexicalUnitType.COUNTERS_FUNCTION) {
194194
}
195195
}
196196

197-
private List<CSSValueImpl> getValues(final LexicalUnit value) {
198-
final List<CSSValueImpl> values = new ArrayList<CSSValueImpl>();
197+
private static List<CSSValueImpl> getValues(final LexicalUnit value) {
198+
final List<CSSValueImpl> values = new ArrayList<>();
199199
LexicalUnit lu = value;
200200
while (lu != null) {
201201
values.add(new CSSValueImpl(lu, true));
@@ -255,8 +255,7 @@ public String getCssText() {
255255
* @throws DOMException in case of error
256256
*/
257257
public void setCssText(final String cssText) throws DOMException {
258-
try {
259-
final InputSource is = new InputSource(new StringReader(cssText));
258+
try (InputSource is = new InputSource(new StringReader(cssText))) {
260259
final CSSOMParser parser = new CSSOMParser();
261260
final CSSValueImpl v2 = parser.parsePropertyValue(is);
262261
value_ = v2.value_;

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class MediaListImpl extends AbstractLocatable implements Serializable {
4545
* @param mediaList the media list
4646
*/
4747
public MediaListImpl(final MediaQueryList mediaList) {
48-
mediaQueries_ = new ArrayList<MediaQuery>(10);
48+
mediaQueries_ = new ArrayList<>(10);
4949

5050
setMediaList(mediaList);
5151
if (mediaList != null) {
@@ -77,8 +77,7 @@ public String getMediaText() {
7777
* @throws DOMException in case of error
7878
*/
7979
public void setMediaText(final String mediaText) throws DOMException {
80-
final InputSource source = new InputSource(new StringReader(mediaText));
81-
try {
80+
try (InputSource source = new InputSource(new StringReader(mediaText))) {
8281
final CSSOMParser parser = new CSSOMParser();
8382
parser.setErrorHandler(ThrowCssExceptionErrorHandler.INSTANCE);
8483
final MediaQueryList sml = parser.parseMedia(source);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ public MediaQueryList parseMedia(final InputSource source) throws IOException {
442442
return ml;
443443
}
444444

445-
private CharStream getCharStream(final InputSource source) throws IOException {
445+
private static CharStream getCharStream(final InputSource source) throws IOException {
446446
if (source.getReader() != null) {
447447
return new CssCharStream(source.getReader(), 1, 1);
448448
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public CSSStyleDeclarationImpl parseStyleDeclaration(final InputSource source) t
108108
* @throws IOException if the underlying SAC parser throws an IOException
109109
*/
110110
public void parseStyleDeclaration(final CSSStyleDeclarationImpl sd, final InputSource source) throws IOException {
111-
final Stack<Object> nodeStack = new Stack<Object>();
111+
final Stack<Object> nodeStack = new Stack<>();
112112
nodeStack.push(sd);
113113
final CSSOMHandler handler = new CSSOMHandler(nodeStack);
114114
parser_.setDocumentHandler(handler);
@@ -207,7 +207,7 @@ private void setHref(final String href) {
207207
}
208208

209209
CSSOMHandler() {
210-
nodeStack_ = new Stack<Object>();
210+
nodeStack_ = new Stack<>();
211211
}
212212

213213
Object getRoot() {

‎src/main/java/com/gargoylesoftware/css/parser/media/MediaQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public MediaQuery(final String media) {
4747
*/
4848
public MediaQuery(final String media, final boolean isOnly, final boolean isNot) {
4949
media_ = media;
50-
properties_ = new ArrayList<Property>(10);
50+
properties_ = new ArrayList<>(10);
5151
isOnly_ = isOnly;
5252
isNot_ = isNot;
5353
}

‎src/main/java/com/gargoylesoftware/css/parser/media/MediaQueryList.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class MediaQueryList extends AbstractLocatable {
3232
* Ctor.
3333
*/
3434
public MediaQueryList() {
35-
mediaQueries_ = new ArrayList<MediaQuery>();
35+
mediaQueries_ = new ArrayList<>();
3636
}
3737

3838
/**

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@
1414
*/
1515
package com.gargoylesoftware.css.parser.selector;
1616

17-
import java.io.Serializable;
18-
1917
/**
2018
* @author Ronald Brill
2119
*/
22-
public class ChildSelector extends AbstractSelector implements Serializable {
20+
public class ChildSelector extends AbstractSelector {
2321

2422
private Selector ancestorSelector_;
2523
private SimpleSelector simpleSelector_;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@
1414
*/
1515
package com.gargoylesoftware.css.parser.selector;
1616

17-
import java.io.Serializable;
18-
1917
/**
2018
* @author Ronald Brill
2119
*/
22-
public class DescendantSelector extends AbstractSelector implements Serializable {
20+
public class DescendantSelector extends AbstractSelector {
2321

2422
private final Selector ancestorSelector_;
2523
private final SimpleSelector simpleSelector_;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@
1414
*/
1515
package com.gargoylesoftware.css.parser.selector;
1616

17-
import java.io.Serializable;
18-
1917
/**
2018
* @author Ronald Brill
2119
*/
22-
public class DirectAdjacentSelector extends AbstractSelector implements Serializable {
20+
public class DirectAdjacentSelector extends AbstractSelector {
2321

2422
private final Selector selector_; // child
2523
private final SimpleSelector simpleSelector_;

0 commit comments

Comments
 (0)