You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2012/10/07 17:47:19 UTC
svn commit: r1395331 -
/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java
Author: rfscholte
Date: Sun Oct 7 15:47:19 2012
New Revision: 1395331
URL: http://svn.apache.org/viewvc?rev=1395331&view=rev
Log:
Add generics
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java?rev=1395331&r1=1395330&r2=1395331&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java Sun Oct 7 15:47:19 2012
@@ -22,7 +22,6 @@ package org.apache.maven.shared.utils;
import java.util.Collections;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Locale;
import java.util.Set;
@@ -57,7 +56,7 @@ public class Os
public static final String OS_FAMILY = getOsFamily();
// store the valid families
- private static final Set validFamilies = getValidFamilies();
+ private static final Set<String> validFamilies = getValidFamilies();
/**
@@ -152,14 +151,14 @@ public class Os
/**
* Initializes the set of valid families.
*/
- public static Set getValidFamilies()
+ public static Set<String> getValidFamilies()
{
if ( validFamilies != null )
{
return validFamilies;
}
- Set valid = new HashSet();
+ Set<String> valid = new HashSet<String>();
valid.add( FAMILY_DOS );
valid.add( FAMILY_MAC );
valid.add( FAMILY_NETWARE );
@@ -432,12 +431,10 @@ public class Os
*/
private static String getOsFamily()
{
- Set families = getValidFamilies();
+ Set<String> families = getValidFamilies();
- Iterator iter = families.iterator();
- while ( iter.hasNext() )
+ for ( String fam : families )
{
- String fam = (String) iter.next();
if ( Os.isFamily( fam ) )
{
return fam;
@@ -457,5 +454,4 @@ public class Os
return validFamilies.contains( family );
}
-
}