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 2007/11/08 10:11:51 UTC
svn commit: r593086 - in /maven/continuum/trunk/continuum-xmlrpc:
continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/
continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/
continuum-xmlrpc-server/src/main/jav...
Author: evenisse
Date: Thu Nov 8 01:11:49 2007
New Revision: 593086
URL: http://svn.apache.org/viewvc?rev=593086&view=rev
Log:
Add more generics
Modified:
maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumService.java
maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ContinuumXmlRpcClient.java
maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java
Modified: maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumService.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumService.java?rev=593086&r1=593085&r2=593086&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumService.java (original)
+++ maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumService.java Thu Nov 8 01:11:49 2007
@@ -54,7 +54,7 @@
* @throws ContinuumException
* @throws XmlRpcException
*/
- List getProjects( int projectGroupId )
+ List<ProjectSummary> getProjects( int projectGroupId )
throws ContinuumException, XmlRpcException;
/**
@@ -188,7 +188,7 @@
* @throws ContinuumException
* @throws XmlRpcException
*/
- List getBuildDefinitionsForProject( int projectId )
+ List<BuildDefinition> getBuildDefinitionsForProject( int projectId )
throws ContinuumException, XmlRpcException;
/**
@@ -199,7 +199,7 @@
* @throws ContinuumException
* @throws XmlRpcException
*/
- List getBuildDefinitionsForProjectGroup( int projectGroupId )
+ List<BuildDefinition> getBuildDefinitionsForProjectGroup( int projectGroupId )
throws ContinuumException, XmlRpcException;
/**
Modified: maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ContinuumXmlRpcClient.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ContinuumXmlRpcClient.java?rev=593086&r1=593085&r2=593086&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ContinuumXmlRpcClient.java (original)
+++ maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-client/src/main/java/org/apache/maven/continuum/xmlrpc/client/ContinuumXmlRpcClient.java Thu Nov 8 01:11:49 2007
@@ -113,7 +113,7 @@
// Projects
// ----------------------------------------------------------------------
- public List getProjects( int projectGroupId )
+ public List<ProjectSummary> getProjects( int projectGroupId )
throws ContinuumException
{
try
@@ -310,7 +310,7 @@
// Build Definitions
// ----------------------------------------------------------------------
- public List getBuildDefinitionsForProject( int projectId )
+ public List<BuildDefinition> getBuildDefinitionsForProject( int projectId )
throws ContinuumException
{
try
@@ -323,7 +323,7 @@
}
}
- public List getBuildDefinitionsForProjectGroup( int projectGroupId )
+ public List<BuildDefinition> getBuildDefinitionsForProjectGroup( int projectGroupId )
throws ContinuumException
{
try
Modified: maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java?rev=593086&r1=593085&r2=593086&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java (original)
+++ maven/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumServiceImpl.java Thu Nov 8 01:11:49 2007
@@ -87,20 +87,19 @@
// Projects
// ----------------------------------------------------------------------
- public List getProjects( int projectGroupId )
+ public List<ProjectSummary> getProjects( int projectGroupId )
throws ContinuumException
{
checkViewProjectGroupAuthorization( getProjectGroupName( projectGroupId ) );
- List projectsList = new ArrayList();
+ List<ProjectSummary> projectsList = new ArrayList<ProjectSummary>();
- Collection projects = continuum.getProjectsInGroup( projectGroupId );
+ Collection<org.apache.maven.continuum.model.project.Project> projects =
+ continuum.getProjectsInGroup( projectGroupId );
if ( projects != null )
{
- for ( Iterator i = projects.iterator(); i.hasNext(); )
+ for ( org.apache.maven.continuum.model.project.Project project : projects )
{
- org.apache.maven.continuum.model.project.Project project =
- (org.apache.maven.continuum.model.project.Project) i.next();
ProjectSummary ps = populateProjectSummary( project );
projectsList.add( ps );
}
@@ -312,36 +311,36 @@
// Build Definitions
// ----------------------------------------------------------------------
- public List getBuildDefinitionsForProject( int projectId )
+ public List<BuildDefinition> getBuildDefinitionsForProject( int projectId )
throws ContinuumException
{
ProjectSummary ps = getProjectSummary( projectId );
checkViewProjectGroupAuthorization( ps.getProjectGroup().getName() );
- List bds = continuum.getBuildDefinitionsForProject( projectId );
+ List<org.apache.maven.continuum.model.project.BuildDefinition> bds =
+ continuum.getBuildDefinitionsForProject( projectId );
- List result = new ArrayList();
- for ( Iterator i = bds.iterator(); i.hasNext(); )
+ List<BuildDefinition> result = new ArrayList<BuildDefinition>();
+ for ( org.apache.maven.continuum.model.project.BuildDefinition bd : bds )
{
- result.add(
- populateBuildDefinition( (org.apache.maven.continuum.model.project.BuildDefinition) i.next() ) );
+ result.add( populateBuildDefinition( bd ) );
}
return result;
}
- public List getBuildDefinitionsForProjectGroup( int projectGroupId )
+ public List<BuildDefinition> getBuildDefinitionsForProjectGroup( int projectGroupId )
throws ContinuumException
{
checkViewProjectGroupAuthorization( getProjectGroupName( projectGroupId ) );
- List bds = continuum.getBuildDefinitionsForProjectGroup( projectGroupId );
+ List<org.apache.maven.continuum.model.project.BuildDefinition> bds =
+ continuum.getBuildDefinitionsForProjectGroup( projectGroupId );
- List result = new ArrayList();
- for ( Iterator i = bds.iterator(); i.hasNext(); )
+ List<BuildDefinition> result = new ArrayList<BuildDefinition>();
+ for ( org.apache.maven.continuum.model.project.BuildDefinition bd : bds )
{
- result.add(
- populateBuildDefinition( (org.apache.maven.continuum.model.project.BuildDefinition) i.next() ) );
+ result.add( populateBuildDefinition( bd ) );
}
return result;
}
@@ -931,10 +930,11 @@
p.setDescription( profile.getDescription() );
if ( profile.getEnvironmentVariables() != null )
{
- List envs = new ArrayList();
- for ( Iterator i = profile.getEnvironmentVariables().iterator(); i.hasNext(); )
+ List<org.apache.maven.continuum.model.system.Installation> envs =
+ new ArrayList<org.apache.maven.continuum.model.system.Installation>();
+ for ( Installation install : (List<Installation>) profile.getEnvironmentVariables() )
{
- envs.add( populateInstallation( (Installation) i.next() ) );
+ envs.add( populateInstallation( install ) );
}
p.setEnvironmentVariables( envs );
}