More java5 code and clean up lot of warnings found by Idea.

merge -r 769654:769655 from 1.3.x branch git-svn-id: https://svn.apache.org/repos/asf/continuum/trunk@769659 13f79535-47bb-0310-9956-ffa450edef68
apache · Apr 29, 2009 · 2d12b97 · 2d12b97
1 parent 5b5bddd
commit 2d12b97
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 26 deletions.
diff --git a/...nuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java b/...nuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java
@@ -289,7 +289,7 @@ public static String getInstallationVarName( Map<String, Object> context )
         return getString( context, KEY_INSTALLATION_VAR_NAME );
     }
 
-    public static List<Map> getScmChanges( Map<String, Object> context )
+    public static List<Map<String, Object>> getScmChanges( Map<String, Object> context )
     {
         return getList( context, KEY_SCM_CHANGES );
     }
@@ -318,7 +318,7 @@ public static long getChangeSetDate( Map<String, Object> context )
         }
     }
 
-    public static List<Map> getChangeSetFiles( Map<String, Object> context )
+    public static List<Map<String, Object>> getChangeSetFiles( Map<String, Object> context )
     {
         return getList( context, KEY_CHANGESET_FILES );
     }
@@ -379,12 +379,12 @@ public static String getScmTag( Map<String, Object> context )
         return getString( context, KEY_SCM_TAG );
     }
 
-    public static Map getProjectParent( Map<String, Object> context )
+    public static Map<String, Object> getProjectParent( Map<String, Object> context )
     {
         return getMap( context, KEY_PROJECT_PARENT );
     }
 
-    public static List<Map> getProjectDevelopers( Map<String, Object> context )
+    public static List<Map<String, Object>> getProjectDevelopers( Map<String, Object> context )
     {
         return getList( context, KEY_PROJECT_DEVELOPERS );
     }
@@ -404,12 +404,12 @@ public static String getDeveloperScmId( Map<String, Object> context )
         return getString( context, KEY_PROJECT_DEVELOPER_SCMID );
     }
 
-    public static List<Map> getProjectDependencies( Map<String, Object> context )
+    public static List<Map<String, Object>> getProjectDependencies( Map<String, Object> context )
     {
         return getList( context, KEY_PROJECT_DEPENDENCIES );
     }
 
-    public static List<Map> getProjectNotifiers( Map<String, Object> context )
+    public static List<Map<String, Object>> getProjectNotifiers( Map<String, Object> context )
     {
         return getList( context, KEY_PROJECT_NOTIFIERS );
     }
@@ -464,12 +464,12 @@ public static boolean isNotifierSendOnWarning( Map<String, Object> context )
         return getBoolean( context, KEY_NOTIFIER_SEND_ON_WARNING );
     }
 
-    public static Map getScmResult( Map<String, Object> context )
+    public static Map<String, Object> getScmResult( Map<String, Object> context )
     {
         return getMap( context, KEY_SCM_RESULT );
     }
 
-    public static Map getMavenProject( Map<String, Object> context )
+    public static Map<String, Object> getMavenProject( Map<String, Object> context )
     {
         return getMap( context, KEY_MAVEN_PROJECT );
     }

