Author: sfermigier
Date: Tue Apr 5 13:04:19 2011
New Revision: 1089016
URL: http://svn.apache.org/viewvc?rev=1089016&view=rev
Log:
Cleanup.
Modified:
incubator/stanbol/trunk/enhancer/autotagging/src/test/java/org/apache/stanbol/autotagging/AutotaggingTest.java
incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkParserImpl.java
incubator/stanbol/trunk/enhancer/engines/autotagging/src/test/java/org/apache/stanbol/enhancer/engines/autotagging/impl/TestEntityMentionEnhancementEngine.java
incubator/stanbol/trunk/enhancer/engines/entitytagging/src/test/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/TestEntityLinkingEnhancementEngine.java
incubator/stanbol/trunk/enhancer/engines/geonames/src/test/java/org/apache/stanbol/enhancer/engines/geonames/impl/TestLocationEnhancementEngine.java
incubator/stanbol/trunk/enhancer/engines/opencalais/src/test/java/org/apache/stanbol/enhancer/engines/opencalais/impl/TestOpenCalaisEngine.java
incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/test/java/org/apache/stanbol/enhancer/engines/opennlp/impl/TestNamedEntityExtractionEnhancementEngine.java
incubator/stanbol/trunk/enhancer/engines/zemanta/src/test/java/org/apache/stanbol/enhancer/engines/zemanta/impl/ZemantaEnhancementEngineTest.java
incubator/stanbol/trunk/enhancer/generic/jsonld/src/test/java/org/apache/stanbol/jsonld/JsonLdTest.java
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/utils/OsgiUtils.java
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/yard/AbstractYard.java
incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/defaults/DataTypeEnum.java
incubator/stanbol/trunk/entityhub/indexing/genericrdf/src/main/java/org/apache/stanbol/entityhub/indexing/rdf/RdfIndexer.java
incubator/stanbol/trunk/entityhub/indexing/geonames/src/main/java/org/apache/stanbol/entityhub/indexing/geonames/GeoNamesIndexer.java
incubator/stanbol/trunk/entityhub/yard/clerezza/src/test/java/org/apache/stanbol/entityhub/yard/clerezza/impl/ClerezzaYardTest.java
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/SolrServerProviderManager.java
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/queryencoders/AssignmentEncoder.java
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/queryencoders/DataTypeEncoder.java
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/queryencoders/FieldEncoder.java
incubator/stanbol/trunk/entityhub/yard/solr/src/test/java/org/apache/stanbol/entityhub/yard/solr/SolrYardTest.java
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/JSONJenaWriter.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/cache/ODPRegistryCacheManager.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/model/impl/RegistryLoaderImpl.java
incubator/stanbol/trunk/ontologymanager/store/api/src/main/java/org/apache/stanbol/ontologymanager/store/model/ObjectFactory.java
incubator/stanbol/trunk/ontologymanager/store/rest/src/main/java/org/apache/stanbol/ontologymanager/store/rest/JAXBProvider.java
incubator/stanbol/trunk/ontologymanager/web/src/test/java/org/apache/stanbol/ontologymanager/web/JettyServerTest.java
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/RunSingleSPARQLTest.java
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/trasformation/ConversionTester.java
incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomList.java
incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/RuleList.java
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleParser.java
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/AddRecipe.java
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/changes/RemoveRecipe.java
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImpl.java
incubator/stanbol/trunk/rules/manager/src/test/java/org/apache/stanbol/rules/manager/parse/RuleParserTest.java
Modified:
incubator/stanbol/trunk/enhancer/autotagging/src/test/java/org/apache/stanbol/autotagging/AutotaggingTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/autotagging/src/test/java/org/apache/stanbol/autotagging/AutotaggingTest.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/autotagging/src/test/java/org/apache/stanbol/autotagging/AutotaggingTest.java
(original)
+++
incubator/stanbol/trunk/enhancer/autotagging/src/test/java/org/apache/stanbol/autotagging/AutotaggingTest.java
Tue Apr 5 13:04:19 2011
@@ -24,8 +24,6 @@ import org.apache.lucene.store.FSDirecto
import org.apache.lucene.store.LockObtainFailedException;
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.Version;
-import org.apache.stanbol.autotagging.Autotagger;
-import org.apache.stanbol.autotagging.TagInfo;
import org.apache.stanbol.autotagging.jena.ModelIndexer;
import org.junit.Before;
import org.junit.BeforeClass;
Modified:
incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkParserImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkParserImpl.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkParserImpl.java
(original)
+++
incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkParserImpl.java
Tue Apr 5 13:04:19 2011
@@ -38,7 +38,7 @@ public class BenchmarkParserImpl impleme
TripleMatcherGroupImpl currentGroup;
}
- private static abstract class State {
+ private abstract static class State {
protected final ParserContext ctx;
State(ParserContext ctx) {
Modified:
incubator/stanbol/trunk/enhancer/engines/autotagging/src/test/java/org/apache/stanbol/enhancer/engines/autotagging/impl/TestEntityMentionEnhancementEngine.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/autotagging/src/test/java/org/apache/stanbol/enhancer/engines/autotagging/impl/TestEntityMentionEnhancementEngine.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/engines/autotagging/src/test/java/org/apache/stanbol/enhancer/engines/autotagging/impl/TestEntityMentionEnhancementEngine.java
(original)
+++
incubator/stanbol/trunk/enhancer/engines/autotagging/src/test/java/org/apache/stanbol/enhancer/engines/autotagging/impl/TestEntityMentionEnhancementEngine.java
Tue Apr 5 13:04:19 2011
@@ -29,8 +29,6 @@ import org.apache.clerezza.rdf.core.Trip
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.commons.io.IOUtils;
-import
org.apache.stanbol.enhancer.engines.autotagging.impl.ConfiguredAutotaggerProvider;
-import
org.apache.stanbol.enhancer.engines.autotagging.impl.EntityMentionEnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
import org.apache.stanbol.enhancer.servicesapi.TextAnnotation;
import org.apache.stanbol.enhancer.servicesapi.helper.RdfEntityFactory;
Modified:
incubator/stanbol/trunk/enhancer/engines/entitytagging/src/test/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/TestEntityLinkingEnhancementEngine.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/entitytagging/src/test/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/TestEntityLinkingEnhancementEngine.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/engines/entitytagging/src/test/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/TestEntityLinkingEnhancementEngine.java
(original)
+++
incubator/stanbol/trunk/enhancer/engines/entitytagging/src/test/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/TestEntityLinkingEnhancementEngine.java
Tue Apr 5 13:04:19 2011
@@ -33,7 +33,6 @@ import org.apache.clerezza.rdf.core.Trip
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.commons.io.IOUtils;
-import
org.apache.stanbol.enhancer.engines.entitytagging.impl.ReferencedSiteEntityTaggingEnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
import org.apache.stanbol.enhancer.servicesapi.TextAnnotation;
import org.apache.stanbol.enhancer.servicesapi.helper.RdfEntityFactory;
Modified:
incubator/stanbol/trunk/enhancer/engines/geonames/src/test/java/org/apache/stanbol/enhancer/engines/geonames/impl/TestLocationEnhancementEngine.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/geonames/src/test/java/org/apache/stanbol/enhancer/engines/geonames/impl/TestLocationEnhancementEngine.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/engines/geonames/src/test/java/org/apache/stanbol/enhancer/engines/geonames/impl/TestLocationEnhancementEngine.java
(original)
+++
incubator/stanbol/trunk/enhancer/engines/geonames/src/test/java/org/apache/stanbol/enhancer/engines/geonames/impl/TestLocationEnhancementEngine.java
Tue Apr 5 13:04:19 2011
@@ -41,7 +41,6 @@ import org.apache.clerezza.rdf.core.Trip
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.commons.io.IOUtils;
-import
org.apache.stanbol.enhancer.engines.geonames.impl.LocationEnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
import org.apache.stanbol.enhancer.servicesapi.EngineException;
import org.apache.stanbol.enhancer.servicesapi.TextAnnotation;
Modified:
incubator/stanbol/trunk/enhancer/engines/opencalais/src/test/java/org/apache/stanbol/enhancer/engines/opencalais/impl/TestOpenCalaisEngine.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/opencalais/src/test/java/org/apache/stanbol/enhancer/engines/opencalais/impl/TestOpenCalaisEngine.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/engines/opencalais/src/test/java/org/apache/stanbol/enhancer/engines/opencalais/impl/TestOpenCalaisEngine.java
(original)
+++
incubator/stanbol/trunk/enhancer/engines/opencalais/src/test/java/org/apache/stanbol/enhancer/engines/opencalais/impl/TestOpenCalaisEngine.java
Tue Apr 5 13:04:19 2011
@@ -26,8 +26,6 @@ import org.apache.clerezza.rdf.core.UriR
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
-import
org.apache.stanbol.enhancer.engines.opencalais.impl.CalaisEntityOccurrence;
-import org.apache.stanbol.enhancer.engines.opencalais.impl.OpenCalaisEngine;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
import org.apache.stanbol.enhancer.servicesapi.EngineException;
import org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper;
Modified:
incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/test/java/org/apache/stanbol/enhancer/engines/opennlp/impl/TestNamedEntityExtractionEnhancementEngine.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/test/java/org/apache/stanbol/enhancer/engines/opennlp/impl/TestNamedEntityExtractionEnhancementEngine.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/test/java/org/apache/stanbol/enhancer/engines/opennlp/impl/TestNamedEntityExtractionEnhancementEngine.java
(original)
+++
incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/test/java/org/apache/stanbol/enhancer/engines/opennlp/impl/TestNamedEntityExtractionEnhancementEngine.java
Tue Apr 5 13:04:19 2011
@@ -34,8 +34,6 @@ import org.apache.clerezza.rdf.core.Trip
import org.apache.clerezza.rdf.core.TypedLiteral;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
-import org.apache.stanbol.enhancer.engines.opennlp.impl.NameOccurrence;
-import
org.apache.stanbol.enhancer.engines.opennlp.impl.NamedEntityExtractionEnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
import org.apache.stanbol.enhancer.servicesapi.EngineException;
import org.junit.AfterClass;
Modified:
incubator/stanbol/trunk/enhancer/engines/zemanta/src/test/java/org/apache/stanbol/enhancer/engines/zemanta/impl/ZemantaEnhancementEngineTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/zemanta/src/test/java/org/apache/stanbol/enhancer/engines/zemanta/impl/ZemantaEnhancementEngineTest.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/engines/zemanta/src/test/java/org/apache/stanbol/enhancer/engines/zemanta/impl/ZemantaEnhancementEngineTest.java
(original)
+++
incubator/stanbol/trunk/enhancer/engines/zemanta/src/test/java/org/apache/stanbol/enhancer/engines/zemanta/impl/ZemantaEnhancementEngineTest.java
Tue Apr 5 13:04:19 2011
@@ -43,7 +43,6 @@ import org.apache.clerezza.rdf.core.UriR
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
import org.apache.clerezza.rdf.jena.serializer.JenaSerializerProvider;
-import
org.apache.stanbol.enhancer.engines.zemanta.impl.ZemantaEnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
import org.apache.stanbol.enhancer.servicesapi.EngineException;
import org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper;
Modified:
incubator/stanbol/trunk/enhancer/generic/jsonld/src/test/java/org/apache/stanbol/jsonld/JsonLdTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/jsonld/src/test/java/org/apache/stanbol/jsonld/JsonLdTest.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/generic/jsonld/src/test/java/org/apache/stanbol/jsonld/JsonLdTest.java
(original)
+++
incubator/stanbol/trunk/enhancer/generic/jsonld/src/test/java/org/apache/stanbol/jsonld/JsonLdTest.java
Tue Apr 5 13:04:19 2011
@@ -2,8 +2,6 @@ package org.apache.stanbol.jsonld;
import static org.junit.Assert.assertEquals;
-import org.apache.stanbol.jsonld.JsonLd;
-import org.apache.stanbol.jsonld.JsonLdResource;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified:
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java
(original)
+++
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java
Tue Apr 5 13:04:19 2011
@@ -73,7 +73,7 @@ public final class FieldMappingUtils {
}
- protected final static Logger log =
LoggerFactory.getLogger(FieldMappingUtils.class);
+ protected static final Logger log =
LoggerFactory.getLogger(FieldMappingUtils.class);
private FieldMappingUtils() { /* Do not create Instances of Util Classes*/
}
/**
Modified:
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/utils/OsgiUtils.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/utils/OsgiUtils.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/utils/OsgiUtils.java
(original)
+++
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/utils/OsgiUtils.java
Tue Apr 5 13:04:19 2011
@@ -45,7 +45,7 @@ public final class OsgiUtils {
* @return the value
* @throws ConfigurationException if the property is not present
*/
- public final static Object checkProperty(Dictionary<?, ?> properties,
String propertyName) throws ConfigurationException{
+ public static final Object checkProperty(Dictionary<?, ?> properties,
String propertyName) throws ConfigurationException{
return checkProperty(properties, propertyName, null);
}
/**
@@ -57,7 +57,7 @@ public final class OsgiUtils {
* @return the value of the property (guaranteed NOT <code>null</code>)
* @throws ConfigurationException In case the property is not present and
no default value was parsed
*/
- public final static Object checkProperty(Dictionary<?, ?> properties,
String propertyName,Object defaultValue) throws ConfigurationException{
+ public static final Object checkProperty(Dictionary<?, ?> properties,
String propertyName,Object defaultValue) throws ConfigurationException{
Object value = properties.get(propertyName);
if(value == null){
if(defaultValue != null){
@@ -77,7 +77,7 @@ public final class OsgiUtils {
* @throws ConfigurationException if the property is not present or the
* configured value is no valid URI
*/
- public final static URI checkUriProperty(Dictionary<?, ?>
properties,String propertyName) throws ConfigurationException {
+ public static final URI checkUriProperty(Dictionary<?, ?>
properties,String propertyName) throws ConfigurationException {
Object uri = checkProperty(properties,propertyName);
try {
return new URI(uri.toString());
@@ -92,7 +92,7 @@ public final class OsgiUtils {
* @throws ConfigurationException if the property is not present or the
* configured value is no valid URL
*/
- public final static URL checkUrlProperty(Dictionary<?, ?>
properties,String propertyName) throws ConfigurationException {
+ public static final URL checkUrlProperty(Dictionary<?, ?>
properties,String propertyName) throws ConfigurationException {
Object uri = checkProperty(properties,propertyName);
try {
return new URL(uri.toString());
@@ -110,7 +110,7 @@ public final class OsgiUtils {
* @throws ConfigurationException if the property is missing or the value
is
* not a member of the parsed enumeration
*/
- public final static <T extends Enum<T>> T checkEnumProperty(Class<T>
enumeration,Dictionary<?, ?> properties,String propertyName) throws
ConfigurationException{
+ public static final <T extends Enum<T>> T checkEnumProperty(Class<T>
enumeration,Dictionary<?, ?> properties,String propertyName) throws
ConfigurationException{
Object value =checkProperty(properties, propertyName);
try {
return Enum.valueOf(enumeration,value.toString());
Modified:
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/yard/AbstractYard.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/yard/AbstractYard.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/yard/AbstractYard.java
(original)
+++
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/yard/AbstractYard.java
Tue Apr 5 13:04:19 2011
@@ -267,7 +267,7 @@ public abstract class AbstractYard imple
// public abstract void update(Representation represnetation) throws
IllegalArgumentException;
- public static abstract class YardConfig {
+ public abstract static class YardConfig {
protected final Dictionary<String, Object> config;
Modified:
incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/defaults/DataTypeEnum.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/defaults/DataTypeEnum.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/defaults/DataTypeEnum.java
(original)
+++
incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/defaults/DataTypeEnum.java
Tue Apr 5 13:04:19 2011
@@ -145,12 +145,12 @@ public enum DataTypeEnum {
return getUri();
}
- static private Map<Class<?>,Set<DataTypeEnum>> class2DataTypeMap;
- static private Map<Class<?>,Set<DataTypeEnum>> interface2DataTypeMap;
- static private Map<Class<?>,Set<DataTypeEnum>> allClass2DataTypeMap;
- static private Map<Class<?>,Set<DataTypeEnum>> allInterface2DataTypeMap;
- static private Map<String,DataTypeEnum> uri2DataType;
- static private Map<String,DataTypeEnum> shortName2DataType;
+ private static Map<Class<?>,Set<DataTypeEnum>> class2DataTypeMap;
+ private static Map<Class<?>,Set<DataTypeEnum>> interface2DataTypeMap;
+ private static Map<Class<?>,Set<DataTypeEnum>> allClass2DataTypeMap;
+ private static Map<Class<?>,Set<DataTypeEnum>> allInterface2DataTypeMap;
+ private static Map<String,DataTypeEnum> uri2DataType;
+ private static Map<String,DataTypeEnum> shortName2DataType;
static{
Map<Class<?>,Set<DataTypeEnum>> c2d = new HashMap<Class<?>,
Set<DataTypeEnum>>();
Map<Class<?>,Set<DataTypeEnum>> i2d = new HashMap<Class<?>,
Set<DataTypeEnum>>();
Modified:
incubator/stanbol/trunk/entityhub/indexing/genericrdf/src/main/java/org/apache/stanbol/entityhub/indexing/rdf/RdfIndexer.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/indexing/genericrdf/src/main/java/org/apache/stanbol/entityhub/indexing/rdf/RdfIndexer.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/entityhub/indexing/genericrdf/src/main/java/org/apache/stanbol/entityhub/indexing/rdf/RdfIndexer.java
(original)
+++
incubator/stanbol/trunk/entityhub/indexing/genericrdf/src/main/java/org/apache/stanbol/entityhub/indexing/rdf/RdfIndexer.java
Tue Apr 5 13:04:19 2011
@@ -829,21 +829,21 @@ public class RdfIndexer {
Destination<Triple> sink = new Destination<Triple>() {
long count = 0 ;
- final public void start()
+ public final void start()
{
loaderTriples.loadStart() ;
loaderTriples.loadDataStart() ;
}
- final public void send(Triple triple)
+ public final void send(Triple triple)
{
loaderTriples.load(triple.getSubject(), triple.getPredicate(),
triple.getObject()) ;
count++ ;
}
- final public void flush() { }
+ public final void flush() { }
public void close() { }
- final public void finish()
+ public final void finish()
{
loaderTriples.loadDataFinish() ;
loaderTriples.loadIndexStart() ;
Modified:
incubator/stanbol/trunk/entityhub/indexing/geonames/src/main/java/org/apache/stanbol/entityhub/indexing/geonames/GeoNamesIndexer.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/indexing/geonames/src/main/java/org/apache/stanbol/entityhub/indexing/geonames/GeoNamesIndexer.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/entityhub/indexing/geonames/src/main/java/org/apache/stanbol/entityhub/indexing/geonames/GeoNamesIndexer.java
(original)
+++
incubator/stanbol/trunk/entityhub/indexing/geonames/src/main/java/org/apache/stanbol/entityhub/indexing/geonames/GeoNamesIndexer.java
Tue Apr 5 13:04:19 2011
@@ -180,7 +180,7 @@ public class GeoNamesIndexer {
*/
public static final String KEY_HIERARCHY =
"org.apache.stanbol.entityhub.indexing.geonames.hierarchyFile";
- private final static Map<String,Reference> indexDocRefs = new
HashMap<String, Reference>();
+ private static final Map<String,Reference> indexDocRefs = new
HashMap<String, Reference>();
private static enum Properties{
rdf_type(NamespaceEnum.rdf.getNamespace(),"type"),
@@ -963,7 +963,7 @@ public class GeoNamesIndexer {
private final String lang;
private final boolean preferred;
private final boolean shortName;
- private final static String TRUE = "1";
+ private static final String TRUE = "1";
protected FeatureName(String line){
Tokenizer t = new Tokenizer(line);
labelID = Integer.parseInt(t.next()); //first Elem the labelID
Modified:
incubator/stanbol/trunk/entityhub/yard/clerezza/src/test/java/org/apache/stanbol/entityhub/yard/clerezza/impl/ClerezzaYardTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/clerezza/src/test/java/org/apache/stanbol/entityhub/yard/clerezza/impl/ClerezzaYardTest.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/entityhub/yard/clerezza/src/test/java/org/apache/stanbol/entityhub/yard/clerezza/impl/ClerezzaYardTest.java
(original)
+++
incubator/stanbol/trunk/entityhub/yard/clerezza/src/test/java/org/apache/stanbol/entityhub/yard/clerezza/impl/ClerezzaYardTest.java
Tue Apr 5 13:04:19 2011
@@ -37,7 +37,7 @@ public class ClerezzaYardTest extends Ya
private static Yard yard;
@BeforeClass
- public final static void initYard(){
+ public static final void initYard(){
YardConfig config = new
SimpleYardConfig("urn:yard.clerezza:testYardId");
config.setName("Clerezza Yard Test");
config.setDescription("The Clerezza Yard instance used to execute the
Unit Tests defined for the Yard Interface");
@@ -80,7 +80,7 @@ public class ClerezzaYardTest extends Ya
* {@link #representationIds} list.
*/
@AfterClass
- public final static void clearUpRepresentations() throws YardException {
+ public static final void clearUpRepresentations() throws YardException {
yard.remove(representationIds);
}
Modified:
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/SolrServerProviderManager.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/SolrServerProviderManager.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/SolrServerProviderManager.java
(original)
+++
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/SolrServerProviderManager.java
Tue Apr 5 13:04:19 2011
@@ -82,7 +82,7 @@ public final class SolrServerProviderMan
// @Reference
// private DefaultSolrServerProvider defaultProvider;
- private final static Logger log =
LoggerFactory.getLogger(SolrServerProviderManager.class);
+ private static final Logger log =
LoggerFactory.getLogger(SolrServerProviderManager.class);
@Reference(
referenceInterface=SolrServerProvider.class,
strategy=ReferenceStrategy.EVENT,
Modified:
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/queryencoders/AssignmentEncoder.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/queryencoders/AssignmentEncoder.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/queryencoders/AssignmentEncoder.java
(original)
+++
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/queryencoders/AssignmentEncoder.java
Tue Apr 5 13:04:19 2011
@@ -32,20 +32,22 @@ import org.apache.stanbol.entityhub.yard
/**
* Encodes the Assignment of the field to an value. If a value is parsed, than
* it encodes that the field must be equals to this value.
- * @author Rupert Westenthaler
*
+ * @author Rupert Westenthaler
*/
public class AssignmentEncoder implements IndexConstraintTypeEncoder<Object>{
- private final static ConstraintTypePosition POS = new
ConstraintTypePosition(PositionType.assignment);
- private final static String EQ = ":";
+ private static final ConstraintTypePosition POS = new
ConstraintTypePosition(PositionType.assignment);
+ private static final String EQ = ":";
private final IndexValueFactory indexValueFactory;
+
public AssignmentEncoder(IndexValueFactory indexValueFactory) {
if(indexValueFactory == null){
throw new IllegalArgumentException("The indexValueFactory MUST NOT
be NULL");
}
this.indexValueFactory = indexValueFactory;
}
+
@Override
public void encode(EncodedConstraintParts constraint, Object value) {
IndexValue indexValue;
@@ -70,10 +72,12 @@ public class AssignmentEncoder implement
public boolean supportsDefault() {
return true;
}
+
@Override
public Collection<IndexConstraintTypeEnum> dependsOn() {
return Arrays.asList(IndexConstraintTypeEnum.FIELD);
}
+
@Override
public IndexConstraintTypeEnum encodes() {
return IndexConstraintTypeEnum.EQ;
@@ -84,5 +88,4 @@ public class AssignmentEncoder implement
return Object.class;
}
-
}
Modified:
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/queryencoders/DataTypeEncoder.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/queryencoders/DataTypeEncoder.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/queryencoders/DataTypeEncoder.java
(original)
+++
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/queryencoders/DataTypeEncoder.java
Tue Apr 5 13:04:19 2011
@@ -33,15 +33,17 @@ import org.apache.stanbol.entityhub.yard
/**
* Encodes the DataType to the field name.
- * @author Rupert Westenthaler
*
+ * @author Rupert Westenthaler
*/
public class DataTypeEncoder implements IndexConstraintTypeEncoder<Object> {
private static final ConstraintTypePosition PREFIX = new
ConstraintTypePosition(PositionType.prefix);
private static final ConstraintTypePosition SUFFIX = new
ConstraintTypePosition(PositionType.suffux);
+
private final FieldMapper fieldMapper;
private final IndexValueFactory indexValueFactory;
+
public DataTypeEncoder(IndexValueFactory indexValueFactory, FieldMapper
fieldMapper) {
if(fieldMapper == null){
throw new IllegalArgumentException("The FieldMapper MUST NOT be
NULL!");
@@ -52,6 +54,7 @@ public class DataTypeEncoder implements
this.fieldMapper = fieldMapper;
this.indexValueFactory = indexValueFactory;
}
+
@Override
public void encode(EncodedConstraintParts constraint,Object value) throws
IllegalArgumentException {
IndexDataType indexDataType;
@@ -92,10 +95,10 @@ public class DataTypeEncoder implements
public IndexConstraintTypeEnum encodes() {
return IndexConstraintTypeEnum.DATATYPE;
}
+
@Override
public Class<Object> acceptsValueType() {
return Object.class;
}
-
}
Modified:
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/queryencoders/FieldEncoder.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/queryencoders/FieldEncoder.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/queryencoders/FieldEncoder.java
(original)
+++
incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/queryencoders/FieldEncoder.java
Tue Apr 5 13:04:19 2011
@@ -40,6 +40,7 @@ public class FieldEncoder implements Ind
}
this.fieldMapper = fieldMapper;
}
+
@Override
public Collection<IndexConstraintTypeEnum> dependsOn() {
return Collections.emptySet();
@@ -62,6 +63,7 @@ public class FieldEncoder implements Ind
public boolean supportsDefault() {
return false;
}
+
@SuppressWarnings("unchecked")
@Override
public Class<List<String>> acceptsValueType() {
Modified:
incubator/stanbol/trunk/entityhub/yard/solr/src/test/java/org/apache/stanbol/entityhub/yard/solr/SolrYardTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/test/java/org/apache/stanbol/entityhub/yard/solr/SolrYardTest.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/entityhub/yard/solr/src/test/java/org/apache/stanbol/entityhub/yard/solr/SolrYardTest.java
(original)
+++
incubator/stanbol/trunk/entityhub/yard/solr/src/test/java/org/apache/stanbol/entityhub/yard/solr/SolrYardTest.java
Tue Apr 5 13:04:19 2011
@@ -53,7 +53,7 @@ public class SolrYardTest extends YardTe
private static final Logger log =
LoggerFactory.getLogger(SolrYardTest.class);
@BeforeClass
- public final static void initYard() throws YardException {
+ public static final void initYard() throws YardException {
//get the working directory
//use property substitution to test this feature!
String solrServerDir = "${basedir}"+TEST_INDEX_REL_PATH;
@@ -94,7 +94,7 @@ public class SolrYardTest extends YardTe
* {@link #representationIds} list.
*/
@AfterClass
- public final static void clearUpRepresentations() throws YardException {
+ public static final void clearUpRepresentations() throws YardException {
yard.remove(representationIds);
}
Modified:
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/JSONJenaWriter.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/JSONJenaWriter.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/JSONJenaWriter.java
(original)
+++
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/JSONJenaWriter.java
Tue Apr 5 13:04:19 2011
@@ -30,7 +30,7 @@ public class JSONJenaWriter implements R
private static final Logger LOG =
LoggerFactory.getLogger(JSONJenaWriter.class);
- static protected final String propBase =
"http://jena.hpl.hp.com/json/properties/"; ;
+ protected static final String propBase =
"http://jena.hpl.hp.com/json/properties/"; ;
private String lineSeparator = JenaRuntime.getLineSeparator() ;
private RDFErrorHandler errorHandler = null;
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/cache/ODPRegistryCacheManager.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/cache/ODPRegistryCacheManager.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/cache/ODPRegistryCacheManager.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/cache/ODPRegistryCacheManager.java
Tue Apr 5 13:04:19 2011
@@ -95,7 +95,7 @@ public class ODPRegistryCacheManager {
* @throws ODPRegistryCacheException
* @throws URIUnresolvableException
*/
- public synchronized static OWLOntology getOntology(URI uri)
+ public static synchronized OWLOntology getOntology(URI uri)
throws ODPRegistryCacheException,
URIUnresolvableException {
if (getUnresolvedURIs().contains(uri))
throw new URIUnresolvableException();
@@ -113,7 +113,7 @@ public class ODPRegistryCacheManager {
}
}
- public synchronized static OWLOntologyDocumentSource
getOntologyInputSource(
+ public static synchronized OWLOntologyDocumentSource
getOntologyInputSource(
URI uri) throws ODPRegistryCacheException,
URIUnresolvableException {
if (getUnresolvedURIs().contains(uri))
throw new URIUnresolvableException();
@@ -164,7 +164,7 @@ public class ODPRegistryCacheManager {
return file;
}
- private synchronized static OWLOntology retrieveLocalResource(URI uri)
+ private static synchronized OWLOntology retrieveLocalResource(URI uri)
throws OWLOntologyCreationException,
ODPRegistryCacheException,
URIUnresolvableException {
File file = uris.get(uri);
@@ -203,7 +203,7 @@ public class ODPRegistryCacheManager {
* @throws UnknownOWLOntologyException
* @throws OWLOntologyStorageException
*/
- private synchronized static OWLOntology retrieveRemoteResource(URI uri)
+ private static synchronized OWLOntology retrieveRemoteResource(URI uri)
throws OWLOntologyCreationException,
UnknownOWLOntologyException,
OWLOntologyStorageException {
@@ -278,7 +278,7 @@ public class ODPRegistryCacheManager {
manager.saveOntology(ont, new RDFXMLOntologyFormat(),
IRI.create(file));
}
- public synchronized static boolean save() {
+ public static synchronized boolean save() {
File registry = new
File(ODPRegistryCacheManager.getRegistryURI());
if (registry.exists())
registry.delete();
@@ -297,7 +297,7 @@ public class ODPRegistryCacheManager {
return true;
}
- public synchronized static boolean load() {
+ public static synchronized boolean load() {
File registry = new
File(ODPRegistryCacheManager.getRegistryURI());
if (!registry.exists())
return false;
@@ -328,7 +328,7 @@ public class ODPRegistryCacheManager {
return true;
}
- public synchronized static boolean clean() {
+ public static synchronized boolean clean() {
// FileUriHelper fu = new FileUriHelper();
try {
// fu
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/model/impl/RegistryLoaderImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/model/impl/RegistryLoaderImpl.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/model/impl/RegistryLoaderImpl.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/registry/model/impl/RegistryLoaderImpl.java
Tue Apr 5 13:04:19 2011
@@ -90,12 +90,10 @@ public class RegistryLoaderImpl implemen
result.addAll(gatherOntologies(item,
manager,
recurseRegistries));
} catch (OWLOntologyCreationException e) {
- log
- .warn(
- "KReS
:: [NONFATAL] Could not gather ontologies for registry "
-
+ registryItem.getName()
-
+ ". Skipping.", e);
- continue;
+ log.warn("KReS :: [NONFATAL] Could not gather ontologies
for registry "
+ + registryItem.getName()
+ + ". Skipping.", e);
+ continue;
}
else if (registryItem.isOntology())
try {
@@ -113,10 +111,9 @@ public class RegistryLoaderImpl implemen
else if (registryItem.isLibrary())
for (RegistryItem item : ((RegistryLibrary)
registryItem)
.getChildren()) {
- result
- .addAll(gatherOntologies(item,
manager,
-
recurseRegistries));
- }
+ result.addAll(gatherOntologies(item, manager,
+ recurseRegistries));
+ }
return result;
}
@@ -465,11 +462,10 @@ public class RegistryLoaderImpl implemen
}
}
} catch (Throwable th) {
- log
- .error(
- "KreS :: Exception
occurred while trying to get registry locations.",
- th);
- }
+ log.error(
+ "KreS :: Exception occurred while trying to get registry
locations.",
+ th);
+ }
}
/**
Modified:
incubator/stanbol/trunk/ontologymanager/store/api/src/main/java/org/apache/stanbol/ontologymanager/store/model/ObjectFactory.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/store/api/src/main/java/org/apache/stanbol/ontologymanager/store/model/ObjectFactory.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/store/api/src/main/java/org/apache/stanbol/ontologymanager/store/model/ObjectFactory.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/store/api/src/main/java/org/apache/stanbol/ontologymanager/store/model/ObjectFactory.java
Tue Apr 5 13:04:19 2011
@@ -25,8 +25,8 @@ import javax.xml.namespace.QName;
@XmlRegistry
public class ObjectFactory {
- private final static QName _URI_QNAME = new
QName("model.rest.persistence.iks.srdc.com.tr", "URI");
- private final static QName _Description_QNAME = new
QName("model.rest.persistence.iks.srdc.com.tr",
+ private static final QName _URI_QNAME = new
QName("model.rest.persistence.iks.srdc.com.tr", "URI");
+ private static final QName _Description_QNAME = new
QName("model.rest.persistence.iks.srdc.com.tr",
"Description");
/**
Modified:
incubator/stanbol/trunk/ontologymanager/store/rest/src/main/java/org/apache/stanbol/ontologymanager/store/rest/JAXBProvider.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/store/rest/src/main/java/org/apache/stanbol/ontologymanager/store/rest/JAXBProvider.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/store/rest/src/main/java/org/apache/stanbol/ontologymanager/store/rest/JAXBProvider.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/store/rest/src/main/java/org/apache/stanbol/ontologymanager/store/rest/JAXBProvider.java
Tue Apr 5 13:04:19 2011
@@ -77,8 +77,8 @@ public class JAXBProvider implements Mes
XMLUtil.class.getClassLoader());
List<StreamSource> streamSourceList = new Vector<StreamSource>();
- for (int i = 0; i < schemaLocations.length; i++) {
- InputStream is = cl.getResourceAsStream(schemaLocations[i]);
+ for (String schemaLocation : schemaLocations) {
+ InputStream is = cl.getResourceAsStream(schemaLocation);
StreamSource streamSource = new StreamSource(is);
streamSourceList.add(streamSource);
}
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/test/java/org/apache/stanbol/ontologymanager/web/JettyServerTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/test/java/org/apache/stanbol/ontologymanager/web/JettyServerTest.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/test/java/org/apache/stanbol/ontologymanager/web/JettyServerTest.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/test/java/org/apache/stanbol/ontologymanager/web/JettyServerTest.java
Tue Apr 5 13:04:19 2011
@@ -102,8 +102,6 @@ public class JettyServerTest {
/**
* Tests that the creation of active and inactive scopes is reflected in
the RDF version of the scope set,
* whether it is set to display all scopes or only the active ones.
- *
- * @throws Exception
*/
// @Test
public void testActiveVsAll() throws Exception {
Modified:
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/RunSingleSPARQLTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/RunSingleSPARQLTest.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/RunSingleSPARQLTest.java
(original)
+++
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/RunSingleSPARQLTest.java
Tue Apr 5 13:04:19 2011
@@ -10,7 +10,6 @@ import static org.junit.Assert.*;
import java.io.File;
import java.util.HashMap;
-import org.apache.stanbol.owl.RunSingleSPARQL;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
Modified:
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/trasformation/ConversionTester.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/trasformation/ConversionTester.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/trasformation/ConversionTester.java
(original)
+++
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/trasformation/ConversionTester.java
Tue Apr 5 13:04:19 2011
@@ -9,7 +9,6 @@ package org.apache.stanbol.owl.trasforma
*
* @author elvio
*/
-import org.apache.stanbol.owl.trasformation.JenaToOwlConvert;
import com.hp.hpl.jena.ontology.AnnotationProperty;
import com.hp.hpl.jena.rdf.model.StmtIterator;
import java.net.URI;
Modified:
incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomList.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomList.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomList.java
(original)
+++
incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomList.java
Tue Apr 5 13:04:19 2011
@@ -5,7 +5,6 @@ import java.util.Collection;
import java.util.Iterator;
import org.apache.stanbol.rules.base.api.RuleAtom;
-import org.apache.stanbol.rules.base.api.util.AtomIterator;
public class AtomList implements Collection<RuleAtom> {
Modified:
incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/RuleList.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/RuleList.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/RuleList.java
(original)
+++
incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/RuleList.java
Tue Apr 5 13:04:19 2011
@@ -5,7 +5,6 @@ import java.util.Collection;
import java.util.Iterator;
import org.apache.stanbol.rules.base.api.Rule;
-import org.apache.stanbol.rules.base.api.util.RuleIterator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleParser.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleParser.java?rev=1089016&r1=1089015&r2=1089016&view=diff
==============================================================================
---
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleParser.java
(original)
+++
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleParser.java
Tue Apr 5 13:04:19 2011
@@ -29,8 +29,7 @@ import org.apache.stanbol.rules.base.SWR
public class RuleParser {
public static String ruleNS = "http://www.prova.org/rules.rdf#";;
-
-
+
private Model sourceModel;
private Model destinationModel;
@@ -41,8 +40,7 @@ public class RuleParser {
this.destinationModel = destinationModel;
this.ruleOntology =
ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, ruleOntology);
}
-
-
+
public RuleParser(OntModel inputOntology, Map<String, String>prefixMap,
Model ruleOntology) {
this.sourceModel = inputOntology;
this.ruleOntology =
ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, ruleOntology);
@@ -125,11 +123,8 @@ public class RuleParser {
}
return imp;
-
}
-
-
-
+
public OntModel getRuleOntology() {
return ruleOntology;
}
@@ -175,8 +170,7 @@ public class RuleParser {
variableResource =
ruleOntology.createResource(variable, SWRL.Variable);
System.out.println("LA CREO");
}
-
-
+
return variableResource;
}
@@ -214,10 +208,8 @@ public class RuleParser {
}
return sameASAtom;
-
}
-
-
+
private Resource createDifferentAtom(String token, int openPar, int
closePar){
Resource differentIndividualAtom =
ruleOntology.createResource(SWRL.DifferentIndividualsAtom);
@@ -252,7 +244,6 @@ public class RuleParser {
}
return differentIndividualAtom;
-
}
private Resource createClassAtom(OntResource ontResource, String token,
int openPar, int closePar){
@@ -264,9 +255,8 @@ public class RuleParser {
classAtom.addProperty(SWRL.classPredicate, ontResource);
String[] arguments = argumentString.split(",");
+
if(arguments.length == 1){
-
-
String argument = arguments[0];
argument = argument.replaceAll(" ", "");
System.out.println("ARGUMENT : "+argument);
@@ -283,13 +273,9 @@ public class RuleParser {
}
return classAtom;
-
}
private Resource createIndividualAtom(OntResource ontResource, String
token, int openPar, int closePar){
-
-
-
Resource individualPropertyAtom =
ruleOntology.createResource(SWRL.IndividualPropertyAtom);
String argumentString = token.substring(openPar+1, closePar);
System.out.println("ARGUMENT STRING INDIVIDUAL PROPERTY ATOM:
"+argumentString);
@@ -324,7 +310,6 @@ public class RuleParser {
}
return individualPropertyAtom;
-
}
private Resource createDatavaluedPropertyAtom(OntResource ontResource,
String token, int openPar, int closePar){
@@ -411,16 +396,16 @@ public class RuleParser {
}
int openPar = token.indexOf("(");
int closePar = token.indexOf(")");
-
+
String atom = token.substring(0, openPar);
System.out.println("ATOM : "+atom);
-
+
Resource atomResource = null;
-
-
-
- if(atom.equals("same")){
- atomResource = createSameAsAtom(token,
openPar, closePar);
+
+
+
+ if(atom.equals("same")){
+ atomResource = createSameAsAtom(token,
openPar, closePar);
}
else if(atom.equals("different")){
atomResource =
createDifferentAtom(token, openPar, closePar);
@@ -435,16 +420,16 @@ public class RuleParser {
System.out.println("atomNSPrefix : "+atomNSPrefix);
//ruleOntology.write(System.out);
String namespaceURI =
ruleOntology.getNsPrefixURI(atomNSPrefix);
-
+
System.out.println("SEMION RULE
PARSER : ontology "+namespaceURI.replace("#", ""));
-
+
OntModel ontModelExternal =
ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, null);
ontModelExternal.read(namespaceURI.replace("#", ""));
-
+
ontResource =
ontModelExternal.getOntResource(namespaceURI+atomName);
-
+
System.out.println("NAME
ATOOOOM: "+namespaceURI+atomName);
-
+
if(ontResource != null){
System.out.println("QUIIIIIIIIIIIIIIII");
if(ontResource.isClass()){
@@ -472,23 +457,23 @@ public class RuleParser {
System.out.println(ontResource.getURI()+ " nil");
}
}
-
+
}
else{
System.out.println("SONO UNA MINCHIA");
}
-
-
+
+
}
}
-
+
if(atomResource != null){
-
+
list = list.cons(atomResource);
System.out.println("ENTRO QUI
"+list.size());
-
+
}
-
+
}
}
