svn commit: r813309 - in /maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain: DefaultToolchain.java DefaultToolchainManager.java

[hboutemy]

Author: hboutemy
Date: Thu Sep 10 08:43:32 2009
New Revision: 813309

URL: http://svn.apache.org/viewvc?rev=813309&view=rev
Log:
o Generified code (partial merge from maven-3 r788990)

Modified:
    
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
    
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java

Modified: 
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
URL: 
http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java?rev=813309&r1=813308&r2=813309&view=diff
==============================================================================
--- 
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
 (original)
+++ 
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
 Thu Sep 10 08:43:32 2009
@@ -35,18 +35,18 @@
 
     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
-    
+
     private ToolchainModel model;
-    
+
     private Logger logger;
 
-    protected DefaultToolchain( ToolchainModel model, Logger logger ) 
+    protected DefaultToolchain( ToolchainModel model, Logger logger )
     {
         this.model = model;
-        
+
         this.logger = logger;
     }
 
@@ -61,8 +61,8 @@
         return type != null ? type : model.getType();
     }
 
-    
-    public final ToolchainModel getModel( ) 
+
+    public final ToolchainModel getModel( )
     {
         return model;
     }
@@ -79,9 +79,9 @@
         while ( it.hasNext() )
         {
             String key = (String) it.next();
-            
-            RequirementMatcher matcher = (RequirementMatcher) 
provides.get(key);
-            
+
+            RequirementMatcher matcher = provides.get(key);
+
             if ( matcher == null )
             {
                 getLog().debug( "Toolchain "  + this + " is missing required 
property: "  + key );
@@ -95,7 +95,7 @@
         }
         return true;
     }
-    
+
     protected Logger getLog() {
         return logger;
     }

Modified: 
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
URL: 
http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java?rev=813309&r1=813308&r2=813309&view=diff
==============================================================================
--- 
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
 (original)
+++ 
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
 Thu Sep 10 08:43:32 2009
@@ -185,7 +185,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 
() );
     }