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 11:05:05 UTC
svn commit: r777436 - in
/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat:
api/ report/claim/ report/claim/impl/ report/claim/impl/xml/
Author: rdonkin
Date: Fri May 22 09:05:04 2009
New Revision: 777436
URL: http://svn.apache.org/viewvc?rev=777436&view=rev
Log:
RAT-53 Start moving away from IClaim. 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/ArchiveFileTypeClaim.java
Modified:
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/FileType.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/xml/SimpleXmlClaimReporter.java
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java?rev=777436&r1=777435&r2=777436&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java Fri May 22 09:05:04 2009
@@ -31,6 +31,14 @@
*/
public class MetaData {
+ public static final String RAT_DOCUMENT_CATEGORY_VALUE_GENERATED = "GEN ";
+ public static final String RAT_DOCUMENT_CATEGORY_VALUE_UNKNOWN = "?????";
+ public static final String RAT_DOCUMENT_CATEGORY_VALUE_ARCHIVE = "archive";
+ public static final String RAT_DOCUMENT_CATEGORY_VALUE_NOTICE = "notice";
+ public static final String RAT_DOCUMENT_CATEGORY_VALUE_BINARY = "binary";
+ public static final String RAT_DOCUMENT_CATEGORY_VALUE_STANDARD = "standard";
+ public static final String RAT_DOCUMENT_CATEGORY_URL ="http://org/apache/rat/meta-data#FileCategory";
+
private ContentType contentType;
/**
* Only likely to be a small quantity of data
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/FileType.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/FileType.java?rev=777436&r1=777435&r2=777436&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/FileType.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/FileType.java Fri May 22 09:05:04 2009
@@ -1,5 +1,7 @@
package org.apache.rat.report.claim;
+import org.apache.rat.api.MetaData;
+
/**
* This class is used to provide a pseudo enumeration
@@ -7,15 +9,6 @@
*/
public class FileType {
- public static final String TYPE_STANDARD = "standard";
- public static final String TYPE_BINARY = "binary";
- public static final String TYPE_NOTICE = "notice";
- public static final String TYPE_ARCHIVE = "archive";
- public static final String TYPE_UNKNOWN = "?????";
- public static final String TYPE_GENERATED = "GEN ";
-
- public static final String RAT_FILE_CATEGORY ="http://org/apache/rat/meta-data#FileCategory";
-
private final String name;
/**
@@ -43,10 +36,10 @@
return getName().equals(((FileType) pOther).getName());
}
- public static final FileType GENERATED = new FileType(TYPE_GENERATED);
- public static final FileType UNKNOWN = new FileType(TYPE_UNKNOWN);
- public static final FileType ARCHIVE = new FileType(TYPE_ARCHIVE);
- public static final FileType NOTICE = new FileType(TYPE_NOTICE);
- public static final FileType BINARY = new FileType(TYPE_BINARY);
- public static final FileType STANDARD = new FileType(TYPE_STANDARD);
+ public static final FileType GENERATED = new FileType(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_GENERATED);
+ public static final FileType UNKNOWN = new FileType(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_UNKNOWN);
+ public static final FileType ARCHIVE = new FileType(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_ARCHIVE);
+ public static final FileType NOTICE = new FileType(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_NOTICE);
+ public static final FileType BINARY = new FileType(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_BINARY);
+ public static final FileType STANDARD = new FileType(MetaData.RAT_DOCUMENT_CATEGORY_VALUE_STANDARD);
}
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=777436&r1=777435&r2=777436&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 09:05:04 2009
@@ -12,9 +12,6 @@
* this class.
*/
public abstract class AbstractClaimReporter implements IClaimReporter {
- protected void handleClaim(ArchiveFileTypeClaim pClaim) {
- handleClaim((FileTypeClaim) pClaim);
- }
protected void handleClaim(FileTypeClaim pClaim) {
// Does nothing
@@ -37,9 +34,7 @@
}
protected void handleClaim(IClaim pClaim) {
- if (pClaim instanceof ArchiveFileTypeClaim) {
- handleClaim((ArchiveFileTypeClaim) pClaim);
- } else if (pClaim instanceof FileTypeClaim) {
+ if (pClaim instanceof FileTypeClaim) {
handleClaim((FileTypeClaim) pClaim);
} else if (pClaim instanceof LicenseApprovalClaim) {
handleClaim((LicenseApprovalClaim) pClaim);
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=777436&r1=777435&r2=777436&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 09:05:04 2009
@@ -24,7 +24,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.ArchiveFileTypeClaim;
import org.apache.rat.report.claim.impl.FileTypeClaim;
import org.apache.rat.report.claim.impl.LicenseApprovalClaim;
import org.apache.rat.report.claim.impl.LicenseFamilyClaim;
@@ -49,12 +48,6 @@
this.writer = writer;
}
- protected void handleClaim(ArchiveFileTypeClaim pClaim)
- throws IOException, RatReportFailedException {
- handleClaim((FileTypeClaim) pClaim);
- writeClaim(ARCHIVE_TYPE_PREDICATE, pClaim.isReadable() ? ARCHIVE_TYPE_READABLE : ARCHIVE_TYPE_UNREADABLE, false);
- }
-
protected void handleClaim(FileTypeClaim pClaim)
throws IOException, RatReportFailedException {
writeClaim(FILE_TYPE_PREDICATE, pClaim.getType().getName(), false);
@@ -101,9 +94,7 @@
}
protected void handleClaim(IClaim pClaim) throws IOException, RatReportFailedException {
- if (pClaim instanceof ArchiveFileTypeClaim) {
- handleClaim((ArchiveFileTypeClaim) pClaim);
- } else if (pClaim instanceof FileTypeClaim) {
+ if (pClaim instanceof FileTypeClaim) {
handleClaim((FileTypeClaim) pClaim);
} else if (pClaim instanceof LicenseApprovalClaim) {
handleClaim((LicenseApprovalClaim) pClaim);