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:44:53 UTC
svn commit: r1464816 - in
/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat:
annotation/ api/ document/impl/ document/impl/guesser/ report/claim/
report/claim/impl/ report/claim/util/ report/xml/
report/xml/writer/impl/base/ walker/
Author: sebb
Date: Fri Apr 5 02:44:53 2013
New Revision: 1464816
URL: http://svn.apache.org/r1464816
Log:
Generics
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/api/ContentType.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/DocumentImplUtils.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/NoteGuesser.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/ClaimStatistic.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/util/ClaimReporterMultiplexer.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/FileNameComparator.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=1464816&r1=1464815&r2=1464816&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:44:53 2013
@@ -105,7 +105,7 @@ public abstract class AbstractLicenceApp
TYPE_VISUAL_STUDIO_SOLUTION,
};
- private static final Map<String, Integer> EXT2TYPE = new HashMap();
+ private static final Map<String, Integer> EXT2TYPE = new HashMap<String, Integer>();
static {
// these arrays are used in Arrays.binarySearch so they must
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/api/ContentType.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/api/ContentType.java?rev=1464816&r1=1464815&r2=1464816&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/api/ContentType.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/api/ContentType.java Fri Apr 5 02:44:53 2013
@@ -28,7 +28,7 @@ import java.util.Map;
public class ContentType {
private final String mediaType;
private final String subType;
- private final Map/*<String, String>*/ parameters;
+ private final Map<String, String> parameters;
/**
* Constructs content types,
@@ -37,13 +37,12 @@ public class ContentType {
* @param subType not null
* @param parameters not null
*/
- public ContentType(final String mediaType, final String subType, final Map parameters) {
+ public ContentType(final String mediaType, final String subType, final Map<String, String> parameters) {
super();
this.mediaType = mediaType.toLowerCase(Locale.US);
this.subType = subType.toLowerCase(Locale.US);
- this.parameters = new HashMap(parameters.size());
- for (Object o : parameters.entrySet()) {
- final Map.Entry entry = (Map.Entry) o;
+ this.parameters = new HashMap<String, String>(parameters.size());
+ for (Map.Entry<String, String> entry : parameters.entrySet()) {
this.parameters.put(entry.getKey().toString().toLowerCase(Locale.US), entry.getValue());
}
}
@@ -72,7 +71,7 @@ public class ContentType {
* with keys normalised to lower case.
* @return not null
*/
- public Map/*<String, String>*/ getParameters() {
+ public Map<String, String> getParameters() {
return parameters;
}
}
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=1464816&r1=1464815&r2=1464816&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:44:53 2013
@@ -165,7 +165,7 @@ public class MetaData {
* Gets all data.
* @return unmodifiable view of the meta data.
*/
- public Collection getData() {
+ public Collection<Datum> getData() {
return Collections.unmodifiableCollection(data);
}
@@ -231,8 +231,8 @@ public class MetaData {
*/
public boolean clear(final String name) {
boolean dataRemoved = false;
- for (final Iterator it=data.iterator();it.hasNext();) {
- final Datum datum = (Datum) it.next();
+ for (final Iterator<Datum> it = data.iterator();it.hasNext();) {
+ final Datum datum = it.next();
if (datum.getName().equals(name)) {
it.remove();
dataRemoved = true;
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java?rev=1464816&r1=1464815&r2=1464816&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/DocumentImplUtils.java Fri Apr 5 02:44:53 2013
@@ -25,6 +25,8 @@ import java.io.InputStream;
import java.util.zip.ZipException;
import java.util.zip.ZipInputStream;
+import org.apache.commons.io.IOUtils;
+
public class DocumentImplUtils {
public final static String toName(File file) {
@@ -43,13 +45,7 @@ public class DocumentImplUtils {
} catch (IOException e) {
return false;
} finally {
- if (zip != null) {
- try {
- zip.close();
- } catch (Throwable t) {
- // Swallow
- }
- }
+ IOUtils.closeQuietly(zip);
}
}
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/NoteGuesser.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/NoteGuesser.java?rev=1464816&r1=1464815&r2=1464816&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/NoteGuesser.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/NoteGuesser.java Fri Apr 5 02:44:53 2013
@@ -57,7 +57,7 @@ public class NoteGuesser {
public static final boolean isNote(final String name) {
if (name == null) {return false;}
- List l = Arrays.asList(NoteGuesser.NOTE_FILE_NAMES);
+ List<String> l = Arrays.asList(NoteGuesser.NOTE_FILE_NAMES);
String normalisedName = GuessUtils.normalise(name);
if (l.contains(name) || l.contains(normalisedName)) {
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/ClaimStatistic.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/ClaimStatistic.java?rev=1464816&r1=1464815&r2=1464816&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/ClaimStatistic.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/ClaimStatistic.java Fri Apr 5 02:44:53 2013
@@ -27,7 +27,7 @@ import java.util.Map;
* the report.
*/
public class ClaimStatistic {
- private Map documentCategoryMap, licenseFamilyCodeMap, licenseFamilyNameMap;
+ private Map<String, Integer> documentCategoryMap, licenseFamilyCodeMap, licenseFamilyNameMap;
private int numApproved, numUnApproved, numGenerated, numUnknown;
/**
@@ -100,7 +100,7 @@ public class ClaimStatistic {
* are integers with the number of resources matching
* the file type.
*/
- public void setDocumentCategoryMap(Map pDocumentCategoryMap) {
+ public void setDocumentCategoryMap(Map<String, Integer> pDocumentCategoryMap) {
documentCategoryMap = pDocumentCategoryMap;
}
@@ -110,7 +110,7 @@ public class ClaimStatistic {
* are integers with the number of resources matching
* the file type.
*/
- public Map getDocumentCategoryMap() {
+ public Map<String, Integer> getDocumentCategoryMap() {
return documentCategoryMap;
}
@@ -120,7 +120,7 @@ public class ClaimStatistic {
* the map values are integers with the number of resources
* matching the license family code.
*/
- public Map getLicenseFileCodeMap() {
+ public Map<String, Integer> getLicenseFileCodeMap() {
return licenseFamilyCodeMap;
}
@@ -130,7 +130,7 @@ public class ClaimStatistic {
* the map values are integers with the number of resources
* matching the license family code.
*/
- public void setLicenseFileCodeMap(Map pLicenseFamilyCodeMap) {
+ public void setLicenseFileCodeMap(Map<String, Integer> pLicenseFamilyCodeMap) {
licenseFamilyCodeMap = pLicenseFamilyCodeMap;
}
@@ -140,7 +140,7 @@ public class ClaimStatistic {
* the map values are integers with the number of resources
* matching the license family name.
*/
- public Map getLicenseFileNameMap() {
+ public Map<String, Integer> getLicenseFileNameMap() {
return licenseFamilyNameMap;
}
@@ -150,7 +150,7 @@ public class ClaimStatistic {
* the map values are integers with the number of resources
* matching the license family name.
*/
- public void setLicenseFileNameMap(Map pLicenseFamilyNameMap) {
+ public void setLicenseFileNameMap(Map<String, Integer> pLicenseFamilyNameMap) {
licenseFamilyNameMap = pLicenseFamilyNameMap;
}
}
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=1464816&r1=1464815&r2=1464816&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:44:53 2013
@@ -33,17 +33,17 @@ import org.apache.rat.report.claim.Claim
*/
public class ClaimAggregator extends AbstractClaimReporter {
private final ClaimStatistic statistic;
- private final Map numsByLicenseFamilyName = new HashMap();
- private final Map numsByLicenseFamilyCode = new HashMap();
- private final Map numsByFileType = new HashMap();
+ private final Map<String, Integer> numsByLicenseFamilyName = new HashMap<String, Integer>();
+ private final Map<String, Integer> numsByLicenseFamilyCode = new HashMap<String, Integer>();
+ private final Map<String, Integer> numsByFileType = new HashMap<String, Integer>();
private int numApproved, numUnApproved, numGenerated, numUnknown;
public ClaimAggregator(ClaimStatistic pStatistic) {
statistic = pStatistic;
}
- private void incMapValue(Map pMap, Object pKey) {
- final Integer num = (Integer) pMap.get(pKey);
+ private void incMapValue(Map<String, Integer> pMap, String pKey) {
+ final Integer num = pMap.get(pKey);
final int newNum;
if (num == null) {
newNum = 1;
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java?rev=1464816&r1=1464815&r2=1464816&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java Fri Apr 5 02:44:53 2013
@@ -29,9 +29,9 @@ import java.util.List;
public class ClaimReporterMultiplexer implements RatReport {
private final IDocumentAnalyser analyser;
- private final List reporters;
+ private final List<? extends RatReport> reporters;
- public ClaimReporterMultiplexer(final IDocumentAnalyser pAnalyser, final List reporters) {
+ public ClaimReporterMultiplexer(final IDocumentAnalyser pAnalyser, final List<? extends RatReport> reporters) {
analyser = pAnalyser;
this.reporters = reporters;
}
@@ -44,22 +44,19 @@ public class ClaimReporterMultiplexer im
throw new RatException(e.getMessage(), e);
}
}
- for (Object reporter : reporters) {
- final RatReport report = (RatReport) reporter;
+ for (RatReport report : reporters) {
report.report(document);
}
}
public void startReport() throws RatException {
- for (Object reporter : reporters) {
- final RatReport report = (RatReport) reporter;
+ for (RatReport report : reporters) {
report.startReport();
}
}
public void endReport() throws RatException {
- for (Object reporter : reporters) {
- final RatReport report = (RatReport) reporter;
+ for (RatReport report : reporters) {
report.endReport();
}
}
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java?rev=1464816&r1=1464815&r2=1464816&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java Fri Apr 5 02:44:53 2013
@@ -41,7 +41,7 @@ import org.apache.rat.report.xml.writer.
public class XmlReportFactory {
public static final RatReport createStandardReport(IXmlWriter writer,
final ClaimStatistic pStatistic, ReportConfiguration pConfiguration) {
- final List reporters = new ArrayList();
+ final List<RatReport> reporters = new ArrayList<RatReport>();
if (pStatistic != null) {
reporters.add(new ClaimAggregator(pStatistic));
}
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java?rev=1464816&r1=1464815&r2=1464816&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java Fri Apr 5 02:44:53 2013
@@ -402,7 +402,7 @@ public final class XmlWriter implements
private final Writer writer;
private final ArrayStack elementNames;
- private final Set currentAttributes = new HashSet();
+ private final Set<CharSequence> currentAttributes = new HashSet<CharSequence>();
boolean elementsWritten = false;
boolean inElement = false;
Modified: creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/FileNameComparator.java
URL: http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/FileNameComparator.java?rev=1464816&r1=1464815&r2=1464816&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/FileNameComparator.java (original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/FileNameComparator.java Fri Apr 5 02:44:53 2013
@@ -21,12 +21,10 @@ package org.apache.rat.walker;
import java.io.File;
import java.util.Comparator;
-class FileNameComparator implements Comparator {
+class FileNameComparator implements Comparator<File> {
- public int compare(Object first, Object second) {
+ public int compare(File firstFile, File secondFile) {
int result = 0;
- File firstFile = (File) first;
- File secondFile = (File) second;
if (firstFile == null) {
if (secondFile != null) {
result = 1;