diff --git a/lib/procalign.jar b/lib/procalign.jar
index 111eafd40fafb30c886a88231d3ec4bf109f9e97..c8502683b81f1ec2c353c8c8f2c233b2a0970a57 100644
Binary files a/lib/procalign.jar and b/lib/procalign.jar differ
diff --git a/src/fr/inrialpes/exmo/align/impl/BasicCell.java b/src/fr/inrialpes/exmo/align/impl/BasicCell.java
index 026c3c2cf685e1701f30199fdae6991139bdf705..08201b6240a2aab9adb7950729b2c16dbe803b3c 100644
--- a/src/fr/inrialpes/exmo/align/impl/BasicCell.java
+++ b/src/fr/inrialpes/exmo/align/impl/BasicCell.java
@@ -36,6 +36,8 @@ import org.semanticweb.owl.align.AlignmentVisitor;
import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.Relation;
+import fr.inrialpes.exmo.align.impl.rel.*;
+
/**
* Represents an OWL ontology alignment. An ontology comprises a number of
* collections. Each ontology has a number of classes, properties and
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/PRecEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/PRecEvaluator.java
index 2c216d3456640b62525499e76eb5e09310dafbf3..d16ab869434ef0bcbf43a7c1b1eb59da1883a4a4 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/PRecEvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/PRecEvaluator.java
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.impl;
+package fr.inrialpes.exmo.align.impl.eval;
import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.AlignmentException;
@@ -26,6 +26,8 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.Evaluator;
import org.semanticweb.owl.align.Parameters;
+import fr.inrialpes.exmo.align.impl.BasicEvaluator;
+
import org.semanticweb.owl.model.OWLOntology;
import org.semanticweb.owl.model.OWLEntity;
import org.semanticweb.owl.model.OWLException;
diff --git a/src/fr/inrialpes/exmo/align/impl/eval/SymMeanEvaluator.java b/src/fr/inrialpes/exmo/align/impl/eval/SymMeanEvaluator.java
index d72cf70e8324eaafced5a0c0b00bc198a71a1cc5..ac139d8ac465483e39f463eb1a67e947b1f98eb6 100644
--- a/src/fr/inrialpes/exmo/align/impl/eval/SymMeanEvaluator.java
+++ b/src/fr/inrialpes/exmo/align/impl/eval/SymMeanEvaluator.java
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.impl;
+package fr.inrialpes.exmo.align.impl.eval;
import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.AlignmentException;
@@ -26,6 +26,8 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.Evaluator;
import org.semanticweb.owl.align.Parameters;
+import fr.inrialpes.exmo.align.impl.BasicEvaluator;
+
import org.semanticweb.owl.model.OWLOntology;
import org.semanticweb.owl.model.OWLEntity;
import org.semanticweb.owl.model.OWLException;
diff --git a/src/fr/inrialpes/exmo/align/impl/method/ClassNameEqAlignment.java b/src/fr/inrialpes/exmo/align/impl/method/ClassNameEqAlignment.java
index 16e86f0e9c5d8ccc24b29e602903d22cc2107db3..2a4623c289eecfa41d75fa24e87a799444115cd5 100644
--- a/src/fr/inrialpes/exmo/align/impl/method/ClassNameEqAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/method/ClassNameEqAlignment.java
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.impl;
+package fr.inrialpes.exmo.align.impl.method;
import java.util.Iterator;
import java.util.Hashtable;
@@ -33,6 +33,8 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Parameters;
+import fr.inrialpes.exmo.align.impl.BasicAlignment;
+
/**
* Represents an OWL ontology alignment. An ontology comprises a number of
* collections. Each ontology has a number of classes, properties and
diff --git a/src/fr/inrialpes/exmo/align/impl/method/ClassStructAlignment.java b/src/fr/inrialpes/exmo/align/impl/method/ClassStructAlignment.java
index 242196bc1e4ff4a5b3515fae0aaf7161b91749de..2610f2af119cd64084afd06dbb3973970c719817 100644
--- a/src/fr/inrialpes/exmo/align/impl/method/ClassStructAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/method/ClassStructAlignment.java
@@ -19,7 +19,7 @@
*/
-package fr.inrialpes.exmo.align.impl;
+package fr.inrialpes.exmo.align.impl.method;
import java.util.Iterator;
import java.util.Vector;
@@ -45,6 +45,8 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Parameters;
+import fr.inrialpes.exmo.align.impl.DistanceAlignment;
+
/** This class has been built for ISWC experiments with bibliography.
* It implements a non iterative (one step) OLA algorithms based on
* the name of classes and properties. It could be made iterative by
diff --git a/src/fr/inrialpes/exmo/align/impl/method/EditDistNameAlignment.java b/src/fr/inrialpes/exmo/align/impl/method/EditDistNameAlignment.java
index 6dbde78382524dd5c066e890e0162a9fe91b84f8..bb5db45cbd2d290d42b45061ed4b52f87c7a56a3 100644
--- a/src/fr/inrialpes/exmo/align/impl/method/EditDistNameAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/method/EditDistNameAlignment.java
@@ -20,7 +20,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.impl;
+package fr.inrialpes.exmo.align.impl.method;
import java.util.Iterator;
import java.util.Vector;
@@ -36,6 +36,8 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Parameters;
+import fr.inrialpes.exmo.align.impl.DistanceAlignment;
+
/**
* This class aligns ontology with regard to the editing distance between
* class names.
diff --git a/src/fr/inrialpes/exmo/align/impl/method/NameAndPropertyAlignment.java b/src/fr/inrialpes/exmo/align/impl/method/NameAndPropertyAlignment.java
index 1c5f7b2161b05ab40a6774cb03a08b9e2982dd3e..3397dad2ca446fd5d994ee0613330e272876a194 100644
--- a/src/fr/inrialpes/exmo/align/impl/method/NameAndPropertyAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/method/NameAndPropertyAlignment.java
@@ -19,7 +19,7 @@
*/
-package fr.inrialpes.exmo.align.impl;
+package fr.inrialpes.exmo.align.impl.method;
import java.util.Iterator;
import java.util.Vector;
@@ -44,6 +44,8 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Parameters;
+import fr.inrialpes.exmo.align.impl.DistanceAlignment;
+
/** This class has been built for ISWC experiments with bibliography.
* It implements a non iterative (one step) OLA algorithms based on
diff --git a/src/fr/inrialpes/exmo/align/impl/method/NameEqAlignment.java b/src/fr/inrialpes/exmo/align/impl/method/NameEqAlignment.java
index 65e89769d65f4705e3f623de1e78f83d933c6605..6e471dcbe24bdaf419231cbebbab5f888c6b8b03 100644
--- a/src/fr/inrialpes/exmo/align/impl/method/NameEqAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/method/NameEqAlignment.java
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.impl;
+package fr.inrialpes.exmo.align.impl.method;
import java.util.Iterator;
import java.util.Hashtable;
@@ -36,6 +36,9 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Parameters;
+import fr.inrialpes.exmo.align.impl.BasicAlignment;
+
+
/**
* Represents an OWL ontology alignment. An ontology comprises a number of
* collections. Each ontology has a number of classes, properties and
diff --git a/src/fr/inrialpes/exmo/align/impl/method/PropSubsDistAlignment.java b/src/fr/inrialpes/exmo/align/impl/method/PropSubsDistAlignment.java
index 96904ab740598ce0cdd0c101b2be689aeb16fe65..30e68a94ade776efc64fd0afca644e36aff19e24 100644
--- a/src/fr/inrialpes/exmo/align/impl/method/PropSubsDistAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/method/PropSubsDistAlignment.java
@@ -19,7 +19,7 @@
*/
-package fr.inrialpes.exmo.align.impl;
+package fr.inrialpes.exmo.align.impl.method;
import java.util.Iterator;
import java.util.Vector;
@@ -42,6 +42,8 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Parameters;
+import fr.inrialpes.exmo.align.impl.DistanceAlignment;
+
/** This class has been built for ISWC experiments with bibliography.
* It implements a non iterative (one step) OLA algorithms based on
* the name of classes and properties. It could be made iterative by
diff --git a/src/fr/inrialpes/exmo/align/impl/method/StringDistances.java b/src/fr/inrialpes/exmo/align/impl/method/StringDistances.java
index a3f1c81ea2c586035fa3bc61be9272f67c3c2991..e6d662fad4e220a6672cd4e9fbc5b1a21a59a7b5 100644
--- a/src/fr/inrialpes/exmo/align/impl/method/StringDistances.java
+++ b/src/fr/inrialpes/exmo/align/impl/method/StringDistances.java
@@ -24,7 +24,7 @@
* @version $Id$
*/
-package fr.inrialpes.exmo.align.impl;
+package fr.inrialpes.exmo.align.impl.method;
public class StringDistances {
diff --git a/src/fr/inrialpes/exmo/align/impl/method/StrucSubsDistAlignment.java b/src/fr/inrialpes/exmo/align/impl/method/StrucSubsDistAlignment.java
index cfb7dba38293b7b929213302a15aa672890f1a53..18588864033a0799e477c5ec6590ee15ecf99b52 100644
--- a/src/fr/inrialpes/exmo/align/impl/method/StrucSubsDistAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/method/StrucSubsDistAlignment.java
@@ -19,7 +19,7 @@
*/
-package fr.inrialpes.exmo.align.impl;
+package fr.inrialpes.exmo.align.impl.method;
import java.util.Iterator;
import java.util.Vector;
@@ -44,6 +44,8 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Parameters;
+import fr.inrialpes.exmo.align.impl.DistanceAlignment;
+
/** This class has been built for ISWC experiments with bibliography.
* It implements a non iterative (one step) OLA algorithms based on
* the name of classes and properties. It could be made iterative by
diff --git a/src/fr/inrialpes/exmo/align/impl/method/SubsDistNameAlignment.java b/src/fr/inrialpes/exmo/align/impl/method/SubsDistNameAlignment.java
index fb5af56346a58b98d6fc9c4418a9693e1bec9cd1..a7730cbc6895ba1b301bbc8b1322c07d8b111e44 100644
--- a/src/fr/inrialpes/exmo/align/impl/method/SubsDistNameAlignment.java
+++ b/src/fr/inrialpes/exmo/align/impl/method/SubsDistNameAlignment.java
@@ -19,7 +19,7 @@
*/
-package fr.inrialpes.exmo.align.impl;
+package fr.inrialpes.exmo.align.impl.method;
import java.util.Iterator;
import java.util.Vector;
@@ -42,6 +42,8 @@ import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Parameters;
+import fr.inrialpes.exmo.align.impl.DistanceAlignment;
+
/** This class has been built for ISWC experiments with bibliography.
* It implements a non iterative (one step) OLA algorithms based on
* the name of classes and properties. It could be made iterative by
diff --git a/src/fr/inrialpes/exmo/align/impl/rel/EquivRelation.java b/src/fr/inrialpes/exmo/align/impl/rel/EquivRelation.java
index 300d2266cc08393e220cad33f444613f4a25b6a6..a6b9bc5b1ac11d9988f1d1fc2f5165d23c2d968b 100644
--- a/src/fr/inrialpes/exmo/align/impl/rel/EquivRelation.java
+++ b/src/fr/inrialpes/exmo/align/impl/rel/EquivRelation.java
@@ -17,11 +17,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.impl;
+package fr.inrialpes.exmo.align.impl.rel;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.AlignmentVisitor;
+import fr.inrialpes.exmo.align.impl.BasicRelation;
+
/**
* Represents an OWL equivalence relation.
*
diff --git a/src/fr/inrialpes/exmo/align/impl/rel/IncompatRelation.java b/src/fr/inrialpes/exmo/align/impl/rel/IncompatRelation.java
index 223c9492024eb74b09f0f35b9250228937c2b977..888b6c10063237a793397713c5a93bb5856fd2d9 100644
--- a/src/fr/inrialpes/exmo/align/impl/rel/IncompatRelation.java
+++ b/src/fr/inrialpes/exmo/align/impl/rel/IncompatRelation.java
@@ -17,11 +17,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.impl;
+package fr.inrialpes.exmo.align.impl.rel;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.AlignmentVisitor;
+import fr.inrialpes.exmo.align.impl.BasicRelation;
+
/**
* Represents an OWL equivalence relation.
*
diff --git a/src/fr/inrialpes/exmo/align/impl/rel/SubsumeRelation.java b/src/fr/inrialpes/exmo/align/impl/rel/SubsumeRelation.java
index cd901aa7d1e42055c5cf15d05b8b28ab2c7b2a8a..260f33d2f914fed3482a64dd3248662a4927847b 100644
--- a/src/fr/inrialpes/exmo/align/impl/rel/SubsumeRelation.java
+++ b/src/fr/inrialpes/exmo/align/impl/rel/SubsumeRelation.java
@@ -17,11 +17,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.impl;
+package fr.inrialpes.exmo.align.impl.rel;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.AlignmentVisitor;
+import fr.inrialpes.exmo.align.impl.BasicRelation;
+
/**
* Represents an OWL subsumption relation.
*
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java
index 4516fe5b88ba4aeed76a823bbd897098fdfd1734..94546a5ec9068308a11418bbbd983eb234673847 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.impl;
+package fr.inrialpes.exmo.align.impl.renderer;
import java.util.Hashtable;
import java.util.Enumeration;
@@ -40,6 +40,8 @@ import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.Relation;
+import fr.inrialpes.exmo.align.impl.rel.*;
+
/**
* Renders an alignment as a new ontology merging these.
*
@@ -147,15 +149,15 @@ public class OWLAxiomsRendererVisitor implements AlignmentVisitor
// but this seems to be the case...
try {
Method mm = null;
- if ( Class.forName("fr.inrialpes.exmo.align.impl.EquivRelation").isInstance(rel) ){
+ if ( Class.forName("fr.inrialpes.exmo.align.impl.rel.EquivRelation").isInstance(rel) ){
mm = this.getClass().getMethod("visit",
- new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.EquivRelation")});
- } else if (Class.forName("fr.inrialpes.exmo.align.impl.SubsumeRelation").isInstance(rel) ) {
+ new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.rel.EquivRelation")});
+ } else if (Class.forName("fr.inrialpes.exmo.align.impl.rel.SubsumeRelation").isInstance(rel) ) {
mm = this.getClass().getMethod("visit",
- new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.SubsumeRelation")});
- } else if (Class.forName("fr.inrialpes.exmo.align.impl.IncompatRelation").isInstance(rel) ) {
+ new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.rel.SubsumeRelation")});
+ } else if (Class.forName("fr.inrialpes.exmo.align.impl.rel.IncompatRelation").isInstance(rel) ) {
mm = this.getClass().getMethod("visit",
- new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.IncompatRelation")});
+ new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.rel.IncompatRelation")});
}
if ( mm != null ) mm.invoke(this,new Object[] {rel});
} catch (Exception e) { throw new AlignmentException("Dispatching problem ", e); };
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java
index bdc86dfbe97f7d9b189b4c90245f097d5213f944..f65a29a2e92889ad03799b86d50c44afbaffdc6d 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/RDFRendererVisitor.java
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.impl;
+package fr.inrialpes.exmo.align.impl.renderer;
import java.util.Hashtable;
import java.util.Enumeration;
@@ -40,6 +40,8 @@ import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.Relation;
+import fr.inrialpes.exmo.align.impl.rel.*;
+
/**
* Renders an alignment as a new ontology merging these.
*
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/SWRLRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/SWRLRendererVisitor.java
index 896b6008cf153b2584bfa297d8b5b0969cf98022..a4c8f05cc2170ee472ca1e83bf2cb76bba53f353 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/SWRLRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/SWRLRendererVisitor.java
@@ -1,5 +1,5 @@
/*
- * $id$
+ * $Id$
*
* Copyright (C) INRIA Rhône-Alpes, 2003-2004
*
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.impl;
+package fr.inrialpes.exmo.align.impl.renderer;
import java.util.Hashtable;
import java.util.Enumeration;
@@ -41,6 +41,8 @@ import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.Relation;
+import fr.inrialpes.exmo.align.impl.rel.*;
+
/**
* Renders an alignment as a SWRL rule set interpreting
*.data of the first ontology into the second one.
@@ -120,15 +122,15 @@ public class SWRLRendererVisitor implements AlignmentVisitor
// but this seems to be the case...
try {
Method mm = null;
- if ( Class.forName("fr.inrialpes.exmo.align.impl.EquivRelation").isInstance(rel) ){
+ if ( Class.forName("fr.inrialpes.exmo.align.impl.rel.EquivRelation").isInstance(rel) ){
mm = this.getClass().getMethod("visit",
- new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.EquivRelation")});
- } else if (Class.forName("fr.inrialpes.exmo.align.impl.SubsumeRelation").isInstance(rel) ) {
+ new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.rel.EquivRelation")});
+ } else if (Class.forName("fr.inrialpes.exmo.align.impl.rel.SubsumeRelation").isInstance(rel) ) {
mm = this.getClass().getMethod("visit",
- new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.SubsumeRelation")});
- } else if (Class.forName("fr.inrialpes.exmo.align.impl.IncompatRelation").isInstance(rel) ) {
+ new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.rel.SubsumeRelation")});
+ } else if (Class.forName("fr.inrialpes.exmo.align.impl.rel.IncompatRelation").isInstance(rel) ) {
mm = this.getClass().getMethod("visit",
- new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.IncompatRelation")});
+ new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.rel.IncompatRelation")});
}
if ( mm != null ) mm.invoke(this,new Object[] {rel});
} catch (Exception e) { throw new AlignmentException("Dispatching problem ", e); };
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/XSLTRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/XSLTRendererVisitor.java
index f6c7ee0f78dd08bf188a0f45b73af345844c85b0..84e5a3e828606dadee58d1a2cd83d679f8fda74c 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/XSLTRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/XSLTRendererVisitor.java
@@ -1,5 +1,5 @@
/*
- * $id$
+ * $Id$
*
* Copyright (C) INRIA Rhône-Alpes, 2003-2004
*
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package fr.inrialpes.exmo.align.impl;
+package fr.inrialpes.exmo.align.impl.renderer;
import java.util.Hashtable;
import java.util.Enumeration;
@@ -41,6 +41,8 @@ import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Cell;
import org.semanticweb.owl.align.Relation;
+import fr.inrialpes.exmo.align.impl.rel.*;
+
/**
* Renders an alignment as a XSLT stylesheet transforming
*.data of the first ontology into the second one.
@@ -119,15 +121,15 @@ public class XSLTRendererVisitor implements AlignmentVisitor
// but this seems to be the case...
try {
Method mm = null;
- if ( Class.forName("fr.inrialpes.exmo.align.impl.EquivRelation").isInstance(rel) ){
+ if ( Class.forName("fr.inrialpes.exmo.align.impl.rel.EquivRelation").isInstance(rel) ){
mm = this.getClass().getMethod("visit",
- new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.EquivRelation")});
- } else if (Class.forName("fr.inrialpes.exmo.align.impl.SubsumeRelation").isInstance(rel) ) {
+ new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.rel.EquivRelation")});
+ } else if (Class.forName("fr.inrialpes.exmo.align.impl.rel.SubsumeRelation").isInstance(rel) ) {
mm = this.getClass().getMethod("visit",
- new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.SubsumeRelation")});
- } else if (Class.forName("fr.inrialpes.exmo.align.impl.IncompatRelation").isInstance(rel) ) {
+ new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.rel.SubsumeRelation")});
+ } else if (Class.forName("fr.inrialpes.exmo.align.impl.rel.IncompatRelation").isInstance(rel) ) {
mm = this.getClass().getMethod("visit",
- new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.IncompatRelation")});
+ new Class [] {Class.forName("fr.inrialpes.exmo.align.impl.rel.IncompatRelation")});
}
if ( mm != null ) mm.invoke(this,new Object[] {rel});
} catch (Exception e) { throw new AlignmentException("Dispatching problem ", e); };
diff --git a/src/fr/inrialpes/exmo/align/util/ParserPrinter.java b/src/fr/inrialpes/exmo/align/util/ParserPrinter.java
index adbb91d7c365a7dc6b9d709ff8efcea9ec967247..34cfb7c2cbe1fbb74a5e3580a99c62d0ab9137a4 100644
--- a/src/fr/inrialpes/exmo/align/util/ParserPrinter.java
+++ b/src/fr/inrialpes/exmo/align/util/ParserPrinter.java
@@ -48,7 +48,7 @@ import org.semanticweb.owl.io.Parser;
import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.AlignmentVisitor;
-import fr.inrialpes.exmo.align.impl.RDFRendererVisitor;
+import fr.inrialpes.exmo.align.impl.renderer.RDFRendererVisitor;
import java.io.PrintStream;
import java.io.FileOutputStream;
diff --git a/src/fr/inrialpes/exmo/align/util/Procalign.java b/src/fr/inrialpes/exmo/align/util/Procalign.java
index a55b6cff70b43e6c075a5a2305cfa24ac89e0afe..362bb9f4bbd865e2df6a62542dffe0b080ca630f 100644
--- a/src/fr/inrialpes/exmo/align/util/Procalign.java
+++ b/src/fr/inrialpes/exmo/align/util/Procalign.java
@@ -4,6 +4,7 @@
* Copyright (C) 2003 The University of Manchester
* Copyright (C) 2003 The University of Karlsruhe
* Copyright (C) 2003-2004, INRIA Rhône-Alpes
+ * Copyright (C) 2004, Universit de Montral
*
* Modifications to the initial code base are copyright of their
* respective authors, or their employers as appropriate. Authorship
@@ -112,10 +113,10 @@ public class Procalign {
String initName = null;
Alignment init = null;
String alignmentClassName =
- "fr.inrialpes.exmo.align.impl.ClassNameEqAlignment";
+ "fr.inrialpes.exmo.align.impl.method.ClassNameEqAlignment";
String filename = null;
String rendererClass =
- "fr.inrialpes.exmo.align.impl.RDFRendererVisitor";
+ "fr.inrialpes.exmo.align.impl.renderer.RDFRendererVisitor";
PrintStream writer = null;
AlignmentVisitor renderer = null;
int debug = 0;
@@ -306,10 +307,10 @@ public class Procalign {
String initName = null;
Alignment init = null;
String alignmentClassName =
- "fr.inrialpes.exmo.align.impl.ClassNameEqAlignment";
+ "fr.inrialpes.exmo.align.impl.method.ClassNameEqAlignment";
String filename = null;
String rendererClass =
- "fr.inrialpes.exmo.align.impl.RDFRendererVisitor";
+ "fr.inrialpes.exmo.align.impl.renderer.RDFRendererVisitor";
PrintStream writer = null;
AlignmentVisitor renderer = null;
int debug = 0;