svn commit: r788990 - in /maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain: DefaultToolchain.java DefaultToolchainManagerPrivate.java java/DefaultJavaToolchainFactory.java

[be...@apache.org]

Author: bentmann
Date: Sat Jun 27 15:09:59 2009
New Revision: 788990

URL: http://svn.apache.org/viewvc?rev=788990&view=rev
Log:
o Used injection for logger
o Generified code

Modified:
    maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
    maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
    maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java

Modified: maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java?rev=788990&r1=788989&r2=788990&view=diff
==============================================================================
--- maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java (original)
+++ maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java Sat Jun 27 15:09:59 2009
@@ -36,7 +36,7 @@
 
     private String type;
 
-    private Map provides = new HashMap /*<String,RequirementMatcher>*/ (  );
+    private Map<String, RequirementMatcher> provides = new HashMap<String, RequirementMatcher>();
 
     public static final String KEY_TYPE = "type"; //NOI18N
     
@@ -81,7 +81,7 @@
         {
             String key = (String) it.next();
             
-            RequirementMatcher matcher = (RequirementMatcher) provides.get(key);
+            RequirementMatcher matcher = provides.get( key );
             
             if ( matcher == null )
             {
@@ -100,4 +100,4 @@
     protected Logger getLog() {
         return logger;
     }
-}
\ No newline at end of file
+}

Modified: maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java?rev=788990&r1=788989&r2=788990&view=diff
==============================================================================
--- maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java (original)
+++ maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java Sat Jun 27 15:09:59 2009
@@ -83,7 +83,7 @@
 
     public void storeToolchainToBuildContext( ToolchainPrivate toolchain, MavenSession session )
     {
-        Map context = retrieveContext( session );
+        Map<String, Object> context = retrieveContext( session );
         context.put( getStorageKey( toolchain.getType() ), toolchain.getModel() );
     }
 

Modified: maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java?rev=788990&r1=788989&r2=788990&view=diff
==============================================================================
--- maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java (original)
+++ maven/components/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java Sat Jun 27 15:09:59 2009
@@ -27,7 +27,7 @@
 import org.apache.maven.toolchain.ToolchainPrivate;
 import org.apache.maven.toolchain.model.ToolchainModel;
 import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.logging.LogEnabled;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -38,8 +38,10 @@
  */
 @Component( role = ToolchainFactory.class, hint = "jdk" )
 public class DefaultJavaToolchainFactory
-    implements ToolchainFactory, LogEnabled
+    implements ToolchainFactory
 {
+
+    @Requirement
     private Logger logger;
 
     public DefaultJavaToolchainFactory( )
@@ -106,10 +108,5 @@
     {
         return logger;
     }
-
-    public void enableLogging( Logger logger )
-    {
-        this.logger = logger;
-    }
     
 }
\ No newline at end of file