Author: hboutemy
Date: Mon Apr 14 20:39:58 2014
New Revision: 1587311
URL: http://svn.apache.org/r1587311
Log:
use Java 5 constructs
Modified:
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReport.java
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReportUtil.java
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrTestReport.java
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/FileManager.java
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/JavaFile.java
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/PackageManager.java
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/PackageType.java
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/util/SimpleWordTokenizer.java
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/util/StringEntry.java
Modified:
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java?rev=1587311&r1=1587310&r2=1587311&view=diff
==============================================================================
---
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
(original)
+++
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
Mon Apr 14 20:39:58 2014
@@ -25,7 +25,6 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
@@ -120,7 +119,7 @@ public abstract class AbstractJxrReport
* @since 2.1
*/
@Parameter
- private ArrayList excludes;
+ private ArrayList<String> excludes;
/**
* A list of include patterns to use. By default all .java files are
included.
@@ -128,13 +127,13 @@ public abstract class AbstractJxrReport
* @since 2.1
*/
@Parameter
- private ArrayList includes;
+ private ArrayList<String> includes;
/**
* The projects in the reactor for aggregation report.
*/
@Parameter( defaultValue = "${reactorProjects}", readonly = true )
- protected List reactorProjects;
+ protected List<MavenProject> reactorProjects;
/**
* Whether to build an aggregated report at the root, or build individual
reports.
@@ -176,12 +175,11 @@ public abstract class AbstractJxrReport
* @param sourceDirs the List of the source directories
* @return a List of the directories that will be included in the JXR
report generation
*/
- protected List pruneSourceDirs( List sourceDirs )
+ protected List<String> pruneSourceDirs( List<String> sourceDirs )
{
- List pruned = new ArrayList( sourceDirs.size() );
- for ( Iterator i = sourceDirs.iterator(); i.hasNext(); )
+ List<String> pruned = new ArrayList<String>( sourceDirs.size() );
+ for ( String dir : sourceDirs )
{
- String dir = (String) i.next();
if ( !pruned.contains( dir ) && hasSources( new File( dir ) ) )
{
pruned.add( dir );
@@ -197,12 +195,11 @@ public abstract class AbstractJxrReport
{
// wanna know if Javadoc is being generated
// TODO: what if it is not part of the site though, and just on the
command line?
- Collection plugin = project.getReportPlugins();
+ Collection<ReportPlugin> plugin = project.getReportPlugins();
if ( plugin != null )
{
- for ( Iterator iter = plugin.iterator(); iter.hasNext(); )
+ for ( ReportPlugin reportPlugin : plugin )
{
- ReportPlugin reportPlugin = (ReportPlugin) iter.next();
if ( "maven-javadoc-plugin".equals(
reportPlugin.getArtifactId() ) )
{
break;
@@ -221,10 +218,8 @@ public abstract class AbstractJxrReport
{
if ( dir.exists() && dir.isDirectory() )
{
- File[] files = dir.listFiles();
- for ( int i = 0; i < files.length; i++ )
+ for ( File currentFile : dir.listFiles() )
{
- File currentFile = files[i];
if ( currentFile.isFile() )
{
if ( currentFile.getName().endsWith( ".java" ) )
@@ -256,7 +251,7 @@ public abstract class AbstractJxrReport
* @throws org.apache.maven.jxr.JxrException
*
*/
- private void createXref( Locale locale, String destinationDirectory, List
sourceDirs )
+ private void createXref( Locale locale, String destinationDirectory,
List<String> sourceDirs )
throws IOException, JxrException
{
JXR jxr = new JXR();
@@ -276,11 +271,11 @@ public abstract class AbstractJxrReport
// Set include/exclude patterns on the jxr instance
if ( excludes != null && !excludes.isEmpty() )
{
- jxr.setExcludes( (String[]) excludes.toArray( new String[0] ) );
+ jxr.setExcludes( excludes.toArray( new String[0] ) );
}
if ( includes != null && !includes.isEmpty() )
{
- jxr.setIncludes( (String[]) includes.toArray( new String[0] ) );
+ jxr.setIncludes( includes.toArray( new String[0] ) );
}
// avoid winding up using Velocity in two class loaders.
@@ -425,7 +420,7 @@ public abstract class AbstractJxrReport
* @param sourceDirs
* @return true if the report could be generated
*/
- protected boolean canGenerateReport( List sourceDirs )
+ protected boolean canGenerateReport( List<String> sourceDirs )
{
boolean canGenerate = !sourceDirs.isEmpty();
@@ -473,7 +468,7 @@ public abstract class AbstractJxrReport
getLog().info( "Skipping JXR." );
return;
}
- List sourceDirs = constructSourceDirs();
+ List<String> sourceDirs = constructSourceDirs();
if ( canGenerateReport( sourceDirs ) )
{
// init some attributes -- TODO (javadoc)
@@ -499,15 +494,13 @@ public abstract class AbstractJxrReport
*
* @return a List of the source directories whose contents will be
included in the JXR report generation
*/
- protected List constructSourceDirs()
+ protected List<String> constructSourceDirs()
{
- List sourceDirs = new ArrayList( getSourceRoots() );
+ List<String> sourceDirs = new ArrayList<String>( getSourceRoots() );
if ( isAggregate() )
{
- for ( Iterator i = reactorProjects.iterator(); i.hasNext(); )
+ for ( MavenProject project : reactorProjects )
{
- MavenProject project = (MavenProject) i.next();
-
if ( "java".equals(
project.getArtifact().getArtifactHandler().getLanguage() ) )
{
sourceDirs.addAll( getSourceRoots( project ) );
@@ -621,7 +614,7 @@ public abstract class AbstractJxrReport
*
* @return a List of the source directories
*/
- protected abstract List getSourceRoots();
+ protected abstract List<String> getSourceRoots();
/**
* Abstract method that returns the compile source directories of the
specified project that will be included in the
@@ -630,7 +623,7 @@ public abstract class AbstractJxrReport
* @param project the MavenProject where the JXR report plugin will be
executed
* @return a List of the source directories
*/
- protected abstract List getSourceRoots( MavenProject project );
+ protected abstract List<String> getSourceRoots( MavenProject project );
/**
* Abstract method that returns the directory of the javadoc files.
Modified:
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReport.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReport.java?rev=1587311&r1=1587310&r2=1587311&view=diff
==============================================================================
---
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReport.java
(original)
+++
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReport.java
Mon Apr 14 20:39:58 2014
@@ -44,7 +44,7 @@ public class JxrReport
* Source directories of the project.
*/
@Parameter( defaultValue = "${project.compileSourceRoots}", required =
true, readonly = true )
- private List sourceDirs;
+ private List<String> sourceDirs;
/**
* Specifies the source path where the java files are located.
@@ -76,7 +76,7 @@ public class JxrReport
/**
* @see org.apache.maven.plugin.jxr.AbstractJxrReport#getSourceRoots()
*/
- protected List getSourceRoots()
+ protected List<String> getSourceRoots()
{
if ( sourcePath != null )
{
@@ -87,7 +87,7 @@ public class JxrReport
}
}
- List l = new ArrayList();
+ List<String> l = new ArrayList<String>();
if ( !"pom".equals( getProject().getPackaging().toLowerCase() ) )
{
@@ -108,9 +108,9 @@ public class JxrReport
/**
* @see
org.apache.maven.plugin.jxr.AbstractJxrReport#getSourceRoots(org.apache.maven.project.MavenProject)
*/
- protected List getSourceRoots( MavenProject project )
+ protected List<String> getSourceRoots( MavenProject project )
{
- List l = new ArrayList();
+ List<String> l = new ArrayList<String>();
if ( !"pom".equals( project.getPackaging().toLowerCase() ) )
{
Modified:
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReportUtil.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReportUtil.java?rev=1587311&r1=1587310&r2=1587311&view=diff
==============================================================================
---
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReportUtil.java
(original)
+++
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrReportUtil.java
Mon Apr 14 20:39:58 2014
@@ -74,26 +74,18 @@ public class JxrReportUtil
{
return true;
}
- List plugins = getMavenJavadocPlugins ( project );
- Iterator pi = plugins.iterator();
- while ( pi.hasNext() )
+ for ( Object pluginObject : getMavenJavadocPlugins ( project ) )
{
- Object pluginObject = pi.next();
-
if ( pluginObject instanceof Plugin )
{
- Plugin plugin = (Plugin)pluginObject;
- List executions = plugin.getExecutions();
- Iterator ei = executions.iterator();
- while ( ei.hasNext() )
- {
- PluginExecution pe = (PluginExecution) ei.next();
- List goals = pe.getGoals();
- Iterator gi = goals.iterator();
- while ( gi.hasNext() )
+ Plugin plugin = (Plugin) pluginObject;
+ List<PluginExecution> executions = plugin.getExecutions();
+ for ( PluginExecution pe : executions )
+ {
+ List<String> goals = pe.getGoals();
+ for ( String goal : goals )
{
- String goal = (String) gi.next();
- if ( "aggregate".equals(goal) )
+ if ( "aggregate".equals( goal ) )
{
return true;
}
@@ -117,21 +109,19 @@ public class JxrReportUtil
String
defaultValue )
throws IOException
{
- List plugins = new ArrayList();
- for ( Iterator it =
project.getModel().getReporting().getPlugins().iterator(); it.hasNext(); )
+ List<Object> plugins = new ArrayList<Object>();
+ for ( Iterator<?> it =
project.getModel().getReporting().getPlugins().iterator(); it.hasNext(); )
{
plugins.add( it.next() );
}
- for ( Iterator it =
project.getModel().getBuild().getPlugins().iterator(); it.hasNext(); )
+ for ( Iterator<?> it =
project.getModel().getBuild().getPlugins().iterator(); it.hasNext(); )
{
plugins.add( it.next() );
}
String pluginArtifactId = MAVEN_JAVADOC_PLUGIN_ARTIFACT_ID;
- for ( Iterator it = plugins.iterator(); it.hasNext(); )
+ for ( Object next : plugins )
{
- Object next = it.next();
-
Xpp3Dom pluginConf = null;
if ( next instanceof Plugin )
@@ -206,26 +196,24 @@ public class JxrReportUtil
* @param project not null
* @throws IOException if any
*/
- protected static List getMavenJavadocPlugins( MavenProject project )
+ protected static List<?> getMavenJavadocPlugins( MavenProject project )
throws IOException
{
- List plugins = new ArrayList();
- for ( Iterator it =
project.getModel().getReporting().getPlugins().iterator(); it.hasNext(); )
+ List<Object> plugins = new ArrayList<Object>();
+ for ( Iterator<?> it =
project.getModel().getReporting().getPlugins().iterator(); it.hasNext(); )
{
plugins.add( it.next() );
}
- for ( Iterator it =
project.getModel().getBuild().getPlugins().iterator(); it.hasNext(); )
+ for ( Iterator<?> it =
project.getModel().getBuild().getPlugins().iterator(); it.hasNext(); )
{
plugins.add( it.next() );
}
- List result = new ArrayList();
+ List<Object> result = new ArrayList<Object>();
String pluginArtifactId = MAVEN_JAVADOC_PLUGIN_ARTIFACT_ID;
- for ( Iterator it = plugins.iterator(); it.hasNext(); )
+ for ( Object next : plugins )
{
- Object next = it.next();
-
if ( next instanceof Plugin )
{
Plugin plugin = (Plugin) next;
Modified:
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrTestReport.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrTestReport.java?rev=1587311&r1=1587310&r2=1587311&view=diff
==============================================================================
---
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrTestReport.java
(original)
+++
maven/jxr/trunk/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/JxrTestReport.java
Mon Apr 14 20:39:58 2014
@@ -44,7 +44,7 @@ public class JxrTestReport
* Test directories of the project.
*/
@Parameter( defaultValue = "${project.testCompileSourceRoots}", required =
true, readonly = true )
- private List sourceDirs;
+ private List<String> sourceDirs;
/**
* Folder where the Xref files will be copied to.
@@ -61,9 +61,9 @@ public class JxrTestReport
/**
* @see org.apache.maven.plugin.jxr.AbstractJxrReport#getSourceRoots()
*/
- protected List getSourceRoots()
+ protected List<String> getSourceRoots()
{
- List l = new ArrayList();
+ List<String> l = new ArrayList<String>();
if ( !"pom".equals( getProject().getPackaging().toLowerCase() ) )
{
@@ -84,9 +84,9 @@ public class JxrTestReport
/**
* @see
org.apache.maven.plugin.jxr.AbstractJxrReport#getSourceRoots(org.apache.maven.project.MavenProject)
*/
- protected List getSourceRoots( MavenProject project )
+ protected List<String> getSourceRoots( MavenProject project )
{
- List l = new ArrayList();
+ List<String> l = new ArrayList<String>();
if ( project.getExecutionProject() != null )
{
Modified:
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java?rev=1587311&r1=1587310&r2=1587311&view=diff
==============================================================================
---
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java
(original)
+++
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/DirectoryIndexer.java
Mon Apr 14 20:39:58 2014
@@ -336,10 +336,10 @@ public class DirectoryIndexer
* allClasses collection of Maps with class info, format as above
*
*/
- private Map getPackageInfo()
+ private Map<String, Object> getPackageInfo()
{
- TreeMap allPackages = new TreeMap();
- TreeMap allClasses = new TreeMap();
+ TreeMap<String, Map<String, Object>> allPackages = new TreeMap<String,
Map<String, Object>>();
+ TreeMap<String, Map<String, String>> allClasses = new TreeMap<String,
Map<String, String>>();
Perl5Util perl = new Perl5Util();
Enumeration packages = packageManager.getPackageTypes();
@@ -359,14 +359,14 @@ public class DirectoryIndexer
rootRef = "./";
}
- TreeMap pkgClasses = new TreeMap();
+ TreeMap<String, Map<String, String>> pkgClasses = new
TreeMap<String, Map<String, String>>();
Enumeration classes = pkg.getClassTypes();
while ( classes.hasMoreElements() )
{
ClassType clazz = (ClassType) classes.nextElement();
String className = clazz.getName();
- Map classInfo = new HashMap();
+ Map<String, String> classInfo = new HashMap<String, String>();
if ( clazz.getFilename() != null )
{
classInfo.put( "filename", clazz.getFilename() );
@@ -382,7 +382,7 @@ public class DirectoryIndexer
allClasses.put( className, classInfo );
}
- Map pkgInfo = new HashMap();
+ Map<String, Object> pkgInfo = new HashMap<String, Object>();
pkgInfo.put( "name", pkgName );
pkgInfo.put( "dir", pkgDir );
pkgInfo.put( "classes", pkgClasses );
@@ -390,7 +390,7 @@ public class DirectoryIndexer
allPackages.put( pkgName, pkgInfo );
}
- Map info = new HashMap();
+ Map<String, Object> info = new HashMap<String, Object>();
info.put( "allPackages", allPackages );
info.put( "allClasses", allClasses );
Modified: maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java?rev=1587311&r1=1587310&r2=1587311&view=diff
==============================================================================
--- maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java
(original)
+++ maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java Mon
Apr 14 20:39:58 2014
@@ -27,7 +27,6 @@ import org.apache.maven.jxr.pacman.Packa
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
@@ -48,7 +47,7 @@ public class JXR
/**
* The default list of include patterns to use.
*/
- private static final String[] DEFAULT_INCLUDES = {"**/*.java"};
+ private static final String[] DEFAULT_INCLUDES = { "**/*.java" };
/**
* Path to destination.
@@ -244,7 +243,7 @@ public class JXR
* @throws IOException
* @throws JxrException
*/
- public void xref( List sourceDirs, String templateDir, String windowTitle,
String docTitle, String bottom )
+ public void xref( List<String> sourceDirs, String templateDir, String
windowTitle, String docTitle, String bottom )
throws IOException, JxrException
{
// first collect package and class info
@@ -256,9 +255,8 @@ public class JXR
pkgmgr.setIncludes( includes );
// go through each source directory and xref the java files
- for ( Iterator i = sourceDirs.iterator(); i.hasNext(); )
+ for ( String path : sourceDirs )
{
- String path = (String) i.next();
path = new File( path ).getCanonicalPath();
pkgmgr.process( path );
@@ -354,7 +352,7 @@ public class JXR
StringBuffer fromLink = new StringBuffer(); // down into toDir
// create a List of toDir's parent directories
- List parents = new LinkedList();
+ List<File> parents = new LinkedList<File>();
File f = new File( toDir );
f = f.getCanonicalFile();
while ( f != null )
@@ -377,14 +375,14 @@ public class JXR
{
for ( int i = 0; i < parents.size(); ++i )
{
- File parent = (File) parents.get( i );
+ File parent = parents.get( i );
if ( f.equals( parent ) )
{
// when we find the common parent, add the subdirectories
// down to toDir itself
for ( int j = 0; j < i; ++j )
{
- File p = (File) parents.get( j );
+ File p = parents.get( j );
toLink.insert( 0, p.getName() + "/" );
}
found = true;
Modified:
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java?rev=1587311&r1=1587310&r2=1587311&view=diff
==============================================================================
---
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
(original)
+++
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
Mon Apr 14 20:39:58 2014
@@ -163,7 +163,7 @@ public class JavaCodeTransform
/**
* HashTable containing java reserved words
*/
- private Hashtable reservedWords = new Hashtable();
+ private Hashtable<String, String> reservedWords = new Hashtable<String,
String>();
/**
* flag set to true when a multi-line comment is started
@@ -1196,7 +1196,7 @@ public class JavaCodeTransform
return line;
}
- Vector v = new Vector();
+ Vector<String> v = new Vector<String>();
//get the imported packages
ImportType[] imports = jf.getImportTypes();
Modified:
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/FileManager.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/FileManager.java?rev=1587311&r1=1587310&r2=1587311&view=diff
==============================================================================
---
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/FileManager.java
(original)
+++
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/FileManager.java
Mon Apr 14 20:39:58 2014
@@ -41,7 +41,7 @@ public class FileManager
*/
private static FileManager instance = new FileManager();
- private Hashtable files = new Hashtable();
+ private Hashtable<String, JavaFile> files = new Hashtable<String,
JavaFile>();
private String encoding = null;
@@ -61,7 +61,7 @@ public class FileManager
throws IOException
{
- JavaFile real = (JavaFile) this.files.get( name );
+ JavaFile real = this.files.get( name );
if ( real == null )
{
Modified:
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/JavaFile.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/JavaFile.java?rev=1587311&r1=1587310&r2=1587311&view=diff
==============================================================================
---
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/JavaFile.java
(original)
+++
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/JavaFile.java
Mon Apr 14 20:39:58 2014
@@ -32,9 +32,9 @@ import java.util.Vector;
public abstract class JavaFile
{
- private Vector imports = new Vector();
+ private Vector<ImportType> imports = new Vector<ImportType>();
- private ArrayList classTypes = new ArrayList();
+ private List<ClassType> classTypes = new ArrayList<ClassType>();
private PackageType packageType = new PackageType();
@@ -65,14 +65,14 @@ public abstract class JavaFile
else
{
// To retain backward compatibility, return the first class
- return (ClassType) this.classTypes.get( 0 );
+ return this.classTypes.get( 0 );
}
}
/**
* Get the names of the classes in this file.
*/
- public List getClassTypes()
+ public List<ClassType> getClassTypes()
{
return this.classTypes;
}
Modified:
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/PackageManager.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/PackageManager.java?rev=1587311&r1=1587310&r2=1587311&view=diff
==============================================================================
---
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/PackageManager.java
(original)
+++
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/PackageManager.java
Mon Apr 14 20:39:58 2014
@@ -26,8 +26,6 @@ import java.io.File;
import java.io.IOException;
import java.util.Enumeration;
import java.util.Hashtable;
-import java.util.Iterator;
-
/**
* Given a list of directories, parse them out and store them as rendered
@@ -37,12 +35,12 @@ public class PackageManager
{
private final Log log;
- private Hashtable directories = new Hashtable();
+ private Hashtable<String, String> directories = new Hashtable<String,
String>();
/**
* All the packages that have been parsed
*/
- private Hashtable packages = new Hashtable();
+ private Hashtable<String, PackageType> packages = new Hashtable<String,
PackageType>();
/**
* The default Java package.
@@ -59,7 +57,7 @@ public class PackageManager
/**
* The list of include patterns to use.
*/
- private String[] includes = {"**/*.java"};
+ private String[] includes = { "**/*.java" };
public PackageManager( Log log, FileManager fileManager )
{
@@ -80,7 +78,7 @@ public class PackageManager
return defaultPackage;
}
- return (PackageType) this.packages.get( name );
+ return this.packages.get( name );
}
/**
@@ -94,7 +92,7 @@ public class PackageManager
/**
* Get all of the packages in the PackageManager
*/
- public Enumeration getPackageTypes()
+ public Enumeration<PackageType> getPackageTypes()
{
return packages.elements();
}
@@ -113,16 +111,15 @@ public class PackageManager
directoryScanner.setExcludes( excludes );
directoryScanner.setIncludes( includes );
directoryScanner.scan();
- String[] files = directoryScanner.getIncludedFiles();
- for ( int j = 0; j < files.length; ++j )
+ for ( String file : directoryScanner.getIncludedFiles() )
{
- log.debug( "parsing... " + files[j] );
+ log.debug( "parsing... " + file );
//now parse out this file to get the packages/classname/etc
try
{
- String fileName = new File( baseDir, files[j]
).getAbsolutePath();
+ String fileName = new File( baseDir, file ).getAbsolutePath();
JavaFile jfi = fileManager.getFile( fileName );
// now that we have this parsed out blend its information
@@ -138,9 +135,9 @@ public class PackageManager
// Add the current file's class(es) to this global package.
if ( jfi.getClassTypes() != null &&
!jfi.getClassTypes().isEmpty() )
{
- for ( Iterator iterator = jfi.getClassTypes().iterator();
iterator.hasNext(); )
+ for ( ClassType ct : jfi.getClassTypes() )
{
- jp.addClassType( (ClassType) iterator.next() );
+ jp.addClassType( ct );
}
}
@@ -187,23 +184,23 @@ public class PackageManager
log.debug( "Dumping out PackageManager structure" );
- Enumeration pts = this.getPackageTypes();
+ Enumeration<PackageType> pts = this.getPackageTypes();
while ( pts.hasMoreElements() )
{
//get the current package and print it.
- PackageType current = (PackageType) pts.nextElement();
+ PackageType current = pts.nextElement();
log.debug( current.getName() );
//get the classes under the package and print those too.
- Enumeration classes = current.getClassTypes();
+ Enumeration<ClassType> classes = current.getClassTypes();
while ( classes.hasMoreElements() )
{
- ClassType currentClass = (ClassType) classes.nextElement();
+ ClassType currentClass = classes.nextElement();
log.debug( "\t" + currentClass.getName() );
Modified:
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/PackageType.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/PackageType.java?rev=1587311&r1=1587310&r2=1587311&view=diff
==============================================================================
---
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/PackageType.java
(original)
+++
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/pacman/PackageType.java
Mon Apr 14 20:39:58 2014
@@ -29,7 +29,7 @@ public class PackageType
extends BaseType
{
- private Hashtable classes = new Hashtable();
+ private Hashtable<String, ClassType> classes = new Hashtable<String,
ClassType>();
/**
* Create a Java package
@@ -52,7 +52,7 @@ public class PackageType
/**
* Get all the known classes
*/
- public Enumeration getClassTypes()
+ public Enumeration<ClassType> getClassTypes()
{
return classes.elements();
@@ -75,7 +75,7 @@ public class PackageType
public ClassType getClassType( String classType )
{
- return (ClassType) this.classes.get( classType );
+ return this.classes.get( classType );
}
}
Modified:
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/util/SimpleWordTokenizer.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/util/SimpleWordTokenizer.java?rev=1587311&r1=1587310&r2=1587311&view=diff
==============================================================================
---
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/util/SimpleWordTokenizer.java
(original)
+++
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/util/SimpleWordTokenizer.java
Mon Apr 14 20:39:58 2014
@@ -69,16 +69,14 @@ public class SimpleWordTokenizer
public static StringEntry[] tokenize( String line, String find )
{
- Vector v = new Vector();
+ Vector<StringEntry> v = new Vector<StringEntry>();
- StringEntry[] se = tokenize( line );
-
- for ( int i = 0; i < se.length; ++i )
+ for ( StringEntry se : tokenize( line ) )
{
- if ( se[i].toString().equals( find ) )
+ if ( se.toString().equals( find ) )
{
- v.addElement( se[i] );
+ v.addElement( se );
}
}
@@ -95,7 +93,7 @@ public class SimpleWordTokenizer
private static StringEntry[] tokenize( String line, int start )
{
- Vector words = new Vector();
+ Vector<StringEntry> words = new Vector<StringEntry>();
//algorithm works like this... break the line out into segments
//that are separated by spaces, and if the entire String doesn't
contain
Modified:
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/util/StringEntry.java
URL:
http://svn.apache.org/viewvc/maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/util/StringEntry.java?rev=1587311&r1=1587310&r2=1587311&view=diff
==============================================================================
---
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/util/StringEntry.java
(original)
+++
maven/jxr/trunk/maven-jxr/src/main/java/org/apache/maven/jxr/util/StringEntry.java
Mon Apr 14 20:39:58 2014
@@ -24,7 +24,7 @@ package org.apache.maven.jxr.util;
* this StringEntry was found in the source string
*/
public class StringEntry
- implements Comparable
+ implements Comparable<StringEntry>
{
private String value = null;
@@ -63,18 +63,10 @@ public class StringEntry
/**
* Compare two objects for equality.
*/
- public int compareTo( Object obj )
+ public int compareTo( StringEntry se )
{
//right now only sort by the index.
- if ( obj instanceof StringEntry == false )
- {
-
- throw new IllegalArgumentException( "object must be a StringEntry"
);
- }
-
- StringEntry se = (StringEntry) obj;
-
if ( se.getIndex() < this.getIndex() )
{
return -1;
