diff options
author | rnveach <rveach02@gmail.com> | 2015-10-26 16:45:04 -0400 |
---|---|---|
committer | rnveach <rveach02@gmail.com> | 2015-10-27 22:36:51 -0400 |
commit | b0891b556788d4c9c8cdf6982648001427d92238 (patch) | |
tree | 1f1baf948b23201e2d5e406eb7d3f381e6d7ec07 /src/main | |
parent | 50e9439fa2b1c51fe5a4eb3502f53089592fba3c (diff) | |
download | checkstyle-b0891b556788d4c9c8cdf6982648001427d92238.tar.gz |
Issue #2442: fixed xdoc check errors
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java | 10 | ||||
-rw-r--r-- | src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java index 7c75d713c..cfcb1713f 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java @@ -50,7 +50,7 @@ public abstract class AbstractHeaderCheck extends AbstractFileSetCheck { /** Pattern to detect occurrences of '\n' in text. */ private static final Pattern ESCAPED_LINE_FEED_PATTERN = Pattern.compile("\\\\n"); /** The file that contains the header to check against. */ - private String filename; + private String headerFile; /** Name of a charset to use for loading the header from a file. */ private String charset = System.getProperty("file.encoding", "UTF-8"); @@ -97,7 +97,7 @@ public abstract class AbstractHeaderCheck extends AbstractFileSetCheck { + getConfiguration().getName()); } - filename = fileName; + headerFile = fileName; } /** @@ -108,14 +108,14 @@ public abstract class AbstractHeaderCheck extends AbstractFileSetCheck { checkHeaderNotInitialized(); Reader headerReader = null; try { - final URI uri = CommonUtils.getUriByFilename(filename); + final URI uri = CommonUtils.getUriByFilename(headerFile); headerReader = new InputStreamReader(new BufferedInputStream( uri.toURL().openStream()), charset); loadHeader(headerReader); } catch (final IOException ex) { throw new CheckstyleException( - "unable to load header file " + filename, ex); + "unable to load header file " + headerFile, ex); } finally { Closeables.closeQuietly(headerReader); @@ -182,7 +182,7 @@ public abstract class AbstractHeaderCheck extends AbstractFileSetCheck { @Override protected final void finishLocalSetup() throws CheckstyleException { - if (filename != null) { + if (headerFile != null) { loadHeaderFile(); } if (readerLines.isEmpty()) { diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java index d445424a2..ba9107029 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java @@ -34,7 +34,7 @@ public class SeverityMatchFilter extends AutomaticBean implements Filter { /** The severity level to accept. */ - private SeverityLevel severityLevel = SeverityLevel.ERROR; + private SeverityLevel severity = SeverityLevel.ERROR; /** Whether to accept or reject on severity matches. */ private boolean acceptOnMatch = true; @@ -47,7 +47,7 @@ public class SeverityMatchFilter * @see SeverityLevel */ public final void setSeverity(String severity) { - severityLevel = SeverityLevel.getInstance(severity); + this.severity = SeverityLevel.getInstance(severity); } /** @@ -61,7 +61,7 @@ public class SeverityMatchFilter @Override public boolean accept(AuditEvent event) { - final boolean result = severityLevel == event.getSeverityLevel(); + final boolean result = severity == event.getSeverityLevel(); if (acceptOnMatch) { return result; } |