diff --git a/src/fr/inrialpes/exmo/align/cli/CommonCLI.java b/src/fr/inrialpes/exmo/align/cli/CommonCLI.java
index 0c99b4aaffe65e4aa8b585d18d8a5eefc459d49a..be9c8f1e8a8d2628233d3ccd3f950da0a04f5935 100644
--- a/src/fr/inrialpes/exmo/align/cli/CommonCLI.java
+++ b/src/fr/inrialpes/exmo/align/cli/CommonCLI.java
@@ -26,6 +26,7 @@
package fr.inrialpes.exmo.align.cli;
import java.util.Properties;
+import java.util.Map.Entry;
import java.io.FileInputStream;
import org.slf4j.Logger;
@@ -34,7 +35,6 @@ import org.slf4j.LoggerFactory;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.PosixParser;
-//import org.apache.commons.cli.GnuParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.ParseException;
@@ -87,8 +87,8 @@ public abstract class CommonCLI {
for ( Object o : line.getArgList() ) {
logger.info( " Arg: {}", o );
}
- for ( String k : parameters.stringPropertyNames() ) {
- logger.info( " Param: {} = {}", k, parameters.getProperty( k ) );
+ for ( Entry<Object,Object> m : parameters.entrySet() ) {
+ logger.info( " Param: {} = {}", m.getKey(), m.getValue() );
}
} catch( ParseException exp ) {
logger.error( exp.getMessage() );
diff --git a/src/fr/inrialpes/exmo/align/cli/GenPlot.java b/src/fr/inrialpes/exmo/align/cli/GenPlot.java
index 5bb8a6a5adfe2246672a38334b58de79633fe4de..ce1a0c49aa74b0d6e4f0d12d73c8488dc86288f1 100644
--- a/src/fr/inrialpes/exmo/align/cli/GenPlot.java
+++ b/src/fr/inrialpes/exmo/align/cli/GenPlot.java
@@ -45,7 +45,6 @@ import java.lang.Integer;
import java.util.Hashtable;
import java.util.Properties;
import java.util.Vector;
-import java.util.Enumeration;
import java.lang.reflect.Constructor;
import java.lang.InstantiationException;
diff --git a/src/fr/inrialpes/exmo/align/gen/AlteratorFactory.java b/src/fr/inrialpes/exmo/align/gen/AlteratorFactory.java
index a3277c3b2f0c570f1a47a1605cb4face1905b576..a60c6736b9bed0e31c0908a5ca4a2d3f0a8ada0d 100644
--- a/src/fr/inrialpes/exmo/align/gen/AlteratorFactory.java
+++ b/src/fr/inrialpes/exmo/align/gen/AlteratorFactory.java
@@ -1,7 +1,7 @@
/**
* $Id$
*
- * Copyright (C) INRIA, 2011, 2013
+ * Copyright (C) INRIA, 2011, 2013-2014
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -152,10 +152,9 @@ public class AlteratorFactory {
modifier.modify( params );
}
/*
- for( String key : params.stringPropertyNames() ) {
- String value = params.getProperty(key);
- //logger.trace( "[{}] = [{}]", key, value );
- modifier.modifyOntology( key, value ); //modify the ontology according to it
+ for( Entry<Object,Object> m : params.entrySet() ) {
+ //logger.trace( "[{}] = [{}]", m.getKey(), m.getValue );
+ modifier.modifyOntology( m.getKey(), m.getValue ); //modify the ontology according to it
}
*/
return modifier;
diff --git a/src/fr/inrialpes/exmo/align/gen/TestSet.java b/src/fr/inrialpes/exmo/align/gen/TestSet.java
index d05f33a076ec2cee0f692f9bdab31db07474d261..5ea4d443619a36b275e4fd80991c0e2090773fad 100644
--- a/src/fr/inrialpes/exmo/align/gen/TestSet.java
+++ b/src/fr/inrialpes/exmo/align/gen/TestSet.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) 2011-2013, INRIA
+ * Copyright (C) 2011-2014, INRIA
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -39,6 +39,7 @@ package fr.inrialpes.exmo.align.gen;
import java.util.Properties;
import java.util.HashMap;
import java.util.Set;
+import java.util.Map.Entry;
import java.util.HashSet;
import org.slf4j.Logger;
@@ -144,8 +145,8 @@ public abstract class TestSet {
public void printTestHierarchy( TestCase c, int level ) {
for ( int i = 0; i < level; i++ ) System.out.print( " " );
System.out.print( c.name+" [" );
- for ( Object k : c.cumulated.keySet() ) {
- System.out.print( " "+k+"="+c.cumulated.getProperty( (String)k )+";" );
+ for ( Entry<Object,Object> m : c.cumulated.entrySet() ) {
+ System.out.print( " "+m.getKey()+"="+m.getValue()+";" );
}
System.out.println( " ]" );
for ( TestCase sub : c.subTests ) printTestHierarchy( sub, level+1 );
@@ -183,6 +184,9 @@ class TestCase {
for ( Object k : params.keySet() ) {
t.cumulated.setProperty( (String)k, params.getProperty( (String)k ) );
}
+ for ( Entry<Object,Object> m : params.entrySet() ) {
+ t.cumulated.setProperty( (String)m.getKey(), (String)m.getValue() );
+ }
return t;
}
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/BasicAlterator.java b/src/fr/inrialpes/exmo/align/gen/alt/BasicAlterator.java
index 14d850a7073c0afb08119d09e0ce72f55c74be12..434a0fd05560e6dc9acba866dfd36fd19f45459f 100644
--- a/src/fr/inrialpes/exmo/align/gen/alt/BasicAlterator.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/BasicAlterator.java
@@ -1,7 +1,7 @@
/**
* $Id$
*
- * Copyright (C) 2011-2013, INRIA
+ * Copyright (C) 2011-2014, INRIA
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -36,12 +36,11 @@ package fr.inrialpes.exmo.align.gen.alt;
//Java classes
import java.net.URI;
import java.util.HashMap;
-import java.util.Iterator;
+import java.util.Map.Entry;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import java.util.Random;
-import java.util.Enumeration;
import java.lang.StringBuffer;
import java.io.ByteArrayInputStream;
@@ -245,11 +244,9 @@ public abstract class BasicAlterator implements Alterator {
// JE: this is usually not efficient, since these lists will likely be used for iterating
//gets the Ontology classes
- @SuppressWarnings("unchecked")
public List<OntClass> getOntologyClasses() {
List<OntClass> classes = new ArrayList<OntClass>();
- for ( Iterator it = modifiedModel.listNamedClasses(); it.hasNext(); ) {
- OntClass aux = (OntClass)it.next();
+ for ( OntClass aux : modifiedModel.listNamedClasses().toList() ) {
// JE: why not startsWith ?
if ( getNameSpace( aux.getURI() ).equals( modifiedOntologyNS ) ) {
classes.add( aux );
@@ -259,11 +256,9 @@ public abstract class BasicAlterator implements Alterator {
}
//gets the Ontology properties
- @SuppressWarnings("unchecked")
public List<OntProperty> getOntologyProperties() {
List<OntProperty> properties = new ArrayList<OntProperty>();
- for ( Iterator it = modifiedModel.listAllOntProperties(); it.hasNext(); ) {
- OntProperty prop = (OntProperty)it.next();
+ for ( OntProperty prop : modifiedModel.listAllOntProperties().toList() ) {
// JE: why not startsWith ?
if ( getNameSpace( prop.getURI() ).equals( modifiedOntologyNS ) )
properties.add( prop );
@@ -313,11 +308,9 @@ public abstract class BasicAlterator implements Alterator {
//check if the removed class appears as AllValueFrom or SomeValueFrom in a restriction
// JE2012: This should be replaced by all parentclasses
- @SuppressWarnings("unchecked")
public void checkClassesRestrictions ( OntClass childClass, OntClass parentClass ) {
String uri = childClass.getURI();
- for ( Iterator it = modifiedModel.listRestrictions(); it.hasNext(); ) {
- Restriction restr = (Restriction)it.next(); //get the restriction
+ for ( Restriction restr : modifiedModel.listRestrictions().toList() ) {
/* isAllValuesFromRestriction */
if ( restr.isAllValuesFromRestriction() ) {
AllValuesFromRestriction av = restr.asAllValuesFromRestriction();
@@ -334,20 +327,19 @@ public abstract class BasicAlterator implements Alterator {
}
//removes a class, returns the uri of his parent
- @SuppressWarnings("unchecked")
public String removeClass( OntClass cls ) {
ArrayList<OntClass> subClasses = new ArrayList<OntClass>(); //the list of all the subclasses of the class
OntClass thing = modifiedModel.createClass( OWL.Thing.getURI() ); //Thing class
buildClassHierarchy(); //build the class hierarchy if necessary
OntClass parentClass = classHierarchy.removeClass( modifiedModel, cls );//get the parent of the class
- for (Iterator it = cls.listSubClasses(); it.hasNext(); ) { //build the list of subclasses
+ for ( OntClass cl : cls.listSubClasses().toList() ) { //build the list of subclasses
//because we can't change the
- subClasses.add( (OntClass)it.next() ); //model while we are iterating
+ subClasses.add( cl ); //model while we are iterating
}
if ( parentClass != thing ) //now we change the superclass of classes
- for (OntClass clss : subClasses) //new superclass =>
+ for ( OntClass clss : subClasses ) //new superclass =>
clss.setSuperClass( parentClass ); //=>the superclass of the node
checkClassesRestrictions( cls, parentClass );
@@ -379,7 +371,6 @@ public abstract class BasicAlterator implements Alterator {
modifiedOntologyNS = base2;
}
- @SuppressWarnings("unchecked")
public Alignment extractAlignment( String base1, String base2 ) {
Alignment extractedAlignment = new URIAlignment();
@@ -395,11 +386,11 @@ public abstract class BasicAlterator implements Alterator {
extractedAlignment.setFile1( onto1 );
extractedAlignment.setFile2( onto2 );
- for ( String key : alignment.stringPropertyNames() ) {
+ for ( Entry<Object,Object> e : alignment.entrySet() ) {
+ String key = (String)e.getKey();
if ( !key.equals("##") ) {
- String value = alignment.getProperty(key);
//logger.trace( "[{} --> {}]", source, target );
- extractedAlignment.addAlignCell( URI.create( base1+key ), URI.create( base2+value ) );
+ extractedAlignment.addAlignCell( URI.create( base1+key ), URI.create( base2+e.getValue() ) );
}
}
alignment.setProperty( "##", base1 );
diff --git a/src/fr/inrialpes/exmo/align/gen/alt/EmptyModification.java b/src/fr/inrialpes/exmo/align/gen/alt/EmptyModification.java
index dd7e264985d8404582109533389458f9146cd125..6027603e82d6c9b7a65ce22b3aedc5343445b0f8 100755
--- a/src/fr/inrialpes/exmo/align/gen/alt/EmptyModification.java
+++ b/src/fr/inrialpes/exmo/align/gen/alt/EmptyModification.java
@@ -28,7 +28,6 @@ import com.hp.hpl.jena.ontology.Individual;
import com.hp.hpl.jena.ontology.Ontology;
import java.util.Properties;
-import java.util.Enumeration;
import java.util.List;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java b/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java
index 3a4d3a6fb884e057871b37376575f77a0f231fc3..82a3da9076714e1ad2cf4a8389dfec941e1603e9 100644
--- a/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java
@@ -33,7 +33,7 @@ import java.util.Properties;
import java.util.List;
import java.util.Set;
import java.util.ArrayList;
-import java.util.Map;
+import java.util.Map.Entry;
import java.util.regex.Pattern;
import java.net.URI;
@@ -129,8 +129,8 @@ public class BasicAlignment implements Alignment, Extensible {
public int nbCells() {
int sum = 0;
- for ( Enumeration e = hash1.elements(); e.hasMoreElements(); ) {
- sum += ((Set)e.nextElement()).size();
+ for ( Set<Cell> s : hash1.values() ) {
+ sum += s.size();
}
return sum;
}
@@ -290,13 +290,17 @@ public class BasicAlignment implements Alignment, Extensible {
return (Cell)new BasicCell( id, ob1, ob2, relation, measure);
}
+ // JE2014: Check the alternative
+ // for ( Cell c1 : s1 ) {
+ // if ( c.equals( c1 ) ) { found = true; break; }
+ // }
protected void addCell( Cell c ) throws AlignmentException {
boolean found = false;
Set<Cell> s1 = hash1.get(c.getObject1());
if ( s1 != null ) {
// I must check that there is no one here
for ( Iterator<Cell> i = s1.iterator(); !found && i.hasNext(); ) {
- if ( c.equals( i.next() ) ) found = true;
+ if ( c.equals( i.next() ) ) { found = true; break; }
}
if (!found) s1.add( c );
found = false;
@@ -771,13 +775,11 @@ public class BasicAlignment implements Alignment, Extensible {
result.setType( getType() );
result.setLevel( getLevel() );
result.setExtensions( extensions.convertExtension( "inverted", "http://exmo.inrialpes.fr/align/impl/BasicAlignment#inverse" ) );
- //for ( Enumeration e = namespaces.getNames() ; e.hasMoreElements(); ){
- // String label = (String)e.nextElement();
- for ( String label : namespaces.stringPropertyNames() ) {
- result.setXNamespace( label, getXNamespace( label ) );
+ for ( Entry<Object,Object> e : namespaces.entrySet() ) {
+ result.setXNamespace( (String)e.getKey(), (String)e.getValue() );
}
- for ( Enumeration e = getElements() ; e.hasMoreElements(); ){
- result.addCell(((Cell)e.nextElement()).inverse());
+ for ( Cell c : this ) {
+ result.addCell( c.inverse() );
}
return (Alignment)result;
};
@@ -793,7 +795,7 @@ public class BasicAlignment implements Alignment, Extensible {
* JE: May be a "force" boolean for really ingesting or copying may be
* useful
*/
- public void ingest(Alignment alignment) throws AlignmentException {
+ public void ingest( Alignment alignment ) throws AlignmentException {
if ( alignment != null )
for ( Cell c : alignment )
addCell( c );
@@ -815,10 +817,8 @@ public class BasicAlignment implements Alignment, Extensible {
align.setFile1( getFile1() );
align.setFile2( getFile2() );
align.setExtensions( extensions.convertExtension( "cloned", this.getClass().getName()+"#clone" ) );
- //for ( Enumeration e = namespaces.getNames() ; e.hasMoreElements(); ){
- // String label = (String)e.nextElement();
- for ( String label : namespaces.stringPropertyNames() ) {
- align.setXNamespace( label, getXNamespace( label ) );
+ for ( Entry<Object,Object> e : namespaces.entrySet() ) {
+ align.setXNamespace( (String)e.getKey(), (String)e.getValue() );
}
try { align.ingest( this ); }
catch (AlignmentException ex) {
@@ -898,7 +898,7 @@ public class BasicAlignment implements Alignment, Extensible {
mainQuery = translateMessage( mainQuery );
// Post process prefix
- for ( Map.Entry<Object,Object> m : prefix.entrySet() ) {
+ for ( Entry<Object,Object> m : prefix.entrySet() ) {
if ( m.getKey() != null ) {
mainQuery = Pattern.compile("<"+m.getValue()+"([A-Za-z0-9_-]+)>").matcher(mainQuery).replaceAll( m.getKey()+":$1" );
mainQuery = "PREFIX "+m.getKey()+": <"+m.getValue()+"> \n" + mainQuery;
diff --git a/src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java b/src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java
index 594e3b4bfde3ab19835ec43ac382f6767c1a544c..eb85ab9f279b112f1a830af7f2a6dfc6fa1cbd7b 100644
--- a/src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java
+++ b/src/fr/inrialpes/exmo/align/impl/BasicOntologyNetwork.java
@@ -20,12 +20,9 @@
package fr.inrialpes.exmo.align.impl;
-import java.lang.Iterable;
import java.util.Collections;
import java.util.Collection;
-import java.util.Enumeration;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.HashSet;
@@ -51,8 +48,6 @@ import com.hp.hpl.jena.rdf.model.Property;
import com.hp.hpl.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.vocabulary.RDF;
-//import fr.inrialpes.exmo.ontowrap.Ontology;
-
import fr.inrialpes.exmo.align.parser.SyntaxElement;
import fr.inrialpes.exmo.align.parser.AlignmentParser;
import fr.inrialpes.exmo.align.parser.RDFParser;
diff --git a/src/fr/inrialpes/exmo/align/impl/BasicParameters.java b/src/fr/inrialpes/exmo/align/impl/BasicParameters.java
index 0cbaa053c38d5a9d579a371107817773109b993a..dd2fbce1fb3f8f671fdc3a4842ded19195c88e79 100644
--- a/src/fr/inrialpes/exmo/align/impl/BasicParameters.java
+++ b/src/fr/inrialpes/exmo/align/impl/BasicParameters.java
@@ -27,6 +27,7 @@ import java.util.Hashtable;
import java.util.Enumeration;
import java.util.Collection;
import java.util.Properties;
+import java.util.Map.Entry;
import java.io.PrintStream;
import java.io.File;
@@ -74,11 +75,9 @@ public class BasicParameters extends Properties implements Parameters, Cloneable
public BasicParameters() {}
- @SuppressWarnings( "unchecked" )
public BasicParameters( Properties prop ) {
- for ( Enumeration<String> e = (Enumeration<String>)prop.propertyNames(); e.hasMoreElements(); ) { //[W:unchecked]
- String k = e.nextElement();
- setProperty( k, prop.getProperty(k) );
+ for ( Entry<Object,Object> e : prop.entrySet() ) {
+ setProperty( (String)e.getKey(), (String)e.getValue() );
}
}
@@ -109,13 +108,11 @@ public class BasicParameters extends Properties implements Parameters, Cloneable
* and p.loadFromXML( new FileInputStream( filename ) )
* which are natural implementers for this.
*/
- @SuppressWarnings( "unchecked" )
public void write(){
System.out.println("<?xml version='1.0' ?>");
System.out.println("<Parameters>");
- for ( Enumeration<String> e = (Enumeration<String>)propertyNames(); e.hasMoreElements(); ) { //[W:unchecked]
- String k = e.nextElement();
- System.out.println(" <param name='"+k+"'>"+getProperty(k)+"</param>");
+ for ( Entry<Object,Object> e : entrySet() ) {
+ System.out.println(" <param name='"+e.getKey()+"'>"+e.getValue()+"</param>");
}
System.out.println("</Parameters>");
}
@@ -123,12 +120,10 @@ public class BasicParameters extends Properties implements Parameters, Cloneable
/**
* displays the current parameters (debugging)
*/
- @SuppressWarnings( "unchecked" )
public void displayParameters( PrintStream stream ){
stream.println("Parameters:");
- for ( Enumeration<String> e = (Enumeration<String>)propertyNames(); e.hasMoreElements();) { //[W:unchecked]
- String k = e.nextElement();
- stream.println(" "+k+" = "+getProperty(k));
+ for ( Entry<Object,Object> e : entrySet() ) {
+ stream.println(" "+e.getKey()+" = "+e.getValue());
}
}
diff --git a/src/fr/inrialpes/exmo/align/impl/IDDLOntologyNetwork.java b/src/fr/inrialpes/exmo/align/impl/IDDLOntologyNetwork.java
index 1955813ef3e2dd158520a8e98b544b6bc547331d..722d336f74f0f61fa2cb62feecbffdd51cf24f0b 100644
--- a/src/fr/inrialpes/exmo/align/impl/IDDLOntologyNetwork.java
+++ b/src/fr/inrialpes/exmo/align/impl/IDDLOntologyNetwork.java
@@ -1,7 +1,7 @@
/*
* $Id: IDDLOntologyNetwork.java 987 2009-05-27 13:48:33Z euzenat $
*
- * Copyright (C) INRIA, 2009-2010, 2013
+ * Copyright (C) INRIA, 2009-2010, 2013-2014
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -21,9 +21,6 @@
package fr.inrialpes.exmo.align.impl;
import java.lang.Cloneable;
-import java.lang.Iterable;
-import java.util.Enumeration;
-import java.util.Iterator;
import java.util.Set;
import java.util.ArrayList;
import java.util.HashSet;
diff --git a/src/fr/inrialpes/exmo/align/impl/MatrixMeasure.java b/src/fr/inrialpes/exmo/align/impl/MatrixMeasure.java
index 5c844fdbe07b4d8882c7ab04df2039d0b9d6b481..6d590ebf4b1b3acb66e57c84c8c05c0cb581ebcc 100644
--- a/src/fr/inrialpes/exmo/align/impl/MatrixMeasure.java
+++ b/src/fr/inrialpes/exmo/align/impl/MatrixMeasure.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2010, 2013
+ * Copyright (C) INRIA, 2003-2010, 2013-2014
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -22,6 +22,7 @@ package fr.inrialpes.exmo.align.impl;
import java.util.Iterator;
import java.util.HashMap;
+import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
import java.text.NumberFormat;
@@ -237,20 +238,20 @@ public abstract class MatrixMeasure implements Similarity {
for ( int i = 0; i < nb1 ; i++ ) System.out.print("c");
System.out.println("}");
try {
- Set<Object> key1 = ent1.keySet();
- for( Object ob1 : key1 ){
- System.out.print(" & \\rotatebox{90}{"+onto1.getEntityName( ob1 )+"}");
+ Set<Entry<Object,Integer>> key1 = ent1.entrySet();
+ for( Entry<Object,Integer> e1 : key1 ){
+ System.out.print(" & \\rotatebox{90}{"+onto1.getEntityName( e1.getKey() )+"}");
}
System.out.println(" \\\\ \\hline");
- for ( Object ob2 : ent2.keySet() ){
- System.out.print( onto2.getEntityName( ob2 ) );
- for ( Object ob1 : key1 ){
- System.out.print(" & "+numFormat.format(matrix[ent1.get(ob1).intValue()][ent2.get(ob2).intValue()]));
+ for ( Entry<Object,Integer> e2 : ent2.entrySet() ) {
+ System.out.print( onto2.getEntityName( e2.getKey() ) );
+ for ( Entry<Object,Integer> e1 : key1 ){
+ System.out.print(" & "+numFormat.format(matrix[e1.getValue().intValue()][e2.getValue().intValue()]));
}
System.out.println("\\\\");
}
- } catch (OntowrapException e) {
- logger.debug( "IGNORED Exception", e );
+ } catch ( OntowrapException owex ) {
+ logger.debug( "IGNORED Exception", owex );
};
System.out.println("\n\\end{tabular}");
}
diff --git a/src/fr/inrialpes/exmo/align/impl/Namespace.java b/src/fr/inrialpes/exmo/align/impl/Namespace.java
index 186ae022405d111564a56f66e6db0fc67a1d19b9..dd9a9993f76d91fbd5d501fc88fccc1fe8d1e0bc 100644
--- a/src/fr/inrialpes/exmo/align/impl/Namespace.java
+++ b/src/fr/inrialpes/exmo/align/impl/Namespace.java
@@ -96,7 +96,7 @@ public enum Namespace {
Namespace result = null;
if (register.size() <= 0) {
for ( Namespace ns : Namespace.values() ) {
- register.put(ns.getUri(), ns);
+ register.put( ns.getUri(), ns );
if ( ns.getUri().equals( url ) ) result = ns;
}
} else { result = register.get(url); }
diff --git a/src/fr/inrialpes/exmo/align/impl/ObjectAlignment.java b/src/fr/inrialpes/exmo/align/impl/ObjectAlignment.java
index ada4592c133ce133742201897e9dee3bcef062bf..f07af3a5b0bbb403412c3a89c117c7120699468f 100644
--- a/src/fr/inrialpes/exmo/align/impl/ObjectAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/ObjectAlignment.java
@@ -22,8 +22,6 @@ package fr.inrialpes.exmo.align.impl;
import java.util.Hashtable;
import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Enumeration;
import java.util.Set;
import java.util.Collection;
import java.net.URI;
@@ -120,8 +118,7 @@ public class ObjectAlignment extends BasicAlignment {
align.setFile1( getFile1() );
align.setFile2( getFile2() );
align.setExtensions( extensions.convertExtension( "EDOALURIConverted", this.getClass().getName()+"#toURI" ) );
- for (Enumeration e = getElements(); e.hasMoreElements();) {
- Cell c = (Cell)e.nextElement();
+ for ( Cell c : this ) {
try {
align.addAlignCell( c.getId(), c.getObject1AsURI(this), c.getObject2AsURI(this), c.getRelation(), c.getStrength() );
} catch (AlignmentException aex) {
diff --git a/src/fr/inrialpes/exmo/align/impl/ObjectCell.java b/src/fr/inrialpes/exmo/align/impl/ObjectCell.java
index 6e6a9199162c2b03cd8a9ec5ea588694ac7ae5a5..027f5425755ad94bb95ddcbd66da5116691b0b12 100644
--- a/src/fr/inrialpes/exmo/align/impl/ObjectCell.java
+++ b/src/fr/inrialpes/exmo/align/impl/ObjectCell.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2005, 2007-2010
+ * Copyright (C) INRIA, 2003-2005, 2007-2010, 2014
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -22,7 +22,6 @@
package fr.inrialpes.exmo.align.impl;
import java.net.URI;
-import java.util.Enumeration;
import org.xml.sax.ContentHandler;
diff --git a/src/fr/inrialpes/exmo/align/impl/URIAlignment.java b/src/fr/inrialpes/exmo/align/impl/URIAlignment.java
index 7352438ad369096af1f59571a91681980ecbd0ef..aa37f263df97a0d68353044c6f532609afb7eeaa 100644
--- a/src/fr/inrialpes/exmo/align/impl/URIAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/URIAlignment.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2008, 2010
+ * Copyright (C) INRIA, 2003-2008, 2010, 2014
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -23,8 +23,6 @@ package fr.inrialpes.exmo.align.impl;
import java.lang.ClassNotFoundException;
import java.util.Hashtable;
import java.util.HashSet;
-import java.util.Enumeration;
-import java.util.Iterator;
import java.util.Collections;
import java.util.List;
import java.util.Set;
diff --git a/src/fr/inrialpes/exmo/align/impl/edoal/EDOALAlignment.java b/src/fr/inrialpes/exmo/align/impl/edoal/EDOALAlignment.java
index 82ee24b67b98a3da9eaa4f7a2a1306cda07e88f3..16bead7c72f0d2777a2f4a9ab486cb2e7cfcc354 100644
--- a/src/fr/inrialpes/exmo/align/impl/edoal/EDOALAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/edoal/EDOALAlignment.java
@@ -21,7 +21,6 @@
package fr.inrialpes.exmo.align.impl.edoal;
-import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Collection;
import java.util.Set;
@@ -230,8 +229,7 @@ public class EDOALAlignment extends BasicAlignment {
align.setFile1( getFile1() );
align.setFile2( getFile2() );
align.setExtensions( extensions.convertExtension( "EDOALURIConverted", "http://exmo.inrialpes.fr/align/impl/edoal/EDOALAlignment#toURI" ) );
- for (Enumeration e = getElements(); e.hasMoreElements();) {
- Cell c = (Cell)e.nextElement();
+ for ( Cell c : this ) {
try {
align.addAlignCell( c.getId(), c.getObject1AsURI(this), c.getObject2AsURI(this), c.getRelation(), c.getStrength() );
} catch (AlignmentException aex) {
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/AveragePRGraphEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/AveragePRGraphEvaluator.java
index afbb08a912541ea94f5c338a0b25500bf4addb08..97cd78c3a2bf800eba61a6945a7743860caa2c35 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/AveragePRGraphEvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/AveragePRGraphEvaluator.java
@@ -1,7 +1,7 @@
/*
* $Id: AveragePRGraphEvaluator.java 1196 2010-01-10 19:58:52Z euzenat $
*
- * Copyright (C) INRIA, 2004-2005, 2007-2010, 2013
+ * Copyright (C) INRIA, 2004-2005, 2007-2010, 2013-2014
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,6 @@ import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Cell;
-import java.util.Enumeration;
import java.util.Properties;
import java.util.Iterator;
import java.util.TreeSet;
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/DiffEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/DiffEvaluator.java
index a3c73934574daddcd40c1e87923c765bf7498349..799a72dc066198401042bfae607e51875e8dc932 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/DiffEvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/DiffEvaluator.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2010, 2012-2013
+ * Copyright (C) INRIA, 2010, 2012-2014
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -31,9 +31,7 @@ import fr.inrialpes.exmo.align.impl.BasicEvaluator;
import fr.inrialpes.exmo.align.impl.BasicAlignment;
import fr.inrialpes.exmo.align.impl.Annotations;
-import java.util.Enumeration;
import java.util.Properties;
-import java.util.Iterator;
import java.util.Set;
import java.util.HashSet;
import java.io.PrintWriter;
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/ExtPREvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/ExtPREvaluator.java
index f62dd6304d5639ad1705d235abc6ffc9372c11f8..c231e673abb88e1a9e2fafaf03d2c41147fe0c00 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/ExtPREvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/ExtPREvaluator.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2004-2010, 2012-2013
+ * Copyright (C) INRIA, 2004-2010, 2012-2014
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -34,9 +34,7 @@ import fr.inrialpes.exmo.ontowrap.LoadedOntology;
import fr.inrialpes.exmo.ontowrap.OntologyFactory;
import fr.inrialpes.exmo.ontowrap.OntowrapException;
-import java.util.Enumeration;
import java.util.Properties;
-import java.util.Iterator;
import java.util.HashSet;
import java.util.Set;
import java.io.PrintWriter;
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/GraphEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/GraphEvaluator.java
index 821cc29461fc380483175e5c44a800fb7afe084f..4538083ab2296d9b1138ee0248962e6c8a05c3a7 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/GraphEvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/GraphEvaluator.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2004-2005, 2007-2010, 2013
+ * Copyright (C) INRIA, 2004-2005, 2007-2010, 2013-2014
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -27,9 +27,7 @@ import org.semanticweb.owl.align.Cell;
import fr.inrialpes.exmo.align.impl.BasicEvaluator;
-import java.util.Enumeration;
import java.util.Properties;
-import java.util.Iterator;
import java.util.TreeSet;
import java.util.Set;
import java.util.Vector;
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/PRGraphEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/PRGraphEvaluator.java
index 1b321b8e26919eb23ec83c074d8cf132c0e12aff..c74e7163d6c59cfa0eed4d2c6256662600721508 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/PRGraphEvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/PRGraphEvaluator.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2004-2005, 2007-2010, 2013
+ * Copyright (C) INRIA, 2004-2005, 2007-2010, 2013-2014
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -28,9 +28,7 @@ import org.semanticweb.owl.align.Cell;
import fr.inrialpes.exmo.align.impl.Namespace;
import fr.inrialpes.exmo.align.parser.SyntaxElement;
-import java.util.Enumeration;
import java.util.Properties;
-import java.util.Iterator;
import java.util.TreeSet;
import java.util.Set;
import java.util.SortedSet;
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/PRecEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/PRecEvaluator.java
index 33b8da9bd97874a24216163d7b8ae81998c57295..cd8be2a36d78636f02badb44a09d21a3e1f87bc0 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/PRecEvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/PRecEvaluator.java
@@ -31,9 +31,7 @@ import fr.inrialpes.exmo.align.impl.BasicEvaluator;
import fr.inrialpes.exmo.align.impl.BasicAlignment;
import fr.inrialpes.exmo.align.impl.Annotations;
-import java.util.Enumeration;
import java.util.Properties;
-import java.util.Iterator;
import java.util.Set;
import java.io.PrintWriter;
import java.net.URI;
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/ROCCurveEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/ROCCurveEvaluator.java
index cd322181963158a97b176a7c300d4de5a98fa5f6..3ee5e8d24a138c3b5517459a977ee6c0997cf0fe 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/ROCCurveEvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/ROCCurveEvaluator.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2004-2005, 2007-2010
+ * Copyright (C) INRIA, 2004-2005, 2007-2010, 2014
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -28,9 +28,7 @@ import org.semanticweb.owl.align.Cell;
import fr.inrialpes.exmo.align.impl.Namespace;
import fr.inrialpes.exmo.align.parser.SyntaxElement;
-import java.util.Enumeration;
import java.util.Properties;
-import java.util.Iterator;
import java.util.TreeSet;
import java.util.Set;
import java.util.SortedSet;
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/SemPRecEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/SemPRecEvaluator.java
index 5fb97c0c8ae79994d72b84bd8a5b8a4a6aefd61e..152930f991b9e1f59410954531b8cee75639ba94 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/SemPRecEvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/SemPRecEvaluator.java
@@ -84,8 +84,6 @@ import java.lang.Runnable;
import java.lang.IllegalArgumentException;
import java.util.Properties;
-import java.util.Enumeration;
-import java.util.Iterator;
import java.util.Set;
import java.util.ArrayList;
import java.io.PrintWriter;
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/SymMeanEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/SymMeanEvaluator.java
index a7b5d827beb181ece9103c0082cd3c49f477dfa2..98b8101aaaae178a48f9354ef63c7d86d72b5632 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/SymMeanEvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/SymMeanEvaluator.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA Rhône-Alpes, 2004-2005, 2007-2010
+ * Copyright (C) INRIA Rhône-Alpes, 2004-2005, 2007-2010, 2014
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -33,9 +33,7 @@ import fr.inrialpes.exmo.ontowrap.LoadedOntology;
import fr.inrialpes.exmo.ontowrap.OntowrapException;
import java.lang.Math;
-import java.util.Enumeration;
import java.util.Properties;
-import java.util.Iterator;
import java.util.Set;
import java.io.PrintWriter;
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/ThresholdGraphEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/ThresholdGraphEvaluator.java
index 6b7c332a5337f2b9f3d5acf707443fc07d42834e..55fdeaef2b036e24b1db1f440326c9e0427d02b8 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/ThresholdGraphEvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/ThresholdGraphEvaluator.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2004-2005, 2007-2010, 2013
+ * Copyright (C) INRIA, 2004-2005, 2007-2010, 2013-2014
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -28,9 +28,7 @@ import org.semanticweb.owl.align.Cell;
import fr.inrialpes.exmo.align.impl.Namespace;
import fr.inrialpes.exmo.align.parser.SyntaxElement;
-import java.util.Enumeration;
import java.util.Properties;
-import java.util.Iterator;
import java.util.TreeSet;
import java.util.Set;
import java.util.SortedSet;
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/WeightedPREvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/WeightedPREvaluator.java
index 5c8dc5a9de11def8eba37ba53b85bf22f9c2a839..ec62c43bf137bf51d3dd7985a8f7fc16c604e654 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/WeightedPREvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/WeightedPREvaluator.java
@@ -31,9 +31,7 @@ import fr.inrialpes.exmo.align.impl.BasicEvaluator;
import fr.inrialpes.exmo.align.impl.BasicAlignment;
import fr.inrialpes.exmo.align.impl.Annotations;
-import java.util.Enumeration;
import java.util.Properties;
-import java.util.Iterator;
import java.util.Set;
import java.io.PrintWriter;
import java.net.URI;
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/COWLMappingRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/COWLMappingRendererVisitor.java
index 57551611e2d71629ec91b31a641467d38ee63af1..a3f5e510c52a2e1a992f460ef61228de172fcf08 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/COWLMappingRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/COWLMappingRendererVisitor.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2004, 2007-2010, 2012-2013
+ * Copyright (C) INRIA, 2003-2004, 2007-2010, 2012-2014
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -21,7 +21,6 @@
package fr.inrialpes.exmo.align.impl.renderer;
import java.net.URI;
-import java.util.Enumeration;
import java.util.Properties;
import java.io.PrintWriter;
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/GraphPatternRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/GraphPatternRendererVisitor.java
index 9d66a3fb1519a3e01ad1561d2e74e0bcc69360a4..88f9ce4c8e5181b4680a03c7818cd7d4d5ccbfe5 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/GraphPatternRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/GraphPatternRendererVisitor.java
@@ -27,6 +27,7 @@ import java.net.URI;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Hashtable;
+import java.util.Map.Entry;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -283,8 +284,8 @@ public abstract class GraphPatternRendererVisitor extends IndentedRendererVisito
protected String createPrefixList() {
String result = "";
- for (String k : prefixList.keySet()) {
- result += "PREFIX " + prefixList.get(k) + ":<" + k + ">" + NL;
+ for ( Entry<String,String> e : prefixList.entrySet() ) {
+ result += "PREFIX " + e.getValue() + ":<" + e.getKey() + ">" + NL;
}
return result;
}
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/HTMLMetadataRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/HTMLMetadataRendererVisitor.java
index 4a493264948378b8fd7116ccac6f99e97a48ffb3..06db8ed0d2cade11c1fb13eaad3e9b840d303b83 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/HTMLMetadataRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/HTMLMetadataRendererVisitor.java
@@ -20,9 +20,9 @@
package fr.inrialpes.exmo.align.impl.renderer;
-import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Properties;
+import java.util.Map.Entry;
import java.io.PrintWriter;
import java.net.URI;
@@ -92,9 +92,8 @@ public class HTMLMetadataRendererVisitor extends GenericReflectiveVisitor implem
writer.print("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML+RDFa 1.0//EN\" \"http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd\">\n");
}
writer.print("<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\"");
- for ( Enumeration e = nslist.keys() ; e.hasMoreElements(); ) {
- String k = (String)e.nextElement();
- writer.print("\n xmlns:"+nslist.get(k)+"='"+k+"'");
+ for ( Entry<String,String> e : nslist.entrySet() ) {
+ writer.print("\n xmlns:"+e.getValue()+"='"+e.getKey()+"'");
}
writer.print(">\n<head><title>Alignment</title></head>\n<body>\n");
String alid = align.getExtension( Namespace.ALIGNMENT.uri, Annotations.ID );
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/HTMLRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/HTMLRendererVisitor.java
index 7f322c9bbb13e9301df11ecdac30a27cec74e69f..3f01426a5606b7437df50bc4fb7996fc97f9fddc 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/HTMLRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/HTMLRendererVisitor.java
@@ -20,9 +20,9 @@
package fr.inrialpes.exmo.align.impl.renderer;
-import java.util.Enumeration;
import java.util.Properties;
import java.util.Hashtable;
+import java.util.Map.Entry;
import java.io.PrintWriter;
import java.net.URI;
@@ -95,9 +95,8 @@ public class HTMLRendererVisitor extends GenericReflectiveVisitor implements Ali
writer.print("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML+RDFa 1.0//EN\" \"http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd\">\n");
}
writer.print("<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\"");
- for ( Enumeration e = nslist.keys() ; e.hasMoreElements(); ) {
- String k = (String)e.nextElement();
- writer.print("\n xmlns:"+nslist.get(k)+"='"+k+"'");
+ for ( Entry<String,String> e : nslist.entrySet() ) {
+ writer.print("\n xmlns:"+e.getValue()+"='"+e.getKey()+"'");
}
writer.print(">\n<head><title>Alignment</title><style type=\"text/css\">body {font-family: sans-serif}</style></head>\n<body>\n");
alid = align.getExtension( Namespace.ALIGNMENT.uri, Annotations.ID );
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/JSONRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/JSONRendererVisitor.java
index 109b5f964fb80f2922db37b0897e664783af847a..3d1f7b9ed3b867f42e4280b844a6353dafd5388a 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/JSONRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/JSONRendererVisitor.java
@@ -19,9 +19,9 @@
*/
package fr.inrialpes.exmo.align.impl.renderer;
-import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Set;
+import java.util.Map.Entry;
import java.util.Properties;
import java.io.PrintWriter;
import java.net.URI;
@@ -124,7 +124,7 @@ public class JSONRendererVisitor extends IndentedRendererVisitor implements Alig
nslist.put(Namespace.EDOAL.prefix, Namespace.EDOAL.shortCut);
// Get the keys of the parameter
int gen = 0;
- for (String[] ext : align.getExtensions()) {
+ for ( String[] ext : align.getExtensions() ) {
String prefix = ext[0];
String name = ext[1];
if (!(prefix.endsWith("#") || prefix.endsWith("/"))) {
@@ -138,11 +138,11 @@ public class JSONRendererVisitor extends IndentedRendererVisitor implements Alig
tag += ":" + name;
extensionString += INDENT + "\"" + tag + "\" : \"" + ext[2] + "\"," + NL;
}
- if (align instanceof BasicAlignment) {
- for (String label : ((BasicAlignment) align).getXNamespaces().stringPropertyNames()) {
- if (!label.equals("rdf") && !label.equals("xsd")
- && !label.equals("<default>")) {
- extensionString += INDENT + "\"" + label + "\" : \"" + ((BasicAlignment) align).getXNamespace(label) + "\"," + NL;
+ if ( align instanceof BasicAlignment ) {
+ for ( Entry<Object,Object> e : ((BasicAlignment)align).getXNamespaces().entrySet() ) {
+ String label = (String)e.getKey();
+ if ( !label.equals("rdf") && !label.equals("xsd") && !label.equals("<default>") ) {
+ extensionString += INDENT + "\"" + label + "\" : \"" + e.getValue() + "\"," + NL;
}
}
}
@@ -150,9 +150,8 @@ public class JSONRendererVisitor extends IndentedRendererVisitor implements Alig
increaseIndent();
indentedOutputln("\"@context\" : {");
increaseIndent();
- for (Enumeration e = nslist.keys(); e.hasMoreElements();) {
- String k = (String) e.nextElement();
- indentedOutputln("\"" + nslist.get(k) + "\" : \"" + k + "\",");
+ for ( Entry<String,String> e : nslist.entrySet() ) {
+ indentedOutputln("\"" + e.getValue() + "\" : \"" + e.getKey() + "\",");
}
// Not sure that this is fully correct
indentedOutputln("\"" + SyntaxElement.MEASURE.print(DEF) + "\" : { \"@type\" : \"xsd:float\" }");
@@ -231,7 +230,7 @@ public class JSONRendererVisitor extends IndentedRendererVisitor implements Alig
} else {
indentedOutput("\"" + SyntaxElement.LOCATION.print(DEF) + "\" : \"" + u + "\"");
}
- if (onto.getFormalism() != null) {
+ if ( onto.getFormalism() != null ) {
writer.print("," + NL);
indentedOutputln("\"" + SyntaxElement.FORMATT.print(DEF) + "\" : ");
increaseIndent();
@@ -296,7 +295,7 @@ public class JSONRendererVisitor extends IndentedRendererVisitor implements Alig
indentedOutputln("\"" + SyntaxElement.LINKKEYS.print(DEF) + "\" : [");
increaseIndent();
boolean first = true;
- for (Linkkey linkkey : linkeys) {
+ for ( Linkkey linkkey : linkeys ) {
if (first) {
first = false;
} else {
@@ -313,7 +312,7 @@ public class JSONRendererVisitor extends IndentedRendererVisitor implements Alig
writer.print("," + NL);
indentedOutputln("\"" + SyntaxElement.TRANSFORMATION.print(DEF) + "\" : [");
increaseIndent();
- for (Transformation transf : transfs) {
+ for ( Transformation transf : transfs ) {
transf.accept(this);
}
writer.print(NL);
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java
index 65cf0580b368d17e4c6a1d68954a42745852ccb3..760872c6349edc33ff1c7e29c86b9d2da38455df 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java
@@ -20,7 +20,6 @@
package fr.inrialpes.exmo.align.impl.renderer;
-import java.util.Enumeration;
import java.util.Properties;
import java.io.PrintWriter;
import java.net.URI;
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java
index c7bc0ac10ba107570ac9c77ed49bc75efc68890d..6d1598bf92c82fe3b1f60e01f2681e5ed1b6cdec 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java
@@ -17,11 +17,12 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
package fr.inrialpes.exmo.align.impl.renderer;
-import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Set;
+import java.util.Map.Entry;
import java.util.Properties;
import java.io.PrintWriter;
import java.net.URI;
@@ -152,15 +153,14 @@ public class RDFRendererVisitor extends IndentedRendererVisitor implements Align
writer.print("<" + SyntaxElement.RDF.print(DEF) + " xmlns='" + Namespace.ALIGNMENT.prefix + "'");
// JE2009: (1) I must use xml:base
//writer.print(NL+" xml:base='"+Namespace.ALIGNMENT.uri+"'");
- for (Enumeration e = nslist.keys(); e.hasMoreElements();) {
- String k = (String) e.nextElement();
- writer.print(NL + INDENT + INDENT + INDENT + INDENT + " xmlns:" + nslist.get(k) + "='" + k + "'");
- }
- if (align instanceof BasicAlignment) {
- for (String label : ((BasicAlignment) align).getXNamespaces().stringPropertyNames()) {
- if (!label.equals("rdf") && !label.equals("xsd")
- && !label.equals("<default>")) {
- writer.print(NL + INDENT + INDENT + INDENT + INDENT + " xmlns:" + label + "='" + ((BasicAlignment) align).getXNamespace(label) + "'");
+ for ( Entry<String,String> e : nslist.entrySet() ) {
+ writer.print(NL + INDENT + INDENT + INDENT + INDENT + " xmlns:" + e.getValue() + "='" + e.getKey() + "'");
+ }
+ if ( align instanceof BasicAlignment ) {
+ for ( Entry<Object,Object> e : ((BasicAlignment) align).getXNamespaces().entrySet() ) {
+ String label = (String)e.getKey();
+ if ( !label.equals("rdf") && !label.equals("xsd") && !label.equals("<default>") ) {
+ writer.print(NL + INDENT + INDENT + INDENT + INDENT + " xmlns:" + label + "='" + e.getValue() + "'");
}
}
}
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/SEKTMappingRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/SEKTMappingRendererVisitor.java
index d24d75a93c7867528d78f72a1280507bbf63254a..cc022ab36cc8492aa92b1333ee401300a93f0c90 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/SEKTMappingRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/SEKTMappingRendererVisitor.java
@@ -20,7 +20,6 @@
package fr.inrialpes.exmo.align.impl.renderer;
-import java.util.Enumeration;
import java.util.Properties;
import java.util.Random;
import java.io.PrintWriter;
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/SILKRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/SILKRendererVisitor.java
index 15ecfedd63fa816fa6bbad7ec7bf8ad8c3c481e4..da3738f44466f747bb546ad95e3ce1bf02d583d1 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/SILKRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/SILKRendererVisitor.java
@@ -39,8 +39,8 @@ import fr.inrialpes.exmo.align.impl.edoal.LinkkeyEquals;
import fr.inrialpes.exmo.align.impl.edoal.LinkkeyIntersects;
import java.net.URI;
-import java.util.Enumeration;
import java.util.Hashtable;
+import java.util.Map.Entry;
import java.util.Properties;
import java.util.Random;
@@ -121,8 +121,8 @@ public class SILKRendererVisitor extends GraphPatternRendererVisitor implements
// JE2014: BUG
// These prefix are usually added by the GraphPatternGenerator after the patterns are generated...
// So, now they are empty...
- for ( String k : prefixList.keySet() ) {
- indentedOutputln("<Prefix id=\""+k+" namespace=\""+prefixList.get(k)+"\" />");
+ for ( Entry<String,String> e : prefixList.entrySet() ) {
+ indentedOutputln("<Prefix id=\""+e.getKey()+" namespace=\""+e.getValue()+"\" />");
}
decreaseIndent();
indentedOutputln("</Prefixes>"+NL);
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/SKOSRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/SKOSRendererVisitor.java
index 3d0eb51d9ae87cbe31167c1070c566d03dcca069..ddbc5c1315ed3bfe1020a6b10952b8ce28e5363f 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/SKOSRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/SKOSRendererVisitor.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2004, 2006-2010, 2012
+ * Copyright (C) INRIA, 2003-2004, 2006-2010, 2012, 2014
* Copyright (C) Quentin Reul, 2008
*
* This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,6 @@
package fr.inrialpes.exmo.align.impl.renderer;
-import java.util.Enumeration;
import java.util.Properties;
import java.io.PrintWriter;
import java.net.URI;
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/SWRLRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/SWRLRendererVisitor.java
index b4c2d42cacba6609604b8699ff3137b187bc86a1..b7d33010b31ea07da619d1a17dd89af0669ca67b 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/SWRLRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/SWRLRendererVisitor.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2004, 2007-2010, 2012-2013
+ * Copyright (C) INRIA, 2003-2004, 2007-2010, 2012-2014
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -20,7 +20,6 @@
package fr.inrialpes.exmo.align.impl.renderer;
-import java.util.Enumeration;
import java.util.Properties;
import java.io.PrintWriter;
import java.net.URI;
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/XMLMetadataRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/XMLMetadataRendererVisitor.java
index 8068ba53fa950ed0f7b444b2fa1266ba2424f8b0..d976e2d7c889e1f27869aec18e0f21ec010b2b23 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/XMLMetadataRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/XMLMetadataRendererVisitor.java
@@ -20,8 +20,8 @@
package fr.inrialpes.exmo.align.impl.renderer;
-import java.util.Enumeration;
import java.util.Hashtable;
+import java.util.Map.Entry;
import java.util.Properties;
import java.io.PrintWriter;
@@ -89,15 +89,15 @@ public class XMLMetadataRendererVisitor extends GenericReflectiveVisitor impleme
writer.print("' standalone='no'?>\n");
}
writer.print("<rdf:RDF xmlns='"+Namespace.ALIGNMENT.uri+"'");
- for ( Enumeration e = nslist.keys() ; e.hasMoreElements(); ) {
- String k = (String)e.nextElement();
- writer.print("\n xmlns:"+nslist.get(k)+"='"+k+"'");
+ for ( Entry<String,String> e : nslist.entrySet() ) {
+ writer.print("\n xmlns:"+e.getValue()+"='"+e.getKey()+"'");
}
if ( align instanceof BasicAlignment ) {
- for ( String label : ((BasicAlignment)align).getXNamespaces().stringPropertyNames() ) {
+ for ( Entry<Object,Object> e : ((BasicAlignment)align).getXNamespaces().entrySet() ) {
+ String label = (String)e.getKey();
if ( !label.equals("rdf") && !label.equals("xsd")
&& !label.equals("<default>") )
- writer.print("\n xmlns:"+label+"='"+((BasicAlignment)align).getXNamespace( label )+"'");
+ writer.print("\n xmlns:"+label+"='"+e.getValue()+"'");
}
}
writer.print(">\n");
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/XSLTRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/XSLTRendererVisitor.java
index c13dc989392503ec14a4f8ee908cf34f8a621b8a..16283b8a548277965facc10321b2201d23b43c7a 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/XSLTRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/XSLTRendererVisitor.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2004, 2006-2010, 2012-2013
+ * Copyright (C) INRIA, 2003-2004, 2006-2010, 2012-2014
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -21,7 +21,7 @@
package fr.inrialpes.exmo.align.impl.renderer;
import java.util.Hashtable;
-import java.util.Enumeration;
+import java.util.Map.Entry;
import java.util.Properties;
import java.io.PrintWriter;
import java.net.URI;
@@ -85,9 +85,8 @@ public class XSLTRendererVisitor extends GenericReflectiveVisitor implements Ali
if ( embedded == false )
writer.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
writer.println("<xsl:stylesheet version=\"1.0\"");
- for ( Enumeration e = namespaces.keys(); e.hasMoreElements(); ){
- Object ns = e.nextElement();
- writer.println(" xmlns:"+namespaces.get(ns)+"=\""+ns+"\"");
+ for ( Entry<String,String> e : namespaces.entrySet() ) {
+ writer.println(" xmlns:"+e.getValue()+"=\""+e.getKey()+"\"");
}
writer.println(" >\n");
@@ -98,10 +97,7 @@ public class XSLTRendererVisitor extends GenericReflectiveVisitor implements Ali
}
writer.print("\n");
- for ( Enumeration e = alignment.getElements() ; e.hasMoreElements(); ){
- Cell c = (Cell)e.nextElement();
- c.accept( this );
- }
+ for ( Cell c : alignment ) { c.accept( this ); }
writer.println(" <!-- Copying the root -->");
writer.println(" <xsl:template match=\"/\">");
diff --git a/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java b/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
index 46c1043321ce9af49f35b69e07267e5e796a2f53..6649cf76151e747417a26535ca40d2513b6d9619 100644
--- a/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
+++ b/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
@@ -103,6 +103,7 @@ import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
import java.util.Set;
+import java.util.Map.Entry;
import java.util.HashSet;
import java.util.Collection;
import java.util.Enumeration;
@@ -303,28 +304,20 @@ public class AServProtocolManager implements Service {
public Message align( Properties params ){
Message result = null;
// These are added to the parameters wich are in the message
- //for ( String key : commandLineParams ) {
- // Unfortunately non iterable
- for ( Enumeration<String> e = (Enumeration<String>)commandLineParams.propertyNames(); e.hasMoreElements();) { //[W:unchecked]
- String key = e.nextElement();
- if ( params.getProperty( key ) == null ){
- params.setProperty( key , commandLineParams.getProperty( key ) );
- }
+ for ( Entry<Object,Object> e : commandLineParams.entrySet() ) {
+ if ( params.getProperty( (String)e.getKey() ) == null ) params.setProperty( (String)e.getKey(), (String)e.getValue() );
}
// Do the fast part (retrieve)
result = retrieveAlignment( params );
if ( result != null ) return result;
- // [JE2013:ID]
String uri = alignmentCache.generateAlignmentUri();
- // [JE2013:ID]
Aligner althread = new Aligner( params, uri );
Thread th = new Thread(althread);
// Do the slow part (align)
if ( params.getProperty("async") != null ) {
th.start();
// Parameters are used
- // [JE2013:ID]
return new AlignmentId( params, newId(), serverId, uri );
} else {
th.start();
@@ -1576,8 +1569,6 @@ public class AServProtocolManager implements Service {
if ( pretty != null && !pretty.equals("") )
aresult.setExtension( Namespace.EXT.uri, Annotations.PRETTY, pretty );
} catch (AlignmentException e) {
- // The unreachability test has already been done
- // JE 15/1/2009: commented the unreachability test
if ( reachable( uri1 ) == null ){
result = new UnreachableOntology( params, newId(), serverId,params.getProperty("onto1") );
} else if ( reachable( uri2 ) == null ){
diff --git a/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java b/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java
index a851d4da51026d2e8926d03b901254fe0644ca9f..0759bdaa74ab962e7bc910f8da941fa69dbe22bc 100644
--- a/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java
+++ b/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java
@@ -54,8 +54,6 @@ import java.util.Hashtable;
import java.util.Properties;
import java.util.Collection;
import java.util.Date;
-import java.util.Enumeration;
-import java.util.Iterator;
import java.util.Map;
import java.net.URI;
import java.net.URISyntaxException;
diff --git a/src/fr/inrialpes/exmo/align/service/HTTPTransport.java b/src/fr/inrialpes/exmo/align/service/HTTPTransport.java
index 6f2c5a1f982656ac2b62255e95be3b62d180ba92..eb71606d7073d7bcbfe38006e4a3c3e371da82f2 100644
--- a/src/fr/inrialpes/exmo/align/service/HTTPTransport.java
+++ b/src/fr/inrialpes/exmo/align/service/HTTPTransport.java
@@ -32,6 +32,7 @@ import java.io.FileOutputStream;
import java.util.Vector;
import java.util.List;
+import java.util.Map.Entry;
import java.util.Properties;
import java.util.Enumeration;
@@ -257,16 +258,16 @@ public class HTTPTransport {
// Convert parms to parameters
Properties params = new Properties();
- for ( String key : parms.stringPropertyNames() ) {
- //logger.trace( " PRM: '{}' = '{}'", key, parms.getProperty( key ) );
+ for ( Entry<Object,Object> e : parms.entrySet() ) {
+ //logger.trace( " PRM: '{}' = '{}'", e.getKey(), e.getValue() );
+ String key = (String)e.getKey();
if ( key.startsWith( "paramn" ) ){
- params.setProperty( parms.getProperty( key ),
- parms.getProperty( "paramv"+key.substring( 6 ) ) );
+ params.setProperty( (String)e.getValue(),
+ parms.getProperty( "paramv"+key.substring( 6 ) ) );
} else if ( !key.startsWith( "paramv" ) ) {
- params.setProperty( key, parms.getProperty( key ) );
+ params.setProperty( (String)key, (String)e.getValue() );
}
}
-
int start = 0;
while ( start < uri.length() && uri.charAt(start) == '/' ) start++;
int end = uri.indexOf( '/', start+1 );
diff --git a/src/fr/inrialpes/exmo/align/service/WSAlignment.java b/src/fr/inrialpes/exmo/align/service/WSAlignment.java
index 067fc9dd280e80b2e1b91f231bbfaebed15ef56d..2577a7be950cbbb307979725f8118f75e2660f09 100644
--- a/src/fr/inrialpes/exmo/align/service/WSAlignment.java
+++ b/src/fr/inrialpes/exmo/align/service/WSAlignment.java
@@ -23,11 +23,10 @@ package fr.inrialpes.exmo.align.service;
import java.lang.ClassNotFoundException;
import java.util.Hashtable;
import java.util.HashSet;
-import java.util.Enumeration;
-import java.util.Iterator;
import java.util.Collections;
import java.util.List;
import java.util.Set;
+import java.util.Map.Entry;
import java.util.ArrayList;
import java.util.Properties;
import java.io.File;
@@ -117,12 +116,11 @@ public class WSAlignment extends URIAlignment implements AlignmentProcess {
}
message += " <url1>"+uri1+"</url1>\n <url2>"+uri2+"</url2>\n";
// Parameter encoding
- for (Enumeration e = params.propertyNames(); e.hasMoreElements();) {
- String k = (String)e.nextElement();
+ for ( Entry<Object,Object> e : params.entrySet() ) {
+ String k = (String)e.getKey();
if ( k != null && !k.equals("") )
- message += " <param name=\""+k+"\">"+params.getProperty(k)+"</param>\n";
+ message += " <param name=\""+k+"\">"+e.getValue()+"</param>\n";
}
-
message += " </"+Namespace.SOAP_ENV.shortCut+":Body>\n"+
"</"+Namespace.SOAP_ENV.shortCut+":Envelope>\n";
byte[] byteMess = message.getBytes();
@@ -204,7 +202,7 @@ public class WSAlignment extends URIAlignment implements AlignmentProcess {
align.setFile2( getFile2() );
for ( String[] ext : extensions.getValues() ){
align.setExtension( ext[0], ext[1], ext[2] );
- }
+ }
String oldid = align.getExtension( Namespace.ALIGNMENT.uri, Annotations.ID );
if ( oldid != null && !oldid.equals("") ) {
align.setExtension( Namespace.EXT.uri, Annotations.DERIVEDFROM, oldid );
diff --git a/src/fr/inrialpes/exmo/align/service/jade/JadeFIPAAServiceAgent.java b/src/fr/inrialpes/exmo/align/service/jade/JadeFIPAAServiceAgent.java
index 799b14416abcca30d27ec8b1e1f196f8d8d54bde..610354bf3373ac5566ae10216e608234869fea0a 100755
--- a/src/fr/inrialpes/exmo/align/service/jade/JadeFIPAAServiceAgent.java
+++ b/src/fr/inrialpes/exmo/align/service/jade/JadeFIPAAServiceAgent.java
@@ -257,9 +257,11 @@ public class JadeFIPAAServiceAgent extends Agent {
private Properties decodeMessage(ContentElement ce, Properties param) {
Properties toReturn = param;
Action action= (Action)ce;
+ // Not iterable in this version
+ //for ( Parameter ontoParam : action.getAllHasParameter() ) {
for( Iterator<Parameter> iter = action.getAllHasParameter(); iter.hasNext(); ) {
- Parameter OntoParam = iter.next();
- toReturn.setProperty( OntoParam.getName(), OntoParam.getValue() );
+ Parameter ontoParam = iter.next();
+ toReturn.setProperty( ontoParam.getName(), ontoParam.getValue() );
}
return toReturn;
}
diff --git a/src/fr/inrialpes/exmo/align/service/msg/ErrorMsg.java b/src/fr/inrialpes/exmo/align/service/msg/ErrorMsg.java
index 5e8293ebf66e9f3a6a1c03392d67da06fc951144..6d297f641fbc3470b265f2aef06487bd4eede4bf 100644
--- a/src/fr/inrialpes/exmo/align/service/msg/ErrorMsg.java
+++ b/src/fr/inrialpes/exmo/align/service/msg/ErrorMsg.java
@@ -21,6 +21,8 @@
package fr.inrialpes.exmo.align.service.msg;
import java.util.Properties;
+import java.util.Map;
+import java.util.Map.Entry;
/**
* Contains the messages that should be sent according to the protocol
@@ -40,8 +42,8 @@ public class ErrorMsg extends Message {
String message = "Generic error: "+content;
if ( parameters != null ) {
message += "<ul>";
- for ( String key : parameters.stringPropertyNames()) {
- message += "<li>"+key+" = "+parameters.getProperty( key )+"</li>";
+ for ( Entry<Object,Object> m : parameters.entrySet()) {
+ message += "<li>"+m.getKey()+" = "+m.getValue()+"</li>";
}
message += "/<ul>";
}
diff --git a/src/fr/inrialpes/exmo/align/service/msg/EvalResult.java b/src/fr/inrialpes/exmo/align/service/msg/EvalResult.java
index c21b169c870b20fa27d01b46e6b9488bdff1f6ad..77b57ff621a8020341a756f5d1a24f54c28a1f5f 100644
--- a/src/fr/inrialpes/exmo/align/service/msg/EvalResult.java
+++ b/src/fr/inrialpes/exmo/align/service/msg/EvalResult.java
@@ -21,6 +21,8 @@
package fr.inrialpes.exmo.align.service.msg;
import java.util.Properties;
+import java.util.Map;
+import java.util.Map.Entry;
/**
* Contains the messages that should be sent according to the protocol
@@ -43,8 +45,8 @@ public class EvalResult extends Success {
results += getContent();
} else {
results += "Alignment method: "+getContent()+"\n<ul>\n";
- for ( String key : getParameters().stringPropertyNames() ) {
- results += "<li>"+key+" : "+getParameters().getProperty( key )+"</li>\n";
+ for ( Entry<Object,Object> m : getParameters().entrySet() ) {
+ results += "<li>"+m.getKey()+" : "+m.getValue()+"</li>\n";
}
results += "</ul>\n";
}
@@ -54,16 +56,16 @@ public class EvalResult extends Success {
// A diff will never be rendered outside of HTML
public String RESTString(){
String results = "<EvaluationResults>";
- for ( String key : getParameters().stringPropertyNames() ) {
- results += "<"+key+">"+getParameters().getProperty( key )+"</"+key+">";
+ for ( Entry<Object,Object> m : getParameters().entrySet() ) {
+ results += "<"+m.getKey()+">"+m.getValue()+"</"+m.getKey()+">";
}
results += "</EvaluationResults>";
return results;
}
public String JSONString(){
String results = "{ \"type\" : \"EvaluationResult\"";
- for ( String key : getParameters().stringPropertyNames() ) {
- results += ",\n \""+key+"\" : \""+getParameters().getProperty( key )+"\"";
+ for ( Entry<Object,Object> m : getParameters().entrySet() ) {
+ results += ",\n \""+m.getKey()+"\" : \""+m.getValue()+"\"";
}
results += "\n}";
return results;
diff --git a/src/fr/inrialpes/exmo/ontowrap/OntologyFactory.java b/src/fr/inrialpes/exmo/ontowrap/OntologyFactory.java
index e7a60e78c87c646382a6e32cdb772ed2505a4e2d..5ce91a979a4fbf8b9465dd928742dd4de2ca9fd4 100644
--- a/src/fr/inrialpes/exmo/ontowrap/OntologyFactory.java
+++ b/src/fr/inrialpes/exmo/ontowrap/OntologyFactory.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2008, 2010-2013
+ * Copyright (C) INRIA, 2008, 2010-2014
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -110,9 +110,9 @@ public abstract class OntologyFactory {
if ( of != null ) return of;
try {
// This should also be a static getInstance!
- Class<?> ofClass = Class.forName(apiName);
+ Class<?> ofClass = Class.forName( apiName );
Class[] cparams = {};
- java.lang.reflect.Constructor ofConstructor = ofClass.getConstructor(cparams);
+ java.lang.reflect.Constructor ofConstructor = ofClass.getConstructor( cparams );
Object[] mparams = {};
of = (OntologyFactory)ofConstructor.newInstance(mparams);
} catch ( ClassNotFoundException cnfex ) {
diff --git a/src/fr/inrialpes/exmo/queryprocessor/QueryMediator.java b/src/fr/inrialpes/exmo/queryprocessor/QueryMediator.java
index 8de3364edd8055f1c187f11d6065e418411ac039..56f1f8afd4edde1f5414bd727a804b97105f78d0 100644
--- a/src/fr/inrialpes/exmo/queryprocessor/QueryMediator.java
+++ b/src/fr/inrialpes/exmo/queryprocessor/QueryMediator.java
@@ -39,7 +39,6 @@ import org.xml.sax.SAXException;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.xpath.XPathExpressionException;
-import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Properties;
import java.io.IOException;