diff --git a/html/relnotes.html b/html/relnotes.html index 5dc51637e75780067136d58c2cc6a70025938231..373b98371aa4ba1665e94aff6cbf814b08908bcb 100644 --- a/html/relnotes.html +++ b/html/relnotes.html @@ -39,8 +39,12 @@ <p> <ul compact="1"> -<li><tt>OntologyCache</tt> is now local at each <tt>OntologyFactory</tt> (onto)</li> -<li>Implement <tt>owlapi10</tt> as <tt>HeavyLoadedAlignment</tt> (onto)</li> +<li><font color="red">Deprecated</font> <tt>Alignment.init(onto,onto,cache)</tt> + in favour of <tt>Alignment.init(onto,onto)</tt>, see below (api)</tt> +<li><tt>OntologyCache</tt> is now local at + each <tt>OntologyFactory</tt>, it does not need to be manipulated + from outside (onto)</li> +<li>Implementing <tt>owlapi10</tt> as <tt>HeavyLoadedAlignment</tt> (onto)</li> <li>Started to put copyright notices to INRIA instead of INRIA Rhône-Alpes (misc)</li> </ul> </p> diff --git a/lib/mappingapilite.jar b/lib/mappingapilite.jar index bee7123aa96e96a56e4e23f9c3ae5e58da19c967..fc5d6b400526bf1317ce55c67236a9edee07af25 100644 Binary files a/lib/mappingapilite.jar and b/lib/mappingapilite.jar differ diff --git a/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java b/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java index dc5708d3b81010ac3c4395675ebca76ba54ff99c..38221d832ca7b81c99c849b7feb6e06bf20bd128 100644 --- a/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java +++ b/src/fr/inrialpes/exmo/align/impl/BasicAlignment.java @@ -1,7 +1,7 @@ /* * $Id$ * - * Copyright (C) INRIA Rhône-Alpes, 2003-2008 + * Copyright (C) INRIA, 2003-2008 * Copyright (C) CNR Pisa, 2005 * * This program is free software; you can redistribute it and/or modify @@ -102,6 +102,10 @@ public class BasicAlignment implements Alignment { * object. */ public void init( Object onto1, Object onto2, Object cache ) throws AlignmentException { + init( onto1, onto2 ); + } + + public void init( Object onto1, Object onto2 ) throws AlignmentException { if ( onto1 instanceof Ontology ) { this.onto1 = (Ontology<Object>)onto1; // [W:unchecked] this.onto2 = (Ontology<Object>)onto2; // [W:unchecked] @@ -111,10 +115,6 @@ public class BasicAlignment implements Alignment { } } - public void init( Object onto1, Object onto2 ) throws AlignmentException { - init( onto1, onto2, null ); - } - public static Parameters getParameters() { return (Parameters)null; } diff --git a/src/fr/inrialpes/exmo/align/impl/OWLAPIAlignment.java b/src/fr/inrialpes/exmo/align/impl/OWLAPIAlignment.java index 87304751daba6cdf2e0d0e9df331f17f0e40b9b3..f9836f391132395df203e657b9ab699dd723db7d 100644 --- a/src/fr/inrialpes/exmo/align/impl/OWLAPIAlignment.java +++ b/src/fr/inrialpes/exmo/align/impl/OWLAPIAlignment.java @@ -1,7 +1,7 @@ /* * $Id$ * - * Copyright (C) INRIA Rhône-Alpes, 2003-2008 + * Copyright (C) INRIA, 2003-2008 * * 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 diff --git a/src/fr/inrialpes/exmo/align/impl/ObjectAlignment.java b/src/fr/inrialpes/exmo/align/impl/ObjectAlignment.java index d15989eba0923e8fec05e3bbff7d6a9cc62c8ab3..d7b7187f02d1c813b5fd236177fe1b56a1d3cebc 100644 --- a/src/fr/inrialpes/exmo/align/impl/ObjectAlignment.java +++ b/src/fr/inrialpes/exmo/align/impl/ObjectAlignment.java @@ -1,7 +1,7 @@ /* * $Id$ * - * Copyright (C) INRIA Rhône-Alpes, 2003-2008 + * Copyright (C) INRIA, 2003-2008 * * 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 diff --git a/src/org/semanticweb/owl/align/Alignment.java b/src/org/semanticweb/owl/align/Alignment.java index 3d0f788962d47d3643ac7c8d5fa93ffc3bbe40dd..cf7b83dd60fd29bb00d0fe37a07500574b7468a2 100644 --- a/src/org/semanticweb/owl/align/Alignment.java +++ b/src/org/semanticweb/owl/align/Alignment.java @@ -1,7 +1,7 @@ /* * $Id$ * - * Copyright (C) INRIA Rhône-Alpes, 2003-2005, 2007-2008 + * Copyright (C) INRIA, 2003-2005, 2007-2008 * * 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 @@ -43,6 +43,13 @@ public interface Alignment extends Cloneable, Iterable<Cell> { public void init( Object onto1, Object onto2 ) throws AlignmentException; + /** + * Initialize the alignement before using it, with some ontology caching trick + * //@deprecated The OntologyCache is now internal, use init( onto1, onto2 ) instead + **/ + //@Deprecated + public void init( Object onto1, Object onto2, Object cache ) throws AlignmentException; + /** Alignment methods **/ public void accept( AlignmentVisitor visitor ) throws AlignmentException;