svn commit: r1303946 - /incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/clerezza/AbstractOntologyCollectorImpl.java

[al...@apache.org]

Author: alexdma
Date: Thu Mar 22 18:13:36 2012
New Revision: 1303946

URL: http://svn.apache.org/viewvc?rev=1303946&view=rev
Log:
STANBOL-426: fixed an error in the import statement rewriting of managed OWLOntology object (probably introduced by a previous commit). It should now be possible to load an entire scope with applications such as Protege

Modified:
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/clerezza/AbstractOntologyCollectorImpl.java

Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/clerezza/AbstractOntologyCollectorImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/clerezza/AbstractOntologyCollectorImpl.java?rev=1303946&r1=1303945&r2=1303946&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/clerezza/AbstractOntologyCollectorImpl.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/clerezza/AbstractOntologyCollectorImpl.java Thu Mar 22 18:13:36 2012
@@ -80,7 +80,7 @@ public abstract class AbstractOntologyCo
     public Set<IRI> listManagedOntologies() {
         return managedOntologies;
     }
-    
+
     protected String _id = null;
 
     /**
@@ -158,8 +158,7 @@ public abstract class AbstractOntologyCo
 
         // Now for the actual storage. We pass the ontology object directly.
         String key = null;
-        if (ontologyProvider.hasOntology(IRI.create(uri.getUnicodeString())))
-        if (o instanceof MGraph) claimOwnership((MGraph) o);
+        if (ontologyProvider.hasOntology(IRI.create(uri.getUnicodeString()))) if (o instanceof MGraph) claimOwnership((MGraph) o);
         else if (o instanceof OWLOntology) claimOwnership((OWLOntology) o);
         key = ontologyProvider.loadInStore(o, uri.getUnicodeString(), false);
         /*
@@ -545,6 +544,8 @@ public abstract class AbstractOntologyCo
 
             for (Triple t : replaceUs) {
                 String s = ((UriRef) (t.getObject())).getUnicodeString();
+                // FIXME note the different import targets in the OWLOntology and TripleColllection objects!
+                // s = s.substring(s.indexOf("::") + 2, s.length());
                 boolean managed = managedOntologies.contains(IRI.create(s));
                 UriRef target = new UriRef((managed ? ns + "/" + tid + "/" : URIUtils.upOne(ns) + "/") + s);
                 o.remove(t);
@@ -604,7 +605,7 @@ public abstract class AbstractOntologyCo
             for (OWLImportsDeclaration oldImp : o.getImportsDeclarations()) {
                 changes.add(new RemoveImport(o, oldImp));
                 String s = oldImp.getIRI().toString();
-                // s = s.substring(s.indexOf("::") + 2, s.length());
+                s = s.substring(s.indexOf("::") + 2, s.length());
                 boolean managed = managedOntologies.contains(oldImp.getIRI());
                 // For space, always go up at least one
                 IRI ns = getNamespace();