mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correctly configure findbugs, add excludes, fix a few simple warnings

Browse source
This commit is contained in:
Sean Owen 2014-02-26 22:47:32 +00:00
parent 8364bf02ea
commit cef513e790
6 changed files with 45 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/com/google/zxing/oned/Code39Writer.java
View file

@ -67,7 +67,7 @@ public final class Code39Writer extends OneDimensionalCodeWriter {
int pos = appendPattern(result, 0, widths, true); int pos = appendPattern(result, 0, widths, true);
int[] narrowWhite = {1}; int[] narrowWhite = {1};
pos += appendPattern(result, pos, narrowWhite, false); pos += appendPattern(result, pos, narrowWhite, false);
//append next character to bytematrix //append next character to byte matrix
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
int indexInString = Code39Reader.ALPHABET_STRING.indexOf(contents.charAt(i)); int indexInString = Code39Reader.ALPHABET_STRING.indexOf(contents.charAt(i));
toIntArray(Code39Reader.CHARACTER_ENCODINGS[indexInString], widths); toIntArray(Code39Reader.CHARACTER_ENCODINGS[indexInString], widths);
@ -75,7 +75,7 @@ public final class Code39Writer extends OneDimensionalCodeWriter {
pos += appendPattern(result, pos, narrowWhite, false); pos += appendPattern(result, pos, narrowWhite, false);
} }
toIntArray(Code39Reader.CHARACTER_ENCODINGS[39], widths); toIntArray(Code39Reader.CHARACTER_ENCODINGS[39], widths);
pos += appendPattern(result, pos, widths, true); appendPattern(result, pos, widths, true);
return result; return result;
} }

2
core/src/main/java/com/google/zxing/oned/EAN13Writer.java
View file

@ -86,7 +86,7 @@ public final class EAN13Writer extends UPCEANWriter {
int digit = Integer.parseInt(contents.substring(i, i + 1)); int digit = Integer.parseInt(contents.substring(i, i + 1));
pos += appendPattern(result, pos, UPCEANReader.L_PATTERNS[digit], true); pos += appendPattern(result, pos, UPCEANReader.L_PATTERNS[digit], true);
} }
pos += appendPattern(result, pos, UPCEANReader.START_END_PATTERN, true); appendPattern(result, pos, UPCEANReader.START_END_PATTERN, true);
return result; return result;
} }

2
core/src/main/java/com/google/zxing/oned/EAN8Writer.java
View file

@ -76,7 +76,7 @@ public final class EAN8Writer extends UPCEANWriter {
int digit = Integer.parseInt(contents.substring(i, i + 1)); int digit = Integer.parseInt(contents.substring(i, i + 1));
pos += appendPattern(result, pos, UPCEANReader.L_PATTERNS[digit], true); pos += appendPattern(result, pos, UPCEANReader.L_PATTERNS[digit], true);
} }
pos += appendPattern(result, pos, UPCEANReader.START_END_PATTERN, true); appendPattern(result, pos, UPCEANReader.START_END_PATTERN, true);
return result; return result;
} }

13
pom.xml
View file

@ -257,12 +257,6 @@
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId> <artifactId>findbugs-maven-plugin</artifactId>
<version>2.5.3</version> <version>2.5.3</version>
<configuration>
<threshold>Normal</threshold>
<effort>Max</effort>
<xmlOutput>true</xmlOutput>
<xmlOutputDirectory>target/site</xmlOutputDirectory>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -346,6 +340,13 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId> <artifactId>findbugs-maven-plugin</artifactId>
<configuration>
<threshold>Normal</threshold>
<effort>Max</effort>
<xmlOutput>true</xmlOutput>
<xmlOutputDirectory>target/site</xmlOutputDirectory>
<excludeFilterFile>src/findbugs/excludes.xml</excludeFilterFile>
</configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>

33
src/findbugs/excludes.xml Normal file
View file

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2014 ZXing authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<FindBugsFilter>
<Match>
<Or>
<Bug pattern="EI_EXPOSE_REP"/>
<Bug pattern="EI_EXPOSE_REP2"/>
<Bug pattern="EI_EXPOSE_STATIC_REP2"/>
<Bug pattern="PZLA_PREFER_ZERO_LENGTH_ARRAYS"/>
<Bug pattern="SE_NO_SERIALVERSIONID"/>
<Bug pattern="SF_SWITCH_NO_DEFAULT"/>
<Bug pattern=""/>
<Bug pattern=""/>
<Bug pattern=""/>
</Or>
</Match>
</FindBugsFilter>

2
src/site/site.xml
View file

@ -22,7 +22,7 @@
<skin> <skin>
<groupId>org.apache.maven.skins</groupId> <groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId> <artifactId>maven-fluido-skin</artifactId>
<version>1.3.0</version> <version>1.3.1</version>
</skin> </skin>
<body> <body>