Author: alexdma
Date: Mon Nov 28 11:08:27 2011
New Revision: 1207076
URL: http://svn.apache.org/viewvc?rev=1207076&view=rev
Log:
(STANBOL-332) moved asOWLOntology() implementation - sorry, there was a mistake
in the previous commit
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/clerezza/AbstractOntologyCollectorImpl.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/clerezza/AbstractOntologySpaceImpl.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionImpl.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=1207076&r1=1207075&r2=1207076&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
Mon Nov 28 11:08:27 2011
@@ -295,11 +295,6 @@ public abstract class AbstractOntologyCo
}
@Override
- public OWLOntology getOntology(IRI ontologyIri) {
- return getOntology(ontologyIri, false);
- }
-
- @Override
public int getOntologyCount(boolean withClosure) {
if (withClosure) throw new UnsupportedOperationException(
"Closure support not implemented efficiently yet. Please call
getOntologyCount(false).");
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/clerezza/AbstractOntologySpaceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/clerezza/AbstractOntologySpaceImpl.java?rev=1207076&r1=1207075&r2=1207076&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/clerezza/AbstractOntologySpaceImpl.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/clerezza/AbstractOntologySpaceImpl.java
Mon Nov 28 11:08:27 2011
@@ -55,6 +55,11 @@ public abstract class AbstractOntologySp
}
@Override
+ public OWLOntology getOntology(IRI ontologyIri) {
+ return getOntology(ontologyIri, false);
+ }
+
+ @Override
public OWLOntology getOntology(IRI ontologyIri, boolean merge) {
// Remove the check below. It might be an unmanaged dependency (TODO
remove from collector and
// reintroduce check?).
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionImpl.java?rev=1207076&r1=1207075&r2=1207076&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionImpl.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionImpl.java
Mon Nov 28 11:08:27 2011
@@ -87,30 +87,31 @@ public class SessionImpl extends Abstrac
listeners.add(listener);
}
- @Override
- public OWLOntology asOWLOntology(boolean merge) {
- OWLOntology o = super.asOWLOntology(merge);
- if (o != null && !merge) {
- OWLOntologyManager ontologyManager = o.getOWLOntologyManager();
- OWLDataFactory df = ontologyManager.getOWLDataFactory();
- List<OWLOntologyChange> changes = new
LinkedList<OWLOntologyChange>();
- // Add import declarations for attached scopes.
- for (String scopeID : getAttachedScopes()) {
- IRI physIRI = IRI.create(namespace + scopeID);
- changes.add(new AddImport(o,
df.getOWLImportsDeclaration(physIRI)));
- }
- ontologyManager.applyChanges(changes);
- }
- return o;
- }
+ // TODO reinstate this
+ // @Override
+ // public OWLOntology asOWLOntology(boolean merge) {
+ // OWLOntology o = super.asOWLOntology(merge);
+ // if (o != null && !merge) {
+ // OWLOntologyManager ontologyManager = o.getOWLOntologyManager();
+ // OWLDataFactory df = ontologyManager.getOWLDataFactory();
+ // List<OWLOntologyChange> changes = new LinkedList<OWLOntologyChange>();
+ // // Add import declarations for attached scopes.
+ // for (String scopeID : getAttachedScopes()) {
+ // IRI physIRI = IRI.create(namespace + scopeID);
+ // changes.add(new AddImport(o, df.getOWLImportsDeclaration(physIRI)));
+ // }
+ // ontologyManager.applyChanges(changes);
+ // }
+ // return o;
+ // }
/**
* FIXME not merging yet FIXME not including imported ontologies unless
they are merged *before* storage.
*
* @see OWLExportable#asOWLOntology(boolean)
*/
- // @Override
- public OWLOntology asOWLOntology2(boolean merge) {
+ @Override
+ public OWLOntology asOWLOntology(boolean merge) {
long before = System.currentTimeMillis();
@@ -237,6 +238,11 @@ public class SessionImpl extends Abstrac
}
@Override
+ public OWLOntology getOntology(IRI ontologyIri) {
+ return getOntology(ontologyIri, false);
+ }
+
+ @Override
public OWLOntology getOntology(IRI ontologyIri, boolean merge) {
long before = System.currentTimeMillis();
