Author: hboutemy
Date: Sat Jul 16 22:10:33 2011
New Revision: 1147495
URL: http://svn.apache.org/viewvc?rev=1147495&view=rev
Log:
avoid generics warnings
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/Format.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/NamespaceStack.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/XMLOutputter.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawler.java
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypePrompter.java
maven/archetype/trunk/maven-archetype-plugin/src/test/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelectorTest.java
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java?rev=1147495&r1=1147494&r2=1147495&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeFilesResolver.java
Sat Jul 16 22:10:33 2011
@@ -309,6 +309,7 @@ public class DefaultArchetypeFilesResolv
excludes += "," + defaultExclude + "/**";
}
+ @SuppressWarnings( "unchecked" )
List<File> absoluteFiles = FileUtils.getFiles( basedir,
StringUtils.join( languagesPathesArray, "," ), excludes );
getLogger().debug( "Found " + absoluteFiles.size() + " potential
archetype files" );
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java?rev=1147495&r1=1147494&r2=1147495&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
Sat Jul 16 22:10:33 2011
@@ -108,7 +108,8 @@ public class DefaultPomManager
project.addText( "\n" );
}
// TODO: change to while loop
- for ( Iterator<Element> i = modules.elementIterator( "module" );
i.hasNext() && !found; )
+ for ( @SuppressWarnings( "unchecked" )
+ Iterator<Element> i = modules.elementIterator( "module" );
i.hasNext() && !found; )
{
Element module = i.next();
if ( module.getText().equals( artifactId ) )
@@ -119,7 +120,8 @@ public class DefaultPomManager
if ( !found )
{
Node lastTextNode = null;
- for ( Iterator<Node> i = modules.nodeIterator(); i.hasNext(); )
+ for ( @SuppressWarnings( "unchecked" )
+ Iterator<Node> i = modules.nodeIterator(); i.hasNext(); )
{
Node node = i.next();
if ( node.getNodeType() == Node.ELEMENT_NODE )
@@ -376,9 +378,11 @@ public class DefaultPomManager
private void mergeProfiles( Model model, Model generatedModel )
{
+ @SuppressWarnings( "unchecked" )
List<Profile> generatedProfiles = generatedModel.getProfiles();
if ( generatedProfiles != null && generatedProfiles.size() > 0 )
{
+ @SuppressWarnings( "unchecked" )
List<Profile> modelProfiles = model.getProfiles();
Map<String,Profile> modelProfileIdMap = new
HashMap<String,Profile>();
if ( modelProfiles == null )
@@ -429,7 +433,9 @@ public class DefaultPomManager
{
// ModelBase can be a Model or a Profile...
+ @SuppressWarnings( "unchecked" )
Map<String, Dependency> dependenciesByIds = createDependencyMap(
model.getDependencies() );
+ @SuppressWarnings( "unchecked" )
Map<String, Dependency> generatedDependenciesByIds =
createDependencyMap( generatedModel.getDependencies() );
for ( String generatedDependencyId :
generatedDependenciesByIds.keySet() )
@@ -459,7 +465,9 @@ public class DefaultPomManager
model.setReporting( new Reporting() );
}
+ @SuppressWarnings( "unchecked" )
Map<String, ReportPlugin> reportPluginsByIds =
model.getReporting().getReportPluginsAsMap();
+ @SuppressWarnings( "unchecked" )
Map<String, ReportPlugin> generatedReportPluginsByIds =
generatedModel.getReporting().getReportPluginsAsMap();
@@ -479,7 +487,9 @@ public class DefaultPomManager
private void mergeBuildPlugins( BuildBase modelBuild, BuildBase
generatedModelBuild )
{
+ @SuppressWarnings( "unchecked" )
Map<String, Plugin> pluginsByIds = modelBuild.getPluginsAsMap();
+ @SuppressWarnings( "unchecked" )
List<Plugin> generatedPlugins = generatedModelBuild.getPlugins();
for ( Plugin generatedPlugin : generatedPlugins )
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/Format.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/Format.java?rev=1147495&r1=1147494&r2=1147495&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/Format.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/Format.java
Sat Jul 16 22:10:33 2011
@@ -489,12 +489,12 @@ public class Format
//encoder = Charset.forName(encoding).newEncoder();
try
{
- Class charsetClass = Class.forName(
"java.nio.charset.Charset" );
- Class encoderClass = Class.forName(
"java.nio.charset.CharsetEncoder" );
+ Class<?> charsetClass = Class.forName(
"java.nio.charset.Charset" );
+ Class<?> encoderClass = Class.forName(
"java.nio.charset.CharsetEncoder" );
Method forName = charsetClass.getMethod( "forName", new
Class[] { String.class } );
Object charsetObj = forName.invoke( null, new Object[] {
encoding } );
- Method newEncoder = charsetClass.getMethod( "newEncoder",
null );
- encoder = newEncoder.invoke( charsetObj, null );
+ Method newEncoder = charsetClass.getMethod( "newEncoder" );
+ encoder = newEncoder.invoke( charsetObj );
canEncode = encoderClass.getMethod( "canEncode", new
Class[] { char.class } );
}
catch ( Exception ignored )
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/NamespaceStack.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/NamespaceStack.java?rev=1147495&r1=1147494&r2=1147495&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/NamespaceStack.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/NamespaceStack.java
Sat Jul 16 22:10:33 2011
@@ -69,6 +69,7 @@ import java.util.Stack;
class NamespaceStack
{
+ @SuppressWarnings( "unused" )
private static final String CVS_ID =
"@(#) $RCSfile: NamespaceStack.java,v $ $Revision: 1.13 $ $Date:
2004/02/06 09:28:32 $ $Name: jdom_1_0 $";
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/XMLOutputter.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/XMLOutputter.java?rev=1147495&r1=1147494&r2=1147495&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/XMLOutputter.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/util/XMLOutputter.java
Sat Jul 16 22:10:33 2011
@@ -129,6 +129,7 @@ public class XMLOutputter
implements Cloneable
{
+ @SuppressWarnings( "unused" )
private static final String CVS_ID =
"@(#) $RCSfile: XMLOutputter.java,v $ $Revision: 1.112 $ $Date:
2004/09/01 06:08:18 $ $Name: jdom_1_0 $";
@@ -280,7 +281,7 @@ public class XMLOutputter
* @param list <code>List</code> of nodes.
* @param out <code>OutputStream</code> to use.
*/
- public void output( List list, OutputStream out )
+ public void output( List<?> list, OutputStream out )
throws IOException
{
Writer writer = makeWriter( out );
@@ -404,7 +405,7 @@ public class XMLOutputter
// Print out root element, as well as any root level
// comments and processing instructions,
// starting with no indentation
- List content = doc.getContent();
+ List<?> content = doc.getContent();
int size = content.size();
for ( int i = 0; i < size; i++ )
{
@@ -489,7 +490,7 @@ public class XMLOutputter
public void outputElementContent( Element element, Writer out )
throws IOException
{
- List content = element.getContent();
+ List<?> content = element.getContent();
printContentRange( out, content, 0, content.size(),
0, createNamespaceStack() );
out.flush();
@@ -504,7 +505,7 @@ public class XMLOutputter
* @param list <code>List</code> of nodes.
* @param out <code>Writer</code> to use.
*/
- public void output( List list, Writer out )
+ public void output( List<?> list, Writer out )
throws IOException
{
printContentRange( out, list, 0, list.size(), 0,
createNamespaceStack() );
@@ -652,7 +653,7 @@ public class XMLOutputter
*
* @param list <code>List</code> to format.
*/
- public String outputString( List list )
+ public String outputString( List<?> list )
{
StringWriter out = new StringWriter();
try
@@ -986,8 +987,8 @@ public class XMLOutputter
throws IOException
{
- List attributes = element.getAttributes();
- List content = element.getContent();
+ List<?> attributes = element.getAttributes();
+ List<?> content = element.getContent();
// Check for xml:space and adjust format settings
String space = null;
@@ -1098,7 +1099,7 @@ public class XMLOutputter
* @param level <code>int</code> level of indentation.
* @param namespaces <code>List</code> stack of Namespaces in scope.
*/
- private void printContentRange( Writer out, List content, int start, int
end, int level, NamespaceStack namespaces )
+ private void printContentRange( Writer out, List<?> content, int start,
int end, int level, NamespaceStack namespaces )
throws IOException
{
boolean firstNode; // Flag for 1st node in content
@@ -1176,7 +1177,7 @@ public class XMLOutputter
* @param end index of last content node (exclusive).
* @param out <code>Writer</code> to use.
*/
- private void printTextRange( Writer out, List content, int start, int end )
+ private void printTextRange( Writer out, List<?> content, int start, int
end )
throws IOException
{
String previous; // Previous text printed
@@ -1294,7 +1295,7 @@ public class XMLOutputter
* @param attributes <code>List</code> of Attribute objcts
* @param out <code>Writer</code> to use
*/
- protected void printAttributes( Writer out, List attributes, Element
parent, NamespaceStack namespaces )
+ protected void printAttributes( Writer out, List<?> attributes, Element
parent, NamespaceStack namespaces )
throws IOException
{
@@ -1343,7 +1344,7 @@ public class XMLOutputter
private void printAdditionalNamespaces( Writer out, Element element,
NamespaceStack namespaces )
throws IOException
{
- List list = element.getAdditionalNamespaces();
+ List<?> list = element.getAdditionalNamespaces();
if ( list != null )
{
for ( int i = 0; i < list.size(); i++ )
@@ -1397,7 +1398,7 @@ public class XMLOutputter
// index = content.size() is returned if content contains
// all whitespace.
// @param start index to begin search (inclusive)
- private int skipLeadingWhite( List content, int start )
+ private int skipLeadingWhite( List<?> content, int start )
{
if ( start < 0 )
{
@@ -1426,7 +1427,7 @@ public class XMLOutputter
// Text node, index < 0 is returned
// if content contains all whitespace.
// @param start index to begin search (exclusive)
- private int skipTrailingWhite( List content, int start )
+ private int skipTrailingWhite( List<?> content, int start )
{
int size = content.size();
if ( start > size )
@@ -1455,7 +1456,7 @@ public class XMLOutputter
// index = content.size() is returned if there is no more non-CDATA,
// non-Text, or non-EntiryRef nodes
// @param start index to begin search (inclusive)
- private static int nextNonText( List content, int start )
+ private static int nextNonText( List<?> content, int start )
{
if ( start < 0 )
{
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java?rev=1147495&r1=1147494&r2=1147495&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/generator/DefaultFilesetArchetypeGenerator.java
Sat Jul 16 22:10:33 2011
@@ -428,7 +428,7 @@ public class DefaultFilesetArchetypeGene
context.put( Constants.PACKAGE, request.getPackage() );
context.put( Constants.PACKAGE_IN_PATH_FORMAT, getPackageInPathFormat(
request.getPackage() ) );
- for ( Iterator iterator = request.getProperties().keySet().iterator();
iterator.hasNext(); )
+ for ( Iterator<?> iterator =
request.getProperties().keySet().iterator(); iterator.hasNext(); )
{
String key = (String) iterator.next();
@@ -604,6 +604,7 @@ public class DefaultFilesetArchetypeGene
pomManager.addParent( pom, basedirPom );
}
+ @SuppressWarnings( "deprecation" )
private void processTemplate( File outFile, Context context, String
templateFileName, String encoding,
boolean failIfExists )
throws OutputFileExists, ArchetypeGenerationFailure
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java?rev=1147495&r1=1147494&r2=1147495&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/old/DefaultOldArchetype.java
Sat Jul 16 22:10:33 2011
@@ -432,7 +432,7 @@ public class DefaultOldArchetype
project.addText( "\n" );
}
boolean found = false;
- for ( Iterator i = modules.elementIterator( "module" ); i.hasNext() &&
!found; )
+ for ( Iterator<?> i = modules.elementIterator( "module" ); i.hasNext()
&& !found; )
{
Element module = (Element) i.next();
if ( module.getText().equals( artifactId ) )
@@ -443,7 +443,7 @@ public class DefaultOldArchetype
if ( !found )
{
Node lastTextNode = null;
- for ( Iterator i = modules.nodeIterator(); i.hasNext(); )
+ for ( Iterator<?> i = modules.nodeIterator(); i.hasNext(); )
{
Node node = (Node) i.next();
if ( node.getNodeType() == Node.ELEMENT_NODE )
@@ -596,7 +596,7 @@ public class DefaultOldArchetype
overrideResourceDir = true;
- Iterator resourceItr = build.getResources().iterator();
+ Iterator<?> resourceItr = build.getResources().iterator();
while ( resourceItr.hasNext() )
{
@@ -630,7 +630,7 @@ public class DefaultOldArchetype
overrideTestResourceDir = true;
- Iterator testResourceItr = build.getTestResources().iterator();
+ Iterator<?> testResourceItr = build.getTestResources().iterator();
while ( testResourceItr.hasNext() )
{
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawler.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawler.java?rev=1147495&r1=1147494&r2=1147495&view=diff
==============================================================================
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawler.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawler.java
Sat Jul 16 22:10:33 2011
@@ -62,11 +62,12 @@ public class DefaultRepositoryCrawler
}
ArchetypeCatalog catalog = new ArchetypeCatalog();
- Iterator jars = FileUtils.listFiles( repository, new String[] { "jar"
}, true ).iterator();
+ @SuppressWarnings( "unchecked" )
+ Iterator<File> jars = FileUtils.listFiles( repository, new String[] {
"jar" }, true ).iterator();
while ( jars.hasNext() )
{
- File jar = (File) jars.next();
+ File jar = jars.next();
getLogger().info( "Scanning " + jar );
if ( archetypeArtifactManager.isFileSetArchetype( jar ) ||
archetypeArtifactManager.isOldArchetype( jar ) )
{
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java?rev=1147495&r1=1147494&r2=1147495&view=diff
==============================================================================
---
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
(original)
+++
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/IntegrationTestMojo.java
Sat Jul 16 22:10:33 2011
@@ -96,6 +96,7 @@ public class IntegrationTestMojo
try
{
+ @SuppressWarnings( "unchecked" )
List<File> projectsGoalFiles = FileUtils.getFiles(
projectsDirectory, "*/goal.txt", "" );
File archetypeFile = project.getArtifact().getFile();
@@ -131,7 +132,9 @@ public class IntegrationTestMojo
private void assertTest( File reference, File basedir )
throws IntegrationTestFailure, IOException
{
+ @SuppressWarnings( "unchecked" )
List<String> referenceFiles = FileUtils.getFileNames( reference, "**",
null, false );
+ @SuppressWarnings( "unchecked" )
List<String> projectFiles = FileUtils.getFileNames( basedir, "**",
null, false );
boolean fileNamesEquals = CollectionUtils.isEqualCollection(
referenceFiles, projectFiles );
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypePrompter.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypePrompter.java?rev=1147495&r1=1147494&r2=1147495&view=diff
==============================================================================
---
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypePrompter.java
(original)
+++
maven/archetype/trunk/maven-archetype-plugin/src/main/java/org/apache/maven/archetype/ui/ArchetypePrompter.java
Sat Jul 16 22:10:33 2011
@@ -69,6 +69,7 @@ public class ArchetypePrompter
return line;
}
+ @SuppressWarnings( { "rawtypes", "unchecked" })
public String prompt( String message, List possibleValues, String
defaultReply )
throws PrompterException
{
@@ -104,6 +105,7 @@ public class ArchetypePrompter
return line;
}
+ @SuppressWarnings( "rawtypes" )
public String prompt( String message, List possibleValues )
throws PrompterException
{
Modified:
maven/archetype/trunk/maven-archetype-plugin/src/test/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelectorTest.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/maven-archetype-plugin/src/test/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelectorTest.java?rev=1147495&r1=1147494&r2=1147495&view=diff
==============================================================================
---
maven/archetype/trunk/maven-archetype-plugin/src/test/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelectorTest.java
(original)
+++
maven/archetype/trunk/maven-archetype-plugin/src/test/java/org/apache/maven/archetype/ui/generation/DefaultArchetypeSelectorTest.java
Sat Jul 16 22:10:33 2011
@@ -34,6 +34,7 @@ import org.easymock.MockControl;
import java.io.IOException;
import java.util.Collections;
+import java.util.List;
import java.util.Map;
public class DefaultArchetypeSelectorTest
@@ -110,7 +111,7 @@ public class DefaultArchetypeSelectorTes
MockControl control = MockControl.createControl(
ArchetypeSelectionQueryer.class );
ArchetypeSelectionQueryer queryer = (ArchetypeSelectionQueryer)
control.getMock();
- queryer.selectArchetype( Collections.EMPTY_MAP, new
ArchetypeDefinition() );
+ queryer.selectArchetype( Collections.<String, List<Archetype>>
emptyMap(), new ArchetypeDefinition() );
control.setMatcher( MockControl.ALWAYS_MATCHER );
Archetype archetype = new Archetype();
archetype.setArtifactId( "set-artifactId" );
@@ -164,7 +165,7 @@ public class DefaultArchetypeSelectorTes
MockControl control = MockControl.createControl(
ArchetypeSelectionQueryer.class );
ArchetypeSelectionQueryer queryer = (ArchetypeSelectionQueryer)
control.getMock();
- queryer.selectArchetype( Collections.EMPTY_MAP,
createDefaultArchetypeDefinition() );
+ queryer.selectArchetype( Collections.<String, List<Archetype>>
emptyMap(), createDefaultArchetypeDefinition() );
control.setMatcher( createArgumentMatcher() );
Archetype archetype = new Archetype();
archetype.setArtifactId( "set-artifactId" );
