diff --git a/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java b/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java
index f415ae789c276d57d7a2359a8364ff1249ccccba..4f9f4315e12685658998927ba277ed1348c811d9 100644
--- a/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java
+++ b/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java
@@ -39,7 +39,6 @@ import java.io.OutputStream;
 import java.io.BufferedInputStream;
 import java.io.FileOutputStream;
 
-import java.util.StringTokenizer;
 import java.util.Locale;
 import java.util.TimeZone;
 import java.util.Hashtable;
@@ -862,9 +861,7 @@ result += "<td><form action=\"metadata\"><input type=\"hidden\" name=\"id\" valu
     private void decodeParams( String params, Properties p ) throws InterruptedException {
 	if ( params == null ) return;
 	
-	StringTokenizer st = new StringTokenizer( params, "&" );
-	while ( st.hasMoreTokens())	{
-	    String next = st.nextToken();
+	for ( String next : params.split("&") ) {
 	    int sep = next.indexOf( '=' );
 	    if ( sep >= 0 ){
 		try {
diff --git a/src/fr/inrialpes/exmo/align/util/ExtGroupEval.java b/src/fr/inrialpes/exmo/align/util/ExtGroupEval.java
index 89bd86d0aad90a6db804b4390292713fd428914a..b5dff2f56b5394828ad4d46fc778779aaa6a3bb3 100644
--- a/src/fr/inrialpes/exmo/align/util/ExtGroupEval.java
+++ b/src/fr/inrialpes/exmo/align/util/ExtGroupEval.java
@@ -46,7 +46,6 @@ import java.lang.Integer;
 import java.util.Hashtable;
 import java.util.Vector;
 import java.util.Enumeration;
-import java.util.StringTokenizer;
 import java.util.Arrays;
 import java.util.Formatter;
 
@@ -179,11 +178,9 @@ public class ExtGroupEval {
 	    }
 	}
 
-	// JE: StringTokenizer is obsoleted in Java 1.4 in favor of split: to change
 	listAlgo = new Vector<String>();
-	StringTokenizer st = new StringTokenizer(listFile,",");
-	while (st.hasMoreTokens()) {
-	    listAlgo.add(st.nextToken());
+	for ( String s : listFile.split(",") ) {
+	    listAlgo.add( s );	    
 	}
 
 	params = new BasicParameters();
diff --git a/src/fr/inrialpes/exmo/align/util/GroupEval.java b/src/fr/inrialpes/exmo/align/util/GroupEval.java
index 640095c3c5827e0960cfe3c906bc9333de7c8bd4..5ab6b1cedf66956adcd3fa2cc59d00fcfcc0797b 100644
--- a/src/fr/inrialpes/exmo/align/util/GroupEval.java
+++ b/src/fr/inrialpes/exmo/align/util/GroupEval.java
@@ -41,7 +41,6 @@ import java.lang.Integer;
 import java.util.Hashtable;
 import java.util.Vector;
 import java.util.Enumeration;
-import java.util.StringTokenizer;
 import java.util.Arrays;
 import java.util.Formatter;
 
@@ -176,11 +175,9 @@ public class GroupEval {
 	    }
 	}
 
-	// JE: StringTokenizer is obsoleted in Java 1.4 in favor of split: to change
 	listAlgo = new Vector<String>();
-	StringTokenizer st = new StringTokenizer(listFile,",");
-	while (st.hasMoreTokens()) {
-	    listAlgo.add(st.nextToken());
+	for ( String s : listFile.split(",") ) {
+	    listAlgo.add( s );	    
 	}
 
 	params = new BasicParameters();
diff --git a/src/fr/inrialpes/exmo/align/util/GroupOutput.java b/src/fr/inrialpes/exmo/align/util/GroupOutput.java
index d4ddb4f42cb1810fdc909c2352dc61c2b8bc6302..be92f1a0385577fcb88b6a5d12cb156dc47c2f73 100644
--- a/src/fr/inrialpes/exmo/align/util/GroupOutput.java
+++ b/src/fr/inrialpes/exmo/align/util/GroupOutput.java
@@ -47,7 +47,6 @@ import java.lang.Integer;
 import java.util.Hashtable;
 import java.util.Vector;
 import java.util.Enumeration;
-import java.util.StringTokenizer;
 
 import gnu.getopt.LongOpt;
 import gnu.getopt.Getopt;
@@ -169,11 +168,9 @@ public class GroupOutput {
 	    }
 	}
 
-	// JE: StringTokenizer is obsoleted in Java 1.4 in favor of split: to change
 	listAlgo = new Vector<String>();
-	StringTokenizer st = new StringTokenizer(fileNames,",");
-	while (st.hasMoreTokens()) {
-	    listAlgo.add(st.nextToken());
+	for ( String s : fileNames.split(",") ) {
+	    listAlgo.add( s );	    
 	}
 
 	params = new BasicParameters();