From 2b3bb911756a6a6ae90fd8ce3f4af92b1d59118e Mon Sep 17 00:00:00 2001
From: Chan Le Duc <chan.leduc@univ-paris13.fr>
Date: Mon, 31 Aug 2009 21:32:32 +0000
Subject: [PATCH] --Updated for the last version Align API
---
.../exmo/align/plugin/neontk/AlignView.java | 31 ++++++++++---------
.../align/plugin/neontk/OfflineAlign.java | 13 +++++---
2 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/AlignView.java b/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/AlignView.java
index 1a694060..de280e48 100755
--- a/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/AlignView.java
+++ b/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/AlignView.java
@@ -72,7 +72,6 @@ import org.neontoolkit.core.NeOnCorePlugin;
import org.neontoolkit.core.command.project.CreateProject;
import org.neontoolkit.core.project.IOntologyProject;
import org.neontoolkit.core.project.OntologyProjectManager;
-//import org.neontoolkit.io.ImportExportControl;
import org.neontoolkit.io.util.ImportExportUtils;
import org.semanticweb.owlapi.model.OWLOntologyManager;
import org.semanticweb.owlapi.model.OWLOntology;
@@ -621,11 +620,10 @@ public class AlignView extends ViewPart
}
}
else { //offline
-
+
String resId = offlineAlign.matchAndExportAlign( selectedMethod, ontoByProj.get(selectedOnto1), selectedOnto1, ontoByProj.get(selectedOnto2), selectedOnto2);
-
- localAlignBox.add(resId, 0);
localAlignBox.setEnabled( true );
+ localAlignBox.add(resId, 0);
localImportButton.setEnabled( true );
localTrimButton.setEnabled( true );
selectedLocalAlign = resId;
@@ -1094,21 +1092,26 @@ public class AlignView extends ViewPart
IOntologyProject ontoProject = OntologyProjectManager.getDefault().getOntologyProject( projects[i] );
Set<String> strSet = ontoProject.getAvailableOntologyURIs();
String[] uris = (String[])strSet.toArray(new String[0]);
- if(online) {
- for(int k=0; k < uris.length; k++) {
- //get only http URL
- if(uris[k].startsWith("http://"))
- try {
- fact.loadOntology(new URI(uris[k]));
+ if( !online ) {
+ for(int k=0; k < uris.length; k++) {
+ if(uris[k].startsWith("file:"))
vec.put(uris[k],projects[i]);
- } catch (Exception ex) {
- }
}
} else {
for(int k=0; k < uris.length; k++) {
- vec.put( (uris[k]).toString(), projects[i]);
+ //get only http URL
+ //if(uris[k].startsWith("http://")) {
+ //try {
+ //fact.loadOntology(new URI(uris[k]));
+ //vec.put(uris[k],projects[i]);
+ //} catch (Exception ex) {}
+ //} else {
+ vec.put(uris[k],projects[i]);
+ //}
+ //vec.put( (uris[k]).toString(), projects[i]);
//vec.put(DatamodelPlugin.getDefault().getPhysicalOntologyUri(projects[i], uris[k]).toString(),projects[i]);
- }
+
+ }
}
}
}
diff --git a/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/OfflineAlign.java b/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/OfflineAlign.java
index d4d82198..ceb61b53 100755
--- a/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/OfflineAlign.java
+++ b/plugins/neon/src/fr/inrialpes/exmo/align/plugin/neontk/OfflineAlign.java
@@ -85,15 +85,20 @@ public class OfflineAlign {
uris.add( new URI(selectedNeOnOnto2 ) );
// Create alignment object
+
+
Object[] mparams = {};
Class alignmentClass = Class.forName(method);
Class[] cparams = {};
java.lang.reflect.Constructor alignmentConstructor = alignmentClass.getConstructor(cparams);
- A1 = (AlignmentProcess)alignmentConstructor.newInstance(mparams);
- A1.init( (URI)uris.get(0), (URI)uris.get(1), (OntologyCache)null );
+ A1 = (AlignmentProcess)alignmentConstructor.newInstance(mparams);
+ A1.init( (URI)uris.get(0), (URI)uris.get(1) );
+
+ //System.out.println("matched offline 3" );
A1.align((Alignment)null,p);
+ //System.out.println("matched=" +name.toString());
//AlignView.alignObjects.clear();
//System.out.println(" alignKey From Offline"+ alignFolder.getAbsolutePath() + File.separator + name.toString());
AlignView.alignmentTable.put( alignFolder.getAbsolutePath() + File.separator + name.toString(), (Alignment)A1 );
@@ -119,7 +124,7 @@ public class OfflineAlign {
} catch ( Exception ex ) { ex.printStackTrace(); };
-
+ //System.out.println("match=" +name.toString());
return alignFolder.getAbsolutePath() + File.separator + name.toString();
}
@@ -166,7 +171,7 @@ public class OfflineAlign {
owlF.close();
}
catch ( Exception ex ) { ex.printStackTrace();};
-
+ //System.out.println("trim=" +name.toString());
return alignFolder.getAbsolutePath() + File.separator + name.toString();
}
--
GitLab