You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by sf...@apache.org on 2011/04/05 16:51:57 UTC

svn commit: r1089070 [1/3] - in /incubator/stanbol/trunk: commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/ commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/ enhancer/benchmark/src/main/java/org/apache/stanbo...

Author: sfermigier
Date: Tue Apr  5 14:51:54 2011
New Revision: 1089070

URL: http://svn.apache.org/viewvc?rev=1089070&view=rev
Log:
Remove unneeded keywords.


Modified:
    incubator/stanbol/trunk/commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/RetryLoop.java
    incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java
    incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/BenchmarkParser.java
    incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkParserImpl.java
    incubator/stanbol/trunk/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/FeatureClass.java
    incubator/stanbol/trunk/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/GeonamesAPIWrapper.java
    incubator/stanbol/trunk/enhancer/engines/zemanta/src/main/java/org/apache/stanbol/enhancer/engines/zemanta/ZemantaOntologyEnum.java
    incubator/stanbol/trunk/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/RdfEntityFactoryTest.java
    incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/ValueConverterFactory.java
    incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/utils/AdaptingIterator.java
    incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/utils/FilteringIterator.java
    incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/utils/ModelUtils.java
    incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/defaults/DataTypeEnum.java
    incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/defaults/NamespaceEnum.java
    incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/model/EntityMapping.java
    incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/model/Sign.java
    incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/model/Symbol.java
    incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/model/rdf/RdfResourceEnum.java
    incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/Constraint.java
    incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/FieldQuery.java
    incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/TextConstraint.java
    incubator/stanbol/trunk/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/Utils.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/model/clerezza/src/main/java/org/apache/stanbol/entityhub/model/clerezza/RdfResourceUtils.java
    incubator/stanbol/trunk/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/SparqlQueryUtils.java
    incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/SolrDirectoryManager.java
    incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/SolrServerProvider.java
    incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/defaults/IndexDataTypeEnum.java
    incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrQueryFactory.java
    incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/ConstraintTypePosition.java
    incubator/stanbol/trunk/kres/eu.iksproject.fise.engines.dulcifier/src/main/java/eu/iksproject/fise/dereferencing/IDereferencer.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSource.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/CustomOntologySpace.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyIndex.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyScope.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyScopeFactory.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpace.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceFactory.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceListener.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeEventListenable.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeEventListener.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeOntologyListenable.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeOntologyListener.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeRegistry.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/SessionOntologySpace.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/SpaceType.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/registry/RegistryLoader.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/registry/io/XDRegistrySource.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/registry/models/RegistryItem.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/Session.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionEvent.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionIDGenerator.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListenable.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListener.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionManager.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/xd/lang/Language.java
    incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/xd/utils/XDAction.java
    incubator/stanbol/trunk/ontologymanager/store/api/src/main/java/org/apache/stanbol/ontologymanager/store/api/JenaPersistenceProvider.java
    incubator/stanbol/trunk/ontologymanager/store/api/src/main/java/org/apache/stanbol/ontologymanager/store/api/LockManager.java
    incubator/stanbol/trunk/ontologymanager/store/api/src/main/java/org/apache/stanbol/ontologymanager/store/api/PersistenceStore.java
    incubator/stanbol/trunk/ontologymanager/store/api/src/main/java/org/apache/stanbol/ontologymanager/store/api/ResourceManager.java
    incubator/stanbol/trunk/ontologymanager/store/api/src/main/java/org/apache/stanbol/ontologymanager/store/api/StoreSynchronizer.java
    incubator/stanbol/trunk/ontologymanager/store/rest-client/src/main/java/org/apache/stanbol/ontologymanager/store/rest/client/RestClient.java
    incubator/stanbol/trunk/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/api/ConsistentRefactorer.java
    incubator/stanbol/trunk/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/api/Reasoner.java
    incubator/stanbol/trunk/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/DataSource.java
    incubator/stanbol/trunk/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Reengineer.java
    incubator/stanbol/trunk/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/ReengineerManager.java
    incubator/stanbol/trunk/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/settings/ConnectionSettings.java
    incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBSchemaGenerator.java
    incubator/stanbol/trunk/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java
    incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Recipe.java
    incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Rule.java
    incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleAtom.java
    incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleManager.java
    incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleStore.java
    incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/SPARQLObject.java
    incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/SetRuleStore.java
    incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/URIResource.java
    incubator/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/api/Refactorer.java

