Author: alexdma
Date: Tue Jun 21 17:17:16 2011
New Revision: 1138101
URL: http://svn.apache.org/viewvc?rev=1138101&view=rev
Log:
STANBOL-178 :
- Removed commented code from ONManagerImpl
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java?rev=1138101&r1=1138100&r2=1138101&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java
Tue Jun 21 17:17:16 2011
@@ -3,7 +3,6 @@ package org.apache.stanbol.ontologymanag
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URI;
import java.util.ArrayList;
import java.util.Dictionary;
import java.util.List;
@@ -36,12 +35,11 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import
org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
-import org.apache.stanbol.ontologymanager.ontonet.conf.OfflineConfiguration;
import
org.apache.stanbol.ontologymanager.ontonet.conf.OntologyNetworkConfigurationUtils;
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.InMemoryOntologyStorage;
-import
org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyIndexImpl;
import
org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OWLOntologyManagerFactoryImpl;
+import
org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyIndexImpl;
import
org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyScopeFactoryImpl;
import
org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologySpaceFactoryImpl;
import
org.apache.stanbol.ontologymanager.ontonet.impl.ontology.ScopeRegistryImpl;
@@ -239,31 +237,7 @@ public class ONManagerImpl implements ON
*/
public ONManagerImpl() {
super();
-
-// OfflineConfiguration conf = new OfflineConfiguration();
-// try {
-// URI uri =
ONManagerImpl.this.getClass().getResource("/ontologies").toURI();
-// conf.addDirectory(new File(uri));
-// } catch (Exception e3) {
-// log.warn("Could not add ontology resource /ontologies.");
-// }
-// List<String> dirs = new ArrayList<String>();
-// try {
-// dirs = config.getOntologySourceDirectories();
-// } catch (NullPointerException ex) {
-// // Ok, go empty
-// }
-
-// omgrFactory = new OntologyManagerFactory(dirs);
-//
-// owlFactory = OWLManager.getOWLDataFactory();
-// owlCacheManager = omgrFactory.createOntologyManager(true);
-//
-// // These depend on one another
-// scopeRegistry = new ScopeRegistryImpl();
-// oIndex = new OntologyIndexImpl(this);
-//
-// // Defer the call to the bindResources() method to the activator.
+ // All bindings are deferred to the activator
}
/**
@@ -333,17 +307,16 @@ public class ONManagerImpl implements ON
} else {
log.info("id: {}", config.getID());
}
-
-
+
+ // Bind components, starting with the local directories.
List<String> dirs = new ArrayList<String>();
try {
dirs = config.getOntologySourceDirectories();
} catch (NullPointerException ex) {
// Ok, go empty
}
-
- omgrFactory = new OWLOntologyManagerFactoryImpl(dirs);
+ omgrFactory = new OWLOntologyManagerFactoryImpl(dirs);
owlFactory = OWLManager.getOWLDataFactory();
owlCacheManager = omgrFactory.createOntologyManager(true);
@@ -351,22 +324,6 @@ public class ONManagerImpl implements ON
scopeRegistry = new ScopeRegistryImpl();
oIndex = new OntologyIndexImpl(this);
- // Defer the call to the bindResources() method to the activator.
-
- // Get local directories
-
- // Local directories first
- // try {
- // URI uri =
ONManagerImpl.this.getClass().getResource("/ontologies").toURI();
- // OfflineConfiguration.add(new File(uri));
- // } catch (URISyntaxException e3) {
- // log.warn("Could not add ontology resource.", e3);
- // } catch (NullPointerException e3) {
- // log.warn("Could not add ontology resource.", e3);
- // }
-
- // // if (storage == null) storage = new OntologyStorage(this.tcm,
this.wtcp);
-
bindResources(this.tcm, this.wtcp);
// String tfile = (String) configuration.get(CONFIG_FILE_PATH);
@@ -475,8 +432,10 @@ public class ONManagerImpl implements ON
*/
for (String scopeIRI :
OntologyNetworkConfigurationUtils.getScopes(configOntology)) {
- String[] cores =
OntologyNetworkConfigurationUtils.getCoreOntologies(configOntology, scopeIRI);
- String[] customs =
OntologyNetworkConfigurationUtils.getCustomOntologies(configOntology, scopeIRI);
+ String[] cores = OntologyNetworkConfigurationUtils
+ .getCoreOntologies(configOntology, scopeIRI);
+ String[] customs =
OntologyNetworkConfigurationUtils.getCustomOntologies(configOntology,
+ scopeIRI);
// "Be a man. Use printf"
log.debug("KReS :: Scope " + scopeIRI);
