jvanzyl 2002/11/12 19:46:19
Modified: src/java/org/apache/maven/app PluginManager.java
Log:
o Chaning iterator idiom.
Revision Changes Path
1.50 +28 -58
jakarta-turbine-maven/src/java/org/apache/maven/app/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/PluginManager.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- PluginManager.java 12 Nov 2002 04:04:36 -0000 1.49
+++ PluginManager.java 13 Nov 2002 03:46:19 -0000 1.50
@@ -356,17 +356,13 @@
*/
void invalidateCache(String pluginName)
{
- Set goals = this.goalsCache.keySet();
- Iterator goalIter = goals.iterator();
- String eachGoal = null;
-
- while ( goalIter.hasNext() )
+ for (Iterator i = goalsCache.keySet().iterator(); i.hasNext();)
{
- eachGoal = (String) goalIter.next();
+ String eachGoal = (String) i.next();
if ( this.pluginsCache.getProperty( eachGoal ).equals( pluginName ) )
{
- goalIter.remove();
+ i.remove();
this.pluginsCache.remove( eachGoal );
this.callbacksCache.remove( eachGoal + ".pre" );
this.callbacksCache.remove( eachGoal + ".post" );
@@ -421,19 +417,16 @@
Set origTagLibs = new HashSet( getJellyContext().getTagLibraryUris() );
- Iterator goalIter = originalGoals.iterator();
- Goal eachGoal = null;
-
- while ( goalIter.hasNext() )
+ for (Iterator i = originalGoals.iterator(); i.hasNext();)
{
- eachGoal = (Goal) goalIter.next();
+ Goal eachGoal = (Goal) i.next();
origPreCallbacks.addAll( eachGoal.getPreGoalCallbacks() );
origPostCallbacks.addAll( eachGoal.getPostGoalCallbacks() );
if ( eachGoal.getAction() == null );
{
- goalIter.remove();
+ i.remove();
}
}
@@ -450,11 +443,9 @@
currentGoals.removeAll( originalGoals );
- goalIter = currentGoals.iterator();
-
- while ( goalIter.hasNext() )
+ for (Iterator i = currentGoals.iterator(); i.hasNext();)
{
- eachGoal = (Goal) goalIter.next();
+ Goal eachGoal = (Goal) i.next();
if ( isGoalCached( eachGoal.getName() ) )
{
@@ -471,23 +462,17 @@
continue;
}
- this.pluginsCache.setProperty( eachGoal.getName(),
- name );
-
- Collection prereqs = eachGoal.getPrecursors();
- Iterator prereqIter = prereqs.iterator();
- Goal eachPrereq = null;
+ this.pluginsCache.setProperty( eachGoal.getName(), name );
StringBuffer prereqSpec = new StringBuffer();
-
- while ( prereqIter.hasNext() )
+ for (Iterator j = eachGoal.getPrecursors().iterator(); j.hasNext();)
{
- eachPrereq = (Goal) prereqIter.next();
+ Goal eachPrereq = (Goal) j.next();
prereqSpec.append( eachPrereq.getName() );
- if ( prereqIter.hasNext() )
+ if ( j.hasNext() )
{
prereqSpec.append( " " );
}
@@ -507,11 +492,9 @@
}
}
- goalIter = werkzProject.getGoals().iterator();
-
- while ( goalIter.hasNext() )
+ for (Iterator i = werkzProject.getGoals().iterator(); i.hasNext();)
{
- eachGoal = (Goal) goalIter.next();
+ Goal eachGoal = (Goal) i.next();
if ( ! origPreCallbacks.containsAll( eachGoal.getPreGoalCallbacks() ) )
{
@@ -549,19 +532,16 @@
curTagLibs.removeAll( origTagLibs );
- Iterator tagLibIter = curTagLibs.iterator();
- String eachUri = null;
-
- while ( tagLibIter.hasNext() )
+ for (Iterator i = curTagLibs.iterator(); i.hasNext();)
{
- eachUri = (String) tagLibIter.next();
+ String eachUri = (String) i.next();
if ( eachUri.startsWith( "jelly:" ) )
{
continue;
}
- this.taglibsCache.setProperty( eachUri,
- name );
+
+ this.taglibsCache.setProperty( eachUri, name );
}
}
@@ -581,16 +561,13 @@
Set originalGoals = new HashSet( werkzProject.getGoals() );
- Iterator goalIter = originalGoals.iterator();
- Goal eachGoal = null;
-
- while ( goalIter.hasNext() )
+ for (Iterator i = originalGoals.iterator(); i.hasNext();)
{
- eachGoal = (Goal) goalIter.next();
+ Goal eachGoal = (Goal) i.next();
if ( eachGoal.getAction() == null );
{
- goalIter.remove();
+ i.remove();
}
}
@@ -608,11 +585,9 @@
currentGoals.removeAll( originalGoals );
- goalIter = currentGoals.iterator();
-
- while ( goalIter.hasNext() )
+ for (Iterator i = currentGoals.iterator(); i.hasNext();)
{
- eachGoal = (Goal) goalIter.next();
+ Goal eachGoal = (Goal) i.next();
if ( isGoalCached( eachGoal.getName() ) )
{
@@ -629,20 +604,15 @@
continue;
}
- Collection prereqs = eachGoal.getPrecursors();
- Iterator prereqIter = prereqs.iterator();
- Goal eachPrereq = null;
-
StringBuffer prereqSpec = new StringBuffer();
-
- while ( prereqIter.hasNext() )
+ for (Iterator j = eachGoal.getPrecursors().iterator(); j.hasNext();)
{
- eachPrereq = (Goal) prereqIter.next();
+ Goal eachPrereq = (Goal) j.next();
prereqSpec.append( eachPrereq.getName() );
- if ( prereqIter.hasNext() )
+ if ( j.hasNext() )
{
prereqSpec.append( " " );
}
@@ -1212,7 +1182,7 @@
}
/**
- * Sets the xMLOutput attribute of the PluginManager object
+ * Sets the XMLOutput attribute of the PluginManager object
*/
public void setXMLOutput(XMLOutput output)
{
--
To unsubscribe, e-mail: <mailto:turbine-maven-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:turbine-maven-dev-help@;jakarta.apache.org>
