diff --git a/html/relnotes.html b/html/relnotes.html
index 542c1d5ef78ebc0925061fec097f81b81a9c435d..34722659f748d212439bff56ee53214ca7373237 100644
--- a/html/relnotes.html
+++ b/html/relnotes.html
@@ -87,6 +87,7 @@ with a warning:
<li>Added generation of local <a href="maven.html">maven repository</a> in build.xml</li>
<li>Implemented transactions in database store (server)</li>
<li>Modified evaluators needing <tt>ObjectAlignment</tt> to convert them on the fly (impl)</li>
+<li>Modified renderers needing <tt>ObjectAlignment</tt> to convert them on the fly (impl)</li>
<li>Evaluators report better errors on the server (server)</li>
<li>Fixed a bug in <tt>WeightedPREvaluator</tt> (can be more than 1.) (impl)</li>
<li>Fixed strong bug in the implementation of relaxed precision and recall (impl)</li>
diff --git a/src/fr/inrialpes/exmo/align/cli/ParserPrinter.java b/src/fr/inrialpes/exmo/align/cli/ParserPrinter.java
index 169cde710eb78f11294fddb8e1ccd067f4ed46d9..ff336caa3367a7969dab92c265fe5998723bfc77 100644
--- a/src/fr/inrialpes/exmo/align/cli/ParserPrinter.java
+++ b/src/fr/inrialpes/exmo/align/cli/ParserPrinter.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2004, 2007-2008, 2011-2012
+ * Copyright (C) INRIA, 2003-2004, 2007-2008, 2011-2013
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -257,13 +257,7 @@ public class ParserPrinter {
try {
result.render( renderer );
} catch ( AlignmentException aex ) {
- try {
- result = ObjectAlignment.toObjectAlignment( (URIAlignment)result );
- result.render( renderer );
- } catch ( Exception aex2 ) {
- // Throw the initial one
- throw aex;
- }
+ throw aex;
} finally {
writer.flush();
writer.close();
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/COWLMappingRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/COWLMappingRendererVisitor.java
index 7464504cf5c82aad9a1cbe9b9e14a4668fba7c2c..8604a6d0b3e386b0c27ebc723af0fb0ceec9b22d 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
+ * Copyright (C) INRIA, 2003-2004, 2007-2010, 2012-2013
*
* 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
@@ -32,7 +32,9 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.Relation;
import fr.inrialpes.exmo.align.impl.ObjectAlignment;
+import fr.inrialpes.exmo.align.impl.URIAlignment;
import fr.inrialpes.exmo.align.impl.rel.*;
+
import fr.inrialpes.exmo.ontowrap.LoadedOntology;
import fr.inrialpes.exmo.ontowrap.OntowrapException;
@@ -60,9 +62,15 @@ public class COWLMappingRendererVisitor extends GenericReflectiveVisitor impleme
public void visit( Alignment align ) throws AlignmentException {
if ( subsumedInvocableMethod( this, align, Alignment.class ) ) return;
// default behaviour
- if ( !(align instanceof ObjectAlignment) )
- throw new AlignmentException("COWLMappingRenderer: cannot render simple alignment. Turn them into ObjectAlignment, by toObjectAlignement()");
- alignment = align;
+ if ( align instanceof ObjectAlignment ) {
+ alignment = align;
+ } else {
+ try {
+ alignment = ObjectAlignment.toObjectAlignment( (URIAlignment)align );
+ } catch ( AlignmentException alex ) {
+ throw new AlignmentException("COWLMappingRenderer: cannot render simple alignment. Need an ObjectAlignment", alex );
+ }
+ }
onto1 = (LoadedOntology)((ObjectAlignment)alignment).getOntologyObject1();
onto2 = (LoadedOntology)((ObjectAlignment)alignment).getOntologyObject2();
writer.print("<rdf:RDF\n");
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java
index b268b87c996de0a9583ccb35ebd177929d23408a..e6ab0b1886c3d02c3a86d73b25867997cbe8d5d7 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2004, 2007-2012
+ * Copyright (C) INRIA, 2003-2004, 2007-2013
*
* 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
@@ -35,6 +35,7 @@ import fr.inrialpes.exmo.align.impl.Annotations;
import fr.inrialpes.exmo.align.impl.Namespace;
import fr.inrialpes.exmo.align.impl.Extensions;
import fr.inrialpes.exmo.align.impl.ObjectAlignment;
+import fr.inrialpes.exmo.align.impl.URIAlignment;
import fr.inrialpes.exmo.align.impl.BasicRelation;
import fr.inrialpes.exmo.align.impl.rel.*;
@@ -107,14 +108,20 @@ public class OWLAxiomsRendererVisitor extends IndentedRendererVisitor implements
public void visit( Alignment align ) throws AlignmentException {
if ( subsumedInvocableMethod( this, align, Alignment.class ) ) return;
// default behaviour
- alignment = align;
- if ( align instanceof ObjectAlignment ){
+ if ( align instanceof ObjectAlignment ) {
+ alignment = align;
onto1 = (LoadedOntology)((ObjectAlignment)alignment).getOntologyObject1();
onto2 = (LoadedOntology)((ObjectAlignment)alignment).getOntologyObject2();
} else if ( align instanceof EDOALAlignment ) {
edoal = true;
} else {
- throw new AlignmentException("OWLAxiomsRenderer: cannot render simple alignment. Turn them into ObjectAlignment, by toObjectAlignement() or use EDOALAlignment");
+ try {
+ alignment = ObjectAlignment.toObjectAlignment( (URIAlignment)align );
+ onto1 = (LoadedOntology)((ObjectAlignment)alignment).getOntologyObject1();
+ onto2 = (LoadedOntology)((ObjectAlignment)alignment).getOntologyObject2();
+ } catch ( AlignmentException alex ) {
+ throw new AlignmentException("OWLAxiomsRenderer: cannot render simple alignment. Need an ObjectAlignment", alex );
+ }
}
writer.print("<rdf:RDF"+NL);
writer.print(" xmlns:owl=\"http://www.w3.org/2002/07/owl#\""+NL);
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/SEKTMappingRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/SEKTMappingRendererVisitor.java
index 1608ee45fd5d3bc664511bc8eac779a28153587c..2b3fe3493e8562ebe05f1aa3b9a547b2c790ffef 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/SEKTMappingRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/SEKTMappingRendererVisitor.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2005, 2007-2010, 2012
+ * Copyright (C) INRIA, 2003-2005, 2007-2010, 2012-2013
*
* 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,6 +33,7 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.Relation;
import fr.inrialpes.exmo.align.impl.ObjectAlignment;
+import fr.inrialpes.exmo.align.impl.URIAlignment;
import fr.inrialpes.exmo.align.impl.rel.*;
import fr.inrialpes.exmo.ontowrap.LoadedOntology;
@@ -64,9 +65,15 @@ public class SEKTMappingRendererVisitor extends GenericReflectiveVisitor impleme
public void visit( Alignment align ) throws AlignmentException {
if ( subsumedInvocableMethod( this, align, Alignment.class ) ) return;
// default behaviour
- if ( !(align instanceof ObjectAlignment) )
- throw new AlignmentException("SEKTMappingRenderer: cannot render simple alignment. Turn them into ObjectAlignment, by toObjectAlignement()");
- alignment = align;
+ if ( align instanceof ObjectAlignment ) {
+ alignment = align;
+ } else {
+ try {
+ alignment = ObjectAlignment.toObjectAlignment( (URIAlignment)align );
+ } catch ( AlignmentException alex ) {
+ throw new AlignmentException("SEKTMappingRenderer: cannot render simple alignment. Need an ObjectAlignment", alex );
+ }
+ }
onto1 = (LoadedOntology)((ObjectAlignment)alignment).getOntologyObject1();
onto2 = (LoadedOntology)((ObjectAlignment)alignment).getOntologyObject2();
writer.print("MappingDocument(<\""+"\">\n");
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/SPARQLConstructRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/SPARQLConstructRendererVisitor.java
index 6fea16c4bbe76174ff4109a6009380c987030971..dbf00e2b743b0530a91e6c77f9b9fe7821c09df4 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/SPARQLConstructRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/SPARQLConstructRendererVisitor.java
@@ -20,16 +20,19 @@
package fr.inrialpes.exmo.align.impl.renderer;
-import fr.inrialpes.exmo.align.impl.edoal.EDOALCell;
-import fr.inrialpes.exmo.align.impl.edoal.Expression;
-import fr.inrialpes.exmo.align.impl.edoal.Transformation;
-
-import java.io.PrintWriter;
import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.AlignmentVisitor;
import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.Relation;
+
+import fr.inrialpes.exmo.align.impl.BasicAlignment;
+import fr.inrialpes.exmo.align.impl.edoal.EDOALAlignment;
+import fr.inrialpes.exmo.align.impl.edoal.EDOALCell;
+import fr.inrialpes.exmo.align.impl.edoal.Expression;
+import fr.inrialpes.exmo.align.impl.edoal.Transformation;
+
+import java.io.PrintWriter;
import java.net.URI;
import java.util.ArrayList;
import java.util.Enumeration;
@@ -77,9 +80,17 @@ public class SPARQLConstructRendererVisitor extends GraphPatternRendererVisitor
NL = p.getProperty( "newline" );
}
- public void visit(Alignment align) throws AlignmentException {
+ public void visit( Alignment align ) throws AlignmentException {
if ( subsumedInvocableMethod( this, align, Alignment.class ) ) return;
- alignment = align;
+ if ( align instanceof EDOALAlignment ) {
+ alignment = align;
+ } else {
+ try {
+ alignment = EDOALAlignment.toEDOALAlignment( (BasicAlignment)align );
+ } catch ( AlignmentException alex ) {
+ throw new AlignmentException("SPARQLSELECTRenderer: cannot render simple alignment. Need an EDOALAlignment", alex );
+ }
+ }
content_Corese = "";
content_Corese += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + NL;
content_Corese += "<!DOCTYPE rdf:RDF [" + NL;
@@ -99,7 +110,7 @@ public class SPARQLConstructRendererVisitor extends GraphPatternRendererVisitor
}
}
- public void visit(Cell cell) throws AlignmentException {
+ public void visit( Cell cell ) throws AlignmentException {
if ( subsumedInvocableMethod( this, cell, Cell.class ) ) return;
// default behaviour
this.cell = cell;
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/SPARQLSelectRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/SPARQLSelectRendererVisitor.java
index 957da61d2cb49f5bfaeb8af5dba9d6d67c8e92ab..916f56887d35b5cbbd71cdcb0a3064cd00475ff9 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/SPARQLSelectRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/SPARQLSelectRendererVisitor.java
@@ -20,13 +20,17 @@
package fr.inrialpes.exmo.align.impl.renderer;
-import fr.inrialpes.exmo.align.impl.edoal.Expression;
-import java.io.PrintWriter;
import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.AlignmentVisitor;
import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.Relation;
+
+import fr.inrialpes.exmo.align.impl.BasicAlignment;
+import fr.inrialpes.exmo.align.impl.edoal.EDOALAlignment;
+import fr.inrialpes.exmo.align.impl.edoal.Expression;
+
+import java.io.PrintWriter;
import java.net.URI;
import java.util.Enumeration;
import java.util.Hashtable;
@@ -65,21 +69,28 @@ public class SPARQLSelectRendererVisitor extends GraphPatternRendererVisitor imp
NL = p.getProperty( "newline" );
}
- public void visit(Alignment align) throws AlignmentException {
+ public void visit( Alignment align ) throws AlignmentException {
if ( subsumedInvocableMethod( this, align, Alignment.class ) ) return;
- alignment = align;
+ if ( align instanceof EDOALAlignment ) {
+ alignment = align;
+ } else {
+ try {
+ alignment = EDOALAlignment.toEDOALAlignment( (BasicAlignment)align );
+ } catch ( AlignmentException alex ) {
+ throw new AlignmentException("SPARQLSELECTRenderer: cannot render simple alignment. Need an EDOALAlignment", alex );
+ }
+ }
for( Cell c : align ){ c.accept( this ); };
}
- public void visit(Cell cell) throws AlignmentException {
+ public void visit( Cell cell ) throws AlignmentException {
if ( subsumedInvocableMethod( this, cell, Cell.class ) ) return;
String query = "";
this.cell = cell;
URI u1 = cell.getObject1AsURI(alignment);
URI u2 = cell.getObject2AsURI(alignment);
- if ( ( u1 != null && u2 != null)
- || alignment.getLevel().startsWith("2EDOAL") ){
+ if ( ( u1 != null && u2 != null) || alignment.getLevel().startsWith("2EDOAL") ) {
resetVariables("s", "o");
((Expression)(cell.getObject1())).accept( this );
GP1 = getGP();
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/SWRLRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/SWRLRendererVisitor.java
index 23a5bfa29608a85024f3161f93b976cd09b13858..babf44648069ba3c23a32c504fbcef0b0ba7f4da 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
+ * Copyright (C) INRIA, 2003-2004, 2007-2010, 2012-2013
*
* 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
@@ -32,6 +32,7 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.Relation;
import fr.inrialpes.exmo.align.impl.ObjectAlignment;
+import fr.inrialpes.exmo.align.impl.URIAlignment;
import fr.inrialpes.exmo.align.impl.rel.*;
import fr.inrialpes.exmo.ontowrap.LoadedOntology;
@@ -65,9 +66,15 @@ public class SWRLRendererVisitor extends GenericReflectiveVisitor implements Ali
public void visit( Alignment align ) throws AlignmentException {
if ( subsumedInvocableMethod( this, align, Alignment.class ) ) return;
// default behaviour
- if ( !( align instanceof ObjectAlignment) )
- throw new AlignmentException("SWRLRenderer: cannot render simple alignment. Turn them into ObjectAlignment, by toObjectAlignement()");
- alignment = align;
+ if ( align instanceof ObjectAlignment ) {
+ alignment = align;
+ } else {
+ try {
+ alignment = ObjectAlignment.toObjectAlignment( (URIAlignment)align );
+ } catch ( AlignmentException alex ) {
+ throw new AlignmentException("SWRLRenderer: cannot render simple alignment. Need an ObjectAlignment", alex );
+ }
+ }
onto1 = (LoadedOntology)((ObjectAlignment)alignment).getOntologyObject1();
onto2 = (LoadedOntology)((ObjectAlignment)alignment).getOntologyObject2();
if ( embedded == false )