Modified: incubator/stanbol/trunk/commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/RetryLoop.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/RetryLoop.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/RetryLoop.java (original)
+++ incubator/stanbol/trunk/commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/RetryLoop.java Tue Apr  5 14:51:54 2011
@@ -30,7 +30,7 @@ public class RetryLoop {
      * Interface for conditions to check, isTrue will be called
      * repeatedly until success or timeout
      */
-    public static interface Condition {
+    public interface Condition {
 
         /**
          * Used in failure messages to describe what was expected

Modified: incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java (original)
+++ incubator/stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/WebFragment.java Tue Apr  5 14:51:54 2011
@@ -19,7 +19,7 @@ public interface WebFragment {
      * Name of the fragment. Should be a lowercase short name without any kind of special character, so as to
      * be used as a path component in the URL of the static resources.
      */
-    public String getName();
+    String getName();
 
     /**
      * Java package name that is the classloading root of the static resources of the fragment to be published
@@ -27,7 +27,7 @@ public interface WebFragment {
      * 
      * Note: this package should be exported by the bundle.
      */
-    public String getStaticResourceClassPath();
+    String getStaticResourceClassPath();
 
     /**
      * Set of JAX-RS resources provided as classes.
@@ -35,7 +35,7 @@ public interface WebFragment {
      * Note: those classes should be visible: use the Export-Package bundle declaration to export their
      * packages.
      */
-    public Set<Class<?>> getJaxrsResourceClasses();
+    Set<Class<?>> getJaxrsResourceClasses();
 
     /**
      * Set of JAX-RS resources provided as singleton instances.
@@ -43,14 +43,14 @@ public interface WebFragment {
      * Note: those objects should be visible: use the Export-Package bundle declaration to export their
      * packages.
      */
-    public Set<Object> getJaxrsResourceSingletons();
+    Set<Object> getJaxrsResourceSingletons();
 
     /**
      * @return a template load instance that can be used by the FreemarkerViewProcessor for building the HTML
      *         UI incrementally. If this is an instance of ClassTemplateLoader, the class path visibility
      *         should be exported using the Export-Package bundle declaration.
      */
-    public TemplateLoader getTemplateLoader();
+    TemplateLoader getTemplateLoader();
 
     /**
      * CSS and favicon resources to be linked in the head of all HTML pages controlled by the NavigationMixin
@@ -58,7 +58,7 @@ public interface WebFragment {
      * 
      * ${it.staticRootUrl}/${link.fragmentName}/${link.relativePath}
      */
-    public List<LinkResource> getLinkResources();
+    List<LinkResource> getLinkResources();
 
     /**
      * Javascript resources to be linked in the head of all HTML pages controlled by the NavigationMixin
@@ -66,17 +66,17 @@ public interface WebFragment {
      * 
      * ${it.staticRootUrl}/${script.fragmentName}/${script.relativePath}
      */
-    public List<ScriptResource> getScriptResources();
+    List<ScriptResource> getScriptResources();
 
     /**
      * List of link descriptions to contribute to the main navigation menu.
      */
-    public List<NavigationLink> getNavigationLinks();
+    List<NavigationLink> getNavigationLinks();
 
     /**
      * @return the bundle context who contributed this fragment (useful for loading the resources from the
      *         right classloading context)
      */
-    public BundleContext getBundleContext();
+    BundleContext getBundleContext();
 
 }

Modified: incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/BenchmarkParser.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/BenchmarkParser.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/BenchmarkParser.java (original)
+++ incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/BenchmarkParser.java Tue Apr  5 14:51:54 2011
@@ -23,12 +23,12 @@ import java.util.List;
 public interface BenchmarkParser {
     
     // Marker strings in the benchmark text input
-    static final String COMMENT_MARKER = "#";
-    static final String FIELD_SEPARATOR = ":";
-    static final String INPUT_SECTION_MARKER = "= INPUT =";  
-    static final String EXPECT_SECTION_MARKER = "= EXPECT =";  
-    static final String COMPLAIN_SECTION_MARKER = "= COMPLAIN =";  
-    static final String DESCRIPTION_FIELD = "Description";
+    String COMMENT_MARKER = "#";
+    String FIELD_SEPARATOR = ":";
+    String INPUT_SECTION_MARKER = "= INPUT =";
+    String EXPECT_SECTION_MARKER = "= EXPECT =";
+    String COMPLAIN_SECTION_MARKER = "= COMPLAIN =";
+    String DESCRIPTION_FIELD = "Description";
     
     /** Parse the supplied text in a List of Benchmark
      * 

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=1089070&r1=1089069&r2=1089070&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 14:51:54 2011
@@ -80,8 +80,8 @@ public class BenchmarkParserImpl impleme
          *  (which might this one if no state change is needed) 
          */
         protected abstract State consume(String line) throws IOException;
-    };
-    
+    }
+
     private static class InitState extends State {
         InitState(ParserContext ctx) {
             super(ctx);
@@ -90,8 +90,8 @@ public class BenchmarkParserImpl impleme
         protected State consume(String line) {
             return this;
         }
-    };
-    
+    }
+
     private static class InputState extends State {
         InputState(ParserContext ctx) {
             super(ctx);
@@ -110,8 +110,8 @@ public class BenchmarkParserImpl impleme
             }
             return this;
         }
-    };
-    
+    }
+
     private static class MatcherGroupState extends State {
         private final boolean isExpect;
         

Modified: incubator/stanbol/trunk/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/FeatureClass.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/FeatureClass.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/FeatureClass.java (original)
+++ incubator/stanbol/trunk/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/FeatureClass.java Tue Apr  5 14:51:54 2011
@@ -22,5 +22,5 @@ package org.apache.stanbol.enhancer.engi
  * @author Rupert Westenthaler
  */
 public enum FeatureClass {
-    A, H, L, P, R, S, T, U, V;
+    A, H, L, P, R, S, T, U, V
 }

Modified: incubator/stanbol/trunk/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/GeonamesAPIWrapper.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/GeonamesAPIWrapper.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/GeonamesAPIWrapper.java (original)
+++ incubator/stanbol/trunk/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/GeonamesAPIWrapper.java Tue Apr  5 14:51:54 2011
@@ -82,7 +82,7 @@ public class GeonamesAPIWrapper {
      *
      * @author Rupert Westenthaler
      */
-    public static enum SearchRequestPropertyEnum {
+    public enum SearchRequestPropertyEnum {
         /**
          * search Toponyms by name
          */
@@ -201,7 +201,7 @@ public class GeonamesAPIWrapper {
         }
     }
 
-    public static enum HierarchyRequestPorpertyEnum {
+    public enum HierarchyRequestPorpertyEnum {
         /**
          * The ID of the Toponym the hierarchy is requested for
          */

Modified: incubator/stanbol/trunk/enhancer/engines/zemanta/src/main/java/org/apache/stanbol/enhancer/engines/zemanta/ZemantaOntologyEnum.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/zemanta/src/main/java/org/apache/stanbol/enhancer/engines/zemanta/ZemantaOntologyEnum.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/zemanta/src/main/java/org/apache/stanbol/enhancer/engines/zemanta/ZemantaOntologyEnum.java (original)
+++ incubator/stanbol/trunk/enhancer/engines/zemanta/src/main/java/org/apache/stanbol/enhancer/engines/zemanta/ZemantaOntologyEnum.java Tue Apr  5 14:51:54 2011
@@ -60,7 +60,7 @@ public enum ZemantaOntologyEnum {
      * @param ns    The namespace or <code>null</code> to use the default
      * @param local The local name or <code>null</code> to use the default
      */
-    private ZemantaOntologyEnum(String ns, String local) {
+    ZemantaOntologyEnum(String ns, String local) {
         uri = new UriRef((ns == null ? "http://s.zemanta.com/ns#" : ns) + (local == null ? name() : local));
     }
 
@@ -71,7 +71,7 @@ public enum ZemantaOntologyEnum {
      * @param local the local name or <code>null</code> to use the name() of the
      *              element
      */
-    private ZemantaOntologyEnum(String local) {
+    ZemantaOntologyEnum(String local) {
         this(null, local);
     }
 
@@ -79,7 +79,7 @@ public enum ZemantaOntologyEnum {
      * Creates a new entry of this Enum by using the default Zemanta namespace
      * and the name() of this element as lecal name.
      */
-    private ZemantaOntologyEnum() {
+    ZemantaOntologyEnum() {
         this(null, null);
     }
 

Modified: incubator/stanbol/trunk/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/RdfEntityFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/RdfEntityFactoryTest.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/RdfEntityFactoryTest.java (original)
+++ incubator/stanbol/trunk/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/RdfEntityFactoryTest.java Tue Apr  5 14:51:54 2011
@@ -257,7 +257,7 @@ public class RdfEntityFactoryTest {
      * @author westei
      */
     @Rdf(id="urn:test:TestRdfEntity")
-    public static interface TestRdfEntity extends RdfEntity{
+    public interface TestRdfEntity extends RdfEntity{
         @Rdf(id="urn:test:Integer")
         Integer getInteger();
         @Rdf(id="urn:test:Integer")
@@ -325,7 +325,7 @@ public class RdfEntityFactoryTest {
      * @author westei
      */
     @Rdf(id="urn:test:TestRdfEntity2")
-    public static interface TestRdfEntity2 extends RdfEntity {
+    public interface TestRdfEntity2 extends RdfEntity {
         @Rdf(id="urn:test:RdfEntity")
         TestRdfEntity getTestEntity();
         @Rdf(id="urn:test:RdfEntity")
@@ -343,7 +343,7 @@ public class RdfEntityFactoryTest {
      * @author westei
      */
     @Rdf(id="urn:test:SubTestRdfEntity")
-    public static interface SubTestRdfEntity extends TestRdfEntity {
+    public interface SubTestRdfEntity extends TestRdfEntity {
         @Rdf(id="urn:test:RdfEntity2")
         TestRdfEntity2 getTestEntity2();
         @Rdf(id="urn:test:RdfEntity2")

Modified: incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/ValueConverterFactory.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/ValueConverterFactory.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/ValueConverterFactory.java (original)
+++ incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/ValueConverterFactory.java Tue Apr  5 14:51:54 2011
@@ -178,7 +178,7 @@ public class ValueConverterFactory {
      *
      * @param <T> the type of created objects
      */
-    public static interface ValueConverter<T> {
+    public interface ValueConverter<T> {
 
         /**
          * The URI of the dataType created by this converter

Modified: incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/utils/AdaptingIterator.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/utils/AdaptingIterator.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/utils/AdaptingIterator.java (original)
+++ incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/utils/AdaptingIterator.java Tue Apr  5 14:51:54 2011
@@ -53,7 +53,7 @@ public class AdaptingIterator<T,A> imple
      * @param <T>
      * @param <A>
      */
-    public static interface Adapter<T,A> {
+    public interface Adapter<T,A> {
         /**
          * Converts the value of type T to a value of type A. If an instance of
          * T can not be converted to A, than <code>null</code> is returned

Modified: incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/utils/FilteringIterator.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/utils/FilteringIterator.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/utils/FilteringIterator.java (original)
+++ incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/utils/FilteringIterator.java Tue Apr  5 14:51:54 2011
@@ -51,7 +51,7 @@ public class FilteringIterator<T> extend
      *
      * @param <T>
      */
-    public static interface Filter<T> {
+    public interface Filter<T> {
         boolean isValid(T value);
     }
     public FilteringIterator(Iterator<T> iterator,Filter<T> filter,Class<T> type) {

Modified: incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/utils/ModelUtils.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/utils/ModelUtils.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/utils/ModelUtils.java (original)
+++ incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/utils/ModelUtils.java Tue Apr  5 14:51:54 2011
@@ -181,7 +181,7 @@ public final class ModelUtils {
             c.add(it.next());
         }
         return c;
-    };
+    }
 
     /**
      * Splits up a URI in local name and namespace based on the following rules

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=1089070&r1=1089069&r2=1089070&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 14:51:54 2011
@@ -91,16 +91,16 @@ public enum DataTypeEnum {
     private final String shortName;
     private final String uri;
     private final Set<Class<?>> additional;
-    private DataTypeEnum(Class<?> javaType,Class<?>...additional){
+    DataTypeEnum(Class<?> javaType, Class<?>... additional){
         this(null,null,javaType,additional);
     }
-    private DataTypeEnum(String localName,Class<?> javaType,Class<?>...additional){
+    DataTypeEnum(String localName, Class<?> javaType, Class<?>... additional){
         this(null,localName,javaType,additional);
     }
-    private DataTypeEnum(NamespaceEnum namespace,Class<?> javaType,Class<?>...additional) {
+    DataTypeEnum(NamespaceEnum namespace, Class<?> javaType, Class<?>... additional) {
         this(namespace,null,javaType,additional);
     }
-    private DataTypeEnum(NamespaceEnum namespace,String localName,Class<?> javaType,Class<?>...additional) {
+    DataTypeEnum(NamespaceEnum namespace, String localName, Class<?> javaType, Class<?>... additional) {
         if(namespace == null){
             namespace = NamespaceEnum.xsd;
         }

Modified: incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/defaults/NamespaceEnum.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/defaults/NamespaceEnum.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/defaults/NamespaceEnum.java (original)
+++ incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/defaults/NamespaceEnum.java Tue Apr  5 14:51:54 2011
@@ -70,13 +70,13 @@ public enum NamespaceEnum {
     ;
     private String ns;
     private String prefix;
-    private NamespaceEnum(String ns) {
+    NamespaceEnum(String ns) {
         if(ns == null){
             throw new IllegalArgumentException("The namespace MUST NOT be NULL");
         }
         this.ns = ns;
     }
-    private NamespaceEnum(String prefix,String ns) {
+    NamespaceEnum(String prefix, String ns) {
         this(ns);
         this.prefix = prefix;
     }

Modified: incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/model/EntityMapping.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/model/EntityMapping.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/model/EntityMapping.java (original)
+++ incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/model/EntityMapping.java Tue Apr  5 14:51:54 2011
@@ -87,8 +87,8 @@ public interface EntityMapping extends S
         public static boolean isState(String uri){
             return uri2state.containsKey(uri);
         }
-    };
-//    /**
+    }
+    //    /**
 //     * Getter for the identifier.
 //     * @return the identifier
 //     */
@@ -96,7 +96,8 @@ public interface EntityMapping extends S
     /**
      * The key to be used for the id of the mapped entity
      */
-    String ENTITY_ID = RdfResourceEnum.mappedEntity.toString();;
+    String ENTITY_ID = RdfResourceEnum.mappedEntity.toString();
+
     /**
      * Getter for the ID of the entity
      * @return the mapped entity
@@ -114,7 +115,8 @@ public interface EntityMapping extends S
     /**
      * The key to be used for the state of the MappedEntity instance
      */
-    String STATE = RdfResourceEnum.hasMappingState.toString();;
+    String STATE = RdfResourceEnum.hasMappingState.toString();
+
     /**
      * The state of this mapping
      * @return the state

Modified: incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/model/Sign.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/model/Sign.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/model/Sign.java (original)
+++ incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/model/Sign.java Tue Apr  5 14:51:54 2011
@@ -34,7 +34,7 @@ public interface Sign {
      * @author Rupert Westenthaler
      *
      */
-    public static enum SignTypeEnum {
+    enum SignTypeEnum {
         /**
          * The Sign - the default - type
          */

Modified: incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/model/Symbol.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/model/Symbol.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/model/Symbol.java (original)
+++ incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/model/Symbol.java Tue Apr  5 14:51:54 2011
@@ -63,7 +63,8 @@ public interface Symbol extends Sign{
         public String toString() {
             return uri;
         }
-    };
+    }
+
     /**
      * The property to be used for the symbol label
      */

Modified: incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/model/rdf/RdfResourceEnum.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/model/rdf/RdfResourceEnum.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/model/rdf/RdfResourceEnum.java (original)
+++ incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/model/rdf/RdfResourceEnum.java Tue Apr  5 14:51:54 2011
@@ -170,7 +170,7 @@ public enum RdfResourceEnum {
      * {@link NamespaceEnum#entityhubModel}).
      * @param uri the uri of the element
      */
-    private RdfResourceEnum(String uri) {
+    RdfResourceEnum(String uri) {
         if(uri == null){
             this.uri = NamespaceEnum.entityhubModel+name();
         }
@@ -182,7 +182,7 @@ public enum RdfResourceEnum {
      * @param ns the namespace of the property or <code>null</code> to use the
      * default namespace
      */
-    private RdfResourceEnum(NamespaceEnum ns){
+    RdfResourceEnum(NamespaceEnum ns){
         this(ns,null);
     }
     /**
@@ -192,7 +192,7 @@ public enum RdfResourceEnum {
      * @param localName the local name of the property or <code>null</code> to
      * use the {@link #name()} as local name.
      */
-    private RdfResourceEnum(NamespaceEnum ns,String localName){
+    RdfResourceEnum(NamespaceEnum ns, String localName){
         String uri;
         if(ns == null){
             uri = NamespaceEnum.entityhubModel.getNamespace();
@@ -210,7 +210,7 @@ public enum RdfResourceEnum {
      * Initialise a new property with {@link NamespaceEnum#entityhubModel}) as namespace
      * and the {@link #name()} as local name.
      */
-    private RdfResourceEnum(){
+    RdfResourceEnum(){
         this(null,null);
     }
     /**

Modified: incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/Constraint.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/Constraint.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/Constraint.java (original)
+++ incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/Constraint.java Tue Apr  5 14:51:54 2011
@@ -30,7 +30,7 @@ public abstract class Constraint {
      * @author Rupert Westenthaler
      *
      */
-    public static enum ConstraintType{
+    public enum ConstraintType{
 // NOTE (2010-Nov-09,rw) Because a reference constraint is now a special kind of
 //                       a value constraint.
 //        /**

Modified: incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/FieldQuery.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/FieldQuery.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/FieldQuery.java (original)
+++ incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/FieldQuery.java Tue Apr  5 14:51:54 2011
@@ -46,31 +46,31 @@ public interface FieldQuery extends Quer
      * Adds Fields to be selected by this Query
      * @param fields the fields to be selected by this query
      */
-    public abstract void addSelectedField(String field);
+    void addSelectedField(String field);
 
     /**
      * Adds Fields to be selected by this Query
      * @param fields the fields to be selected by this query
      */
-    public abstract void addSelectedFields(Collection<String> fields);
+    void addSelectedFields(Collection<String> fields);
 
     /**
      * Removes Fields to be selected by this Query
      * @param fields the fields to be selected by this query
      */
-    public abstract void removeSelectedField(String fields);
+    void removeSelectedField(String fields);
 
     /**
      * Removes Fields to be selected by this Query
      * @param fields the fields to be selected by this query
      */
-    public abstract void removeSelectedFields(Collection<String> fields);
+    void removeSelectedFields(Collection<String> fields);
 
     /**
      * Unmodifiable set with all the fields to be selected by this query
      * @return the fields to be selected by this query
      */
-    public abstract Set<String> getSelectedFields();
+    Set<String> getSelectedFields();
 
     /**
      * Sets/replaces the constraint for a field of the representation. If
@@ -79,27 +79,27 @@ public interface FieldQuery extends Quer
      * @param field the field
      * @param constraint the Constraint
      */
-    public abstract void setConstraint(String field, Constraint constraint);
+    void setConstraint(String field, Constraint constraint);
 
     /**
      * Removes the constraint for the parse field
      * @param field
      */
-    public abstract void removeConstraint(String field);
+    void removeConstraint(String field);
 
     /**
      * Checks if there is a constraint for the given field
      * @param field the field
      * @return the state
      */
-    public abstract boolean isConstraint(String field);
+    boolean isConstraint(String field);
 
     /**
      * Getter for the Constraint of a field
      * @param field the field
      * @return the constraint or <code>null</code> if none is defined.
      */
-    public abstract Constraint getConstraint(String field);
+    Constraint getConstraint(String field);
 
     /**
      * Getter for the unmodifiable list of query elements for the given Path. Use
@@ -107,7 +107,7 @@ public interface FieldQuery extends Quer
      * @param path the path
      * @return the list of query elements for a path
      */
-    public abstract Set<Entry<String, Constraint>> getConstraints();
+    Set<Entry<String, Constraint>> getConstraints();
     /**
      * Removes all constraints form the query
      */

Modified: incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/TextConstraint.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/TextConstraint.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/TextConstraint.java (original)
+++ incubator/stanbol/trunk/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/query/TextConstraint.java Tue Apr  5 14:51:54 2011
@@ -24,7 +24,7 @@ import java.util.Set;
 
 public class TextConstraint extends Constraint {
 
-    public static enum PatternType {
+    public enum PatternType {
         /**
          * Simple checks if the parsed constraint equals the value
          */

Modified: incubator/stanbol/trunk/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/Utils.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/Utils.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/Utils.java (original)
+++ incubator/stanbol/trunk/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/Utils.java Tue Apr  5 14:51:54 2011
@@ -35,5 +35,5 @@ public final class Utils {
             c.add(it.next());
         }
         return c;
-    };
+    }
 }

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=1089070&r1=1089069&r2=1089070&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 14:51:54 2011
@@ -147,7 +147,7 @@ public class RdfIndexer {
      * @author Rupert Westenthaler
      *
      */
-    public static enum IndexingMode{ NORMAL, RANKING_MAP_BASED }
+    public enum IndexingMode{ NORMAL, RANKING_MAP_BASED }
 
     public static final String RDF_XML = "application/rdf+xml";
     public static final String TURTLE = "text/turtle";
@@ -518,7 +518,7 @@ public class RdfIndexer {
         long lastIndexed = 0;
         long stdCount = 0;
         long indexedStdCount = 0;
-        long repStdCount = 0;;
+        long repStdCount = 0;
         long start = System.currentTimeMillis();
         long startCurrent = start;
         String current = null;

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=1089070&r1=1089069&r2=1089070&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 14:51:54 2011
@@ -182,7 +182,7 @@ public class GeoNamesIndexer {
 
     private static final Map<String,Reference> indexDocRefs = new HashMap<String, Reference>();
 
-    private static enum Properties{
+    private enum Properties{
         rdf_type(NamespaceEnum.rdf.getNamespace(),"type"),
         rdfs_label(NamespaceEnum.rdfs.getNamespace(),"label"),
         dc_creator(NamespaceEnum.dcTerms.getNamespace(),"creator"),

Modified: incubator/stanbol/trunk/entityhub/model/clerezza/src/main/java/org/apache/stanbol/entityhub/model/clerezza/RdfResourceUtils.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/model/clerezza/src/main/java/org/apache/stanbol/entityhub/model/clerezza/RdfResourceUtils.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/model/clerezza/src/main/java/org/apache/stanbol/entityhub/model/clerezza/RdfResourceUtils.java (original)
+++ incubator/stanbol/trunk/entityhub/model/clerezza/src/main/java/org/apache/stanbol/entityhub/model/clerezza/RdfResourceUtils.java Tue Apr  5 14:51:54 2011
@@ -55,7 +55,7 @@ public final class RdfResourceUtils {
      *      (Rupert Westenthaler, 2010-11-12)
      * @author Rupert Westenthaler
      */
-    public static enum XsdDataTypeEnum {
+    public enum XsdDataTypeEnum {
         //NOTE: Commented lines are not supported by org.apache.clerezza.rdf.core.impl.SimpleLiteralFactory
         // see http://svn.apache.org/repos/asf/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/main/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactory.java
         Boolean("boolean",Boolean.class),

Modified: incubator/stanbol/trunk/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/SparqlQueryUtils.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/SparqlQueryUtils.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/SparqlQueryUtils.java (original)
+++ incubator/stanbol/trunk/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/SparqlQueryUtils.java Tue Apr  5 14:51:54 2011
@@ -59,7 +59,7 @@ public final class SparqlQueryUtils {
     
     private static final Logger log = LoggerFactory.getLogger(SparqlQueryUtils.class);
     
-    public static enum EndpointTypeEnum {
+    public enum EndpointTypeEnum {
         Standard,
         Virtuoso,
         LARQ,

Modified: incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/SolrDirectoryManager.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/SolrDirectoryManager.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/SolrDirectoryManager.java (original)
+++ incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/SolrDirectoryManager.java Tue Apr  5 14:51:54 2011
@@ -69,12 +69,12 @@ public interface SolrDirectoryManager {
      * In case this property is not present the {@link #DEFAULT_SOLR_DATA_DIR}
      * (an relative path) is used.
      */
-    public static final String MANAGED_SOLR_DIR_PROPERTY = "org.apache.stanbol.entityhub.yard.solr.managedSolrDir";
+    String MANAGED_SOLR_DIR_PROPERTY = "org.apache.stanbol.entityhub.yard.solr.managedSolrDir";
     /**
      * Default value for the relative path used if the {@link #MANAGED_SOLR_DIR_PROPERTY}
      * is not present. It is not required that implementations use this as default.
      */
-    public static final String DEFAULT_SOLR_DATA_DIR = "indexes";
+    String DEFAULT_SOLR_DATA_DIR = "indexes";
 
     /**
      * Checks if a solrIndex with the parsed name is managed or not.
@@ -87,7 +87,7 @@ public interface SolrDirectoryManager {
      * @throws IllegalArgumentException In case <code>null</code> or an empty 
      * string is parsed as solrIndexName
      */
-    public abstract boolean isManagedIndex(String solrIndexName) throws IllegalStateException;
+    boolean isManagedIndex(String solrIndexName) throws IllegalStateException;
 
     /**
      * Getter for all the indexes currently available in the managed solr directory.
@@ -98,7 +98,7 @@ public interface SolrDirectoryManager {
      * be obtained (usually indicates that this component is currently 
      * deactivated) or initialised.
      */
-    public abstract Map<String,File> getManagedIndices() throws IllegalStateException;
+    Map<String,File> getManagedIndices() throws IllegalStateException;
 
     /**
      * Getter for the directory of the parsed index. In case the requested index
@@ -114,7 +114,7 @@ public interface SolrDirectoryManager {
      * @throws IllegalArgumentException if the parsed solrIndexName is 
      * <code>null</code> or empty
      */
-    public abstract File getSolrDirectory(final String solrIndexName) throws IllegalArgumentException;
+    File getSolrDirectory(final String solrIndexName) throws IllegalArgumentException;
 
     /**
      * Getter for the managed Solr Directory.
@@ -125,6 +125,6 @@ public interface SolrDirectoryManager {
      * be obtained (usually indicates that this component is currently 
      * deactivated) or initialised.
      */
-    public abstract File getManagedDirectory() throws IllegalStateException;
+    File getManagedDirectory() throws IllegalStateException;
 
 }
\ No newline at end of file

Modified: incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/SolrServerProvider.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/SolrServerProvider.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/SolrServerProvider.java (original)
+++ incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/SolrServerProvider.java Tue Apr  5 14:51:54 2011
@@ -42,7 +42,7 @@ public interface SolrServerProvider {
      * @author Rupert Westenthaler
      *
      */
-    public static enum Type {
+    enum Type {
         /**
          * Uses an embedded SolrServer that runs within the same virtual machine
          */

Modified: incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/defaults/IndexDataTypeEnum.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/defaults/IndexDataTypeEnum.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/defaults/IndexDataTypeEnum.java (original)
+++ incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/defaults/IndexDataTypeEnum.java Tue Apr  5 14:51:54 2011
@@ -71,13 +71,13 @@ public enum IndexDataTypeEnum {
      * texts and added to the {@link SolrConst#LANG_MERGER_FIELD} 
      */
     private boolean languageType;
-    private IndexDataTypeEnum(String name,String prefix,Class<?> type) {
+    IndexDataTypeEnum(String name, String prefix, Class<?> type) {
         this(name,prefix,null,type,false);
     }
-    private IndexDataTypeEnum(String name,String prefix,Class<?> type,boolean language) {
+    IndexDataTypeEnum(String name, String prefix, Class<?> type, boolean language) {
         this(name,prefix,null,type,language);
     }
-    private IndexDataTypeEnum(String name,String prefix,String suffix, Class<?> type,boolean language) {
+    IndexDataTypeEnum(String name, String prefix, String suffix, Class<?> type, boolean language) {
         this.indexType = new IndexDataType(name);
         this.prefix = prefix;
         this.suffix = suffix;

Modified: incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrQueryFactory.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrQueryFactory.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrQueryFactory.java (original)
+++ incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrQueryFactory.java Tue Apr  5 14:51:54 2011
@@ -132,7 +132,7 @@ public class SolrQueryFactory {
         constraintEncoders.put(IndexConstraintTypeEnum.GT, new GtEncoder(indexValueFactory));
         constraintEncoders.put(IndexConstraintTypeEnum.LT, new LtEncoder(indexValueFactory));
     }
-    public static enum SELECT {ID,QUERY,ALL}
+    public enum SELECT {ID,QUERY,ALL}
     public SolrQuery parseFieldQuery(FieldQuery fieldQuery,SELECT select){
         SolrQuery query = initSolrQuery(fieldQuery);
         setSelected(query, fieldQuery.getSelectedFields(),select);

Modified: incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/ConstraintTypePosition.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/ConstraintTypePosition.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/ConstraintTypePosition.java (original)
+++ incubator/stanbol/trunk/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/query/ConstraintTypePosition.java Tue Apr  5 14:51:54 2011
@@ -39,12 +39,12 @@ public class ConstraintTypePosition impl
      * @author Rupert Westenthaler
      *
      */
-    public static enum PositionType {
+    public enum PositionType {
         prefix,
         field,
         suffux,
         assignment,
-        value;
+        value
     }
     private PositionType type;
     private int pos;

Modified: incubator/stanbol/trunk/kres/eu.iksproject.fise.engines.dulcifier/src/main/java/eu/iksproject/fise/dereferencing/IDereferencer.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.fise.engines.dulcifier/src/main/java/eu/iksproject/fise/dereferencing/IDereferencer.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.fise.engines.dulcifier/src/main/java/eu/iksproject/fise/dereferencing/IDereferencer.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.fise.engines.dulcifier/src/main/java/eu/iksproject/fise/dereferencing/IDereferencer.java Tue Apr  5 14:51:54 2011
@@ -18,5 +18,5 @@ public interface IDereferencer {
 	 * @return {@link InputStream} if the location is resolved. Otherwise a {@link FileNotFoundException} is thrown.
 	 * @throws FileNotFoundException
 	 */
-	public InputStream resolve(String location) throws FileNotFoundException;
+    InputStream resolve(String location) throws FileNotFoundException;
 }

Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java Tue Apr  5 14:51:54 2011
@@ -26,7 +26,7 @@ public interface ONManager {
 	 * 
 	 * @return the default ontology index.
 	 */
-	public OntologyIndex getOntologyIndex();
+    OntologyIndex getOntologyIndex();
 
 	/**
 	 * Returns the ontology scope factory that was created along with the
@@ -34,7 +34,7 @@ public interface ONManager {
 	 * 
 	 * @return the default ontology scope factory
 	 */
-	public OntologyScopeFactory getOntologyScopeFactory();
+    OntologyScopeFactory getOntologyScopeFactory();
 
 	/**
 	 * Returns the ontology space factory that was created along with the
@@ -42,14 +42,14 @@ public interface ONManager {
 	 * 
 	 * @return the default ontology space factory.
 	 */
-	public OntologySpaceFactory getOntologySpaceFactory();
+    OntologySpaceFactory getOntologySpaceFactory();
 
 	/**
 	 * Returns the default ontology storage system for this KReS instance.
 	 * 
 	 * @return the default ontology store.
 	 */
-	public ClerezzaOntologyStorage getOntologyStore();
+    ClerezzaOntologyStorage getOntologyStore();
 
 	/**
 	 * Returns an OWL Ontology Manager that is never cleared of its ontologies,
@@ -60,35 +60,35 @@ public interface ONManager {
 	 * 
 	 * @return the OWL Ontology Manager used for caching ontologies.
 	 */
-	public OWLOntologyManager getOwlCacheManager();
+    OWLOntologyManager getOwlCacheManager();
 
 	/**
 	 * Returns a factory object that can be used for obtaining OWL API objects.
 	 * 
 	 * @return the default OWL data factory
 	 */
-	public OWLDataFactory getOwlFactory();
+    OWLDataFactory getOwlFactory();
 
 	/**
 	 * Returns the default ontology registry loader.
 	 * 
 	 * @return the default ontology registry loader.
 	 */
-	public RegistryLoader getRegistryLoader();
+    RegistryLoader getRegistryLoader();
 
 	/**
 	 * Returns the unique ontology scope registry for this context.
 	 * 
 	 * @return the ontology scope registry.
 	 */
-	public ScopeRegistry getScopeRegistry();
+    ScopeRegistry getScopeRegistry();
 
 	/**
 	 * Returns the unique KReS session manager for this context.
 	 * 
 	 * @return the KreS session manager.
 	 */
-	public SessionManager getSessionManager();
+    SessionManager getSessionManager();
 
 	/**
 	 * Returns the list of IRIs that identify scopes that should be activated on
@@ -96,12 +96,12 @@ public interface ONManager {
 	 * 
 	 * @return the list of scope IDs to activate.
 	 */
-	public String[] getUrisToActivate();
+    String[] getUrisToActivate();
 	
 	/**
 	 * Returns the String that represent the namespace used by KReS for its ontologies
 	 * 
 	 * @return the namespace of KReS.
 	 */
-	public String getKReSNamespace();
+    String getKReSNamespace();
 }

Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSource.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSource.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSource.java Tue Apr  5 14:51:54 2011
@@ -32,7 +32,7 @@ public interface OntologyInputSource {
 	 * @return the physical location for this ontology source, or null if
 	 *         unknown.
 	 */
-	public IRI getPhysicalIRI();
+    IRI getPhysicalIRI();
 
 	/**
 	 * Returns the OWL Ontology that imports the whole ontology network
@@ -40,7 +40,7 @@ public interface OntologyInputSource {
 	 * 
 	 * @return the ontology network root.
 	 */
-	public OWLOntology getRootOntology();
+    OWLOntology getRootOntology();
 
 	/**
 	 * Determines if a physical IRI is known for this ontology source. Note that
@@ -50,7 +50,7 @@ public interface OntologyInputSource {
 	 * 
 	 * @return true if a physical location is known for this ontology source.
 	 */
-	public boolean hasPhysicalIRI();
+    boolean hasPhysicalIRI();
 
 	/**
 	 * Determines if a root ontology that imports the entire network is
@@ -58,6 +58,6 @@ public interface OntologyInputSource {
 	 * 
 	 * @return true if a root ontology is available, false otherwise.
 	 */
-	public boolean hasRootOntology();
+    boolean hasRootOntology();
 
 }

Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/CustomOntologySpace.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/CustomOntologySpace.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/CustomOntologySpace.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/CustomOntologySpace.java Tue Apr  5 14:51:54 2011
@@ -33,7 +33,7 @@ public interface CustomOntologySpace ext
 	 *            that construct root ontologies in memory but do not store
 	 *            them.
 	 */
-	public void attachCoreSpace(CoreOntologySpace coreSpace, boolean skipRoot)
+    void attachCoreSpace(CoreOntologySpace coreSpace, boolean skipRoot)
 			throws UnmodifiableOntologySpaceException;
 
 }

Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyIndex.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyIndex.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyIndex.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyIndex.java Tue Apr  5 14:51:54 2011
@@ -25,7 +25,7 @@ public interface OntologyIndex extends S
 	 * @param ontologyIri
 	 * @return
 	 */
-	public OWLOntology getOntology(IRI ontologyIri);
+    OWLOntology getOntology(IRI ontologyIri);
 
 	/**
 	 * Returns the ontology loaded within an ontology scope having the specified
@@ -35,7 +35,7 @@ public interface OntologyIndex extends S
 	 * @param ontologyIri
 	 * @return
 	 */
-	public OWLOntology getOntology(IRI ontologyIri, IRI scopeId);
+    OWLOntology getOntology(IRI ontologyIri, IRI scopeId);
 
 	/**
 	 * Returns the set of ontology scopes where an ontology with the specified
@@ -46,8 +46,8 @@ public interface OntologyIndex extends S
 	 * @param includingSessionSpaces
 	 * @return
 	 */
-	public Set<IRI> getReferencingScopes(IRI ontologyIri,
-			boolean includingSessionSpaces);
+    Set<IRI> getReferencingScopes(IRI ontologyIri,
+            boolean includingSessionSpaces);
 
 	/**
 	 * Determines if an ontology with the specified identifier is loaded within
@@ -56,6 +56,6 @@ public interface OntologyIndex extends S
 	 * @param ontologyIri
 	 * @return
 	 */
-	public boolean isOntologyLoaded(IRI ontologyIri);
+    boolean isOntologyLoaded(IRI ontologyIri);
 
 }

Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyScope.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyScope.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyScope.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyScope.java Tue Apr  5 14:51:54 2011
@@ -33,7 +33,7 @@ public interface OntologyScope extends S
 	 * @param sessionSpace
 	 *            the ontology space to be added.
 	 */
-	public void addSessionSpace(OntologySpace sessionSpace, IRI sessionID);
+    void addSessionSpace(OntologySpace sessionSpace, IRI sessionID);
 
 	/**
 	 * Returns the core ontology space for this ontology scope. The core space
@@ -41,7 +41,7 @@ public interface OntologyScope extends S
 	 * 
 	 * @return the core ontology space
 	 */
-	public OntologySpace getCoreSpace();
+    OntologySpace getCoreSpace();
 
 	/**
 	 * Returns the custom ontology space for this ontology scope.
@@ -49,7 +49,7 @@ public interface OntologyScope extends S
 	 * @return the custom ontology space, or null if no custom space is
 	 *         registered for this scope.
 	 */
-	public OntologySpace getCustomSpace();
+    OntologySpace getCustomSpace();
 
 	/**
 	 * Returns an object that uniquely identifies this ontology scope.
@@ -58,7 +58,7 @@ public interface OntologyScope extends S
 	 * 
 	 * @return the unique identifier for this ontology scope
 	 */
-	public IRI getID();
+    IRI getID();
 
 	/**
 	 * Return the ontology space for this scope that is identified by the
@@ -69,14 +69,14 @@ public interface OntologyScope extends S
 	 * @return the ontology space identified by <code>sessionID</code>, or null
 	 *         if no such space is registered for this scope and session.
 	 */
-	public SessionOntologySpace getSessionSpace(IRI sessionID);
+    SessionOntologySpace getSessionSpace(IRI sessionID);
 
 	/**
 	 * Returns all the active ontology spaces for this scope.
 	 * 
 	 * @return a set of active ontology spaces for this scope.
 	 */
-	public Set<OntologySpace> getSessionSpaces();
+    Set<OntologySpace> getSessionSpaces();
 
 	/**
 	 * Sets an ontology space as the custom space for this scope.
@@ -86,7 +86,7 @@ public interface OntologyScope extends S
 	 * @throws UnmodifiableOntologySpaceException
 	 *             if either the scope or the supplied space are locked.
 	 */
-	public void setCustomSpace(OntologySpace customSpace)
+    void setCustomSpace(OntologySpace customSpace)
 			throws UnmodifiableOntologySpaceException;
 
 	/**
@@ -98,7 +98,7 @@ public interface OntologyScope extends S
 	 * set in the scope constructor. It can be changed in the
 	 * <code>setUp()</code> method though.
 	 */
-	public void setUp();
+    void setUp();
 
 	/**
 	 * Performs whatever operations are required for making sure the custom
@@ -113,7 +113,7 @@ public interface OntologyScope extends S
 	 * scope/space. In the default implementation, it is the scope itself, yet
 	 * the method is left public in order to allow for external controllers.
 	 */
-	public void synchronizeSpaces();
+    void synchronizeSpaces();
 
 	/**
 	 * Performs the operations required for deactivating the ontology scope. In
@@ -121,6 +121,6 @@ public interface OntologyScope extends S
 	 * collection. It should be possible to activate the same ontology scope
 	 * again if need be.
 	 */
-	public void tearDown();
+    void tearDown();
 
 }

Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyScopeFactory.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyScopeFactory.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyScopeFactory.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyScopeFactory.java Tue Apr  5 14:51:54 2011
@@ -33,8 +33,8 @@ public interface OntologyScopeFactory ex
 	 *             <i>registered</i>. The exception is not thrown if another
 	 *             scope with the same ID has been created but not registered.
 	 */
-	public OntologyScope createOntologyScope(IRI scopeID,
-			OntologyInputSource coreSource) throws DuplicateIDException;
+    OntologyScope createOntologyScope(IRI scopeID,
+            OntologyInputSource coreSource) throws DuplicateIDException;
 
 	/**
 	 * Creates and returns a new ontology scope with the core space ontologies
@@ -55,7 +55,7 @@ public interface OntologyScopeFactory ex
 	 *             <i>registered</i>. The exception is not thrown if another
 	 *             scope with the same ID has been created but not registered.
 	 */
-	public OntologyScope createOntologyScope(IRI scopeID,
-			OntologyInputSource coreSource, OntologyInputSource customSource)
+    OntologyScope createOntologyScope(IRI scopeID,
+            OntologyInputSource coreSource, OntologyInputSource customSource)
 			throws DuplicateIDException;
 }

Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpace.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpace.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpace.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpace.java Tue Apr  5 14:51:54 2011
@@ -27,12 +27,12 @@ public interface OntologySpace {
 	 * @throws UnmodifiableOntologySpaceException
 	 *             if the ontology space is read-only
 	 */
-	public void addOntology(OntologyInputSource ontologySource)
+    void addOntology(OntologyInputSource ontologySource)
 			throws UnmodifiableOntologySpaceException;
 
-	public void addOntologySpaceListener(OntologySpaceListener listener);
+	void addOntologySpaceListener(OntologySpaceListener listener);
 
-	public void clearOntologySpaceListeners();
+	void clearOntologySpaceListeners();
 
 	/**
 	 * Returns a Unique Resource Identifier (URI) that identifies this ontology
@@ -41,14 +41,14 @@ public interface OntologySpace {
 	 * 
 	 * @return the URI that identifies this ontology space
 	 */
-	public IRI getID();
+    IRI getID();
 
 	/**
 	 * Returns all the ontologies encompassed by this ontology space.
 	 * 
 	 * @return the set of ontologies in the ontology space
 	 */
-	public Set<OWLOntology> getOntologies();
+    Set<OWLOntology> getOntologies();
 
 	/**
 	 * Returns the ontology identified by the supplied <i>logical</i> IRI, if
@@ -64,11 +64,11 @@ public interface OntologySpace {
 	 * @return the requested ontology, or null if no ontology with this ID has
 	 *         been loaded.
 	 */
-	public OWLOntology getOntology(IRI ontologyIri);
+    OWLOntology getOntology(IRI ontologyIri);
 	
-	public boolean containsOntology(IRI ontologyIri);
+	boolean containsOntology(IRI ontologyIri);
 
-	public Collection<OntologySpaceListener> getOntologyScopeListeners();
+	Collection<OntologySpaceListener> getOntologyScopeListeners();
 
 	/**
 	 * Returns the ontology that serves as a root module for this ontology
@@ -76,7 +76,7 @@ public interface OntologySpace {
 	 * 
 	 * @return the root module of the ontology space
 	 */
-	public OWLOntology getTopOntology();
+    OWLOntology getTopOntology();
 
 	/**
 	 * Determines if the ontology identified by the supplied <i>logical</i> IRI
@@ -91,7 +91,7 @@ public interface OntologySpace {
 	 * 
 	 * @return true if an ontology with this ID has been loaded in this space.
 	 */
-	public boolean hasOntology(IRI ontologyIri);
+    boolean hasOntology(IRI ontologyIri);
 
 	/**
 	 * Determines if it is no longer possible to modify this space until it is
@@ -99,9 +99,9 @@ public interface OntologySpace {
 	 * 
 	 * @return true if this space is write-locked, false otherwise.
 	 */
-	public boolean isLocked();
+    boolean isLocked();
 
-	public boolean isSilentMissingOntologyHandling();
+	boolean isSilentMissingOntologyHandling();
 
 	/**
 	 * Removes the given ontology from the ontology space, if the ontology is a
@@ -115,12 +115,12 @@ public interface OntologySpace {
 	 * @throws UnmodifiableOntologySpaceException
 	 *             if the ontology space is read-only
 	 */
-	public void removeOntology(OntologyInputSource src)
+    void removeOntology(OntologyInputSource src)
 			throws OntologySpaceModificationException;
 
-	public void removeOntologySpaceListener(OntologySpaceListener listener);
+	void removeOntologySpaceListener(OntologySpaceListener listener);
 	
-	public void setSilentMissingOntologyHandling(boolean silent);
+	void setSilentMissingOntologyHandling(boolean silent);
 	
 	/**
 	 * Sets the supplied ontology as the root ontology that (recursively)
@@ -138,7 +138,7 @@ public interface OntologySpace {
 	 *             if the ontology space is read-only or the ontology could not
 	 *             be removed.
 	 */
-	public void setTopOntology(OntologyInputSource ontologySource)
+    void setTopOntology(OntologyInputSource ontologySource)
 			throws UnmodifiableOntologySpaceException;
 
 	/**
@@ -156,19 +156,19 @@ public interface OntologySpace {
 	 * @throws UnmodifiableOntologySpaceException
 	 *             if the ontology space is read-only.
 	 */
-	public void setTopOntology(OntologyInputSource ontologySource,
-			boolean createParent) throws UnmodifiableOntologySpaceException;
+    void setTopOntology(OntologyInputSource ontologySource,
+            boolean createParent) throws UnmodifiableOntologySpaceException;
 
 	/**
 	 * Bootstraps the ontology space. In some cases (such as with core and
 	 * custom spaces) this also implies write-locking its ontologies.
 	 */
-	public void setUp();
+    void setUp();
 
 	/**
 	 * Performs all required operations for disposing of an ontology space and
 	 * releasing its resources (e.g. removing the writelock).
 	 */
-	public void tearDown();
+    void tearDown();
 
 }

Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceFactory.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceFactory.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceFactory.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceFactory.java Tue Apr  5 14:51:54 2011
@@ -27,8 +27,8 @@ public interface OntologySpaceFactory {
 	 *            the input source for the ontologies in this space.
 	 * @return the generated ontology space.
 	 */
-	public CoreOntologySpace createCoreOntologySpace(IRI scopeID,
-			OntologyInputSource coreSource);
+    CoreOntologySpace createCoreOntologySpace(IRI scopeID,
+            OntologyInputSource coreSource);
 
 	/**
 	 * Creates and sets up a default custom ontology space.
@@ -41,8 +41,8 @@ public interface OntologySpaceFactory {
 	 *            the input source for the ontologies in this space.
 	 * @return the generated ontology space.
 	 */
-	public CustomOntologySpace createCustomOntologySpace(IRI scopeID,
-			OntologyInputSource customSource);
+    CustomOntologySpace createCustomOntologySpace(IRI scopeID,
+            OntologyInputSource customSource);
 
 	/**
 	 * Creates and sets up a default session ontology space.
@@ -53,6 +53,6 @@ public interface OntologySpaceFactory {
 	 *            identifier for this ontology space.
 	 * @return the generated ontology space.
 	 */
-	public SessionOntologySpace createSessionOntologySpace(IRI scopeID);
+    SessionOntologySpace createSessionOntologySpace(IRI scopeID);
 
 }

Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceListener.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceListener.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceListener.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologySpaceListener.java Tue Apr  5 14:51:54 2011
@@ -4,8 +4,8 @@ import org.semanticweb.owlapi.model.IRI;
 
 public interface OntologySpaceListener {
 
-	public void onOntologyAdded(IRI spaceId, IRI addedOntology);
+	void onOntologyAdded(IRI spaceId, IRI addedOntology);
 
-	public void onOntologyRemoved(IRI spaceId, IRI removedOntology);
+	void onOntologyRemoved(IRI spaceId, IRI removedOntology);
 
 }

Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeEventListenable.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeEventListenable.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeEventListenable.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeEventListenable.java Tue Apr  5 14:51:54 2011
@@ -11,12 +11,12 @@ import java.util.Collection;
  */
 public interface ScopeEventListenable {
 
-	public void addScopeEventListener(ScopeEventListener listener);
+	void addScopeEventListener(ScopeEventListener listener);
 
-	public void clearScopeEventListeners();
+	void clearScopeEventListeners();
 
-	public Collection<ScopeEventListener> getScopeEventListeners();
+	Collection<ScopeEventListener> getScopeEventListeners();
 
-	public void removeScopeEventListener(ScopeEventListener listener);
+	void removeScopeEventListener(ScopeEventListener listener);
 
 }

Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeEventListener.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeEventListener.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeEventListener.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeEventListener.java Tue Apr  5 14:51:54 2011
@@ -16,7 +16,7 @@ public interface ScopeEventListener {
 	 * @param scope
 	 *            the activated ontology scope
 	 */
-	public void scopeActivated(OntologyScope scope);
+    void scopeActivated(OntologyScope scope);
 
 	/**
 	 * Called <i>after</i> a new ontology scope has been created.
@@ -24,7 +24,7 @@ public interface ScopeEventListener {
 	 * @param scope
 	 *            the created ontology scope
 	 */
-	public void scopeCreated(OntologyScope scope);
+    void scopeCreated(OntologyScope scope);
 
 	/**
 	 * Called <i>after</i> an ontology scope, assuming it is already registered
@@ -34,7 +34,7 @@ public interface ScopeEventListener {
 	 * @param scope
 	 *            the deactivated ontology scope
 	 */
-	public void scopeDeactivated(OntologyScope scope);
+    void scopeDeactivated(OntologyScope scope);
 
 	/**
 	 * Called <i>after</i> an ontology scope is removed from the scope registry.
@@ -42,7 +42,7 @@ public interface ScopeEventListener {
 	 * @param scope
 	 *            the deregistered ontology scope
 	 */
-	public void scopeDeregistered(OntologyScope scope);
+    void scopeDeregistered(OntologyScope scope);
 
 	/**
 	 * Called <i>after</i> an ontology scope is added to the scope registry.
@@ -50,6 +50,6 @@ public interface ScopeEventListener {
 	 * @param scope
 	 *            the registered ontology scope
 	 */
-	public void scopeRegistered(OntologyScope scope);
+    void scopeRegistered(OntologyScope scope);
 
 }

Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeOntologyListenable.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeOntologyListenable.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeOntologyListenable.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeOntologyListenable.java Tue Apr  5 14:51:54 2011
@@ -11,12 +11,12 @@ import java.util.Collection;
  */
 public interface ScopeOntologyListenable {
 
-	public void addOntologyScopeListener(ScopeOntologyListener listener);
+	void addOntologyScopeListener(ScopeOntologyListener listener);
 
-	public void clearOntologyScopeListeners();
+	void clearOntologyScopeListeners();
 
-	public Collection<ScopeOntologyListener> getOntologyScopeListeners();
+	Collection<ScopeOntologyListener> getOntologyScopeListeners();
 
-	public void removeOntologyScopeListener(ScopeOntologyListener listener);
+	void removeOntologyScopeListener(ScopeOntologyListener listener);
 
 }

Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeOntologyListener.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeOntologyListener.java?rev=1089070&r1=1089069&r2=1089070&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeOntologyListener.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/ScopeOntologyListener.java Tue Apr  5 14:51:54 2011
@@ -4,8 +4,8 @@ import org.semanticweb.owlapi.model.IRI;
 
 public interface ScopeOntologyListener {
 
-	public void onOntologyAdded(IRI scopeId, IRI addedOntology);
+	void onOntologyAdded(IRI scopeId, IRI addedOntology);
 
-	public void onOntologyRemoved(IRI scopeId, IRI removedOntology);
+	void onOntologyRemoved(IRI scopeId, IRI removedOntology);
 	
 }