You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by se...@apache.org on 2013/04/05 04:04:52 UTC
svn commit: r1464809 - in /creadur/rat/trunk/apache-rat-core/src:
main/java/org/apache/rat/annotation/ main/java/org/apache/rat/api/
main/java/org/apache/rat/document/impl/
main/java/org/apache/rat/report/claim/impl/
main/java/org/apache/rat/report/cla...
Author: sebb
Date: Fri Apr 5 02:04:52 2013
New Revision: 1464809
URL: http://svn.apache.org/r1464809
Log:
Add missing @Overrides
Modified:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenceAppender.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/ArchiveEntryDocument.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaimReporter.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ClaimAggregator.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/LicenseAddingReport.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/util/MatcherMultiplexerTest.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexerTest.java
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java?rev=1464809&r1=1464808&r2=1464809&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java Fri Apr 5 02:04:52 2013
@@ -506,11 +506,13 @@ class BOMInputStream extends FilterInput
super(s);
}
+ @Override
public int read() throws IOException {
int b = readFirstBytes();
return (b >= 0) ? b : in.read();
}
+ @Override
public int read(byte[] buf, int off, int len) throws IOException {
int firstCount = 0;
int b = 0;
@@ -527,6 +529,7 @@ class BOMInputStream extends FilterInput
? (firstCount > 0 ? firstCount : -1) : firstCount + secondCount;
}
+ @Override
public int read(byte[] buf) throws IOException {
return read(buf, 0, buf.length);
}
@@ -558,12 +561,14 @@ class BOMInputStream extends FilterInput
}
}
}
+ @Override
public synchronized void mark(int readlimit) {
markFbIndex = fbIndex;
markedAtStart = (firstBytes == null);
in.mark(readlimit);
}
+ @Override
public synchronized void reset() throws IOException {
fbIndex = markFbIndex;
if (markedAtStart) {
@@ -573,6 +578,7 @@ class BOMInputStream extends FilterInput
in.reset();
}
+ @Override
public long skip(long n) throws IOException {
while ((n > 0) && (readFirstBytes() >= 0)) {
n--;
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenceAppender.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenceAppender.java?rev=1464809&r1=1464808&r2=1464809&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenceAppender.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenceAppender.java Fri Apr 5 02:04:52 2013
@@ -51,7 +51,7 @@ public class ApacheV2LicenceAppender ext
this.copyright = copyright;
}
- //@Override
+ @Override
public String getLicenceHeader(File document) {
int type = getType(document);
StringBuilder sb = new StringBuilder();
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java?rev=1464809&r1=1464808&r2=1464809&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java Fri Apr 5 02:04:52 2013
@@ -291,6 +291,7 @@ public class MetaData {
* @return a <code>String</code> representation
* of this object.
*/
+ @Override
public String toString()
{
return "Datum [ "
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/ArchiveEntryDocument.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/ArchiveEntryDocument.java?rev=1464809&r1=1464808&r2=1464809&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/ArchiveEntryDocument.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/ArchiveEntryDocument.java Fri Apr 5 02:04:52 2013
@@ -69,6 +69,7 @@ public class ArchiveEntryDocument implem
* @return a <code>String</code> representation
* of this object.
*/
+ @Override
public String toString()
{
return "TarEntryDocument ( "
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java?rev=1464809&r1=1464808&r2=1464809&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java Fri Apr 5 02:04:52 2013
@@ -69,6 +69,7 @@ public class FileDocument implements Doc
* @return a <code>String</code> representation
* of this object.
*/
+ @Override
public String toString()
{
return "FileDocument ( "
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaimReporter.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaimReporter.java?rev=1464809&r1=1464808&r2=1464809&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaimReporter.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaimReporter.java Fri Apr 5 02:04:52 2013
@@ -95,6 +95,7 @@ public abstract class AbstractClaimRepor
}
}
+ @Override
public void report(Document subject) throws RatException {
writeDocumentClaim(subject);
}
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ClaimAggregator.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ClaimAggregator.java?rev=1464809&r1=1464808&r2=1464809&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ClaimAggregator.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ClaimAggregator.java Fri Apr 5 02:04:52 2013
@@ -53,10 +53,12 @@ public class ClaimAggregator extends Abs
pMap.put(pKey, new Integer(newNum));
}
+ @Override
protected void handleDocumentCategoryClaim(String documentCategoryName) {
incMapValue(numsByFileType, documentCategoryName);
}
+ @Override
protected void handleApprovedLicenseClaim(String licenseApproved) {
if (MetaData.RAT_APPROVED_LICENSE_VALUE_TRUE.equals(licenseApproved)) {
numApproved++;
@@ -65,10 +67,12 @@ public class ClaimAggregator extends Abs
}
}
+ @Override
protected void handleLicenseFamilyNameClaim(String licenseFamilyName) {
incMapValue(numsByLicenseFamilyName, licenseFamilyName);
}
+ @Override
protected void handleHeaderCategoryClaim(String headerCategory) {
if (MetaData.RAT_LICENSE_FAMILY_CATEGORY_VALUE_GEN.equals(headerCategory)) {
@@ -90,6 +94,7 @@ public class ClaimAggregator extends Abs
pStatistic.setNumUnknown(numUnknown);
}
+ @Override
public void endReport() throws RatException {
super.endReport();
fillClaimStatistic(statistic);
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java?rev=1464809&r1=1464808&r2=1464809&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java Fri Apr 5 02:04:52 2013
@@ -66,6 +66,7 @@ public class SimpleXmlClaimReporter exte
}
}
+ @Override
public void report(final Document subject) throws RatException {
try {
if (firstTime) {
@@ -125,6 +126,7 @@ public class SimpleXmlClaimReporter exte
}
}
+ @Override
public void startReport() throws RatException {
try {
writer.openElement("rat-report")
@@ -136,6 +138,7 @@ public class SimpleXmlClaimReporter exte
}
}
+ @Override
public void endReport() throws RatException {
try {
writer.closeDocument();
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/LicenseAddingReport.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/LicenseAddingReport.java?rev=1464809&r1=1464808&r2=1464809&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/LicenseAddingReport.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/LicenseAddingReport.java Fri Apr 5 02:04:52 2013
@@ -37,6 +37,7 @@ public class LicenseAddingReport extends
appender.setForce(pForced);
}
+ @Override
public void report(org.apache.rat.api.Document document) throws RatException {
final MetaData metaData = document.getMetaData();
final Datum licenseHeader = metaData.get(MetaData.RAT_URL_HEADER_CATEGORY);
Modified: creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/util/MatcherMultiplexerTest.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/util/MatcherMultiplexerTest.java?rev=1464809&r1=1464808&r2=1464809&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/util/MatcherMultiplexerTest.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/util/MatcherMultiplexerTest.java Fri Apr 5 02:04:52 2013
@@ -37,6 +37,7 @@ public class MatcherMultiplexerTest exte
HeaderMatcherMultiplexer multiplexer;
+ @Override
protected void setUp() throws Exception {
super.setUp();
matcherOne = new MockLicenseMatcher();
@@ -46,6 +47,7 @@ public class MatcherMultiplexerTest exte
reporter = new MockClaimReporter();
}
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
}
Modified: creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexerTest.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexerTest.java?rev=1464809&r1=1464808&r2=1464809&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexerTest.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexerTest.java Fri Apr 5 02:04:52 2013
@@ -29,6 +29,7 @@ public class DocumentAnalyserMultiplexer
IDocumentAnalyser[] analysers;
MockDocument document;
+ @Override
protected void setUp() throws Exception {
super.setUp();
IDocumentAnalyser[] analysers = {
@@ -41,6 +42,7 @@ public class DocumentAnalyserMultiplexer
multiplexer = new DocumentAnalyserMultiplexer(analysers);
}
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
}