You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by rd...@apache.org on 2009/05/22 21:50:48 UTC
svn commit: r777679 - in /incubator/rat/main/trunk/apache-rat-core/src:
main/java/org/apache/rat/report/claim/
main/java/org/apache/rat/report/claim/impl/
main/java/org/apache/rat/report/claim/impl/xml/
test/java/org/apache/rat/report/claim/impl/xml/ t...
Author: rdonkin
Date: Fri May 22 19:50:47 2009
New Revision: 777679
URL: http://svn.apache.org/viewvc?rev=777679&view=rev
Log:
RAT-53 Remove CustomClaim. IClaim is going, and any replacement for this function is likely to be differnt. https://issues.apache.org/jira/browse/RAT-53
Removed:
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/CustomClaim.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporterTest.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexerTest.java
Modified:
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/ClaimStatistic.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaimReporter.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ClaimAggregator.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/claim/impl/xml/MockClaimReporter.java
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/ClaimStatistic.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/ClaimStatistic.java?rev=777679&r1=777678&r2=777679&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/ClaimStatistic.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/ClaimStatistic.java Fri May 22 19:50:47 2009
@@ -2,8 +2,6 @@
import java.util.Map;
-import org.apache.rat.report.claim.impl.xml.CustomClaim;
-
/**
* This class provides a numerical overview about
@@ -11,7 +9,7 @@
*/
public class ClaimStatistic {
private Map documentCategoryMap, licenseFamilyCodeMap, licenseFamilyNameMap;
- private int numApproved, numUnApproved, numGenerated, numUnknown, numCustom;
+ private int numApproved, numUnApproved, numGenerated, numUnknown;
/**
* Returns the number of files with approved licenses.
@@ -78,22 +76,6 @@
}
/**
- * Returns the number of custom claims.
- * @see CustomClaim
- */
- public int getNumCustom() {
- return numCustom;
- }
-
- /**
- * Sets the number of custom claims.
- * @see CustomClaim
- */
- public void setNumCustom(int pNumCustom) {
- numCustom = pNumCustom;
- }
-
- /**
* Sets a map with the file types. The map keys
* are file type names and the map values
* are integers with the number of resources matching
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaimReporter.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaimReporter.java?rev=777679&r1=777678&r2=777679&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaimReporter.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/AbstractClaimReporter.java Fri May 22 19:50:47 2009
@@ -5,7 +5,6 @@
import org.apache.rat.report.RatReportFailedException;
import org.apache.rat.report.claim.IClaim;
import org.apache.rat.report.claim.IClaimReporter;
-import org.apache.rat.report.claim.impl.xml.CustomClaim;
/**
@@ -31,16 +30,8 @@
// Does nothing
}
- protected void handleClaim(CustomClaim pClaim) {
- // Does nothing
- }
-
protected void handleClaim(IClaim pClaim) {
- if (pClaim instanceof CustomClaim) {
- handleClaim((CustomClaim) pClaim);
- } else {
- throw new IllegalStateException("Unsupported type of claim: " + pClaim.getClass().getName());
- }
+ throw new IllegalStateException("Unsupported type of claim: " + pClaim.getClass().getName());
}
public void claim(IClaim pClaim) throws RatReportFailedException {
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ClaimAggregator.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ClaimAggregator.java?rev=777679&r1=777678&r2=777679&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ClaimAggregator.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ClaimAggregator.java Fri May 22 19:50:47 2009
@@ -9,7 +9,6 @@
import org.apache.rat.report.claim.ClaimStatistic;
import org.apache.rat.report.claim.IClaim;
import org.apache.rat.report.claim.IClaimReporter;
-import org.apache.rat.report.claim.impl.xml.CustomClaim;
/**
@@ -21,15 +20,11 @@
private final Map numsByLicenseFamilyName = new HashMap();
private final Map numsByLicenseFamilyCode = new HashMap();
private final Map numsByFileType = new HashMap();
- private int numApproved, numUnApproved, numGenerated, numCustom, numUnknown;
+ private int numApproved, numUnApproved, numGenerated, numUnknown;
public ClaimAggregator(IClaimReporter pReporter) {
reporter = pReporter;
}
-
- protected void handleClaim(CustomClaim pClaim) {
- ++numCustom;
- }
private void incMapValue(Map pMap, Object pKey) {
final Integer num = (Integer) pMap.get(pKey);
@@ -74,7 +69,6 @@
pStatistic.setLicenseFileCodeMap(numsByLicenseFamilyCode);
pStatistic.setLicenseFileNameMap(numsByLicenseFamilyName);
pStatistic.setNumApproved(numApproved);
- pStatistic.setNumCustom(numCustom);
pStatistic.setNumGenerated(numGenerated);
pStatistic.setNumUnApproved(numUnApproved);
pStatistic.setNumUnknown(numUnknown);
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java?rev=777679&r1=777678&r2=777679&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/xml/SimpleXmlClaimReporter.java Fri May 22 19:50:47 2009
@@ -45,10 +45,6 @@
this.writer = writer;
}
- protected void handleClaim(CustomClaim pClaim)
- throws IOException, RatReportFailedException {
- writeClaim(pClaim.getPredicate(), pClaim.getObject(), pClaim.isLiteral());
- }
/**
* Writes a single claim to the XML file.
@@ -69,11 +65,7 @@
}
protected void handleClaim(IClaim pClaim) throws IOException, RatReportFailedException {
- if (pClaim instanceof CustomClaim) {
- handleClaim((CustomClaim) pClaim);
- } else {
- throw new IllegalStateException("Invalid claim type: " + pClaim.getClass().getName());
- }
+ throw new IllegalStateException("Invalid claim type: " + pClaim.getClass().getName());
}
public void claim(IClaim pClaim) throws RatReportFailedException {
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/claim/impl/xml/MockClaimReporter.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/claim/impl/xml/MockClaimReporter.java?rev=777679&r1=777678&r2=777679&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/claim/impl/xml/MockClaimReporter.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/report/claim/impl/xml/MockClaimReporter.java Fri May 22 19:50:47 2009
@@ -35,10 +35,6 @@
claims.add(pClaim);
}
- public CustomClaim getClaim(int index) {
- return (CustomClaim) claims.get(index);
- }
-
public void report(IDocument document) throws RatReportFailedException {
}
}