diff --git a/...java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java b/...java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java
@@ -569,7 +569,7 @@ public Map<String, Object> getBuildResult( int projectId )
         {
             SlaveBuildAgentTransportClient client = new SlaveBuildAgentTransportClient( new URL( buildAgentUrl ) );
 
-            Map result = client.getBuildResult( projectId );
+            Map<String, Object> result = client.getBuildResult( projectId );
 
             if ( result != null )
             {
@@ -1141,11 +1141,11 @@ private Map<String, String> getEnvironmentVariables( BuildDefinition buildDefini
     private List<ChangeSet> getScmChanges( Map<String, Object> context )
     {
         List<ChangeSet> changes = new ArrayList<ChangeSet>();
-        List<Map> scmChanges = ContinuumBuildConstant.getScmChanges( context );
+        List<Map<String, Object>> scmChanges = ContinuumBuildConstant.getScmChanges( context );
 
         if ( scmChanges != null )
         {
-            for ( Map map : scmChanges )
+            for ( Map<String, Object> map : scmChanges )
             {
                 ChangeSet changeSet = new ChangeSet();
                 changeSet.setAuthor( ContinuumBuildConstant.getChangeSetAuthor( map ) );
@@ -1161,11 +1161,11 @@ private List<ChangeSet> getScmChanges( Map<String, Object> context )
 
     private void setChangeFiles( ChangeSet changeSet, Map<String, Object> context )
     {
-        List<Map> changeFiles = ContinuumBuildConstant.getChangeSetFiles( context );
+        List<Map<String, Object>> changeFiles = ContinuumBuildConstant.getChangeSetFiles( context );
 
         if ( changeFiles != null )
         {
-            for ( Map map : changeFiles )
+            for ( Map<String, Object> map : changeFiles )
             {
                 ChangeFile changeFile = new ChangeFile();
                 changeFile.setName( ContinuumBuildConstant.getChangeFileName( map ) );
@@ -1179,7 +1179,7 @@ private void setChangeFiles( ChangeSet changeSet, Map<String, Object> context )
 
     private ProjectDependency getProjectParent( Map<String, Object> context )
     {
-        Map map = ContinuumBuildConstant.getProjectParent( context );
+        Map<String, Object> map = ContinuumBuildConstant.getProjectParent( context );
 
         if ( map != null && map.size() > 0 )
         {
@@ -1198,11 +1198,11 @@ private List<ProjectDependency> getProjectDependencies( Map<String, Object> cont
     {
         List<ProjectDependency> projectDependencies = new ArrayList<ProjectDependency>();
 
-        List<Map> dependencies = ContinuumBuildConstant.getProjectDependencies( context );
+        List<Map<String, Object>> dependencies = ContinuumBuildConstant.getProjectDependencies( context );
 
         if ( dependencies != null )
         {
-            for ( Map map : dependencies )
+            for ( Map<String, Object> map : dependencies )
             {
                 ProjectDependency dependency = new ProjectDependency();
                 dependency.setGroupId( ContinuumBuildConstant.getGroupId( map ) );
@@ -1219,11 +1219,11 @@ private List<ProjectDeveloper> getProjectDevelopers( Map<String, Object> context
     {
         List<ProjectDeveloper> projectDevelopers = new ArrayList<ProjectDeveloper>();
 
-        List<Map> developers = ContinuumBuildConstant.getProjectDevelopers( context );
+        List<Map<String, Object>> developers = ContinuumBuildConstant.getProjectDevelopers( context );
 
         if ( developers != null )
         {
-            for ( Map map : developers )
+            for ( Map<String, Object> map : developers )
             {
                 ProjectDeveloper developer = new ProjectDeveloper();
                 developer.setName( ContinuumBuildConstant.getDeveloperName( map ) );
@@ -1240,11 +1240,11 @@ private List<ProjectNotifier> getProjectNotifiers( Map<String, Object> context )
     {
         List<ProjectNotifier> projectNotifiers = new ArrayList<ProjectNotifier>();
 
-        List<Map> notifiers = ContinuumBuildConstant.getProjectNotifiers( context );
+        List<Map<String, Object>> notifiers = ContinuumBuildConstant.getProjectNotifiers( context );
 
         if ( notifiers != null )
         {
-            for ( Map map : notifiers )
+            for ( Map<String, Object> map : notifiers )
             {
                 ProjectNotifier notifier = new ProjectNotifier();
                 notifier.setConfiguration( ContinuumBuildConstant.getNotifierConfiguration( map ) );
@@ -1266,7 +1266,7 @@ private List<ProjectNotifier> getProjectNotifiers( Map<String, Object> context )
 
     private ScmResult getScmResult( Map<String, Object> context )
     {
-        Map map = ContinuumBuildConstant.getScmResult( context );
+        Map<String, Object> map = ContinuumBuildConstant.getScmResult( context );
 
         if ( !map.isEmpty() )
         {
@@ -1286,7 +1286,7 @@ private ScmResult getScmResult( Map<String, Object> context )
 
     private String getMavenProjectVersion( Map<String, Object> context )
     {
-        Map map = ContinuumBuildConstant.getMavenProject( context );
+        Map<String, Object> map = ContinuumBuildConstant.getMavenProject( context );
 
         if ( !map.isEmpty() )
         {
@@ -1298,7 +1298,7 @@ private String getMavenProjectVersion( Map<String, Object> context )
 
     private List<String> getMavenProjectModules( Map<String, Object> context )
     {
-        Map map = ContinuumBuildConstant.getMavenProject( context );
+        Map<String, Object> map = ContinuumBuildConstant.getMavenProject( context );
 
         if ( !map.isEmpty() )
         {

diff --git a/...ava/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java b/...ava/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java
@@ -33,7 +33,7 @@ public interface SlaveBuildAgentTransportService
     public Boolean buildProjects( List<Map<String, Object>> projectsBuildContext )
         throws Exception;
 
-    public Map getBuildResult( int projectId )
+    public Map<String, Object> getBuildResult( int projectId )
         throws Exception;
 
     public Integer getProjectCurrentlyBuilding()

diff --git a/...java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java b/...java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java
@@ -106,10 +106,10 @@ public List<Map<String, String>> getAvailableInstallations()
         return installations;
     }
 
-    public Map getBuildResult( int projectId )
+    public Map<String, Object> getBuildResult( int projectId )
         throws Exception
     {
-        Map buildResult;
+        Map<String, Object> buildResult;
 
         try
         {