You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2012/09/28 21:13:55 UTC
svn commit: r1391606 - in /maven/plugins/trunk/maven-changelog-plugin/src:
main/java/org/apache/maven/plugin/changelog/
test/java/org/apache/maven/plugin/changelog/
test/java/org/apache/maven/plugin/changelog/stubs/
Author: krosenvold
Date: Fri Sep 28 19:13:55 2012
New Revision: 1391606
URL: http://svn.apache.org/viewvc?rev=1391606&view=rev
Log:
Revert "added generics"
This reverts commit 19ae2a8f731d39653450c89d830f25e7ecf691bf.
Modified:
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogHandler.java
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityComparator.java
maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java
maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/ChangeLogTest.java
maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/FileActivityComparatorTest.java
maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/stubs/ChangeLogScmResultStub.java
maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/stubs/DevelopersStub.java
maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmManagerStub.java
maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmProviderStub.java
Modified: maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java?rev=1391606&r1=1391605&r2=1391606&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java (original)
+++ maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java Fri Sep 28 19:13:55 2012
@@ -29,7 +29,6 @@ import javax.xml.parsers.ParserConfigura
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.maven.scm.command.changelog.ChangeLogSet;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -57,24 +56,24 @@ public class ChangeLog
* @throws SAXException when an error occurred while parsing the xml document
* @throws IOException when an error occurred while accessing the xml document
*/
- public static List<ChangeLogSet> loadChangedSets( InputStream stream )
+ public static List loadChangedSets( InputStream stream )
throws ParserConfigurationException, SAXException, IOException
{
SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
- List<ChangeLogSet> changeLogSets = new ArrayList<ChangeLogSet>();
+ List changeLogSets = new ArrayList();
parser.parse( stream, new ChangeLogHandler( changeLogSets ) );
return changeLogSets;
}
- public static List<ChangeLogSet> loadChangedSets( Reader reader )
+ public static List loadChangedSets( Reader reader )
throws ParserConfigurationException, SAXException, IOException
{
SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
- List<ChangeLogSet> changeLogSets = new ArrayList<ChangeLogSet>();
+ List changeLogSets = new ArrayList();
parser.parse( new InputSource( reader ), new ChangeLogHandler( changeLogSets ) );
Modified: maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogHandler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogHandler.java?rev=1391606&r1=1391605&r2=1391606&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogHandler.java (original)
+++ maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogHandler.java Fri Sep 28 19:13:55 2012
@@ -32,7 +32,6 @@ import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.Date;
import java.util.LinkedList;
-import java.util.List;
import java.util.TimeZone;
/**
@@ -44,7 +43,7 @@ import java.util.TimeZone;
public class ChangeLogHandler
extends DefaultHandler
{
- private Collection<ChangeLogSet> changeSets;
+ private Collection changeSets;
private String bufData = "";
@@ -52,7 +51,7 @@ public class ChangeLogHandler
private ChangeSet bufEntry;
- private List<ChangeSet> bufEntries;
+ private LinkedList bufEntries;
private ChangeLogSet bufSet;
@@ -63,7 +62,7 @@ public class ChangeLogHandler
*
* @param changeSets collection object to store all change sets found within the xml document
*/
- public ChangeLogHandler( Collection<ChangeLogSet> changeSets )
+ public ChangeLogHandler( Collection changeSets )
{
this.changeSets = changeSets;
}
@@ -177,7 +176,7 @@ public class ChangeLogHandler
}
else if ( "changeset".equals( qName ) )
{
- bufEntries = new LinkedList<ChangeSet>();
+ bufEntries = new LinkedList();
currentPattern = attributes.getValue( "datePattern" );
if ( currentPattern == null )
Modified: maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java?rev=1391606&r1=1391605&r2=1391606&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java (original)
+++ maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java Fri Sep 28 19:13:55 2012
@@ -138,13 +138,13 @@ public class ChangeLogReport
* Used to specify the absolute date (or list of dates) to start log entries from.
*/
@Parameter
- private List<String> dates;
+ private List dates;
/**
* Used to specify the tag (or list of tags) to start log entries from.
*/
@Parameter
- private List<String> tags;
+ private List tags;
/**
* Used to specify the date format of the log entries that are retrieved from your SCM system.
@@ -368,13 +368,13 @@ public class ChangeLogReport
* @since 2.2
*/
@Parameter( property = "project.developers" )
- protected List<Developer> developers;
+ protected List developers;
/**
* List of provider implementations.
*/
@Parameter
- private Map<String, String> providerImplementations;
+ private Map providerImplementations;
// temporary field holder while generating the report
private String rptRepository, rptOneRepoParam, rptMultiRepoParam;
@@ -383,10 +383,10 @@ public class ChangeLogReport
private String connection;
// field used to hold a map of the developers by Id
- private HashMap<String, Developer> developersById;
+ private HashMap developersById;
// field used to hold a map of the developers by Name
- private HashMap<String, Developer> developersByName;
+ private HashMap developersByName;
/**
* The system properties to use (needed by the perforce scm provider).
@@ -408,12 +408,12 @@ public class ChangeLogReport
if ( providerImplementations != null )
{
- for ( Map.Entry<String, String> entry : providerImplementations.entrySet() )
+ for ( Iterator i = providerImplementations.keySet().iterator(); i.hasNext(); )
{
- String providerType = entry.getKey();
- String providerImplementation = entry.getValue();
+ String providerType = (String) i.next();
+ String providerImplementation = (String) providerImplementations.get( providerType );
getLog().info( "Change the default '" + providerType + "' provider implementation to '"
- + providerImplementation + "'." );
+ + providerImplementation + "'." );
manager.setScmProviderImplementation( providerType, providerImplementation );
}
}
@@ -427,7 +427,7 @@ public class ChangeLogReport
if ( systemProperties != null )
{
// Add all system properties configured by the user
- Iterator<?> iter = systemProperties.keySet().iterator();
+ Iterator iter = systemProperties.keySet().iterator();
while ( iter.hasNext() )
{
@@ -462,13 +462,15 @@ public class ChangeLogReport
*/
private void initializeDeveloperMaps()
{
- developersById = new HashMap<String, Developer>();
- developersByName = new HashMap<String, Developer>();
+ developersById = new HashMap();
+ developersByName = new HashMap();
if ( developers != null )
{
- for ( Developer developer : developers )
+ for ( Iterator i = developers.iterator(); i.hasNext(); )
{
+ Developer developer = (Developer) i.next();
+
developersById.put( developer.getId(), developer );
developersByName.put( developer.getName(), developer );
}
@@ -481,10 +483,10 @@ public class ChangeLogReport
*
* @throws MavenReportException
*/
- protected List<ChangeLogSet> getChangedSets()
+ protected List getChangedSets()
throws MavenReportException
{
- List<ChangeLogSet> changelogList = null;
+ List changelogList = null;
if ( !outputXML.isAbsolute() )
{
@@ -549,7 +551,7 @@ public class ChangeLogReport
return changelogList;
}
- private void writeChangelogXml( List<ChangeLogSet> changelogList )
+ private void writeChangelogXml( List changelogList )
throws FileNotFoundException, UnsupportedEncodingException, IOException
{
StringBuilder changelogXml = new StringBuilder();
@@ -557,10 +559,11 @@ public class ChangeLogReport
changelogXml.append( "<?xml version=\"1.0\" encoding=\"" ).append( getOutputEncoding() ).append( "\"?>\n" );
changelogXml.append( "<changelog>" );
- for ( ChangeLogSet changelogSet : changelogList )
+ for ( Iterator sets = changelogList.iterator(); sets.hasNext(); )
{
changelogXml.append( "\n " );
+ ChangeLogSet changelogSet = (ChangeLogSet) sets.next();
String changeset = changelogSet.toXML( getOutputEncoding() );
//remove xml header
@@ -594,12 +597,12 @@ public class ChangeLogReport
* @return changedlogsets generated from the SCM
* @throws MavenReportException
*/
- protected List<ChangeLogSet> generateChangeSetsFromSCM()
+ protected List generateChangeSetsFromSCM()
throws MavenReportException
{
try
{
- List<ChangeLogSet> changeSets = new ArrayList<ChangeLogSet>();
+ List changeSets = new ArrayList();
ScmRepository repository = getScmRepository();
@@ -623,16 +626,16 @@ public class ChangeLogReport
throw new MavenReportException( "The type '" + type + "' isn't supported for svn." );
}
- Iterator<String> tagsIter = tags.iterator();
+ Iterator tagsIter = tags.iterator();
- String startTag = tagsIter.next();
+ String startTag = (String) tagsIter.next();
String endTag = null;
if ( tagsIter.hasNext() )
{
while ( tagsIter.hasNext() )
{
- endTag = tagsIter.next();
+ endTag = (String) tagsIter.next();
result = provider.changeLog( repository, new ScmFileSet( basedir ), new ScmRevision( startTag ),
new ScmRevision( endTag ) );
@@ -656,16 +659,16 @@ public class ChangeLogReport
}
else if ( "date".equals( type ) )
{
- Iterator<String> dateIter = dates.iterator();
+ Iterator dateIter = dates.iterator();
- String startDate = dateIter.next();
+ String startDate = (String) dateIter.next();
String endDate = null;
if ( dateIter.hasNext() )
{
while ( dateIter.hasNext() )
{
- endDate = dateIter.next();
+ endDate = (String) dateIter.next();
result = provider.changeLog( repository, new ScmFileSet( basedir ), parseDate( startDate ),
parseDate( endDate ), 0, (ScmBranch) null );
@@ -970,7 +973,7 @@ public class ChangeLogReport
* @param bundle the resource bundle to retrieve report phrases from
* @param sink the report formatting tool
*/
- protected void doGenerateReport( List<ChangeLogSet> changeLogSets, ResourceBundle bundle, Sink sink )
+ protected void doGenerateReport( List changeLogSets, ResourceBundle bundle, Sink sink )
{
sink.head();
sink.title();
@@ -988,8 +991,10 @@ public class ChangeLogReport
// Summary section
doSummarySection( changeLogSets, bundle, sink );
- for ( ChangeLogSet changeLogSet : changeLogSets )
+ for ( Iterator sets = changeLogSets.iterator(); sets.hasNext(); )
{
+ ChangeLogSet changeLogSet = (ChangeLogSet) sets.next();
+
doChangedSet( changeLogSet, bundle, sink );
}
@@ -1007,7 +1012,7 @@ public class ChangeLogReport
* @param bundle the resource bundle to retrieve report phrases from
* @param sink the report formatting tool
*/
- private void doSummarySection( List<ChangeLogSet> changeLogSets, ResourceBundle bundle, Sink sink )
+ private void doSummarySection( List changeLogSets, ResourceBundle bundle, Sink sink )
{
sink.paragraph();
@@ -1115,7 +1120,7 @@ public class ChangeLogReport
* @param entries a collection of SCM changes
* @return number of files changed for the changedsets
*/
- protected long countFilesChanged( Collection<ChangeSet> entries )
+ protected long countFilesChanged( Collection entries )
{
if ( entries == null )
{
@@ -1127,22 +1132,29 @@ public class ChangeLogReport
return 0;
}
- HashMap<String, List<ChangeFile>> fileList = new HashMap<String, List<ChangeFile>>();
+ HashMap fileList = new HashMap();
- for ( ChangeSet entry : entries )
+ for ( Iterator i = entries.iterator(); i.hasNext(); )
{
- for ( ChangeFile file : entry.getFiles() )
+ ChangeSet entry = (ChangeSet) i.next();
+
+ List files = entry.getFiles();
+
+ for ( Iterator fileIterator = files.iterator(); fileIterator.hasNext(); )
{
+ ChangeFile file = (ChangeFile) fileIterator.next();
+
String name = file.getName();
- List<ChangeFile> list = fileList.get( name );
- if ( list != null )
+ if ( fileList.containsKey( name ) )
{
+ LinkedList list = (LinkedList) fileList.get( name );
+
list.add( file );
}
else
{
- list = new LinkedList<ChangeFile>();
+ LinkedList list = new LinkedList();
list.add( file );
@@ -1161,7 +1173,7 @@ public class ChangeLogReport
* @param bundle the resource bundle to retrieve report phrases from
* @param sink the report formatting tool
*/
- private void doChangedSetTable( Collection<ChangeSet> entries, ResourceBundle bundle, Sink sink )
+ private void doChangedSetTable( Collection entries, ResourceBundle bundle, Sink sink )
{
sink.table();
@@ -1179,17 +1191,21 @@ public class ChangeLogReport
initReportUrls();
- List<ChangeSet> sortedEntries = new ArrayList<ChangeSet>( entries );
- Collections.sort( sortedEntries, new Comparator<ChangeSet>()
+ List sortedEntries = new ArrayList( entries );
+ Collections.sort( sortedEntries, new Comparator()
{
- public int compare( ChangeSet changeSet0, ChangeSet changeSet1 )
+ public int compare( Object arg0, Object arg1 )
{
+ ChangeSet changeSet0 = (ChangeSet) arg0;
+ ChangeSet changeSet1 = (ChangeSet) arg1;
return changeSet1.getDate().compareTo( changeSet0.getDate() );
}
} );
- for ( ChangeSet entry : sortedEntries )
+ for ( Iterator i = sortedEntries.iterator(); i.hasNext(); )
{
+ ChangeSet entry = (ChangeSet) i.next();
+
doChangedSetDetail( entry, bundle, sink );
}
@@ -1402,10 +1418,11 @@ public class ChangeLogReport
* @param files list of files to generate the reports from
* @param sink the report formatting tool
*/
- private void doChangedFiles( List<ChangeFile> files, Sink sink )
+ private void doChangedFiles( List files, Sink sink )
{
- for ( ChangeFile file : files )
+ for ( Iterator i = files.iterator(); i.hasNext(); )
{
+ ChangeFile file = (ChangeFile) i.next();
sinkLogFile( sink, file.getName(), file.getRevision() );
}
}
Modified: maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java?rev=1391606&r1=1391605&r2=1391606&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java (original)
+++ maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java Fri Sep 28 19:13:55 2012
@@ -27,10 +27,10 @@ import org.apache.maven.scm.command.chan
import java.util.Collection;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
-import java.util.Map;
import java.util.ResourceBundle;
/**
@@ -45,9 +45,9 @@ public class DeveloperActivityReport
/**
* Used to hold data while creating the report
*/
- private Map<String, List<ChangeSet>> commits;
+ private HashMap commits;
- private Map<String, Map<String, ChangeFile>> files;
+ private HashMap files;
/** {@inheritDoc} */
public String getDescription( Locale locale )
@@ -95,7 +95,7 @@ public class DeveloperActivityReport
}
/** {@inheritDoc} */
- protected void doGenerateReport( List<ChangeLogSet> changeLogSets, ResourceBundle bundle, Sink sink )
+ protected void doGenerateReport( List changeLogSets, ResourceBundle bundle, Sink sink )
{
sink.head();
sink.title();
@@ -117,8 +117,9 @@ public class DeveloperActivityReport
}
else
{
- for ( ChangeLogSet set : changeLogSets )
+ for ( Iterator sets = changeLogSets.iterator(); sets.hasNext(); )
{
+ ChangeLogSet set = (ChangeLogSet) sets.next();
doChangedSets( set, bundle, sink );
}
}
@@ -175,12 +176,12 @@ public class DeveloperActivityReport
{
initDeveloperDetails( set );
- for( Map.Entry<String, List<ChangeSet>> commit : commits.entrySet() )
+ for( Iterator i = commits.keySet().iterator(); i.hasNext(); )
{
- String author = commit.getKey();
+ String author = (String) i.next();
- List<ChangeSet> devCommits = commit.getValue();
- Map<String, ChangeFile> devFiles = files.get( author );
+ LinkedList devCommits = (LinkedList) commits.get( author );
+ HashMap devFiles = (HashMap) files.get( author );
sink.tableRow();
sink.tableCell();
@@ -190,11 +191,11 @@ public class DeveloperActivityReport
sink.tableCell_();
sink.tableCell();
- sink.text( String.valueOf( devCommits.size() ) );
+ sink.text( "" + devCommits.size() );
sink.tableCell_();
sink.tableCell();
- sink.text( String.valueOf( devFiles.size() ) );
+ sink.text( "" + devFiles.size() );
sink.tableCell_();
sink.tableRow_();
@@ -208,9 +209,9 @@ public class DeveloperActivityReport
*/
private void initDeveloperDetails( ChangeLogSet set )
{
- commits = new HashMap<String, List<ChangeSet>>();
+ commits = new HashMap();
- files = new HashMap<String, Map<String, ChangeFile>>();
+ files = new HashMap();
countDevCommits( set.getChangeSets() );
@@ -222,21 +223,28 @@ public class DeveloperActivityReport
*
* @param entries the change log entries used to search and count developer commits
*/
- private void countDevCommits( Collection<ChangeSet> entries )
+ private void countDevCommits( Collection entries )
{
- for ( ChangeSet entry : entries )
+ for ( Iterator i = entries.iterator(); i.hasNext(); )
{
+ ChangeSet entry = (ChangeSet) i.next();
+
String developer = entry.getAuthor();
- List<ChangeSet> list = commits.get( developer );
+ LinkedList list;
- if ( list == null )
+ if ( commits.containsKey( developer ) )
+ {
+ list = (LinkedList) commits.get( developer );
+ }
+ else
{
- list = new LinkedList<ChangeSet>();
- commits.put( developer, list );
+ list = new LinkedList();
}
list.add( entry );
+
+ commits.put( developer, list );
}
}
@@ -245,27 +253,33 @@ public class DeveloperActivityReport
*
* @param entries the change log entries used to search and count file changes
*/
- private void countDevFiles( Collection<ChangeSet> entries )
+ private void countDevFiles( Collection entries )
{
- for ( ChangeSet entry : entries )
+ for ( Iterator i2 = entries.iterator(); i2.hasNext(); )
{
- String developer = entry.getAuthor();
+ ChangeSet entry = (ChangeSet) i2.next();
- Map<String, ChangeFile> filesMap;
+ String developer = entry.getAuthor();
- filesMap = files.get( developer );
+ HashMap filesMap;
- if ( files == null )
+ if ( files.containsKey( developer ) )
+ {
+ filesMap = (HashMap) files.get( developer );
+ }
+ else
{
- filesMap = new HashMap<String, ChangeFile>();
- files.put( developer, filesMap );
+ filesMap = new HashMap();
}
- for ( ChangeFile file : entry.getFiles() )
+ for ( Iterator i3 = entry.getFiles().iterator(); i3.hasNext(); )
{
+ ChangeFile file = (ChangeFile) i3.next();
+
filesMap.put( file.getName(), file );
}
+ files.put( developer, filesMap );
}
}
}
Modified: maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityComparator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityComparator.java?rev=1391606&r1=1391605&r2=1391606&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityComparator.java (original)
+++ maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityComparator.java Fri Sep 28 19:13:55 2012
@@ -23,23 +23,31 @@ import org.apache.commons.lang.StringUti
import org.apache.maven.scm.ChangeFile;
import java.util.Comparator;
+import java.util.Iterator;
import java.util.List;
+
/**
* Object used to sort the file-activity report into descending order.
*
* @version $Id$
*/
public class FileActivityComparator
- implements Comparator<List<ChangeFile>>
+ implements Comparator
{
/**
* {@inheritDoc}
*/
- public int compare( List<ChangeFile> list1, List<ChangeFile> list2 )
+ public int compare( Object o1, Object o2 )
throws ClassCastException
{
- int returnValue = sortByCommits( list1, list2 );
+ int returnValue;
+
+ List list1 = (List) o1;
+
+ List list2 = (List) o2;
+
+ returnValue = sortByCommits( list1, list2 );
if ( returnValue != 0 )
{
@@ -53,7 +61,9 @@ public class FileActivityComparator
return returnValue;
}
- return sortByName( list1, list2 );
+ returnValue = sortByName( list1, list2 );
+
+ return returnValue;
}
/**
@@ -63,7 +73,7 @@ public class FileActivityComparator
* @param list2 the object to compare list1 against
* @return an integer describing the order comparison of list1 and list2
*/
- private int sortByCommits( List<ChangeFile> list1, List<ChangeFile> list2 )
+ private int sortByCommits( List list1, List list2 )
{
if ( list1.size() > list2.size() )
{
@@ -85,7 +95,7 @@ public class FileActivityComparator
* @param list2 the object to compare list1 against
* @return an integer describing the order comparison of list1 and list2
*/
- private int sortByRevision( List<ChangeFile> list1, List<ChangeFile> list2 )
+ private int sortByRevision( List list1, List list2 )
{
String revision1 = getLatestRevision( list1 );
@@ -110,12 +120,14 @@ public class FileActivityComparator
* @param list The list of revisions from the file
* @return the latest revision code
*/
- private String getLatestRevision( List<ChangeFile> list )
+ private String getLatestRevision( List list )
{
String latest = "";
- for ( ChangeFile file : list )
+ for ( Iterator i = list.iterator(); i.hasNext(); )
{
+ ChangeFile file = (ChangeFile) i.next();
+
if ( StringUtils.isNotBlank( latest) )
{
latest = file.getRevision();
@@ -137,11 +149,11 @@ public class FileActivityComparator
* @param list2 the object to compare list1 against
* @return an integer describing the order comparison of list1 and list2
*/
- private int sortByName( List<ChangeFile> list1, List<ChangeFile> list2 )
+ private int sortByName( List list1, List list2 )
{
- ChangeFile file1 = list1.get( 0 );
+ ChangeFile file1 = (ChangeFile) list1.get( 0 );
- ChangeFile file2 = list2.get( 0 );
+ ChangeFile file2 = (ChangeFile) list2.get( 0 );
return file1.getName().compareTo( file2.getName() );
}
Modified: maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java?rev=1391606&r1=1391605&r2=1391606&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java (original)
+++ maven/plugins/trunk/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java Fri Sep 28 19:13:55 2012
@@ -28,6 +28,7 @@ import org.apache.maven.scm.command.chan
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
@@ -89,7 +90,7 @@ public class FileActivityReport
}
/** {@inheritDoc} */
- protected void doGenerateReport( List<ChangeLogSet> changeLogSets, ResourceBundle bundle, Sink sink )
+ protected void doGenerateReport( List changeLogSets, ResourceBundle bundle, Sink sink )
{
sink.head();
sink.title();
@@ -103,8 +104,9 @@ public class FileActivityReport
sink.text( bundle.getString( "report.file-activity.mainTitle" ) );
sink.sectionTitle1_();
- for ( ChangeLogSet set : changeLogSets )
+ for ( Iterator sets = changeLogSets.iterator(); sets.hasNext(); )
{
+ ChangeLogSet set = (ChangeLogSet) sets.next();
doChangedSets( set, bundle, sink );
}
@@ -156,13 +158,14 @@ public class FileActivityReport
*/
private void doRows( ChangeLogSet set, Sink sink )
{
- List<List<ChangeFile>> list = getOrderedFileList( set.getChangeSets() );
+ List list = getOrderedFileList( set.getChangeSets() );
initReportUrls();
- for ( List<ChangeFile> revision : list )
+ for ( Iterator i = list.iterator(); i.hasNext(); )
{
- ChangeFile file = revision.get( 0 );
+ List revision = (List) i.next();
+ ChangeFile file = (ChangeFile) revision.get( 0 );
sink.tableRow();
sink.tableCell();
@@ -201,25 +204,34 @@ public class FileActivityReport
* @param entries the changelog entries to generate the report
* @return list of changed files within the SCM with the number of times changed in descending order
*/
- private List<List<ChangeFile>> getOrderedFileList( Collection<ChangeSet> entries )
+ private List getOrderedFileList( Collection entries )
{
- List<List<ChangeFile>> list = new LinkedList<List<ChangeFile>>();
+ List list = new LinkedList();
- Map<String, List<ChangeFile>> map = new HashMap<String, List<ChangeFile>>();
+ Map map = new HashMap();
- for ( ChangeSet entry : entries )
+ for ( Iterator i = entries.iterator(); i.hasNext(); )
{
- for ( ChangeFile file : entry.getFiles() )
+ ChangeSet entry = (ChangeSet) i.next();
+
+ for ( Iterator j = entry.getFiles().iterator(); j.hasNext(); )
{
- List<ChangeFile> revisions = map.get( file.getName() );
+ ChangeFile file = (ChangeFile) j.next();
+
+ List revisions;
- if ( revisions == null )
+ if ( map.containsKey( file.getName() ) )
+ {
+ revisions = (List) map.get( file.getName() );
+ }
+ else
{
- revisions = new LinkedList<ChangeFile>();
- map.put( file.getName(), revisions );
+ revisions = new LinkedList();
}
revisions.add( file );
+
+ map.put( file.getName(), revisions );
}
}
Modified: maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/ChangeLogTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/ChangeLogTest.java?rev=1391606&r1=1391605&r2=1391606&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/ChangeLogTest.java (original)
+++ maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/ChangeLogTest.java Fri Sep 28 19:13:55 2012
@@ -40,17 +40,17 @@ public class ChangeLogTest
public void testReadFile()
throws Exception
{
- List<ChangeLogSet> changedLogs = readChangeLogXml( "min-changelog.xml" );
+ List changedLogs = readChangeLogXml( "min-changelog.xml" );
assertNotNull( "Test changedSets were parsed", changedLogs );
assertEquals( "Test number of changelog entries", 2, changedLogs.size() );
- ChangeLogSet changelogSets = changedLogs.get( 0 );
+ ChangeLogSet changelogSets = (ChangeLogSet) changedLogs.get( 0 );
assertEquals( "Test number of revisions on changelog 1", 2, changelogSets.getChangeSets().size() );
- ChangeSet changeSet = changelogSets.getChangeSets().get( 0 );
+ ChangeSet changeSet = (ChangeSet) changelogSets.getChangeSets().get( 0 );
Calendar cal = Calendar.getInstance(); // new cal with default TZ
@@ -68,14 +68,14 @@ public class ChangeLogTest
assertEquals( "Test changelog 1 set 1 files", 1, changeSet.getFiles().size() );
- ChangeFile changeFile = changeSet.getFiles().get( 0 );
+ ChangeFile changeFile = (ChangeFile) changeSet.getFiles().get( 0 );
assertEquals( "Test changelog 1 set 1 file 1 filename", "/path/to/file.extension", changeFile.getName() );
assertEquals( "Test changelog 1 set 1 file 1 revision", "1", changeFile.getRevision() );
- changeSet = changelogSets.getChangeSets().get( 1 );
+ changeSet = (ChangeSet) changelogSets.getChangeSets().get( 1 );
cal.set( 2005, 1, 24, 21, 30, 0 );
@@ -87,13 +87,13 @@ public class ChangeLogTest
assertEquals( "Test changelog 1 set 2 files", 2, changeSet.getFiles().size() );
- changeFile = changeSet.getFiles().get( 0 );
+ changeFile = (ChangeFile) changeSet.getFiles().get( 0 );
assertEquals( "Test changelog 1 set 2 file 1 filename", "/path/to/file.extension", changeFile.getName() );
assertEquals( "Test changelog 1 set 2 file 1 revision", "2", changeFile.getRevision() );
- changeFile = changeSet.getFiles().get( 1 );
+ changeFile = (ChangeFile) changeSet.getFiles().get( 1 );
assertEquals( "Test changelog 1 set 2 file 2 filename", "/path/to/file2.extension", changeFile.getName() );
@@ -101,11 +101,11 @@ public class ChangeLogTest
- changelogSets = changedLogs.get( 1 );
+ changelogSets = (ChangeLogSet) changedLogs.get( 1 );
assertEquals( "Test number of revisions on changelog 2", 2, changelogSets.getChangeSets().size() );
- changeSet = changelogSets.getChangeSets().get( 0 );
+ changeSet = (ChangeSet) changelogSets.getChangeSets().get( 0 );
cal.set( 2005, 1, 25, 22, 45, 0 );
@@ -117,14 +117,14 @@ public class ChangeLogTest
assertEquals( "Test changelog 2 set 1 files", 1, changeSet.getFiles().size() );
- changeFile = changeSet.getFiles().get( 0 );
+ changeFile = (ChangeFile) changeSet.getFiles().get( 0 );
assertEquals( "Test changelog 2 set 1 file 1 filename", "/path/to/file.extension", changeFile.getName() );
assertEquals( "Test changelog 2 set 1 file 1 revision", "3", changeFile.getRevision() );
- changeSet = changelogSets.getChangeSets().get( 1 );
+ changeSet = (ChangeSet) changelogSets.getChangeSets().get( 1 );
cal.set( 2100, 1, 25, 5, 30, 0 );
@@ -136,20 +136,20 @@ public class ChangeLogTest
assertEquals( "Test changelog 2 set 2 files", 2, changeSet.getFiles().size() );
- changeFile = changeSet.getFiles().get( 0 );
+ changeFile = (ChangeFile) changeSet.getFiles().get( 0 );
assertEquals( "Test changelog 2 set 2 file 1 filename", "/path/to/file.extension", changeFile.getName() );
assertEquals( "Test changelog 2 set 2 file 1 revision", "4", changeFile.getRevision() );
- changeFile = changeSet.getFiles().get( 1 );
+ changeFile = (ChangeFile) changeSet.getFiles().get( 1 );
assertEquals( "Test changelog 2 set 2 file 2 filename", "/path/to/file2.extension", changeFile.getName() );
assertEquals( "Test changelog 2 set 2 file 2 revision", "4", changeFile.getRevision() );
}
- private List<ChangeLogSet> readChangeLogXml( String filename )
+ private List readChangeLogXml( String filename )
throws Exception
{
File inputFile = new File( getBasedir(), "src/test/changelog-xml/" + filename );
Modified: maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/FileActivityComparatorTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/FileActivityComparatorTest.java?rev=1391606&r1=1391605&r2=1391606&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/FileActivityComparatorTest.java (original)
+++ maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/FileActivityComparatorTest.java Fri Sep 28 19:13:55 2012
@@ -43,17 +43,17 @@ public class FileActivityComparatorTest
public void testCompareByNumberOfCommits()
{
- List<ChangeFile> list1 = new ArrayList<ChangeFile>();
+ List list1 = new ArrayList();
list1.add( new ChangeFile( "anything" ) );
- List<ChangeFile> list2 = new ArrayList<ChangeFile>();
+ List list2 = new ArrayList();
assertTrue( "Test compare by commits, less than", comparator.compare( list1, list2 ) < 0 );
- list1 = new ArrayList<ChangeFile>();
+ list1 = new ArrayList();
list1.add( new ChangeFile( "anything" ) );
- list2 = new ArrayList<ChangeFile>();
+ list2 = new ArrayList();
list2.add( new ChangeFile( "one thing" ) );
list2.add( new ChangeFile( "something") );
@@ -62,21 +62,21 @@ public class FileActivityComparatorTest
public void testCompareByRevision()
{
- List<ChangeFile> list1 = new ArrayList<ChangeFile>();
+ List list1 = new ArrayList();
list1.add( new ChangeFile( "changefile-1", "123" ) );
list1.add( new ChangeFile( "changefile-1", "234" ) );
- List<ChangeFile> list2 = new ArrayList<ChangeFile>();
+ List list2 = new ArrayList();
list2.add( new ChangeFile( "changefile-2", "246" ) );
list2.add( new ChangeFile( "changefile-2", "468" ) );
assertTrue( "Test compare by revision, less than", comparator.compare( list1, list2 ) < 0 );
- list1 = new ArrayList<ChangeFile>();
+ list1 = new ArrayList();
list1.add( new ChangeFile( "changefile-1", "246" ) );
list1.add( new ChangeFile( "changefile-1", "468" ) );
- list2 = new ArrayList<ChangeFile>();
+ list2 = new ArrayList();
list2.add( new ChangeFile( "changefile-2", "123" ) );
list2.add( new ChangeFile( "changefile-2", "234" ) );
@@ -85,21 +85,21 @@ public class FileActivityComparatorTest
public void testCompareByName()
{
- List<ChangeFile> list1 = new ArrayList<ChangeFile>();
+ List list1 = new ArrayList();
list1.add( new ChangeFile( "changefile-1", "123" ) );
list1.add( new ChangeFile( "changefile-1", "468" ) );
- List<ChangeFile> list2 = new ArrayList<ChangeFile>();
+ List list2 = new ArrayList();
list2.add( new ChangeFile( "changefile-2", "246" ) );
list2.add( new ChangeFile( "changefile-2", "468" ) );
assertTrue( "Test compare by name, less than", comparator.compare( list1, list2 ) < 0 );
- list1 = new ArrayList<ChangeFile>();
+ list1 = new ArrayList();
list1.add( new ChangeFile( "changefile-1", "246" ) );
list1.add( new ChangeFile( "changefile-1", "468" ) );
- list2 = new ArrayList<ChangeFile>();
+ list2 = new ArrayList();
list2.add( new ChangeFile( "changefile-2", "123" ) );
list2.add( new ChangeFile( "changefile-2", "234" ) );
Modified: maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/stubs/ChangeLogScmResultStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/stubs/ChangeLogScmResultStub.java?rev=1391606&r1=1391605&r2=1391606&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/stubs/ChangeLogScmResultStub.java (original)
+++ maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/stubs/ChangeLogScmResultStub.java Fri Sep 28 19:13:55 2012
@@ -19,7 +19,6 @@ package org.apache.maven.plugin.changelo
* under the License.
*/
-import org.apache.maven.scm.ChangeSet;
import org.apache.maven.scm.command.changelog.ChangeLogSet;
import java.util.Collections;
@@ -45,6 +44,6 @@ public class ChangeLogScmResultStub
/** {@inheritDoc} */
public ChangeLogSet getChangeLog()
{
- return new ChangeLogSet( Collections.<ChangeSet> emptyList(), new Date( 360 ), new Date( 720 ) );
+ return new ChangeLogSet( Collections.EMPTY_LIST, new Date( 360 ), new Date( 720 ) );
}
}
Modified: maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/stubs/DevelopersStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/stubs/DevelopersStub.java?rev=1391606&r1=1391605&r2=1391606&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/stubs/DevelopersStub.java (original)
+++ maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/stubs/DevelopersStub.java Fri Sep 28 19:13:55 2012
@@ -29,13 +29,13 @@ import java.util.List;
* @version $Id$
*/
public class DevelopersStub
- extends ArrayList<Developer>
+ extends ArrayList
{
public DevelopersStub()
{
super();
- List<Developer> developers = new ArrayList<Developer>();
+ List developers = new ArrayList();
Developer developer = new Developer();
developer.setName( "Edwin Punzalan" );
Modified: maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmManagerStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmManagerStub.java?rev=1391606&r1=1391605&r2=1391606&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmManagerStub.java (original)
+++ maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmManagerStub.java Fri Sep 28 19:13:55 2012
@@ -90,7 +90,7 @@ public class ScmManagerStub
}
/** {@inheritDoc} */
- public List<String> validateScmRepository( String string )
+ public List validateScmRepository( String string )
{
return null;
}
Modified: maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmProviderStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmProviderStub.java?rev=1391606&r1=1391605&r2=1391606&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmProviderStub.java (original)
+++ maven/plugins/trunk/maven-changelog-plugin/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmProviderStub.java Fri Sep 28 19:13:55 2012
@@ -461,7 +461,7 @@ public class ScmProviderStub
}
/** {@inheritDoc} */
- public List<String> validateScmUrl( String string, char c )
+ public List validateScmUrl( String string, char c )
{
return null;
}