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 2010/01/19 11:41:20 UTC
svn commit: r900720 -
/archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
Author: brett
Date: Tue Jan 19 10:41:19 2010
New Revision: 900720
URL: http://svn.apache.org/viewvc?rev=900720&view=rev
Log:
[MRM-1025] remove Java 1.6 methods
Modified:
archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
Modified: archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java?rev=900720&r1=900719&r2=900720&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java (original)
+++ archiva/branches/MRM-1025/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java Tue Jan 19 10:41:19 2010
@@ -120,8 +120,9 @@
Properties properties = readOrCreateProperties( directory, PROJECT_VERSION_METADATA_KEY );
// remove properties that are not references or artifacts
- for ( String name : properties.stringPropertyNames() )
+ for ( Object key : properties.keySet() )
{
+ String name = (String) key;
if ( !name.contains( ":" ) && !name.equals( "facetIds" ) )
{
properties.remove( name );
@@ -295,9 +296,10 @@
{
metadataFacet = metadataFacetFactory.createMetadataFacet( repositoryId, name );
Map<String, String> map = new HashMap<String, String>();
- for ( String key : properties.stringPropertyNames() )
+ for ( Object key : properties.keySet() )
{
- map.put( key, properties.getProperty( key ) );
+ String property = (String) key;
+ map.put( property, properties.getProperty( property ) );
}
metadataFacet.fromProperties( map );
}
@@ -782,11 +784,12 @@
{
MetadataFacet facet = factory.createMetadataFacet();
Map<String, String> map = new HashMap<String, String>();
- for ( String key : properties.stringPropertyNames() )
+ for ( Object key : properties.keySet() )
{
- if ( key.startsWith( facet.getFacetId() ) )
+ String property = (String) key;
+ if ( property.startsWith( facet.getFacetId() ) )
{
- map.put( key, properties.getProperty( key ) );
+ map.put( property, properties.getProperty( property ) );
}
}
facet.fromProperties( map );