You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2009/04/29 06:55:38 UTC
svn commit: r769655 - in /continuum/branches/continuum-1.3.x:
continuum-builder/src/main/java/org/apache/continuum/builder/utils/
continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/
continuum-distributed/continuum-distributed...
Author: evenisse
Date: Wed Apr 29 04:55:37 2009
New Revision: 769655
URL: http://svn.apache.org/viewvc?rev=769655&view=rev
Log:
More java5 code and clean up lot of warnings found by Idea
Modified:
continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java
continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java
continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java
continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java
Modified: continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java?rev=769655&r1=769654&r2=769655&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java Wed Apr 29 04:55:37 2009
@@ -289,7 +289,7 @@
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 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 @@
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 @@
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 @@
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 );
}
Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java?rev=769655&r1=769654&r2=769655&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java Wed Apr 29 04:55:37 2009
@@ -569,7 +569,7 @@
{
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 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 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 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 @@
{
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 @@
{
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 @@
{
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 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 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 List<String> getMavenProjectModules( Map<String, Object> context )
{
- Map map = ContinuumBuildConstant.getMavenProject( context );
+ Map<String, Object> map = ContinuumBuildConstant.getMavenProject( context );
if ( !map.isEmpty() )
{
Modified: continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java?rev=769655&r1=769654&r2=769655&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java Wed Apr 29 04:55:37 2009
@@ -33,7 +33,7 @@
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()
Modified: continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java?rev=769655&r1=769654&r2=769655&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java Wed Apr 29 04:55:37 2009
@@ -106,10 +106,10 @@
return installations;
}
- public Map getBuildResult( int projectId )
+ public Map<String, Object> getBuildResult( int projectId )
throws Exception
{
- Map buildResult;
+ Map<String, Object> buildResult;
try
{