You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by bo...@apache.org on 2011/11/30 22:05:54 UTC
svn commit: r1208778 - in /incubator/rat/main/trunk: ./
apache-rat-core/src/main/java/org/apache/rat/
apache-rat-core/src/main/java/org/apache/rat/analysis/license/
apache-rat-core/src/main/java/org/apache/rat/annotation/
apache-rat-core/src/main/java/...
Author: bodewig
Date: Wed Nov 30 21:05:51 2011
New Revision: 1208778
URL: http://svn.apache.org/viewvc?rev=1208778&view=rev
Log:
Upgrade to Java5. Combining patches by Felix Knecht and Hugo Hirsch. RAT-59
Modified:
incubator/rat/main/trunk/RELEASE_NOTES.txt
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenceAppender.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/ContentType.java
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/policy/DefaultPolicy.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java
incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
incubator/rat/main/trunk/pom.xml
Modified: incubator/rat/main/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/RELEASE_NOTES.txt?rev=1208778&r1=1208777&r2=1208778&view=diff
==============================================================================
--- incubator/rat/main/trunk/RELEASE_NOTES.txt (original)
+++ incubator/rat/main/trunk/RELEASE_NOTES.txt Wed Nov 30 21:05:51 2011
@@ -1,5 +1,9 @@
RAT 0.9
=======
+ * RAT now requires Java5 at runtime
+ * Issues Resolved (see http://issues.apache.org/jira):
+ * Improvement:
+ * RAT-54 Upgrade to Java5
RAT 0.8
=======
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.java?rev=1208778&r1=1208777&r2=1208778&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.java Wed Nov 30 21:05:51 2011
@@ -18,21 +18,6 @@
*/
package org.apache.rat;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.io.PipedReader;
-import java.io.PipedWriter;
-import java.io.PrintStream;
-import java.io.Writer;
-import java.util.List;
-
-import javax.xml.transform.TransformerConfigurationException;
-
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
@@ -43,8 +28,8 @@ import org.apache.commons.cli.ParseExcep
import org.apache.commons.cli.PosixParser;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.NotFileFilter;
-import org.apache.commons.io.filefilter.RegexFileFilter;
import org.apache.commons.io.filefilter.OrFileFilter;
+import org.apache.commons.io.filefilter.RegexFileFilter;
import org.apache.commons.io.filefilter.WildcardFileFilter;
import org.apache.rat.api.RatException;
import org.apache.rat.report.IReportable;
@@ -56,6 +41,10 @@ import org.apache.rat.report.xml.writer.
import org.apache.rat.walker.ArchiveWalker;
import org.apache.rat.walker.DirectoryWalker;
+import javax.xml.transform.TransformerConfigurationException;
+import java.io.*;
+import java.util.List;
+
public class Report {
private static final char EXCLUDE_CLI = 'e';
@@ -105,8 +94,8 @@ public class Report {
if (excludeFileName != null) {
List excludes = FileUtils.readLines(new File(excludeFileName));
final OrFileFilter orFilter = new OrFileFilter();
- for (int i=0; i< excludes.size(); i++) {
- orFilter.addFileFilter(new RegexFileFilter((String)excludes.get(i)));
+ for (Object exclude : excludes) {
+ orFilter.addFileFilter(new RegexFileFilter((String) exclude));
}
final FilenameFilter filter = new NotFileFilter(orFilter);
report.setInputFileFilter(filter);
@@ -226,7 +215,7 @@ public class Report {
HelpFormatter f = new HelpFormatter();
String header = "Options";
- StringBuffer footer = new StringBuffer("\n");
+ StringBuilder footer = new StringBuilder("\n");
footer.append("NOTE:\n");
footer.append("RAT is really little more than a grep ATM\n");
footer.append("RAT is also rather memory hungry ATM\n");
@@ -349,8 +338,6 @@ public class Report {
* @param out the stream to write the report to
* @param base the files or directories to report on
* @param style an input stream representing the stylesheet to use for styling the report
- * @param matcher the header matcher for matching licence headers
- * @param approvedLicenseNames a list of licence families that are approved for use in the project
* @throws IOException
* @throws TransformerConfigurationException
* @throws InterruptedException
@@ -369,8 +356,6 @@ public class Report {
* @param out the writer to write the report to
* @param base the files or directories to report on
* @param style an input stream representing the stylesheet to use for styling the report
- * @param matcher the header matcher for matching licence headers
- * @param approvedLicenseNames a list of licence families that are approved for use in the project
* @throws IOException
* @throws TransformerConfigurationException
* @throws FileNotFoundException
@@ -396,8 +381,6 @@ public class Report {
*
* @param container the files or directories to report on
* @param out the writer to write the report to
- * @param matcher the header matcher for matching licence headers
- * @param approvedLicenseNames a list of licence families that are approved for use in the project
* @throws IOException
* @throws RatException
*/
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java?rev=1208778&r1=1208777&r2=1208778&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/license/SimplePatternBasedLicense.java Wed Nov 30 21:05:51 2011
@@ -98,9 +98,9 @@ public class SimplePatternBasedLicense i
if (pLine != null) {
final String[] pttrns = getPatterns();
if (pttrns != null) {
- for (int i = 0; i < pttrns.length; i++) {
- if (pLine.indexOf(pttrns [i], 0) >= 0) {
- return true;
+ for (String pttrn : pttrns) {
+ if (pLine.indexOf(pttrn, 0) >= 0) {
+ return true;
}
}
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java?rev=1208778&r1=1208777&r2=1208778&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenceAppender.java Wed Nov 30 21:05:51 2011
@@ -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();
static {
// these arrays are used in Arrays.binarySearch so they must
@@ -337,9 +337,9 @@ public abstract class AbstractLicenceApp
int lastDot = path.lastIndexOf(".");
if (lastDot >= 0 && lastDot < path.length() - 1) {
String ext = path.substring(lastDot + 1);
- Object type = EXT2TYPE.get(ext);
- if (type instanceof Integer) {
- return ((Integer) type).intValue();
+ Integer type = EXT2TYPE.get(ext);
+ if (type != null) {
+ return type.intValue();
}
}
return TYPE_UNKNOWN;
@@ -534,8 +534,8 @@ class BOMInputStream extends FilterInput
private void getBOM() throws IOException {
if (firstBytes == null) {
int max = 0;
- for (int i = 0; i < BOMS.length; i++) {
- max = Math.max(max, BOMS[i].length);
+ for (int[] BOM : BOMS) {
+ max = Math.max(max, BOM.length);
}
firstBytes = new int[max];
for (int i = 0; i < firstBytes.length; i++) {
@@ -576,8 +576,8 @@ class BOMInputStream extends FilterInput
}
private boolean find() {
- for (int i = 0; i < BOMS.length; i++) {
- if (matches(BOMS[i])) {
+ for (int[] BOM : BOMS) {
+ if (matches(BOM)) {
return true;
}
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenceAppender.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenceAppender.java?rev=1208778&r1=1208777&r2=1208778&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenceAppender.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/ApacheV2LicenceAppender.java Wed Nov 30 21:05:51 2011
@@ -54,7 +54,7 @@ public class ApacheV2LicenceAppender ext
//@Override
public String getLicenceHeader(File document) {
int type = getType(document);
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if (copyright == null) {
sb.append(getFirstLine(type));
sb.append(getLine(type, ""));
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/ContentType.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/ContentType.java?rev=1208778&r1=1208777&r2=1208778&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/ContentType.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/api/ContentType.java Wed Nov 30 21:05:51 2011
@@ -19,7 +19,6 @@
package org.apache.rat.api;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
@@ -43,8 +42,8 @@ public class ContentType {
this.mediaType = mediaType.toLowerCase(Locale.US);
this.subType = subType.toLowerCase(Locale.US);
this.parameters = new HashMap(parameters.size());
- for (Iterator it=parameters.entrySet().iterator();it.hasNext();) {
- final Map.Entry entry = (Map.Entry) it.next();
+ for (Object o : parameters.entrySet()) {
+ final Map.Entry entry = (Map.Entry) o;
this.parameters.put(entry.getKey().toString().toLowerCase(Locale.US), entry.getValue());
}
}
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=1208778&r1=1208777&r2=1208778&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 Wed Nov 30 21:05:51 2011
@@ -109,7 +109,7 @@ public class MetaData {
* Only likely to be a small quantity of data
* so trade some performance for simplicity.
*/
- private final List/*<Datum>*/ data;
+ private final List<Datum> data;
public MetaData() {
this(null);
@@ -117,7 +117,7 @@ public class MetaData {
public MetaData(final ContentType contentType) {
this.contentType = contentType;
- this.data = new ArrayList/*<Datum>*/(16);
+ this.data = new ArrayList<Datum>(16);
}
/**
@@ -174,8 +174,7 @@ public class MetaData {
*/
public Datum get(final String name) {
Datum result = null;
- for (final Iterator/*<Datum>*/ it=data.iterator();it.hasNext();) {
- final Datum next = (Datum) it.next();
+ for (Datum next : data) {
if (name.equals(next.getName())) {
result = next;
break;
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java?rev=1208778&r1=1208777&r2=1208778&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java Wed Nov 30 21:05:51 2011
@@ -18,8 +18,6 @@
*/
package org.apache.rat.policy;
-import java.util.Arrays;
-
import org.apache.rat.api.Document;
import org.apache.rat.api.MetaData;
import org.apache.rat.api.MetaData.Datum;
@@ -27,6 +25,8 @@ import org.apache.rat.document.IDocument
import org.apache.rat.document.RatDocumentAnalysisException;
import org.apache.rat.license.ILicenseFamily;
+import java.util.Arrays;
+
public class DefaultPolicy implements IDocumentAnalyser {
private static final String[] APPROVED_LICENSES = {
MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0,
@@ -47,7 +47,7 @@ public class DefaultPolicy implements ID
}
return results;
}
- ;
+
private final String[] approvedLicenseNames;
public DefaultPolicy() {
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java?rev=1208778&r1=1208777&r2=1208778&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/util/ClaimReporterMultiplexer.java Wed Nov 30 21:05:51 2011
@@ -18,14 +18,14 @@
*/
package org.apache.rat.report.claim.util;
-import java.util.List;
-
import org.apache.rat.api.Document;
import org.apache.rat.api.RatException;
import org.apache.rat.document.IDocumentAnalyser;
import org.apache.rat.document.RatDocumentAnalysisException;
import org.apache.rat.report.RatReport;
+import java.util.List;
+
public class ClaimReporterMultiplexer implements RatReport {
private final IDocumentAnalyser analyser;
@@ -44,25 +44,22 @@ public class ClaimReporterMultiplexer im
throw new RatException(e.getMessage(), e);
}
}
- final int length = reporters.size();
- for (int i=0; i<length; i++) {
- final RatReport report = (RatReport) reporters.get(i);
+ for (Object reporter : reporters) {
+ final RatReport report = (RatReport) reporter;
report.report(document);
}
}
public void startReport() throws RatException {
- final int length = reporters.size();
- for (int i=0; i<length; i++) {
- final RatReport report = (RatReport) reporters.get(i);
+ for (Object reporter : reporters) {
+ final RatReport report = (RatReport) reporter;
report.startReport();
}
}
public void endReport() throws RatException {
- final int length = reporters.size();
- for (int i=0; i<length; i++) {
- final RatReport report = (RatReport) reporters.get(i);
+ for (Object reporter : reporters) {
+ final RatReport report = (RatReport) reporter;
report.endReport();
}
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java?rev=1208778&r1=1208777&r2=1208778&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java Wed Nov 30 21:05:51 2011
@@ -19,17 +19,17 @@
package org.apache.rat.walker;
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.Arrays;
-import java.util.regex.Pattern;
-
import org.apache.rat.api.Document;
import org.apache.rat.api.RatException;
import org.apache.rat.document.impl.FileDocument;
import org.apache.rat.report.IReportable;
import org.apache.rat.report.RatReport;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.Arrays;
+import java.util.regex.Pattern;
+
/**
* Walks directories.
*/
@@ -108,8 +108,7 @@ public class DirectoryWalker extends Wal
* @throws RatException
*/
private void processDirectories(final RatReport report, final File[] files) throws RatException {
- for (int i = 0; i < files.length; i++) {
- final File file = files[i];
+ for (final File file : files) {
if (!ignored(file)) {
if (file.isDirectory()) {
processDirectory(report, file);
@@ -126,8 +125,7 @@ public class DirectoryWalker extends Wal
* @throws RatException
*/
private void processNonDirectories(final RatReport report, final File[] files) throws RatException {
- for (int i = 0; i < files.length; i++) {
- final File file = files[i];
+ for (final File file : files) {
if (!ignored(file)) {
if (!file.isDirectory()) {
report(report, file);
Modified: incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java?rev=1208778&r1=1208777&r2=1208778&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java (original)
+++ incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java Wed Nov 30 21:05:51 2011
@@ -19,18 +19,6 @@ package org.apache.rat.mp;
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Writer;
-import java.lang.reflect.UndeclaredThrowableException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.transform.TransformerConfigurationException;
-
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -46,6 +34,17 @@ import org.apache.rat.report.IReportable
import org.apache.rat.report.claim.ClaimStatistic;
import org.codehaus.plexus.util.DirectoryScanner;
+import javax.xml.transform.TransformerConfigurationException;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Writer;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
/**
* Abstract base class for Mojos, which are running RAT.
@@ -202,12 +201,10 @@ public abstract class AbstractRatMojo ex
if ( licenseMatchers != null )
{
- for ( int i = 0; i < licenseMatchers.length; i++ )
- {
- final HeaderMatcherSpecification spec = licenseMatchers[i];
+ for (final HeaderMatcherSpecification spec : licenseMatchers) {
final String className = spec.getClassName();
- final IHeaderMatcher headerMatcher = (IHeaderMatcher) newInstance( IHeaderMatcher.class, className );
- list.add( headerMatcher );
+ final IHeaderMatcher headerMatcher = (IHeaderMatcher) newInstance(IHeaderMatcher.class, className);
+ list.add(headerMatcher);
}
}
@@ -261,14 +258,11 @@ public abstract class AbstractRatMojo ex
* @param pArray
* The strings to add to the list.
*/
- private void add( List pList, String[] pArray )
+ private void add( List<String> pList, String[] pArray )
{
if ( pArray != null )
{
- for ( int i = 0; i < pArray.length; i++ )
- {
- pList.add( pArray[i] );
- }
+ Collections.addAll(pList, pArray);
}
}
@@ -305,7 +299,7 @@ public abstract class AbstractRatMojo ex
private void setExcludes( DirectoryScanner ds )
{
- final List excludeList1 = new ArrayList();
+ final List<String> excludeList1 = new ArrayList<String>();
if ( useDefaultExcludes )
{
add( excludeList1, DirectoryScanner.DEFAULTEXCLUDES );
@@ -324,22 +318,21 @@ public abstract class AbstractRatMojo ex
}
if ( excludeSubProjects && project != null && project.getModules() != null )
{
- for ( Iterator it = project.getModules().iterator(); it.hasNext(); )
- {
- String moduleSubPath = (String) it.next();
- excludeList1.add( moduleSubPath + "/**/*" );
+ for (Object o : project.getModules()) {
+ String moduleSubPath = (String) o;
+ excludeList1.add(moduleSubPath + "/**/*");
}
}
- final List excludeList = excludeList1;
+ final List<String> excludeList = excludeList1;
if ( excludes == null || excludes.length == 0 )
{
getLog().info( "No excludes" );
}
else
{
- for ( int i = 0; i < excludes.length; i++ )
+ for ( String exclude : excludes)
{
- getLog().info( "Exclude: " + excludes[i] );
+ getLog().info( "Exclude: " + exclude);
}
}
add( excludeList, excludes );
@@ -406,10 +399,8 @@ public abstract class AbstractRatMojo ex
}
if ( licenseFamilyNames != null)
{
- for ( int i = 0; i < licenseFamilyNames.length; i++ )
- {
- LicenseFamilySpecification spec = licenseFamilyNames[i];
- list.add( newInstance( ILicenseFamily.class, spec.getClassName() ) );
+ for (LicenseFamilySpecification spec : licenseFamilyNames) {
+ list.add(newInstance(ILicenseFamily.class, spec.getClassName()));
}
}
Modified: incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java?rev=1208778&r1=1208777&r2=1208778&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java (original)
+++ incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java Wed Nov 30 21:05:51 2011
@@ -19,13 +19,6 @@ package org.apache.rat.mp;
* under the License.
*/
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-
import org.apache.rat.api.Document;
import org.apache.rat.api.MetaData;
import org.apache.rat.api.RatException;
@@ -33,6 +26,13 @@ import org.apache.rat.document.impl.Docu
import org.apache.rat.report.IReportable;
import org.apache.rat.report.RatReport;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+
/**
* Implementation of IReportable that traverses over a set of files.
@@ -62,11 +62,10 @@ class FilesReportable implements IReport
public void run( RatReport report ) throws RatException
{
FileDocument document = new FileDocument();
- for ( int i = 0; i < files.length; i++ )
- {
- document.setFile( new File( basedir, files[i] ) );
+ for (String file : files) {
+ document.setFile(new File(basedir, file));
document.getMetaData().clear();
- report.report( document );
+ report.report(document);
}
}
Modified: incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java?rev=1208778&r1=1208777&r2=1208778&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java (original)
+++ incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatReportMojo.java Wed Nov 30 21:05:51 2011
@@ -19,18 +19,6 @@ package org.apache.rat.mp;
* under the License.
*/
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.ResourceBundle;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -54,6 +42,18 @@ import org.apache.maven.reporting.MavenR
import org.apache.rat.Defaults;
import org.codehaus.doxia.sink.Sink;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.ResourceBundle;
+
/**
* Generates a report with RAT's output.
@@ -204,7 +204,7 @@ public class RatReportMojo extends Abstr
{
DecorationModel model = new DecorationModel();
model.setBody( new Body() );
- Map attributes = new HashMap();
+ Map<String, String> attributes = new HashMap<String, String>();
attributes.put( "outputEncoding", "UTF-8" );
Locale locale = Locale.getDefault();
try
@@ -260,7 +260,7 @@ public class RatReportMojo extends Abstr
*/
private String getRatVersion()
{
- for ( Iterator iter = getProject().getDependencyArtifacts().iterator(); iter.hasNext(); )
+ for ( Iterator<Artifact> iter = getProject().getDependencyArtifacts().iterator(); iter.hasNext(); )
{
Artifact a = (Artifact) iter.next();
if ( "rat-lib".equals( a.getArtifactId() ) )
Modified: incubator/rat/main/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/pom.xml?rev=1208778&r1=1208777&r2=1208778&view=diff
==============================================================================
--- incubator/rat/main/trunk/pom.xml (original)
+++ incubator/rat/main/trunk/pom.xml Wed Nov 30 21:05:51 2011
@@ -212,8 +212,8 @@ Note that binary compatibility is not gu
<artifactId>maven-compiler-plugin</artifactId>
<version>2.1</version>
<configuration>
- <source>1.4</source>
- <target>1.4</target>
+ <source>1.5</source>
+ <target>1.5</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>