o removed unused imports

o used Java 5 generics

Author: hboutemy

plexus-container-default/src/main/java/org/codehaus/plexus/component/manager/StaticComponentManager.java

@@ -3,7 +3,6 @@
 import org.codehaus.plexus.lifecycle.LifecycleHandler;
 import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
 import org.codehaus.plexus.component.repository.ComponentDescriptor;
-import org.codehaus.plexus.component.factory.ComponentInstantiationException;
 import org.codehaus.plexus.MutablePlexusContainer;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.PhaseExecutionException;
 import org.codehaus.plexus.classworlds.realm.ClassRealm;

plexus-container-default/src/main/java/org/codehaus/plexus/configuration/source/ChainedConfigurationSource.java

@@ -11,25 +11,23 @@
  * author and want to create a custom source of configuration for the components in your application then you would most
  * likely want to create a chained configuration source where you can decide the order of processing, but still have the
  * container perform its default behavior.
- * 
+ *
  * @author Jason van Zyl
  */
 public class ChainedConfigurationSource
     implements ConfigurationSource
 {
-    private List configurationSources;
+    private List<ConfigurationSource> configurationSources;
 
-    public ChainedConfigurationSource( List configurationSources )
+    public ChainedConfigurationSource( List<ConfigurationSource> configurationSources )
     {
         this.configurationSources = configurationSources;
     }
 
     public PlexusConfiguration getConfiguration( ComponentDescriptor componentDescriptor )
     {
-        for ( Iterator i = configurationSources.iterator(); i.hasNext(); )
+        for ( ConfigurationSource configurationSource : configurationSources )
         {
-            ConfigurationSource configurationSource = (ConfigurationSource) i.next();
-
             PlexusConfiguration configuration = configurationSource.getConfiguration( componentDescriptor );
 
             if ( configuration != null )
@@ -41,7 +39,7 @@ public PlexusConfiguration getConfiguration( ComponentDescriptor componentDescri
         return null;
     }
 
-    public List getConfigurationSources()
+    public List<ConfigurationSource> getConfigurationSources()
     {
         return configurationSources;
     }

plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/AbstractLifecycleHandler.java

@@ -28,9 +28,9 @@
 public abstract class AbstractLifecycleHandler
     implements LifecycleHandler
 {
-    private List beginSegment;
+    private List<Phase> beginSegment;
 
-    private List endSegment;
+    private List<Phase> endSegment;
 
     // ----------------------------------------------------------------------
     // Begin Segment
@@ -40,13 +40,13 @@ public void addBeginSegment( Phase phase )
     {
         if ( beginSegment == null )
         {
-            beginSegment = new ArrayList();
+            beginSegment = new ArrayList<Phase>();
         }
 
         beginSegment.add( phase );
     }
 
-    public List getBeginSegment()
+    public List<Phase> getBeginSegment()
     {
         return beginSegment;
     }
@@ -55,13 +55,13 @@ public void addEndSegment( Phase phase )
     {
         if ( endSegment == null )
         {
-            endSegment = new ArrayList();
+            endSegment = new ArrayList<Phase>();
         }
 
         endSegment.add( phase );
     }
 
-    public List getEndSegment()
+    public List<Phase> getEndSegment()
     {
         return endSegment;
     }
@@ -90,10 +90,8 @@ public void start( Object component, ComponentManager manager, ClassRealm realm
             return;
         }
 
-        for ( Iterator i = getBeginSegment().iterator(); i.hasNext(); )
+        for ( Phase phase : getBeginSegment() )
         {
-            Phase phase = (Phase) i.next();
-
             phase.execute( component, manager, realm );
         }
     }
@@ -119,15 +117,13 @@ public void end( Object component, ComponentManager manager, ClassRealm contextR
             return;
         }
 
-        for ( Iterator i = getEndSegment().iterator(); i.hasNext(); )
+        for ( Phase phase : getEndSegment() )
         {
-            Phase phase = (Phase) i.next();
-
             phase.execute( component, manager, contextRealm );
         }
     }
 
-    private boolean segmentIsEmpty( List segment )
+    private boolean segmentIsEmpty( List<Phase> segment )
     {
         if ( segment == null || segment.size() == 0 )
         {

plexus-container-default/src/main/java/org/codehaus/plexus/lifecycle/phase/AbstractPhase.java

@@ -16,10 +16,6 @@
  * limitations under the License.
  */
 
-import org.codehaus.plexus.classworlds.realm.ClassRealm;
-import org.codehaus.plexus.component.manager.ComponentManager;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.PhaseExecutionException;
-
 public abstract class AbstractPhase implements Phase
 {
 }

plexus-container-default/src/main/java/org/codehaus/plexus/logging/BaseLoggerManager.java

@@ -19,7 +19,6 @@
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
 
@@ -33,7 +32,7 @@ public abstract class BaseLoggerManager
         extends AbstractLoggerManager implements Initializable
 {
     /** */
-    private Map loggerCache = new HashMap();
+    private Map<String, Logger> loggerCache = new HashMap<String, Logger>();
 
     private String threshold = "info";
 
@@ -100,9 +99,8 @@ public void setThresholds( int currentThreshold )
     {
         this.currentThreshold = currentThreshold;
 
-        for ( Iterator logs = loggerCache.values().iterator(); logs.hasNext(); )
+        for ( Logger logger : loggerCache.values() )
         {
-            Logger logger = (Logger) logs.next();
             logger.setThreshold( currentThreshold );
         }
     }

plexus-container-default/src/main/java/org/codehaus/plexus/logging/console/ConsoleLoggerManager.java

@@ -38,7 +38,7 @@
  *   </logger>
  * </logging>
  * </pre>
- * 
+ *
  * @author Jason van Zyl
  * @author <a href="mailto:[email protected]">Trygve Laugst&oslash;l</a>
  * @version $Id$
@@ -48,16 +48,16 @@ public class ConsoleLoggerManager
     implements LoggerManager, Initializable
 {
     /**
-     * Message of this level or higher will be logged. 
-     * 
+     * Message of this level or higher will be logged.
+     *
      * This field is set by the plexus container thus the name is 'threshold'. The field
      * currentThreshold contains the current setting of the threshold.
      */
     private String threshold = "info";
 
     private int currentThreshold;
 
-    private Map loggers;
+    private Map<String, Logger> loggers;
 
     /** The number of active loggers in use. */
     private int loggerCount;
@@ -93,7 +93,7 @@ public void initialize()
             currentThreshold = Logger.LEVEL_DEBUG;
         }
 
-        loggers = new HashMap();
+        loggers = new HashMap<String, Logger>();
     }
 
     public void setThreshold( int currentThreshold )
@@ -105,9 +105,8 @@ public void setThresholds( int currentThreshold )
     {
         this.currentThreshold = currentThreshold;
 
-        for ( Iterator logs = loggers.values().iterator(); logs.hasNext(); )
+        for ( Logger logger : loggers.values() )
         {
-            Logger logger = (Logger) logs.next();
             logger.setThreshold( currentThreshold );
         }
     }
@@ -159,14 +158,13 @@ public Logger createLogger(int threshold, String name)
 
     public Logger getLoggerForComponent( String role, String roleHint )
     {
-        Logger logger;
-        String name;
-
-        name = toMapKey( role, roleHint );
-        logger = (Logger)loggers.get( name );
+        String name = toMapKey( role, roleHint );
+        Logger logger = (Logger)loggers.get( name );
 
         if ( logger != null )
+        {
             return logger;
+        }
 
         debug( "Creating logger '" + name + "' " + this.hashCode() + "." );
         logger = createLogger( getThreshold(), name );