You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2009/03/17 16:45:22 UTC
svn commit: r755286 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/
archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/
archiva-reporting/archiva-metadata-reports/s...
Author: brett
Date: Tue Mar 17 15:45:22 2009
New Revision: 755286
URL: http://svn.apache.org/viewvc?rev=755286&view=rev
Log:
clean up warnings
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResultHit.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResults.java
archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaModelCloner.java
archiva/trunk/archiva-modules/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataReport.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResultHit.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResultHit.java?rev=755286&r1=755285&r2=755286&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResultHit.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResultHit.java Tue Mar 17 15:45:22 2009
@@ -49,7 +49,7 @@
private String repositoryId = "";
- private List<String> versions = new ArrayList();
+ private List<String> versions = new ArrayList<String>();
private ArchivaArtifact artifact;
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResults.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResults.java?rev=755286&r1=755285&r2=755286&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResults.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/search/SearchResults.java Tue Mar 17 15:45:22 2009
@@ -32,9 +32,7 @@
*/
public class SearchResults
{
- private List repositories = new ArrayList();
-
- private Map<String, SearchResultHit> hits = new HashMap();
+ private Map<String, SearchResultHit> hits = new HashMap<String, SearchResultHit>();
private int totalHits;
@@ -58,7 +56,7 @@
*/
public List<SearchResultHit> getHits()
{
- return new ArrayList( hits.values() );
+ return new ArrayList<SearchResultHit>( hits.values() );
}
public Map<String, SearchResultHit> getHitsMap()
@@ -66,21 +64,11 @@
return hits;
}
- public List getRepositories()
- {
- return repositories;
- }
-
public boolean isEmpty()
{
return hits.isEmpty();
}
- public void setRepositories( List repositories )
- {
- this.repositories = repositories;
- }
-
public SearchResultLimits getLimits()
{
return limits;
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaModelCloner.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaModelCloner.java?rev=755286&r1=755285&r2=755286&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaModelCloner.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaModelCloner.java Tue Mar 17 15:45:22 2009
@@ -179,6 +179,7 @@
return cloned;
}
+ @SuppressWarnings("unchecked")
public static Properties clone( Properties properties )
{
if ( properties == null )
@@ -188,7 +189,7 @@
Properties cloned = new Properties();
- Enumeration keys = properties.propertyNames();
+ Enumeration<String> keys = (Enumeration<String>) properties.propertyNames();
while ( keys.hasMoreElements() )
{
String key = (String) keys.nextElement();
@@ -246,39 +247,34 @@
return cloned;
}
- public static List cloneArtifactReferences( List artifactReferenceList )
+ public static List<ArtifactReference> cloneArtifactReferences( List<ArtifactReference> artifactReferenceList )
{
if ( artifactReferenceList == null )
{
return null;
}
- List ret = new ArrayList();
+ List<ArtifactReference> ret = new ArrayList<ArtifactReference>();
- Iterator it = artifactReferenceList.iterator();
- while ( it.hasNext() )
+ for ( ArtifactReference ref : artifactReferenceList )
{
- ArtifactReference artifactReference = (ArtifactReference) it.next();
- ret.add( clone( artifactReference ) );
+ ret.add( clone( ref ) );
}
return ret;
}
- public static List cloneDependencies( List dependencies )
+ public static List<Dependency> cloneDependencies( List<Dependency> dependencies )
{
if ( dependencies == null )
{
return null;
}
- List ret = new ArrayList();
+ List<Dependency> ret = new ArrayList<Dependency>();
- Iterator it = dependencies.iterator();
- while ( it.hasNext() )
+ for ( Dependency dep : dependencies )
{
- Dependency dep = (Dependency) it.next();
-
if ( dep == null )
{
// Skip null dependency.
@@ -291,19 +287,17 @@
return ret;
}
- public static List cloneExclusions( List exclusions )
+ public static List<Exclusion> cloneExclusions( List<Exclusion> exclusions )
{
if ( exclusions == null )
{
return null;
}
- List ret = new ArrayList();
+ List<Exclusion> ret = new ArrayList<Exclusion>();
- Iterator it = exclusions.iterator();
- while ( it.hasNext() )
+ for ( Exclusion exclusion : exclusions )
{
- Exclusion exclusion = (Exclusion) it.next();
Exclusion cloned = new Exclusion();
cloned.setGroupId( exclusion.getGroupId() );
@@ -315,19 +309,19 @@
return ret;
}
- public static List cloneIndividuals( List individuals )
+ public static List<Individual> cloneIndividuals( List<Individual> individuals )
{
if ( individuals == null )
{
return individuals;
}
- List ret = new ArrayList();
+ List<Individual> ret = new ArrayList<Individual>();
- Iterator it = individuals.iterator();
+ Iterator<Individual> it = individuals.iterator();
while ( it.hasNext() )
{
- Individual individual = (Individual) it.next();
+ Individual individual = it.next();
Individual cloned = new Individual();
cloned.setPrincipal( individual.getPrincipal() );
@@ -348,19 +342,17 @@
return ret;
}
- public static List cloneLicenses( List licenses )
+ public static List<License> cloneLicenses( List<License> licenses )
{
if ( licenses == null )
{
return null;
}
- List ret = new ArrayList();
+ List<License> ret = new ArrayList<License>();
- Iterator it = licenses.iterator();
- while ( it.hasNext() )
+ for ( License license : licenses )
{
- License license = (License) it.next();
License cloned = new License();
cloned.setId( license.getId() );
@@ -374,20 +366,17 @@
return ret;
}
- public static List cloneMailingLists( List mailingLists )
+ public static List<MailingList> cloneMailingLists( List<MailingList> mailingLists )
{
if ( mailingLists == null )
{
return null;
}
- List ret = new ArrayList();
+ List<MailingList> ret = new ArrayList<MailingList>();
- Iterator it = mailingLists.iterator();
- while ( it.hasNext() )
+ for ( MailingList mailingList : mailingLists )
{
- MailingList mailingList = (MailingList) it.next();
-
if ( mailingList == null )
{
// Skip null mailing list.
@@ -400,29 +389,27 @@
return ret;
}
- public static List clonePlugins( List plugins )
+ public static List<ArtifactReference> clonePlugins( List<ArtifactReference> plugins )
{
return cloneArtifactReferences( plugins );
}
- public static List cloneReports( List reports )
+ public static List<ArtifactReference> cloneReports( List<ArtifactReference> reports )
{
return cloneArtifactReferences( reports );
}
- public static List cloneRepositories( List repositories )
+ public static List<ProjectRepository> cloneRepositories( List<ProjectRepository> repositories )
{
if ( repositories == null )
{
return null;
}
- List ret = new ArrayList();
+ List<ProjectRepository> ret = new ArrayList<ProjectRepository>();
- Iterator it = repositories.iterator();
- while ( it.hasNext() )
+ for ( ProjectRepository repository : repositories )
{
- ProjectRepository repository = (ProjectRepository) it.next();
ProjectRepository cloned = new ProjectRepository();
cloned.setId( repository.getId() );
@@ -439,32 +426,29 @@
return ret;
}
- public static List cloneRoles( List roles )
+ public static List<String> cloneRoles( List<String> roles )
{
return cloneSimpleStringList( roles );
}
- private static List cloneSimpleStringList( List simple )
+ private static List<String> cloneSimpleStringList( List<String> simple )
{
if ( simple == null )
{
return null;
}
- List ret = new ArrayList();
+ List<String> ret = new ArrayList<String>();
- Iterator it = simple.iterator();
-
- while ( it.hasNext() )
+ for ( String txt : simple )
{
- String txt = (String) it.next();
ret.add( txt );
}
return ret;
}
- public static List cloneAvailableVersions( List availableVersions )
+ public static List<String> cloneAvailableVersions( List<String> availableVersions )
{
return cloneSimpleStringList( availableVersions );
}
Modified: archiva/trunk/archiva-modules/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataReport.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataReport.java?rev=755286&r1=755285&r2=755286&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataReport.java (original)
+++ archiva/trunk/archiva-modules/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataReport.java Tue Mar 17 15:45:22 2009
@@ -24,6 +24,7 @@
import org.apache.maven.archiva.database.Constraint;
import org.apache.maven.archiva.database.ObjectNotFoundException;
import org.apache.maven.archiva.database.constraints.RepositoryProblemByTypeConstraint;
+import org.apache.maven.archiva.model.RepositoryProblem;
import org.apache.maven.archiva.reporting.DataLimits;
import org.apache.maven.archiva.reporting.DynamicReportSource;
@@ -59,13 +60,13 @@
constraint = new RepositoryProblemByTypeConstraint( PROBLEM_TYPE_METADATA );
}
- public List getData()
+ public List<RepositoryProblem> getData()
throws ObjectNotFoundException, ArchivaDatabaseException
{
return dao.getRepositoryProblemDAO().queryRepositoryProblems( constraint );
}
- public List getData( DataLimits limits )
+ public List<RepositoryProblem> getData( DataLimits limits )
throws ObjectNotFoundException, ArchivaDatabaseException
{
// TODO: implement limits.