From 75814f936a4754614e364531e822fce76f99622d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Fri, 9 Mar 2012 23:07:32 +0000
Subject: [PATCH] - suppressed dependence on BasicParameters
---
.../inrialpes/exmo/align/cli/EvalAlign.java | 8 ++++----
.../exmo/align/cli/ExtGroupEval.java | 10 +++++-----
.../inrialpes/exmo/align/cli/GroupAlign.java | 17 ++++++++--------
.../inrialpes/exmo/align/cli/GroupEval.java | 12 +++++------
.../inrialpes/exmo/align/cli/GroupOutput.java | 14 ++++++-------
.../inrialpes/exmo/align/cli/Procalign.java | 7 ++++---
.../inrialpes/exmo/align/cli/WGroupEval.java | 10 +++++-----
.../exmo/align/impl/BasicAlignment.java | 20 ++++++++++---------
.../impl/renderer/RDFRendererVisitor.java | 9 ++++-----
.../renderer/XMLMetadataRendererVisitor.java | 9 ++++-----
.../align/service/AServProtocolManager.java | 1 -
.../exmo/align/service/AlignmentService.java | 6 ------
.../exmo/align/service/CacheImpl.java | 1 -
.../exmo/align/service/HTMLAServProfile.java | 19 ++++++++----------
.../exmo/align/service/WSAServProfile.java | 1 -
.../exmo/align/service/WSAlignment.java | 1 -
.../service/jade/JadeFIPAAServiceAgent.java | 5 +----
17 files changed, 68 insertions(+), 82 deletions(-)
diff --git a/src/fr/inrialpes/exmo/align/cli/EvalAlign.java b/src/fr/inrialpes/exmo/align/cli/EvalAlign.java
index 34368296..c2af2b21 100644
--- a/src/fr/inrialpes/exmo/align/cli/EvalAlign.java
+++ b/src/fr/inrialpes/exmo/align/cli/EvalAlign.java
@@ -28,7 +28,6 @@ import org.semanticweb.owl.align.Evaluator;
import fr.inrialpes.exmo.align.parser.AlignmentParser;
import fr.inrialpes.exmo.align.impl.eval.PRecEvaluator;
-import fr.inrialpes.exmo.align.impl.BasicParameters;
//Imported JAVA classes
import java.io.IOException;
@@ -36,6 +35,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.lang.Integer;
import java.lang.Double;
+import java.util.Properties;
import java.io.OutputStream;
import java.io.FileOutputStream;
@@ -83,7 +83,7 @@ public class EvalAlign {
public void run(String[] args) {
- BasicParameters params = new BasicParameters();
+ Properties params = new Properties();
Evaluator eval = null;
String alignName1 = null;
String alignName2 = null;
@@ -129,8 +129,8 @@ public class EvalAlign {
int i = g.getOptind();
- params.setParameter( "debug", Integer.toString( debug ) );
- // debug = Integer.parseInt( params.getParameter("debug") );
+ params.setProperty( "debug", Integer.toString( debug ) );
+ // debug = Integer.parseInt( params.getProperty("debug") );
if (args.length > i+1 ) {
alignName1 = args[i];
diff --git a/src/fr/inrialpes/exmo/align/cli/ExtGroupEval.java b/src/fr/inrialpes/exmo/align/cli/ExtGroupEval.java
index d69dc443..27cf2c25 100644
--- a/src/fr/inrialpes/exmo/align/cli/ExtGroupEval.java
+++ b/src/fr/inrialpes/exmo/align/cli/ExtGroupEval.java
@@ -31,7 +31,6 @@ package fr.inrialpes.exmo.align.cli;
import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.Evaluator;
-import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.impl.ObjectAlignment;
import fr.inrialpes.exmo.align.impl.URIAlignment;
import fr.inrialpes.exmo.align.impl.eval.ExtPREvaluator;
@@ -49,6 +48,7 @@ import java.util.Vector;
import java.util.Enumeration;
import java.util.Arrays;
import java.util.Formatter;
+import java.util.Properties;
import org.xml.sax.SAXException;
@@ -93,7 +93,7 @@ $Id$
public class ExtGroupEval {
- BasicParameters params = null;
+ Properties params = null;
String filename = null;
String reference = "refalign.rdf";
String format = "s";
@@ -184,8 +184,8 @@ public class ExtGroupEval {
listAlgo.add( s );
}
- params = new BasicParameters();
- if (debug > 0) params.setParameter( "debug", Integer.toString( debug-1 ) );
+ params = new Properties();
+ if (debug > 0) params.setProperty( "debug", Integer.toString( debug-1 ) );
print( iterateDirectories() );
}
@@ -267,7 +267,7 @@ public class ExtGroupEval {
eval = new ExtPREvaluator(ObjectAlignment.toObjectAlignment( (URIAlignment)align1 ),
ObjectAlignment.toObjectAlignment( (URIAlignment)align2 ) );
// Compare
- params.setParameter( "debug", Integer.toString( nextdebug ) );
+ params.setProperty( "debug", Integer.toString( nextdebug ) );
eval.eval( params ) ;
} catch (Exception ex) {
if ( debug > 1 ) {
diff --git a/src/fr/inrialpes/exmo/align/cli/GroupAlign.java b/src/fr/inrialpes/exmo/align/cli/GroupAlign.java
index 5d1efaef..6db4ffa1 100644
--- a/src/fr/inrialpes/exmo/align/cli/GroupAlign.java
+++ b/src/fr/inrialpes/exmo/align/cli/GroupAlign.java
@@ -37,13 +37,13 @@ import org.semanticweb.owl.align.AlignmentVisitor;
import fr.inrialpes.exmo.align.impl.Annotations;
import fr.inrialpes.exmo.align.impl.Namespace;
-import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.parser.AlignmentParser;
import fr.inrialpes.exmo.ontowrap.OntologyFactory;
import java.io.File;
import java.io.FileOutputStream;
+import java.io.FileInputStream;
import java.io.PrintWriter;
import java.io.BufferedWriter;
import java.io.OutputStreamWriter;
@@ -52,6 +52,7 @@ import java.lang.Integer;
import java.lang.Long;
import java.util.Hashtable;
import java.util.Enumeration;
+import java.util.Properties;
import org.xml.sax.SAXException;
@@ -88,7 +89,7 @@ $Id$
public class GroupAlign {
- BasicParameters params = null;
+ Properties params = null;
String filename = "align";
String paramfile = null;
String urlprefix = null;
@@ -109,7 +110,7 @@ public class GroupAlign {
public void run(String[] args) throws Exception {
LongOpt[] longopts = new LongOpt[13];
- params = new BasicParameters();
+ params = new Properties();
longopts[0] = new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h');
longopts[1] = new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o');
@@ -151,7 +152,7 @@ public class GroupAlign {
case 'p' :
/* Read parameters from filename */
paramfile = g.getOptarg();
- BasicParameters.read( params, paramfile );
+ params.loadFromXML( new FileInputStream( paramfile ) );
break;
case 'r' :
/* Use the given class for rendering */
@@ -182,7 +183,7 @@ public class GroupAlign {
arg = g.getOptarg();
int index = arg.indexOf('=');
if ( index != -1 ) {
- params.setParameter( arg.substring( 0, index),
+ params.setProperty( arg.substring( 0, index),
arg.substring(index+1));
} else {
System.err.println("Bad parameter syntax: "+g);
@@ -207,10 +208,10 @@ public class GroupAlign {
//int i = g.getOptind();
- if (debug == 0 && params.getParameter("debug") != null) {
- debug = Integer.parseInt(params.getParameter("debug"));
+ if (debug == 0 && params.getProperty("debug") != null) {
+ debug = Integer.parseInt(params.getProperty("debug"));
}
- if (debug > 0) params.setParameter( "debug", Integer.toString( debug-1 ) );
+ if (debug > 0) params.setProperty( "debug", Integer.toString( debug-1 ) );
iterateDirectories();
}
diff --git a/src/fr/inrialpes/exmo/align/cli/GroupEval.java b/src/fr/inrialpes/exmo/align/cli/GroupEval.java
index 458446d4..b896300a 100644
--- a/src/fr/inrialpes/exmo/align/cli/GroupEval.java
+++ b/src/fr/inrialpes/exmo/align/cli/GroupEval.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 The University of Manchester
* Copyright (C) 2003 The University of Karlsruhe
- * Copyright (C) 2003-2011, INRIA
+ * Copyright (C) 2003-2012, INRIA
* Copyright (C) 2004, Université de Montréal
*
* This program is free software; you can redistribute it and/or
@@ -29,7 +29,6 @@ package fr.inrialpes.exmo.align.cli;
import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.Evaluator;
-import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.impl.eval.PRecEvaluator;
import fr.inrialpes.exmo.ontowrap.OntologyFactory;
@@ -45,6 +44,7 @@ import java.util.Vector;
import java.util.Enumeration;
import java.util.Arrays;
import java.util.Formatter;
+import java.util.Properties;
import org.xml.sax.SAXException;
@@ -89,7 +89,7 @@ $Id$
public class GroupEval {
- BasicParameters params = null;
+ Properties params = null;
String filename = null;
String reference = "refalign.rdf";
String format = "pr";
@@ -182,8 +182,8 @@ public class GroupEval {
listAlgo.add( s );
}
- params = new BasicParameters();
- if (debug > 0) params.setParameter( "debug", Integer.toString( debug-1 ) );
+ params = new Properties();
+ if (debug > 0) params.setProperty( "debug", Integer.toString( debug-1 ) );
print( iterateDirectories() );
}
@@ -264,7 +264,7 @@ public class GroupEval {
// Create evaluator object
eval = new PRecEvaluator( align1, align2 );
// Compare
- params.setParameter( "debug", Integer.toString( nextdebug ) );
+ params.setProperty( "debug", Integer.toString( nextdebug ) );
eval.eval( params ) ;
} catch (Exception ex) {
if ( debug > 1 ) {
diff --git a/src/fr/inrialpes/exmo/align/cli/GroupOutput.java b/src/fr/inrialpes/exmo/align/cli/GroupOutput.java
index f9a441b9..b14c2eb6 100644
--- a/src/fr/inrialpes/exmo/align/cli/GroupOutput.java
+++ b/src/fr/inrialpes/exmo/align/cli/GroupOutput.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2003 The University of Manchester
* Copyright (C) 2003 The University of Karlsruhe
- * Copyright (C) 2003-2011, INRIA
+ * Copyright (C) 2003-2012, INRIA
* Copyright (C) 2004, Université de Montréal
*
* This program is free software; you can redistribute it and/or
@@ -31,7 +31,6 @@ import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Evaluator;
-import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.impl.eval.PRecEvaluator;
import fr.inrialpes.exmo.ontowrap.OntologyFactory;
@@ -48,6 +47,7 @@ import java.lang.Integer;
import java.util.Hashtable;
import java.util.Vector;
import java.util.Enumeration;
+import java.util.Properties;
import gnu.getopt.LongOpt;
import gnu.getopt.Getopt;
@@ -108,7 +108,7 @@ public class GroupOutput {
{257},//h=13
{254,260,261},//i=14
{262,265,266} };//emptyset=15
- BasicParameters params = null;
+ Properties params = null;
Vector<String> listAlgo;
String fileNames = "";
String outFile = null;
@@ -174,10 +174,10 @@ public class GroupOutput {
listAlgo.add( s );
}
- params = new BasicParameters();
- if (debug > 0) params.setParameter( "debug", Integer.toString(debug-1) );
+ params = new Properties();
+ if (debug > 0) params.setProperty( "debug", Integer.toString(debug-1) );
- params.setParameter( "step", Integer.toString(SIZE) );
+ params.setProperty( "step", Integer.toString(SIZE) );
// Set output file
OutputStream stream;
@@ -273,7 +273,7 @@ public class GroupOutput {
// Create evaluator object
eval = new PRecEvaluator( align1, align2 );
// Compare
- params.setParameter( "debug", Integer.toString( nextdebug ) );
+ params.setProperty( "debug", Integer.toString( nextdebug ) );
eval.eval( params ) ;
return eval;
}
diff --git a/src/fr/inrialpes/exmo/align/cli/Procalign.java b/src/fr/inrialpes/exmo/align/cli/Procalign.java
index 8736bd45..2dfec619 100644
--- a/src/fr/inrialpes/exmo/align/cli/Procalign.java
+++ b/src/fr/inrialpes/exmo/align/cli/Procalign.java
@@ -33,15 +33,16 @@ import org.semanticweb.owl.align.AlignmentVisitor;
import fr.inrialpes.exmo.align.impl.Annotations;
import fr.inrialpes.exmo.align.impl.Namespace;
-import fr.inrialpes.exmo.align.impl.BasicParameters;
import java.io.OutputStream;
import java.io.FileOutputStream;
+import java.io.FileInputStream;
import java.io.PrintWriter;
import java.io.BufferedWriter;
import java.io.OutputStreamWriter;
import java.net.URI;
import java.util.Hashtable;
+import java.util.Properties;
import java.lang.Double;
import java.lang.Integer;
import java.lang.Long;
@@ -113,7 +114,7 @@ public class Procalign {
AlignmentVisitor renderer = null;
int debug = 0;
double threshold = 0;
- BasicParameters params = new BasicParameters();
+ Properties params = new Properties();
LongOpt[] longopts = new LongOpt[10];
@@ -145,7 +146,7 @@ public class Procalign {
case 'p' :
/* Read parameters from filename */
paramfile = g.getOptarg();
- BasicParameters.read( params, paramfile);
+ params.loadFromXML( new FileInputStream( paramfile ) );
break;
case 'r' :
/* Use the given class for rendering */
diff --git a/src/fr/inrialpes/exmo/align/cli/WGroupEval.java b/src/fr/inrialpes/exmo/align/cli/WGroupEval.java
index 2e876956..959ce371 100644
--- a/src/fr/inrialpes/exmo/align/cli/WGroupEval.java
+++ b/src/fr/inrialpes/exmo/align/cli/WGroupEval.java
@@ -29,7 +29,6 @@ package fr.inrialpes.exmo.align.cli;
import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.Evaluator;
-import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.impl.eval.WeightedPREvaluator;
import fr.inrialpes.exmo.ontowrap.OntologyFactory;
@@ -44,6 +43,7 @@ import java.util.Vector;
import java.util.Enumeration;
import java.util.Arrays;
import java.util.Formatter;
+import java.util.Properties;
import org.xml.sax.SAXException;
@@ -88,7 +88,7 @@ $Id$
public class WGroupEval {
- BasicParameters params = null;
+ Properties params = null;
String filename = null;
String reference = "refalign.rdf";
String format = "pr";
@@ -181,8 +181,8 @@ public class WGroupEval {
listAlgo.add( s );
}
- params = new BasicParameters();
- if (debug > 0) params.setParameter( "debug", Integer.toString( debug-1 ) );
+ params = new Properties();
+ if (debug > 0) params.setProperty( "debug", Integer.toString( debug-1 ) );
print( iterateDirectories() );
}
@@ -263,7 +263,7 @@ public class WGroupEval {
// Create evaluator object
eval = new WeightedPREvaluator( align1, align2 );
// Compare
- params.setParameter( "debug", Integer.toString( nextdebug ) );
+ params.setProperty( "debug", Integer.toString( nextdebug ) );
eval.eval( params ) ;
} catch (Exception ex) {
if ( debug > 1 ) {
diff --git a/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java b/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java
index 0612c2d4..8460a28c 100644
--- a/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java
@@ -81,13 +81,13 @@ public class BasicAlignment implements Alignment {
protected Extensions extensions = null;
- protected BasicParameters namespaces = null;
+ protected Properties namespaces = null;
public BasicAlignment() {
hash1 = new Hashtable<Object,Set<Cell>>();
hash2 = new Hashtable<Object,Set<Cell>>();
extensions = new Extensions();
- namespaces = new BasicParameters();
+ namespaces = new Properties();
if ( this instanceof AlignmentProcess ) setExtension( Namespace.ALIGNMENT.uri, Annotations.METHOD, getClass().getName() );
onto1 = new BasicOntology<Object>();
onto2 = new BasicOntology<Object>();
@@ -222,14 +222,14 @@ public class BasicAlignment implements Alignment {
return extensions.getExtension( uri, label );
};
- public BasicParameters getXNamespaces(){ return namespaces; }
+ public Properties getXNamespaces(){ return namespaces; }
public void setXNamespace( String label, String uri ) {
- namespaces.setParameter( label, uri );
+ namespaces.setProperty( label, uri );
};
public String getXNamespace( String label ) {
- return namespaces.getParameter( label );
+ return (String)namespaces.getProperty( label );
};
public Enumeration<Cell> getElements() {
@@ -696,8 +696,9 @@ public class BasicAlignment implements Alignment {
result.setType( getType() );
result.setLevel( getLevel() );
result.setExtensions( convertExtension( "inverted", "http://exmo.inrialpes.fr/align/impl/BasicAlignment#inverse" ) );
- for ( Enumeration e = namespaces.getNames() ; e.hasMoreElements(); ){
- String label = (String)e.nextElement();
+ //for ( Enumeration e = namespaces.getNames() ; e.hasMoreElements(); ){
+ // String label = (String)e.nextElement();
+ for ( String label : namespaces.stringPropertyNames() ) {
result.setXNamespace( label, getXNamespace( label ) );
}
for ( Enumeration e = getElements() ; e.hasMoreElements(); ){
@@ -736,8 +737,9 @@ public class BasicAlignment implements Alignment {
align.setFile1( getFile1() );
align.setFile2( getFile2() );
align.setExtensions( convertExtension( "cloned", this.getClass().getName()+"#clone" ) );
- for ( Enumeration e = namespaces.getNames() ; e.hasMoreElements(); ){
- String label = (String)e.nextElement();
+ //for ( Enumeration e = namespaces.getNames() ; e.hasMoreElements(); ){
+ // String label = (String)e.nextElement();
+ for ( String label : namespaces.stringPropertyNames() ) {
align.setXNamespace( label, getXNamespace( label ) );
}
try { align.ingest( this ); }
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java
index 0ae6f2d1..b69bffdc 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java
@@ -152,11 +152,10 @@ public class RDFRendererVisitor extends IndentedRendererVisitor implements Align
writer.print(NL+INDENT+INDENT+INDENT+INDENT+" xmlns:"+nslist.get(k)+"='"+k+"'");
}
if ( align instanceof BasicAlignment ) {
- for ( Enumeration e = ((BasicAlignment)align).getXNamespaces().getNames() ; e.hasMoreElements(); ){
- String label = (String)e.nextElement();
- if ( !label.equals("rdf") && !label.equals("xsd")
- && !label.equals("<default>") )
- writer.print(NL+INDENT+INDENT+INDENT+INDENT+" xmlns:"+label+"='"+((BasicAlignment)align).getXNamespace( label )+"'");
+ 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 )+"'");
}
}
writer.print(">"+NL);
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/XMLMetadataRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/XMLMetadataRendererVisitor.java
index 0b529812..bdcb266c 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/XMLMetadataRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/XMLMetadataRendererVisitor.java
@@ -94,11 +94,10 @@ public class XMLMetadataRendererVisitor extends GenericReflectiveVisitor impleme
writer.print("\n xmlns:"+nslist.get(k)+"='"+k+"'");
}
if ( align instanceof BasicAlignment ) {
- for ( Enumeration e = ((BasicAlignment)align).getXNamespaces().getNames() ; e.hasMoreElements(); ){
- String label = (String)e.nextElement();
- if ( !label.equals("rdf") && !label.equals("xsd")
- && !label.equals("<default>") )
- writer.print("\n xmlns:"+label+"='"+((BasicAlignment)align).getXNamespace( label )+"'");
+ for ( String label : ((BasicAlignment)align).getXNamespaces().stringPropertyNames() ) {
+ if ( !label.equals("rdf") && !label.equals("xsd")
+ && !label.equals("<default>") )
+ writer.print("\n xmlns:"+label+"='"+((BasicAlignment)align).getXNamespace( label )+"'");
}
}
writer.print(">\n");
diff --git a/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java b/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
index acf4aaf1..c6f7f684 100644
--- a/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
+++ b/src/fr/inrialpes/exmo/align/service/AServProtocolManager.java
@@ -24,7 +24,6 @@ package fr.inrialpes.exmo.align.service;
import fr.inrialpes.exmo.align.parser.AlignmentParser;
import fr.inrialpes.exmo.align.impl.Annotations;
import fr.inrialpes.exmo.align.impl.Namespace;
-import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.impl.BasicAlignment;
import fr.inrialpes.exmo.align.impl.URIAlignment;
import fr.inrialpes.exmo.align.impl.ObjectAlignment;
diff --git a/src/fr/inrialpes/exmo/align/service/AlignmentService.java b/src/fr/inrialpes/exmo/align/service/AlignmentService.java
index 67a6b69e..0bbbccc3 100644
--- a/src/fr/inrialpes/exmo/align/service/AlignmentService.java
+++ b/src/fr/inrialpes/exmo/align/service/AlignmentService.java
@@ -24,7 +24,6 @@ import fr.inrialpes.exmo.queryprocessor.QueryProcessor;
import fr.inrialpes.exmo.queryprocessor.Result;
import fr.inrialpes.exmo.queryprocessor.Type;
-import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.util.NullStream;
import gnu.getopt.LongOpt;
@@ -248,11 +247,6 @@ public class AlignmentService {
/* Use filename instead of stdout */
outfile = g.getOptarg();
break;
- //case 'p' :
- /* Read parameters from filename */
- //paramfile = g.getOptarg();
- //BasicParameters.read( params, paramfile);
- //break;
case 'l' :
/* Use the given file as a database image to load */
filename = g.getOptarg();
diff --git a/src/fr/inrialpes/exmo/align/service/CacheImpl.java b/src/fr/inrialpes/exmo/align/service/CacheImpl.java
index 0c39e850..d0d901a5 100644
--- a/src/fr/inrialpes/exmo/align/service/CacheImpl.java
+++ b/src/fr/inrialpes/exmo/align/service/CacheImpl.java
@@ -44,7 +44,6 @@ import fr.inrialpes.exmo.align.impl.BasicAlignment;
import fr.inrialpes.exmo.align.impl.BasicRelation;
import fr.inrialpes.exmo.align.impl.Annotations;
import fr.inrialpes.exmo.align.impl.Namespace;
-import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.impl.URIAlignment;
import fr.inrialpes.exmo.align.impl.URICell;
import fr.inrialpes.exmo.align.impl.Namespace;
diff --git a/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java b/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java
index 8c6c3879..830ab77c 100644
--- a/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java
+++ b/src/fr/inrialpes/exmo/align/service/HTMLAServProfile.java
@@ -20,7 +20,6 @@
package fr.inrialpes.exmo.align.service;
-import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.impl.Annotations;
import fr.inrialpes.exmo.align.impl.Namespace;
import fr.inrialpes.exmo.align.service.msg.Message;
@@ -305,10 +304,8 @@ public class HTMLAServProfile implements AlignmentServiceProfile {
*/
// Convert parms to parameters
- BasicParameters params = new BasicParameters();
- Enumeration e = parms.propertyNames();
- while ( e.hasMoreElements()) {
- String key = (String)e.nextElement();
+ Properties params = new Properties();
+ for ( String key : parms.stringPropertyNames() ) {
if ( debug > 1 ) System.err.println( " PRM: '" + key + "' = '" +parms.getProperty( key ) + "'" );
if ( key.startsWith( "paramn" ) ){
params.setProperty( parms.getProperty( key ),
@@ -387,7 +384,7 @@ public class HTMLAServProfile implements AlignmentServiceProfile {
* HTTP administration interface
* Allows some limited administration of the server through HTTP
*/
- public Response adminAnswer( String uri, String perf, Properties header, BasicParameters params ) {
+ public Response adminAnswer( String uri, String perf, Properties header, Properties params ) {
if ( debug > 0 ) System.err.println("ADMIN["+perf+"]");
String msg = "";
if ( perf.equals("listmethods") ){
@@ -464,7 +461,7 @@ public class HTMLAServProfile implements AlignmentServiceProfile {
* Returns the alignment in RDF/XML
*/
public Response returnAlignment( String uri ) {
- BasicParameters params = new BasicParameters();
+ Properties params = new Properties();
params.setProperty("id", manager.serverURL()+uri);
params.setProperty( "method", "fr.inrialpes.exmo.align.impl.renderer.RDFRendererVisitor" );
Message answer = manager.render( new Message(newId(),(Message)null,myId,serverId,"", params) );
@@ -479,7 +476,7 @@ public class HTMLAServProfile implements AlignmentServiceProfile {
* User friendly HTTP interface
* uses the protocol but offers user-targeted interaction
*/
- public Response htmlAnswer( String uri, String perf, Properties header, BasicParameters params ) {
+ public Response htmlAnswer( String uri, String perf, Properties header, Properties params ) {
//System.err.println("HTML["+perf+"]");
// REST get
String msg = "";
@@ -855,11 +852,11 @@ public class HTMLAServProfile implements AlignmentServiceProfile {
// ===============================================
// Util
- public Response wsdlAnswer(String uri, String perf, Properties header, BasicParameters params ) {
+ public Response wsdlAnswer(String uri, String perf, Properties header, Properties params ) {
return new Response( HTTP_OK, MIME_XML, WSAServProfile.wsdlAnswer( false ) );
}
- private String testErrorMessages( Message answer, BasicParameters param ) {
+ private String testErrorMessages( Message answer, Properties param ) {
if ( param.getProperty("restful") != null ) {
return answer.RESTString();
} else {
@@ -867,7 +864,7 @@ public class HTMLAServProfile implements AlignmentServiceProfile {
}
}
- private String displayAnswer( Message answer, BasicParameters param ) {
+ private String displayAnswer( Message answer, Properties param ) {
String result = null;
if( param.getProperty("restful") != null ) {
if( param.getProperty("return").equals("HTML") ) {
diff --git a/src/fr/inrialpes/exmo/align/service/WSAServProfile.java b/src/fr/inrialpes/exmo/align/service/WSAServProfile.java
index ef81bf7a..7fd025ef 100644
--- a/src/fr/inrialpes/exmo/align/service/WSAServProfile.java
+++ b/src/fr/inrialpes/exmo/align/service/WSAServProfile.java
@@ -20,7 +20,6 @@
package fr.inrialpes.exmo.align.service;
-import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.impl.Annotations;
import fr.inrialpes.exmo.align.impl.Namespace;
import fr.inrialpes.exmo.align.service.msg.Message;
diff --git a/src/fr/inrialpes/exmo/align/service/WSAlignment.java b/src/fr/inrialpes/exmo/align/service/WSAlignment.java
index f59b3c7d..382f4575 100644
--- a/src/fr/inrialpes/exmo/align/service/WSAlignment.java
+++ b/src/fr/inrialpes/exmo/align/service/WSAlignment.java
@@ -59,7 +59,6 @@ import fr.inrialpes.exmo.ontowrap.Ontology;
import fr.inrialpes.exmo.align.impl.URIAlignment;
import fr.inrialpes.exmo.align.impl.URICell;
-import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.impl.Annotations;
import fr.inrialpes.exmo.align.impl.Namespace;
import fr.inrialpes.exmo.align.parser.AlignmentParser;
diff --git a/src/fr/inrialpes/exmo/align/service/jade/JadeFIPAAServiceAgent.java b/src/fr/inrialpes/exmo/align/service/jade/JadeFIPAAServiceAgent.java
index d74cca72..1fc9677c 100755
--- a/src/fr/inrialpes/exmo/align/service/jade/JadeFIPAAServiceAgent.java
+++ b/src/fr/inrialpes/exmo/align/service/jade/JadeFIPAAServiceAgent.java
@@ -2,7 +2,7 @@
* $Id$
*
* Copyright (C) Orange R&D, 2006
- * Copyright (C) INRIA, 2006, 2008-2009, 2011
+ * Copyright (C) INRIA, 2006, 2008-2009, 2011-2012
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -42,7 +42,6 @@ import jade.lang.acl.ACLMessage;
import jade.lang.acl.MessageTemplate;
import jade.util.Logger;
-import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.service.AServProtocolManager;
import fr.inrialpes.exmo.align.service.msg.Message;
import fr.inrialpes.exmo.align.service.msg.ErrorMsg;
@@ -131,8 +130,6 @@ public class JadeFIPAAServiceAgent extends Agent {
ce = CTmanager.extractContent(msg);
params = decodeMessage(ce,params);
- //Parameters params = new BasicParameters();
-
if (ce instanceof ALIGN){
Message answer = manager.align(new Message(newId(), (Message)null,myId,serverId,"",params));
if(!(answer instanceof ErrorMsg)){
--
GitLab