You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/10/02 00:33:17 UTC
svn commit: r581104 - in
/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration:
./ functors/
Author: joakime
Date: Mon Oct 1 15:33:16 2007
New Revision: 581104
URL: http://svn.apache.org/viewvc?rev=581104&view=rev
Log:
JDK5 Typesafe Collection Updates
Modified:
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/FiletypeToMapClosure.java
maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/NetworkProxyComparator.java
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java?rev=581104&r1=581103&r2=581104&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java Mon Oct 1 15:33:16 2007
@@ -83,7 +83,7 @@
/**
* Listeners we've registered.
*/
- private List listeners = new LinkedList();
+ private List<RegistryListener> listeners = new LinkedList<RegistryListener>();
public String getFilteredUserConfigFilename()
{
@@ -119,9 +119,9 @@
if ( !config.getRepositories().isEmpty() )
{
- for ( Iterator i = config.getRepositories().iterator(); i.hasNext(); )
+ for ( Iterator<V1RepositoryConfiguration> i = config.getRepositories().iterator(); i.hasNext(); )
{
- V1RepositoryConfiguration r = (V1RepositoryConfiguration) i.next();
+ V1RepositoryConfiguration r = i.next();
r.setScanned( r.isIndexed() );
if ( r.getUrl().startsWith( "file://" ) )
@@ -145,7 +145,7 @@
}
}
}
-
+
return config;
}
@@ -181,11 +181,11 @@
}
else if ( baseSection != null )
{
- Collection keys = baseSection.getKeys();
+ Collection<String> keys = baseSection.getKeys();
boolean foundList = false;
- for ( Iterator i = keys.iterator(); i.hasNext() && !foundList; )
+ for ( Iterator<String> i = keys.iterator(); i.hasNext() && !foundList; )
{
- String key = (String) i.next();
+ String key = i.next();
// a little aggressive with the repositoryScanning and databaseScanning - should be no need to split
// that configuration
@@ -208,9 +208,9 @@
}
// escape all cron expressions to handle ','
- for ( Iterator i = configuration.getManagedRepositories().iterator(); i.hasNext(); )
+ for ( Iterator<ManagedRepositoryConfiguration> i = configuration.getManagedRepositories().iterator(); i.hasNext(); )
{
- ManagedRepositoryConfiguration c = (ManagedRepositoryConfiguration) i.next();
+ ManagedRepositoryConfiguration c = i.next();
c.setRefreshCronExpression( escapeCronExpression( c.getRefreshCronExpression() ) );
}
@@ -244,9 +244,9 @@
{
( (Initializable) registry ).initialize();
- for ( Iterator i = listeners.iterator(); i.hasNext(); )
+ for ( Iterator<RegistryListener> i = listeners.iterator(); i.hasNext(); )
{
- RegistryListener l = (RegistryListener) i.next();
+ RegistryListener l = i.next();
addRegistryChangeListener( l );
}
@@ -319,9 +319,9 @@
private Configuration processExpressions( Configuration config )
{
// TODO: for commons-configuration 1.3 only
- for ( Iterator i = config.getManagedRepositories().iterator(); i.hasNext(); )
+ for ( Iterator<ManagedRepositoryConfiguration> i = config.getManagedRepositories().iterator(); i.hasNext(); )
{
- ManagedRepositoryConfiguration c = (ManagedRepositoryConfiguration) i.next();
+ ManagedRepositoryConfiguration c = i.next();
c.setLocation( removeExpressions( c.getLocation() ) );
c.setRefreshCronExpression( unescapeCronExpression( c.getRefreshCronExpression() ) );
}
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java?rev=581104&r1=581103&r2=581104&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java Mon Oct 1 15:33:16 2007
@@ -64,7 +64,7 @@
/**
* Map of default values for the file types.
*/
- private Map defaultTypeMap = new HashMap();
+ private Map<String, List<String>> defaultTypeMap = new HashMap<String, List<String>>();
/**
* <p>
@@ -83,7 +83,7 @@
* @param id the id to lookup.
* @return the list of patterns.
*/
- public List getFileTypePatterns( String id )
+ public List<String> getFileTypePatterns( String id )
{
Configuration config = archivaConfiguration.getConfiguration();
Predicate selectedFiletype = new FiletypeSelectionPredicate( id );
@@ -95,7 +95,7 @@
return filetype.getPatterns();
}
- List defaultPatterns = (List) defaultTypeMap.get( id );
+ List<String> defaultPatterns = defaultTypeMap.get( id );
if ( CollectionUtils.isEmpty( defaultPatterns ) )
{
@@ -116,7 +116,7 @@
.getResource( "/org/apache/maven/archiva/configuration/default-archiva.xml" );
XMLReader reader = new XMLReader( "configuration", defaultArchivaXml );
- List resp = reader.getElementList( "//configuration/repositoryScanning/fileTypes/fileType" );
+ List<Element> resp = reader.getElementList( "//configuration/repositoryScanning/fileTypes/fileType" );
CollectionUtils.forAllDo( resp, new AddFileTypeToDefaultMap() );
}
@@ -152,11 +152,11 @@
return;
}
- List patternElemList = patternsElem.elements( "pattern" );
+ List<Element> patternElemList = patternsElem.elements( "pattern" );
ElementTextListClosure elemTextList = new ElementTextListClosure();
CollectionUtils.forAllDo( patternElemList, elemTextList );
- List patterns = elemTextList.getList();
+ List<String> patterns = elemTextList.getList();
defaultTypeMap.put( id, patterns );
}
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java?rev=581104&r1=581103&r2=581104&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/MavenProxyPropertyLoader.java Mon Oct 1 15:33:16 2007
@@ -113,6 +113,7 @@
}
}
+ @SuppressWarnings("unchecked")
private Properties getSubset( Properties props, String prefix )
{
Enumeration keys = props.keys();
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/FiletypeToMapClosure.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/FiletypeToMapClosure.java?rev=581104&r1=581103&r2=581104&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/FiletypeToMapClosure.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/FiletypeToMapClosure.java Mon Oct 1 15:33:16 2007
@@ -34,7 +34,7 @@
public class FiletypeToMapClosure
implements Closure
{
- private Map map = new HashMap();
+ private Map<String, FileType> map = new HashMap<String, FileType>();
public void execute( Object input )
{
@@ -45,7 +45,7 @@
}
}
- public Map getMap()
+ public Map<String, FileType> getMap()
{
return map;
}
Modified: maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/NetworkProxyComparator.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/NetworkProxyComparator.java?rev=581104&r1=581103&r2=581104&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/NetworkProxyComparator.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/functors/NetworkProxyComparator.java Mon Oct 1 15:33:16 2007
@@ -30,10 +30,9 @@
* @version $Id$
*/
public class NetworkProxyComparator
- implements Comparator
+ implements Comparator<NetworkProxyConfiguration>
{
-
- public int compare( Object o1, Object o2 )
+ public int compare( NetworkProxyConfiguration o1, NetworkProxyConfiguration o2 )
{
if ( o1 == null && o2 == null )
{
@@ -50,13 +49,8 @@
return -1;
}
- if ( ( o1 instanceof NetworkProxyConfiguration ) && ( o2 instanceof NetworkProxyConfiguration ) )
- {
- String id1 = ( (NetworkProxyConfiguration) o1 ).getId();
- String id2 = ( (NetworkProxyConfiguration) o2 ).getId();
- return id1.compareToIgnoreCase( id2 );
- }
-
- return 0;
+ String id1 = o1.getId();
+ String id2 = o2.getId();
+ return id1.compareToIgnoreCase( id2 );
}
}