marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sschaff...@apache.org
Subject [6/6] marmotta git commit: code style cleanups across the whole source code
Date Sat, 19 Nov 2016 17:45:19 GMT
code style cleanups across the whole source code


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/37707785
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/37707785
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/37707785

Branch: refs/heads/develop
Commit: 377077856e0edb0f69ee92399fb1a352bee5e72a
Parents: 1b1e6f5
Author: Sebastian Schaffert <sschaffert@apache.org>
Authored: Sat Nov 19 18:44:59 2016 +0100
Committer: Sebastian Schaffert <sschaffert@apache.org>
Committed: Sat Nov 19 18:45:00 2016 +0100

----------------------------------------------------------------------
 .../plugins/repochecker/MatrixPrinter.java      |  10 +-
 .../apache/marmotta/client/model/rdf/BNode.java |   3 +-
 .../marmotta/client/model/rdf/Literal.java      |   3 +-
 .../apache/marmotta/client/model/rdf/URI.java   |   3 +-
 .../marmotta/client/util/CollectionUtils.java   |   9 +-
 .../src/ext/java/javolution/lang/Realtime.java  |   2 +-
 .../javolution/util/function/Iteration.java     |   4 +-
 .../collection/AtomicCollectionImpl.java        |  16 +-
 .../internal/collection/CollectionView.java     |   3 +-
 .../util/internal/map/AtomicMapImpl.java        |  20 +-
 .../util/internal/table/AtomicTableImpl.java    |  28 +-
 .../table/sorted/AtomicSortedTableImpl.java     |   2 +-
 .../apache/marmotta/commons/http/UriUtil.java   |  29 +-
 .../commons/nio/watch/AbstractTreeWatcher.java  |  20 +-
 .../commons/sesame/model/LiteralKey.java        |   3 +-
 .../commons/sesame/model/Namespaces.java        |   5 +-
 .../sesame/repository/ResourceUtils.java        |   3 +-
 .../java/com/sun/syndication/feed/CopyFrom.java |   4 +-
 .../sun/syndication/feed/module/DCSubject.java  |   2 +-
 .../sun/syndication/feed/module/Extendable.java |   2 +-
 .../com/sun/syndication/feed/module/Module.java |   3 +-
 .../sun/syndication/feed/module/SyModule.java   |  12 +-
 .../sun/syndication/feed/synd/Converter.java    |   7 +-
 .../sun/syndication/feed/synd/SyndCategory.java |   2 +-
 .../sun/syndication/feed/synd/SyndContent.java  |   2 +-
 .../syndication/feed/synd/SyndEnclosure.java    |  12 +-
 .../sun/syndication/feed/synd/SyndEntry.java    |  20 +-
 .../com/sun/syndication/feed/synd/SyndFeed.java |  14 +-
 .../sun/syndication/feed/synd/SyndImage.java    |   2 +-
 .../com/sun/syndication/feed/synd/SyndLink.java |  32 +-
 .../sun/syndication/feed/synd/SyndPerson.java   |  14 +-
 .../feed/synd/impl/ConverterForAtom10.java      |  30 +-
 .../com/sun/syndication/io/ModuleGenerator.java |   7 +-
 .../com/sun/syndication/io/ModuleParser.java    |   4 +-
 .../sun/syndication/io/WireFeedGenerator.java   |   5 +-
 .../com/sun/syndication/io/WireFeedParser.java  |   7 +-
 .../syndication/io/impl/DCModuleGenerator.java  |  16 +-
 .../sun/syndication/io/impl/DCModuleParser.java |  13 +-
 .../sun/syndication/io/impl/RSS094Parser.java   |   4 +-
 .../activitystreams/ActivityStreamModule.java   |  16 +-
 .../activitystreams/types/HasLocation.java      |   8 +-
 .../org/rometools/feed/module/base/Article.java |  16 +-
 .../org/rometools/feed/module/base/Course.java  |  24 +-
 .../rometools/feed/module/base/CustomTag.java   |   4 +-
 .../feed/module/base/CustomTagImpl.java         |   4 +-
 .../rometools/feed/module/base/CustomTags.java  |   7 +-
 .../org/rometools/feed/module/base/Event.java   |  59 ++--
 .../feed/module/base/GlobalInterface.java       |  20 +-
 .../rometools/feed/module/base/GoogleBase.java  |   2 +-
 .../feed/module/base/GoogleBaseImpl.java        |  20 +-
 .../org/rometools/feed/module/base/Housing.java |  75 +++--
 .../org/rometools/feed/module/base/Job.java     |  40 +--
 .../org/rometools/feed/module/base/Person.java  |  40 +--
 .../org/rometools/feed/module/base/Product.java | 135 ++++----
 .../org/rometools/feed/module/base/Review.java  |  38 +--
 .../feed/module/base/ScholarlyArticle.java      |  20 +-
 .../org/rometools/feed/module/base/Service.java |  58 ++--
 .../org/rometools/feed/module/base/Travel.java  |  63 ++--
 .../org/rometools/feed/module/base/Unknown.java |  28 +-
 .../org/rometools/feed/module/base/Vehicle.java |  87 +++---
 .../org/rometools/feed/module/base/Wanted.java  |  12 +-
 .../feed/module/base/types/CloneableType.java   |   2 +-
 .../feed/module/base/types/DateTimeRange.java   |   4 +-
 .../feed/module/base/types/FloatUnit.java       |   5 +-
 .../feed/module/cc/CreativeCommons.java         |  10 +-
 .../feed/module/cc/CreativeCommonsImpl.java     |   5 +-
 .../feed/module/content/ContentItem.java        |   8 +-
 .../feed/module/content/ContentModule.java      |  21 +-
 .../feed/module/feedburner/FeedBurner.java      |  18 +-
 .../feed/module/itunes/EntryInformation.java    |   4 +-
 .../feed/module/itunes/FeedInformation.java     |  16 +-
 .../rometools/feed/module/itunes/ITunes.java    |  27 +-
 .../feed/module/mediarss/MediaEntryModule.java  |   4 +-
 .../feed/module/mediarss/MediaModule.java       |   6 +-
 .../mediarss/io/MediaModuleGenerator.java       |  33 +-
 .../module/mediarss/io/MediaModuleParser.java   |  30 +-
 .../module/opensearch/OpenSearchModule.java     |   2 +-
 .../module/opensearch/OpenSearchResponse.java   |  26 +-
 .../opensearch/impl/OpenSearchModuleParser.java |  28 +-
 .../feed/module/photocast/PhotocastModule.java  |  23 +-
 .../feed/module/photocast/types/PhotoDate.java  |   5 +-
 .../org/rometools/feed/module/slash/Slash.java  |  19 +-
 .../rometools/feed/module/slash/SlashImpl.java  |   4 +-
 .../feed/module/sle/SimpleListExtension.java    |  14 +-
 .../org/rometools/feed/module/sle/SleEntry.java |  12 +-
 .../rometools/feed/module/sle/SleUtility.java   |  14 +-
 .../feed/module/sle/io/ItemParser.java          |  16 +-
 .../feed/module/sle/io/ModuleGenerator.java     |  19 +-
 .../feed/module/sle/io/ModuleParser.java        |  11 +-
 .../feed/module/sle/types/EntryValue.java       |  11 +-
 .../yahooweather/YWeatherEntryModule.java       |   8 +-
 .../module/yahooweather/YWeatherFeedModule.java |  26 +-
 .../module/yahooweather/YWeatherModule.java     |   2 +-
 .../module/yahooweather/YWeatherModuleImpl.java |  10 +-
 .../transactions/api/TransactionListener.java   |   6 +-
 .../transactions/api/TransactionalSail.java     |   8 +-
 .../api/TransactionalSailConnection.java        |   4 +-
 .../commons/sesame/facading/api/Facading.java   |  12 +-
 .../facading/api/FacadingPredicateBuilder.java  |   6 +-
 .../impl/FacadingInvocationHandler.java         |   8 +-
 .../facading/impl/FacadingInvocationHelper.java |   3 +-
 .../commons/sesame/facading/model/Facade.java   |   2 +-
 .../sesame/facading/util/FacadeUtils.java       |  10 +-
 .../commons/sesame/filter/SesameFilter.java     |   2 +-
 .../platform/ldp/patch/model/PatchLine.java     |   3 +-
 .../ldp/patch/parser/RdfPatchParser.java        |   6 +-
 .../commons/sesame/tripletable/TripleTable.java |   3 +-
 .../kiwi/reasoner/engine/ReasoningEngine.java   |   6 +-
 .../kiwi/reasoner/model/program/Field.java      |   8 +-
 .../reasoner/model/program/LiteralField.java    |   3 +-
 .../kiwi/reasoner/model/program/Program.java    |   3 +-
 .../reasoner/model/program/ResourceField.java   |   3 +-
 .../reasoner/model/program/VariableField.java   |   3 +-
 .../model/query/QueryResultIterator.java        |   2 +-
 .../kiwi/sparql/builder/ValueConverter.java     |   2 +-
 .../kiwi/sparql/builder/model/SQLFragment.java  |   4 +-
 .../kiwi/sparql/builder/model/SQLPattern.java   |   4 +-
 .../kiwi/sparql/builder/model/SQLVariable.java  |   3 +-
 .../kiwi/sparql/function/NativeFunction.java    |  12 +-
 .../optimizer/DistinctLimitOptimizer.java       |  18 +-
 .../kiwi/caching/CacheManagerFactory.java       |   2 +-
 .../kiwi/persistence/KiWiConnection.java        |   2 +-
 .../kiwi/persistence/mysql/MySQLDialect.java    |   5 +-
 .../registry/LocalTripleRegistry.java           |   7 +-
 .../util/ResultTransformerFunction.java         |   2 +-
 .../marmotta/kiwi/sail/KiWiSailConnection.java  |  35 +--
 .../marmotta/kiwi/sail/KiWiValueFactory.java    |  22 +-
 .../kiwi/versioning/api/VersioningSail.java     |   6 +-
 .../marmotta/ldcache/api/LDCachingBackend.java  |  12 +-
 .../ldcache/api/LDCachingConnection.java        |   6 +-
 .../marmotta/ldcache/api/LDCachingService.java  |  14 +-
 .../marmotta/ldpath/api/LDPathConstruct.java    |   2 +-
 .../ldpath/api/backend/NodeBackend.java         |  38 +--
 .../marmotta/ldpath/api/backend/RDFBackend.java |   8 +-
 .../ldpath/api/functions/NodeFunction.java      |  10 +-
 .../ldpath/api/selectors/NodeSelector.java      |  12 +-
 .../api/transformers/NodeTransformer.java       |   6 +-
 .../model/selectors/FunctionSelector.java       |   5 +-
 .../ldpath/model/selectors/GroupedSelector.java |  11 +-
 .../ldpath/model/selectors/PathSelector.java    |   3 +-
 .../model/selectors/PropertySelector.java       |   3 +-
 .../model/selectors/RecursivePathSelector.java  |  11 +-
 .../selectors/ReversePropertySelector.java      |  10 +-
 .../model/selectors/StringConstantSelector.java |   3 +-
 .../ldpath/model/selectors/TestingSelector.java |   5 +-
 .../model/selectors/WildcardSelector.java       |   3 +-
 .../marmotta/ldpath/model/tests/AndTest.java    |   5 +-
 .../ldpath/model/tests/LiteralLanguageTest.java |   5 +-
 .../ldpath/model/tests/LiteralTypeTest.java     |   5 +-
 .../marmotta/ldpath/model/tests/NotTest.java    |   5 +-
 .../marmotta/ldpath/model/tests/OrTest.java     |   3 +-
 .../ldpath/model/tests/PathEqualityTest.java    |   5 +-
 .../marmotta/ldpath/model/tests/PathTest.java   |   3 +-
 libraries/ostrich/backend/ldpath/CMakeLists.txt |   6 +
 .../ostrich/backend/ldpath/ldpath_model.cc      |  26 ++
 libraries/ostrich/backend/ldpath/ldpath_model.h |  46 +++
 libraries/ostrich/backend/ldpath/parser_base.cc |   5 +
 libraries/ostrich/backend/ldpath/parser_base.h  | 304 +++++++++++++++++++
 .../ostrich/model/ProtoLiteralBase.java         |   3 +-
 .../marmotta/loader/api/LoaderBackend.java      |   6 +-
 .../marmotta/loader/api/LoaderHandler.java      |   4 +-
 .../accumulograph/AccumuloGraphProvider.java    |   8 +-
 .../api/endpoint/LinkedDataEndpointService.java |  14 +-
 .../LinkedDataCachingWebService.java            |   2 +-
 .../services/kiwi/FileLDCacheSailProvider.java  |   2 -
 .../platform/core/api/cache/CachingService.java |   8 +-
 .../core/api/config/ConfigurationService.java   |  40 +--
 .../core/api/content/ContentReader.java         |  12 +-
 .../core/api/content/ContentService.java        |  18 +-
 .../core/api/content/ContentWriter.java         |   8 +-
 .../core/api/exporter/ExportService.java        |  14 +-
 .../core/api/http/HttpClientService.java        |  28 +-
 .../core/api/importer/ImportService.java        |   8 +-
 .../platform/core/api/importer/Importer.java    |  12 +-
 .../platform/core/api/io/MarmottaIOService.java |   8 +-
 .../platform/core/api/io/RDFHtmlWriter.java     |   2 +-
 .../platform/core/api/io/RDFWriterPriority.java |   2 +-
 .../core/api/logging/LoggingModule.java         |  20 +-
 .../core/api/logging/LoggingService.java        |  14 +-
 .../core/api/modules/MarmottaHttpFilter.java    |  14 +-
 .../api/modules/MarmottaResourceService.java    |   4 +-
 .../core/api/modules/ModuleService.java         |  31 +-
 .../platform/core/api/ssl/SSLService.java       |   2 +-
 .../core/api/statistics/StatisticsModule.java   |  12 +-
 .../core/api/statistics/StatisticsService.java  |  20 +-
 .../core/api/task/TaskManagerService.java       |  18 +-
 .../api/templating/AdminInterfaceService.java   |   6 +-
 .../core/api/templating/TemplatingService.java  |  28 +-
 .../core/api/triplestore/ContextService.java    |   6 +-
 .../triplestore/GarbageCollectionProvider.java  |   2 +-
 .../api/triplestore/NotifyingSailProvider.java  |   2 +-
 .../core/api/triplestore/SailProvider.java      |   4 +-
 .../api/triplestore/StandardSailProvider.java   |   2 +-
 .../core/api/triplestore/StoreProvider.java     |   4 +-
 .../triplestore/TransactionalSailProvider.java  |   2 +-
 .../core/api/ui/MarmottaSystrayLink.java        |   8 +-
 .../platform/core/api/user/UserService.java     |  22 +-
 .../core/model/content/MediaContentItem.java    |   8 +-
 .../core/model/logging/LoggingOutput.java       |   3 +-
 .../platform/core/model/user/MarmottaUser.java  |  24 +-
 .../platform/core/model/user/OnlineAccount.java |   8 +-
 .../core/qualifiers/cache/MarmottaCache.java    |   2 +-
 .../services/http/HttpClientServiceImpl.java    |  14 +-
 .../sesame/ResourceSubjectMetadata.java         |   2 +-
 .../marmotta/platform/ldp/api/LdpService.java   |   6 +-
 .../platform/ldpath/api/LDPathService.java      |  15 +-
 .../webservices/LDPathUtilWebService.java       |  33 +-
 .../platform/security/api/SecurityService.java  |   8 +-
 .../security/model/SecurityConstraint.java      |   2 +-
 .../platform/sparql/api/sparql/QueryType.java   |   2 +-
 .../sparql/api/sparql/SparqlService.java        |  18 +-
 .../user/api/AuthenticationService.java         |  12 +-
 .../user/api/UserConfigurationService.java      |  16 +-
 .../platform/user/model/UserAccount.java        |   6 +-
 .../webservices/UserManagementWebService.java   |  18 +-
 .../platform/versioning/api/MementoService.java |   4 +-
 .../api/VersionSerializerService.java           |   2 +-
 .../versioning/io/VersionSerializer.java        |   6 +-
 .../services/VersioningSailProvider.java        |  33 +-
 .../zookeeper/api/ZookeeperService.java         |   8 +-
 .../services/ZookeeperServiceImpl.java          |   4 +-
 221 files changed, 1591 insertions(+), 1484 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/build/plugins/repocheck-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/repochecker/MatrixPrinter.java
----------------------------------------------------------------------
diff --git a/build/plugins/repocheck-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/repochecker/MatrixPrinter.java b/build/plugins/repocheck-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/repochecker/MatrixPrinter.java
index e2b150d..37a7bbb 100644
--- a/build/plugins/repocheck-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/repochecker/MatrixPrinter.java
+++ b/build/plugins/repocheck-maven-plugin/src/main/java/org/apache/marmotta/maven/plugins/repochecker/MatrixPrinter.java
@@ -17,18 +17,18 @@
  */
 package org.apache.marmotta.maven.plugins.repochecker;
 
-import java.util.List;
-
 import org.apache.marmotta.maven.plugins.repochecker.RepositoryCheckerMojo.Result;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 
+import java.util.List;
+
 public interface MatrixPrinter {
 
-	public void printHeader(List<ArtifactRepository> repositories);
+	void printHeader(List<ArtifactRepository> repositories);
 	
-	public void printResult(Artifact artifact, int level, List<Result> results);
+	void printResult(Artifact artifact, int level, List<Result> results);
 	
-	public void printFooter(List<ArtifactRepository> repositories);
+	void printFooter(List<ArtifactRepository> repositories);
 	
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/model/rdf/BNode.java
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/model/rdf/BNode.java b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/model/rdf/BNode.java
index 25e5bee..58c0391 100644
--- a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/model/rdf/BNode.java
+++ b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/model/rdf/BNode.java
@@ -45,9 +45,8 @@ public class BNode extends RDFNode {
 
         BNode bNode = (BNode) o;
 
-        if (anonId != null ? !anonId.equals(bNode.anonId) : bNode.anonId != null) return false;
+        return anonId != null ? anonId.equals(bNode.anonId) : bNode.anonId == null;
 
-        return true;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/model/rdf/Literal.java
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/model/rdf/Literal.java b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/model/rdf/Literal.java
index e677f67..eed4925 100644
--- a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/model/rdf/Literal.java
+++ b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/model/rdf/Literal.java
@@ -100,9 +100,8 @@ public class Literal extends RDFNode {
 
         if (!content.equals(literal.content)) return false;
         if (language != null ? !language.equals(literal.language) : literal.language != null) return false;
-        if (type != null ? !type.equals(literal.type) : literal.type != null) return false;
+        return type != null ? type.equals(literal.type) : literal.type == null;
 
-        return true;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/model/rdf/URI.java
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/model/rdf/URI.java b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/model/rdf/URI.java
index da30106..cc4c0f3 100644
--- a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/model/rdf/URI.java
+++ b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/model/rdf/URI.java
@@ -46,9 +46,8 @@ public class URI extends RDFNode {
 
         URI uri1 = (URI) o;
 
-        if (!uri.equals(uri1.uri)) return false;
+        return uri.equals(uri1.uri);
 
-        return true;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/util/CollectionUtils.java
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/util/CollectionUtils.java b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/util/CollectionUtils.java
index 72fbd0c..f33282e 100644
--- a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/util/CollectionUtils.java
+++ b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/util/CollectionUtils.java
@@ -18,12 +18,7 @@
 package org.apache.marmotta.client.util;
 
 import java.text.Format;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * This class contains static helper methods for supporting java collections
@@ -143,7 +138,7 @@ public class CollectionUtils {
      * @param <T> the object type to serialize as string
      */
     public interface StringSerializer<T> {
-        public String serialize(T t);
+        String serialize(T t);
     }
 
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-commons/src/ext/java/javolution/lang/Realtime.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/lang/Realtime.java b/commons/marmotta-commons/src/ext/java/javolution/lang/Realtime.java
index 0b7a24a..2e7ceaa 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/lang/Realtime.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/lang/Realtime.java
@@ -73,7 +73,7 @@ public @interface Realtime {
     /**
      * Identifies the limit behavior for the worst case execution time.
      */
-    public enum Limit {
+    enum Limit {
 
         /**
          * The worst case execution time is constant.

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-commons/src/ext/java/javolution/util/function/Iteration.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/function/Iteration.java b/commons/marmotta-commons/src/ext/java/javolution/util/function/Iteration.java
index 6eb74e2..df59d91 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/function/Iteration.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/function/Iteration.java
@@ -21,8 +21,8 @@ import java.util.Iterator;
  */
 public interface Iteration<E>  {
 
-    public interface Mutable<E> extends Iteration<E> {}
-    public interface Sequential<E> extends Iteration<E> {}
+    interface Mutable<E> extends Iteration<E> {}
+    interface Sequential<E> extends Iteration<E> {}
        
      /** 
      * Runs the iteration using the specified iterator.

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-commons/src/ext/java/javolution/util/internal/collection/AtomicCollectionImpl.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/internal/collection/AtomicCollectionImpl.java b/commons/marmotta-commons/src/ext/java/javolution/util/internal/collection/AtomicCollectionImpl.java
index a76ce38..b35acf4 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/internal/collection/AtomicCollectionImpl.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/internal/collection/AtomicCollectionImpl.java
@@ -60,21 +60,21 @@ public class AtomicCollectionImpl<E> extends CollectionView<E> {
     @Override
     public synchronized boolean add(E element) {
         boolean changed = target().add(element);
-        if (changed && !updateInProgress()) immutable = cloneTarget();
+        if (changed && noUpdateInProgress()) immutable = cloneTarget();
         return changed;
     }
 
     @Override
     public synchronized boolean addAll(Collection<? extends E> c) {
         boolean changed = target().addAll(c);
-        if (changed && !updateInProgress()) immutable = cloneTarget();
+        if (changed && noUpdateInProgress()) immutable = cloneTarget();
         return changed;
     }
 
     @Override
     public synchronized void clear() {
         clear();
-        if (!updateInProgress()) {
+        if (noUpdateInProgress()) {
             immutable = cloneTarget();
         }
     }
@@ -124,21 +124,21 @@ public class AtomicCollectionImpl<E> extends CollectionView<E> {
     @Override
     public synchronized boolean remove(Object o) {
         boolean changed = target().remove(o);
-        if (changed && !updateInProgress()) immutable = cloneTarget();
+        if (changed && noUpdateInProgress()) immutable = cloneTarget();
         return changed;
     }
 
     @Override
     public synchronized boolean removeAll(Collection<?> c) {
         boolean changed = target().removeAll(c);
-        if (changed && !updateInProgress()) immutable = cloneTarget();
+        if (changed && noUpdateInProgress()) immutable = cloneTarget();
         return changed;
     }
 
     @Override
     public synchronized boolean retainAll(Collection<?> c) {
         boolean changed = target().retainAll(c);
-        if (changed && !updateInProgress()) immutable = cloneTarget();
+        if (changed && noUpdateInProgress()) immutable = cloneTarget();
         return changed;
     }
 
@@ -186,8 +186,8 @@ public class AtomicCollectionImpl<E> extends CollectionView<E> {
     }
 
     /** Indicates if the current thread is doing an atomic update. */
-    protected final boolean updateInProgress() {
-        return updatingThread == Thread.currentThread();
+    protected final boolean noUpdateInProgress() {
+        return updatingThread != Thread.currentThread();
 
     }
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-commons/src/ext/java/javolution/util/internal/collection/CollectionView.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/internal/collection/CollectionView.java b/commons/marmotta-commons/src/ext/java/javolution/util/internal/collection/CollectionView.java
index a2ed55b..5f481be 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/internal/collection/CollectionView.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/internal/collection/CollectionView.java
@@ -124,8 +124,7 @@ public abstract class CollectionView<E> extends FastCollection<E> implements Col
                 if (!it2.hasNext()) return false;
                 if (!cmp.areEqual(it1.next(), it2.next())) return false;
             }
-            if (it2.hasNext()) return false;
-            return true;
+            return !it2.hasNext();
         } else {
             return false;
         }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-commons/src/ext/java/javolution/util/internal/map/AtomicMapImpl.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/internal/map/AtomicMapImpl.java b/commons/marmotta-commons/src/ext/java/javolution/util/internal/map/AtomicMapImpl.java
index 3c097ee..ba32243 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/internal/map/AtomicMapImpl.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/internal/map/AtomicMapImpl.java
@@ -56,7 +56,7 @@ public class AtomicMapImpl<K, V> extends MapView<K, V> {
     @Override
     public synchronized void clear() {
         clear();
-        if (!updateInProgress()) {
+        if (noUpdateInProgress()) {
             immutable = cloneTarget();
         }
     }
@@ -101,48 +101,48 @@ public class AtomicMapImpl<K, V> extends MapView<K, V> {
     @Override
     public synchronized V put(K key, V value) {
         V v = target().put(key, value);
-        if (!updateInProgress()) immutable = cloneTarget();
+        if (noUpdateInProgress()) immutable = cloneTarget();
         return v;
     }
 
     @Override
     public synchronized void putAll(Map<? extends K, ? extends V> m) {
         target().putAll(m);
-        if (!updateInProgress()) immutable = cloneTarget();
+        if (noUpdateInProgress()) immutable = cloneTarget();
     }
 
     @Override
     public synchronized V putIfAbsent(K key, V value) {
         V v = target().putIfAbsent(key, value);
-        if (!updateInProgress()) immutable = cloneTarget();
+        if (noUpdateInProgress()) immutable = cloneTarget();
         return v;
     }
 
     @Override
     public synchronized V remove(Object key) {
         V v = target().remove(key);
-        if (!updateInProgress()) immutable = cloneTarget();
+        if (noUpdateInProgress()) immutable = cloneTarget();
         return v;
     }
 
     @Override
     public synchronized boolean remove(Object key, Object value) {
         boolean changed = target().remove(key, value);
-        if (changed && !updateInProgress()) immutable = cloneTarget();
+        if (changed && noUpdateInProgress()) immutable = cloneTarget();
         return changed;
     }
 
     @Override
     public synchronized V replace(K key, V value) {
         V v = target().replace(key, value);
-        if (!updateInProgress()) immutable = cloneTarget();
+        if (noUpdateInProgress()) immutable = cloneTarget();
         return v;
     }
 
     @Override
     public synchronized boolean replace(K key, V oldValue, V newValue) {
         boolean changed = target().replace(key, oldValue, newValue);
-        if (changed && !updateInProgress()) immutable = cloneTarget();
+        if (changed && noUpdateInProgress()) immutable = cloneTarget();
         return changed;
     }
 
@@ -186,7 +186,7 @@ public class AtomicMapImpl<K, V> extends MapView<K, V> {
 
 
     /** Indicates if the current thread is doing an atomic update. */
-    protected final boolean updateInProgress() {
-        return updatingThread == Thread.currentThread();
+    protected final boolean noUpdateInProgress() {
+        return updatingThread != Thread.currentThread();
     }
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/AtomicTableImpl.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/AtomicTableImpl.java b/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/AtomicTableImpl.java
index 4ed8926..0bd9b64 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/AtomicTableImpl.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/AtomicTableImpl.java
@@ -30,26 +30,26 @@ public class AtomicTableImpl<E> extends AtomicCollectionImpl<E> implements
     @Override
     public synchronized void add(int index, E element) {
         target().add(index, element);
-        if (!updateInProgress()) immutable = cloneTarget();
+        if (noUpdateInProgress()) immutable = cloneTarget();
     }
 
     @Override
     public synchronized boolean addAll(int index, Collection<? extends E> c) {
         boolean changed = target().addAll(index, c);
-        if (changed && !updateInProgress()) immutable = cloneTarget();
+        if (changed && noUpdateInProgress()) immutable = cloneTarget();
         return changed;
     }
 
     @Override
     public synchronized void addFirst(E element) {
         target().addFirst(element);
-        if (!updateInProgress()) immutable = cloneTarget();
+        if (noUpdateInProgress()) immutable = cloneTarget();
     }
 
     @Override
     public synchronized void addLast(E element) {
         target().addLast(element);
-        if (!updateInProgress()) immutable = cloneTarget();
+        if (noUpdateInProgress()) immutable = cloneTarget();
     }
 
     @Override
@@ -110,14 +110,14 @@ public class AtomicTableImpl<E> extends AtomicCollectionImpl<E> implements
     @Override
     public synchronized boolean offerFirst(E e) {
         boolean changed = target().offerFirst(e);
-        if (changed && !updateInProgress()) immutable = cloneTarget();
+        if (changed && noUpdateInProgress()) immutable = cloneTarget();
         return changed;
     }
 
     @Override
     public synchronized boolean offerLast(E e) {
         boolean changed = target().offerLast(e);
-        if (changed && !updateInProgress()) immutable = cloneTarget();
+        if (changed && noUpdateInProgress()) immutable = cloneTarget();
         return changed;
     }
 
@@ -144,14 +144,14 @@ public class AtomicTableImpl<E> extends AtomicCollectionImpl<E> implements
     @Override
     public synchronized E pollFirst() {
         E e = target().pollFirst();
-        if ((e != null) && !updateInProgress()) immutable = cloneTarget();
+        if ((e != null) && noUpdateInProgress()) immutable = cloneTarget();
         return e;
     }
 
     @Override
     public synchronized E pollLast() {
         E e = target().pollLast();
-        if ((e != null) && !updateInProgress()) immutable = cloneTarget();
+        if ((e != null) && noUpdateInProgress()) immutable = cloneTarget();
         return e;
     }
 
@@ -173,42 +173,42 @@ public class AtomicTableImpl<E> extends AtomicCollectionImpl<E> implements
     @Override
     public synchronized E remove(int index) {
         E e = target().remove(index);
-        if (!updateInProgress()) immutable = cloneTarget();
+        if (noUpdateInProgress()) immutable = cloneTarget();
         return e;
     }
 
     @Override
     public synchronized E removeFirst() {
         E e = target().removeFirst();
-        if (!updateInProgress()) immutable = cloneTarget();
+        if (noUpdateInProgress()) immutable = cloneTarget();
         return e;
     }
 
     @Override
     public synchronized boolean removeFirstOccurrence(Object o) {
         boolean changed = target().removeFirstOccurrence(o);
-        if (changed && !updateInProgress()) immutable = cloneTarget();
+        if (changed && noUpdateInProgress()) immutable = cloneTarget();
         return changed;
     }
 
     @Override
     public synchronized E removeLast() {
         E e = target().removeLast();
-        if (!updateInProgress()) immutable = cloneTarget();
+        if (noUpdateInProgress()) immutable = cloneTarget();
         return e;
     }
 
     @Override
     public synchronized boolean removeLastOccurrence(Object o) {
         boolean changed = target().removeLastOccurrence(o);
-        if (changed && !updateInProgress()) immutable = cloneTarget();
+        if (changed && noUpdateInProgress()) immutable = cloneTarget();
         return changed;
     }
 
     @Override
     public synchronized E set(int index, E element) {
         E e = target().set(index, element);
-        if (!updateInProgress()) immutable = cloneTarget();
+        if (noUpdateInProgress()) immutable = cloneTarget();
         return e;
     }
  

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/sorted/AtomicSortedTableImpl.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/sorted/AtomicSortedTableImpl.java b/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/sorted/AtomicSortedTableImpl.java
index 3e624e4..0a10fe1 100644
--- a/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/sorted/AtomicSortedTableImpl.java
+++ b/commons/marmotta-commons/src/ext/java/javolution/util/internal/table/sorted/AtomicSortedTableImpl.java
@@ -27,7 +27,7 @@ public class AtomicSortedTableImpl<E> extends AtomicTableImpl<E> implements
     @Override
     public synchronized boolean addIfAbsent(E element) {
         boolean changed = target().addIfAbsent(element);
-        if (changed && !updateInProgress()) immutable = cloneTarget();
+        if (changed && noUpdateInProgress()) immutable = cloneTarget();
         return changed;
     }
 

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/http/UriUtil.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/http/UriUtil.java b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/http/UriUtil.java
index 3161607..0ed874d 100644
--- a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/http/UriUtil.java
+++ b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/http/UriUtil.java
@@ -80,14 +80,13 @@ public class UriUtil {
         String last = uri.substring(uri.length() - 1);
         if ("#".equals(last) || "/".equals(last))
             return null;
-        else {
-            if (uri.contains("#")) // hash namespace
-                return uri.split("#")[0] + "#";
-            else { // slash namespace
-                int index = uri.lastIndexOf('/');
-                return uri.substring(0, index + 1);
-            }
-        }
+
+        if (uri.contains("#")) // hash namespace
+            return uri.split("#")[0] + "#";
+
+        // slash namespace
+        int index = uri.lastIndexOf('/');
+        return uri.substring(0, index + 1);
     }
 
     /**
@@ -101,14 +100,12 @@ public class UriUtil {
         String last = uri.substring(uri.length() - 1);
         if ("#".equals(last) || "/".equals(last))
             return null;
-        else {
-            if (uri.contains("#")) // hash namespace
-                return uri.split("#")[1];
-            else { // slash namespace
-                int index = uri.lastIndexOf('/');
-                return uri.substring(index + 1);
-            }
-        }
+
+        if (uri.contains("#")) // hash namespace
+            return uri.split("#")[1];
+            // slash namespace
+        int index = uri.lastIndexOf('/');
+        return uri.substring(index + 1);
     }
 
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/nio/watch/AbstractTreeWatcher.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/nio/watch/AbstractTreeWatcher.java b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/nio/watch/AbstractTreeWatcher.java
index f92bdf1..cdca813 100644
--- a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/nio/watch/AbstractTreeWatcher.java
+++ b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/nio/watch/AbstractTreeWatcher.java
@@ -17,26 +17,15 @@
  */
 package org.apache.marmotta.commons.nio.watch;
 
-import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE;
-import static java.nio.file.StandardWatchEventKinds.ENTRY_DELETE;
-import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;
-import static java.nio.file.StandardWatchEventKinds.OVERFLOW;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.nio.file.ClosedWatchServiceException;
-import java.nio.file.FileSystems;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.WatchEvent;
-import java.nio.file.WatchKey;
-import java.nio.file.WatchService;
+import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.HashMap;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static java.nio.file.StandardWatchEventKinds.*;
 
 /**
  * AbstractTreeWatcher is a convenience wrapper around the Java7 {@link WatchService}.
@@ -136,7 +125,6 @@ public abstract class AbstractTreeWatcher implements Runnable {
                                 onChildDeleted(parent, target);
                             } else {
                                 log.error("Unexpected event type: {}", kind);
-                                continue;
                             }
                         }
                     } finally {

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/model/LiteralKey.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/model/LiteralKey.java b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/model/LiteralKey.java
index 5170e0d..18d2227 100644
--- a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/model/LiteralKey.java
+++ b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/model/LiteralKey.java
@@ -57,9 +57,8 @@ public class LiteralKey {
 
         if (lang != null ? !lang.equals(that.lang) : that.lang != null) return false;
         if (type != null ? !type.equals(that.type) : that.type != null) return false;
-        if (!value.equals(that.value)) return false;
+        return value.equals(that.value);
 
-        return true;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/model/Namespaces.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/model/Namespaces.java b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/model/Namespaces.java
index fbbddd7..e113223 100644
--- a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/model/Namespaces.java
+++ b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/model/Namespaces.java
@@ -85,7 +85,8 @@ public class Namespaces {
      * Some language related namespaces from LoC (Library of Congress, USA)
      */
     public static final class NSS_LANGUAGE {
-        private NSS_LANGUAGE() {};
+        private NSS_LANGUAGE() {}
+
         /**
          * Use the two-letter identifier, such as "en", "de", "fr"
          */
@@ -106,7 +107,7 @@ public class Namespaces {
          * @see {@link http://id.loc.gov/vocabulary/languages.html}
          */
         public static final String NS_MARC     = "http://id.loc.gov/vocabulary/languages/";
-    };
+    }
 
     public static final String MIME_TYPE_ALL               = "*/*";
     public static final String MIME_TYPE_HTML              = "text/html";

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java
index 17f4cec..f4bfc33 100644
--- a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java
+++ b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/sesame/repository/ResourceUtils.java
@@ -162,8 +162,7 @@ public class ResourceUtils {
      */
     public static boolean isUsed(RepositoryConnection conn, Resource rsc) {
         if (isSubject(conn, rsc) || isContext(conn, rsc) || isObject(conn, rsc)) return true;
-        if (rsc instanceof URI && isPredicate(conn, (URI) rsc)) return true;
-        return false;
+        return rsc instanceof URI && isPredicate(conn, (URI) rsc);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/CopyFrom.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/CopyFrom.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/CopyFrom.java
index fbcad95..68e0b6d 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/CopyFrom.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/CopyFrom.java
@@ -30,7 +30,7 @@ public interface CopyFrom<T> {
      * <p>
      * @return the interface the copyFrom works on.
      */
-    public Class<? extends CopyFrom> getInterface();
+    Class<? extends CopyFrom> getInterface();
 
     /**
      * Copies all the properties of the given bean into this one.
@@ -43,6 +43,6 @@ public interface CopyFrom<T> {
      * @param obj the instance to copy properties from.
      *
      */
-    public void copyFrom(CopyFrom obj);
+    void copyFrom(CopyFrom obj);
 
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/module/DCSubject.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/module/DCSubject.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/module/DCSubject.java
index d4fb96e..799591b 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/module/DCSubject.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/module/DCSubject.java
@@ -65,6 +65,6 @@ public interface DCSubject extends Cloneable,CopyFrom {
      * @throws CloneNotSupportedException thrown if an element of the object cannot be cloned.
      *
      */
-    public Object clone() throws CloneNotSupportedException;
+    Object clone() throws CloneNotSupportedException;
 
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/module/Extendable.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/module/Extendable.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/module/Extendable.java
index f58f774..cfda5b1 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/module/Extendable.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/module/Extendable.java
@@ -31,7 +31,7 @@ public interface Extendable {
      * @param uri the URI of the ModuleImpl.
      * @return The module with the given URI, <b>null</b> if none.
      */
-    public Module getModule(String uri);
+    Module getModule(String uri);
 
     /**
      * Returns the entry modules.

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/module/Module.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/module/Module.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/module/Module.java
index 8ba7f94..df7236f 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/module/Module.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/module/Module.java
@@ -17,6 +17,7 @@
 package com.sun.syndication.feed.module;
 
 import com.sun.syndication.feed.CopyFrom;
+
 import java.io.Serializable;
 
 /**
@@ -43,6 +44,6 @@ public interface Module extends Cloneable,CopyFrom,Serializable{
      * @throws CloneNotSupportedException thrown if an element of the object cannot be cloned.
      *
      */
-    public Object clone() throws CloneNotSupportedException;
+    Object clone() throws CloneNotSupportedException;
 
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/module/SyModule.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/module/SyModule.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/module/SyModule.java
index f241e91..5b216d0 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/module/SyModule.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/module/SyModule.java
@@ -31,13 +31,13 @@ public interface SyModule extends Module {
      * URI of the Syndication ModuleImpl (http://purl.org/rss/1.0/modules/syndication/).
      *
      */
-    static final String URI = "http://purl.org/rss/1.0/modules/syndication/";
+    String URI = "http://purl.org/rss/1.0/modules/syndication/";
 
-    static final String HOURLY  = "hourly";
-    static final String DAILY   = "daily";
-    static final String WEEKLY  = "weekly";
-    static final String MONTHLY = "monthly";
-    static final String YEARLY  = "yearly";
+    String HOURLY  = "hourly";
+    String DAILY   = "daily";
+    String WEEKLY  = "weekly";
+    String MONTHLY = "monthly";
+    String YEARLY  = "yearly";
 
     /**
      * Returns the Syndication module update period.

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/Converter.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/Converter.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/Converter.java
index 9f46b1d..a75d62f 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/Converter.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/Converter.java
@@ -17,7 +17,6 @@
 package com.sun.syndication.feed.synd;
 
 import com.sun.syndication.feed.WireFeed;
-import com.sun.syndication.feed.synd.SyndFeed;
 
 /**
  * Interface that defines the functionality to convert a SyndFeedImpl
@@ -43,7 +42,7 @@ public interface Converter {
      * @return the real feed type.
      *
      */
-    public String getType();
+    String getType();
 
     /**
      * Makes a deep copy/conversion of the values of a real feed into a SyndFeedImpl.
@@ -54,7 +53,7 @@ public interface Converter {
      * @param syndFeed the SyndFeedImpl that will contain the copied/converted values of the real feed.
      *
      */
-    public void copyInto(WireFeed feed,SyndFeed syndFeed);
+    void copyInto(WireFeed feed, SyndFeed syndFeed);
 
     /**
      * Creates real feed with a deep copy/conversion of the values of a SyndFeedImpl.
@@ -63,6 +62,6 @@ public interface Converter {
      * @return a real feed with copied/converted values of the SyndFeedImpl.
      *
      */
-    public WireFeed createRealFeed(SyndFeed syndFeed);
+    WireFeed createRealFeed(SyndFeed syndFeed);
 
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndCategory.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndCategory.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndCategory.java
index 6354c33..10deefd 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndCategory.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndCategory.java
@@ -66,6 +66,6 @@ public interface SyndCategory extends Cloneable {
      * @throws CloneNotSupportedException thrown if an element of the object cannot be cloned.
      *
      */
-    public Object clone() throws CloneNotSupportedException;
+    Object clone() throws CloneNotSupportedException;
 
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndContent.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndContent.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndContent.java
index 12645fe..0d384c2 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndContent.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndContent.java
@@ -83,6 +83,6 @@ public interface SyndContent extends Cloneable,CopyFrom<SyndContent> {
      * @throws CloneNotSupportedException thrown if an element of the object cannot be cloned.
      *
      */
-    public Object clone() throws CloneNotSupportedException;
+    Object clone() throws CloneNotSupportedException;
 
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndEnclosure.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndEnclosure.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndEnclosure.java
index 34ee4e6..e010eda 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndEnclosure.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndEnclosure.java
@@ -12,7 +12,7 @@ public interface SyndEnclosure extends Cloneable, CopyFrom<SyndEnclosure> {
      * @return the enclosure URL, <b>null</b> if none.
      *
      */
-    public String getUrl();
+    String getUrl();
 
     /**
      * Sets the enclosure URL.
@@ -20,7 +20,7 @@ public interface SyndEnclosure extends Cloneable, CopyFrom<SyndEnclosure> {
      * @param url the enclosure URL to set, <b>null</b> if none.
      *
      */
-    public void setUrl(String url);
+    void setUrl(String url);
 
     /**
      * Returns the enclosure length.
@@ -28,7 +28,7 @@ public interface SyndEnclosure extends Cloneable, CopyFrom<SyndEnclosure> {
      * @return the enclosure length, <b>0</b> if none.
      *
      */
-    public long getLength();
+    long getLength();
 
     /**
      * Sets the enclosure length.
@@ -36,7 +36,7 @@ public interface SyndEnclosure extends Cloneable, CopyFrom<SyndEnclosure> {
      * @param length the enclosure length to set, <b>0</b> if none.
      *
      */
-    public void setLength(long length);
+    void setLength(long length);
 
     /**
      * Returns the enclosure type.
@@ -44,7 +44,7 @@ public interface SyndEnclosure extends Cloneable, CopyFrom<SyndEnclosure> {
      * @return the enclosure type, <b>null</b> if none.
      *
      */
-    public String getType();
+    String getType();
 
     /**
      * Sets the enclosure type.
@@ -52,6 +52,6 @@ public interface SyndEnclosure extends Cloneable, CopyFrom<SyndEnclosure> {
      * @param type the enclosure type to set, <b>null</b> if none.
      *
      */
-    public void setType(String type);
+    void setType(String type);
 
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndEntry.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndEntry.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndEntry.java
index fb7a286..9a53b47 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndEntry.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndEntry.java
@@ -16,13 +16,13 @@
  */
 package com.sun.syndication.feed.synd;
 
-import java.util.Date;
-import java.util.List;
-
 import com.sun.syndication.feed.CopyFrom;
 import com.sun.syndication.feed.module.Extendable;
 import com.sun.syndication.feed.module.Module;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * Bean interface for entries of SyndFeedImpl feeds.
  * <p>
@@ -162,7 +162,7 @@ public interface SyndEntry extends Cloneable, CopyFrom, Extendable {
      *         an empty list if none.
      *
      */
-    public List<SyndEnclosure> getEnclosures();
+    List<SyndEnclosure> getEnclosures();
 
     /**
      * Sets the entry enclosures.
@@ -171,7 +171,7 @@ public interface SyndEntry extends Cloneable, CopyFrom, Extendable {
      *        an empty list or <b>null</b> if none.
      *
      */
-    public void setEnclosures(List<SyndEnclosure> enclosures);
+    void setEnclosures(List<SyndEnclosure> enclosures);
 
     /**
      * Returns the entry published date.
@@ -336,7 +336,7 @@ public interface SyndEntry extends Cloneable, CopyFrom, Extendable {
      * @param uri the URI of the ModuleImpl.
      * @return The module with the given URI, <b>null</b> if none.
      */
-    public Module getModule(String uri);
+    Module getModule(String uri);
 
     /**
      * Returns the entry modules.
@@ -362,7 +362,7 @@ public interface SyndEntry extends Cloneable, CopyFrom, Extendable {
      * @return Opaque object to discourage use
      *
      */
-    public Object getForeignMarkup();
+    Object getForeignMarkup();
 
     /**
      * Sets foreign markup found at channel level.
@@ -370,7 +370,7 @@ public interface SyndEntry extends Cloneable, CopyFrom, Extendable {
      * @param foreignMarkup Opaque object to discourage use
      *
      */
-    public void setForeignMarkup(Object foreignMarkup);
+    void setForeignMarkup(Object foreignMarkup);
     
     /**
      * Creates a deep clone of the object.
@@ -379,12 +379,12 @@ public interface SyndEntry extends Cloneable, CopyFrom, Extendable {
      * @throws CloneNotSupportedException thrown if an element of the object cannot be cloned.
      *
      */
-    public Object clone() throws CloneNotSupportedException;
+    Object clone() throws CloneNotSupportedException;
 
     /**
      * Returns the first instance of a SyndLink with the specified relation, or null
      *
      */
-    public SyndLink findRelatedLink(String relation);
+    SyndLink findRelatedLink(String relation);
 
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndFeed.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndFeed.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndFeed.java
index c6ba350..a275e07 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndFeed.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndFeed.java
@@ -97,7 +97,7 @@ public interface SyndFeed extends Cloneable, CopyFrom, Extendable {
      * @return the charset encoding of the feed.
      *
      */
-    public String getEncoding();
+    String getEncoding();
 
     /**
      * Sets the charset encoding of a the feed. This is not set by Rome parsers.
@@ -105,7 +105,7 @@ public interface SyndFeed extends Cloneable, CopyFrom, Extendable {
      * @param encoding the charset encoding of the feed.
      *
      */
-    public void setEncoding(String encoding);
+    void setEncoding(String encoding);
 
     /**
      * Returns the feed URI.
@@ -354,7 +354,7 @@ public interface SyndFeed extends Cloneable, CopyFrom, Extendable {
      * @return the feed author, <b>null</b> if none.
      *
      */
-    public List<SyndPerson> getContributors();
+    List<SyndPerson> getContributors();
 
     /**
      * Sets the feed author.
@@ -468,7 +468,7 @@ public interface SyndFeed extends Cloneable, CopyFrom, Extendable {
      * @param uri the URI of the ModuleImpl.
      * @return The module with the given URI, <b>null</b> if none.
      */
-    public Module getModule(String uri);
+    Module getModule(String uri);
 
     /**
      * Returns the feed modules.
@@ -494,7 +494,7 @@ public interface SyndFeed extends Cloneable, CopyFrom, Extendable {
      * @return Opaque object to discourage use
      *
      */
-    public Object getForeignMarkup();
+    Object getForeignMarkup();
 
     /**
      * Sets foreign markup found at channel level.
@@ -502,7 +502,7 @@ public interface SyndFeed extends Cloneable, CopyFrom, Extendable {
      * @param foreignMarkup Opaque object to discourage use
      *
      */
-    public void setForeignMarkup(Object foreignMarkup);
+    void setForeignMarkup(Object foreignMarkup);
     
     /**
      * Creates a deep clone of the object.
@@ -511,6 +511,6 @@ public interface SyndFeed extends Cloneable, CopyFrom, Extendable {
      * @throws CloneNotSupportedException thrown if an element of the object cannot be cloned.
      *
      */
-    public Object clone() throws CloneNotSupportedException;
+    Object clone() throws CloneNotSupportedException;
 
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndImage.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndImage.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndImage.java
index 423530e..f3326ca 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndImage.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndImage.java
@@ -97,6 +97,6 @@ public interface SyndImage extends Cloneable,CopyFrom {
      * @throws CloneNotSupportedException thrown if an element of the object cannot be cloned.
      *
      */
-    public Object clone() throws CloneNotSupportedException;
+    Object clone() throws CloneNotSupportedException;
 
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndLink.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndLink.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndLink.java
index a6c95f5..269798a 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndLink.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndLink.java
@@ -29,7 +29,7 @@ public interface SyndLink {
      * @throws CloneNotSupportedException thrown if an element of the object cannot be cloned.
      *
      */
-    public abstract Object clone() throws CloneNotSupportedException;
+    Object clone() throws CloneNotSupportedException;
 
     /**
      * Indicates whether some other object is "equal to" this one as defined by the Object equals() method.
@@ -39,7 +39,7 @@ public interface SyndLink {
      *
      */
     @Override
-    public abstract boolean equals(Object other);
+    boolean equals(Object other);
 
     /**
      * Returns a hashcode value for the object.
@@ -50,7 +50,7 @@ public interface SyndLink {
      *
      */
     @Override
-    public abstract int hashCode();
+    int hashCode();
 
     /**
      * Returns the String representation for the object.
@@ -59,7 +59,7 @@ public interface SyndLink {
      *
      */
     @Override
-    public abstract String toString();
+    String toString();
 
     /**
      * Returns the link rel.
@@ -67,7 +67,7 @@ public interface SyndLink {
      * @return the link rel, <b>null</b> if none.
      *
      */
-    public abstract String getRel();
+    String getRel();
 
     /**
      * Sets the link rel.
@@ -75,7 +75,7 @@ public interface SyndLink {
      * @param rel the link rel,, <b>null</b> if none.
      *
      */
-    public abstract void setRel(String rel);
+    void setRel(String rel);
 
     /**
      * Returns the link type.
@@ -83,7 +83,7 @@ public interface SyndLink {
      * @return the link type, <b>null</b> if none.
      *
      */
-    public abstract String getType();
+    String getType();
 
     /**
      * Sets the link type.
@@ -91,7 +91,7 @@ public interface SyndLink {
      * @param type the link type, <b>null</b> if none.
      *
      */
-    public abstract void setType(String type);
+    void setType(String type);
 
     /**
      * Returns the link href.
@@ -99,7 +99,7 @@ public interface SyndLink {
      * @return the link href, <b>null</b> if none.
      *
      */
-    public abstract String getHref();
+    String getHref();
 
     /**
      * Sets the link href.
@@ -107,7 +107,7 @@ public interface SyndLink {
      * @param href the link href, <b>null</b> if none.
      *
      */
-    public abstract void setHref(String href);
+    void setHref(String href);
 
     /**
      * Returns the link title.
@@ -115,7 +115,7 @@ public interface SyndLink {
      * @return the link title, <b>null</b> if none.
      *
      */
-    public abstract String getTitle();
+    String getTitle();
 
     /**
      * Sets the link title.
@@ -123,33 +123,33 @@ public interface SyndLink {
      * @param title the link title, <b>null</b> if none.
      *
      */
-    public abstract void setTitle(String title);
+    void setTitle(String title);
 
     /**
      * Returns the hreflang
      * <p>
      * @return Returns the hreflang.
      */
-    public abstract String getHreflang();
+    String getHreflang();
 
     /**
      * Set the hreflang
      * <p>
      * @param hreflang The hreflang to set.
      */
-    public abstract void setHreflang(String hreflang);
+    void setHreflang(String hreflang);
 
     /**
      * Returns the length
      * <p>
      * @return Returns the length.
      */
-    public abstract long getLength();
+    long getLength();
 
     /**
      * Set the length
      * <p>
      * @param length The length to set.
      */
-    public abstract void setLength(long length);
+    void setLength(long length);
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndPerson.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndPerson.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndPerson.java
index 8b22b79..0c13c3d 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndPerson.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/SyndPerson.java
@@ -31,32 +31,32 @@ public interface SyndPerson extends Cloneable, Extendable
     /**
      * Returns  name of person
      */
-    public String getName();
+    String getName();
     
     /**
      * Sets name of person.
      */
-    public void setName(String name);
+    void setName(String name);
     
     /**
      * Returns URI of person.
      */
-    public String getUri();
+    String getUri();
     
     /** 
      * Sets URI of person.
      */
-    public void setUri(String uri);
+    void setUri(String uri);
     
     /** 
      * Returns email of person.
      */
-    public String getEmail();
+    String getEmail();
     
     /**
      * Sets email of person.
      */
-    public void setEmail(String email);
+    void setEmail(String email);
     
     
     /**
@@ -66,6 +66,6 @@ public interface SyndPerson extends Cloneable, Extendable
      * @throws CloneNotSupportedException thrown if an element of the object cannot be cloned.
      *
      */
-    public Object clone() throws CloneNotSupportedException;
+    Object clone() throws CloneNotSupportedException;
 
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/impl/ConverterForAtom10.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/impl/ConverterForAtom10.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/impl/ConverterForAtom10.java
index 8f9a6b3..d51e9bd 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/impl/ConverterForAtom10.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/feed/synd/impl/ConverterForAtom10.java
@@ -16,34 +16,16 @@
  */
 package com.sun.syndication.feed.synd.impl;
 
+import com.sun.syndication.feed.WireFeed;
+import com.sun.syndication.feed.atom.*;
+import com.sun.syndication.feed.module.impl.ModuleUtils;
+import com.sun.syndication.feed.synd.*;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
-import com.sun.syndication.feed.WireFeed;
-import com.sun.syndication.feed.atom.Category;
-import com.sun.syndication.feed.atom.Content;
-import com.sun.syndication.feed.atom.Entry;
-import com.sun.syndication.feed.atom.Feed;
-import com.sun.syndication.feed.atom.Link;
-import com.sun.syndication.feed.atom.Person;
-import com.sun.syndication.feed.module.impl.ModuleUtils;
-import com.sun.syndication.feed.synd.Converter;
-import com.sun.syndication.feed.synd.SyndCategory;
-import com.sun.syndication.feed.synd.SyndCategoryImpl;
-import com.sun.syndication.feed.synd.SyndContent;
-import com.sun.syndication.feed.synd.SyndContentImpl;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndEntryImpl;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.feed.synd.SyndFeedImpl;
-import com.sun.syndication.feed.synd.SyndLink;
-import com.sun.syndication.feed.synd.SyndLinkImpl;
-import com.sun.syndication.feed.synd.SyndPerson;
-import com.sun.syndication.feed.synd.SyndEnclosure;
-import com.sun.syndication.feed.synd.SyndEnclosureImpl;
-
 
 /**
  */
@@ -493,7 +475,7 @@ public class ConverterForAtom10 implements Converter {
         }
         // add SyndEnclosures as links with rel="enclosure" ONLY if
         // there are no SyndEntry.getLinks() with rel="enclosure"
-        if (enclosures != null && linkRelEnclosureExists == false) {
+        if (enclosures != null && !linkRelEnclosureExists) {
             for (Iterator iter=enclosures.iterator(); iter.hasNext();) {
                 SyndEnclosure syndEncl = (SyndEnclosure)iter.next();
                 Link link = createAtomEnclosure(syndEncl);

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/ModuleGenerator.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/ModuleGenerator.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/ModuleGenerator.java
index a268560..138ee33 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/ModuleGenerator.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/ModuleGenerator.java
@@ -17,7 +17,6 @@
 package com.sun.syndication.io;
 
 import com.sun.syndication.feed.module.Module;
-import com.sun.syndication.feed.WireFeed;
 import org.jdom2.Element;
 
 import java.util.Set;
@@ -40,7 +39,7 @@ public interface ModuleGenerator {
      * @return the namespace URI.
      *
      */
-    public String getNamespaceUri();
+    String getNamespaceUri();
 
     /**
      * Returns a set with all the URIs (JDOM Namespace elements) this module generator uses.
@@ -51,7 +50,7 @@ public interface ModuleGenerator {
      *
      * @return a set with all the URIs (JDOM Namespace elements) this module generator uses.
      */
-    public Set getNamespaces();
+    Set getNamespaces();
 
     /**
      * Generates and injects module metadata into an XML node (JDOM element).
@@ -59,5 +58,5 @@ public interface ModuleGenerator {
      * @param module the module to inject into the XML node (JDOM element).
      * @param element the XML node into which module meta-data will be injected.
      */
-    public void generate(Module module,Element element);
+    void generate(Module module, Element element);
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/ModuleParser.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/ModuleParser.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/ModuleParser.java
index 0f52c59..af62cfd 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/ModuleParser.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/ModuleParser.java
@@ -37,7 +37,7 @@ public interface ModuleParser {
      * @return the namespace URI.
      *
      */
-    public String getNamespaceUri();
+    String getNamespaceUri();
 
     /**
      * Parses the XML node (JDOM element) extracting module information.
@@ -46,5 +46,5 @@ public interface ModuleParser {
      * @return a module instance, <b>null</b> if the element did not have module information.
      *
      */
-    public Module parse(Element element);
+    Module parse(Element element);
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/WireFeedGenerator.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/WireFeedGenerator.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/WireFeedGenerator.java
index 960b486..00bc680 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/WireFeedGenerator.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/WireFeedGenerator.java
@@ -17,7 +17,6 @@
 package com.sun.syndication.io;
 
 import com.sun.syndication.feed.WireFeed;
-import com.sun.syndication.io.FeedException;
 import org.jdom2.Document;
 
 /**
@@ -40,7 +39,7 @@ public interface WireFeedGenerator {
      * @return the type of feed the generator creates.
      *
      */
-    public String getType();
+    String getType();
 
     /**
      * Creates an XML document (JDOM) for the given feed bean.
@@ -52,6 +51,6 @@ public interface WireFeedGenerator {
      * @throws FeedException thrown if the XML Document could not be created.
      *
      */
-    public Document generate(WireFeed feed) throws IllegalArgumentException,FeedException;
+    Document generate(WireFeed feed) throws IllegalArgumentException,FeedException;
 
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/WireFeedParser.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/WireFeedParser.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/WireFeedParser.java
index 486ecff..829b7b8 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/WireFeedParser.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/WireFeedParser.java
@@ -17,7 +17,6 @@
 package com.sun.syndication.io;
 
 import com.sun.syndication.feed.WireFeed;
-import com.sun.syndication.io.FeedException;
 import org.jdom2.Document;
 
 /**
@@ -40,7 +39,7 @@ public interface WireFeedParser {
      * @return the type of feed the parser handles.
      *
      */
-    public String getType();
+    String getType();
 
     /**
      * Inspects an XML Document (JDOM) to check if it can parse it.
@@ -51,7 +50,7 @@ public interface WireFeedParser {
      * @return <b>true</b> if the parser know how to parser this feed, <b>false</b> otherwise.
      *
      */
-    public boolean isMyType(Document document);
+    boolean isMyType(Document document);
 
     /**
      * Parses an XML document (JDOM Document) into a feed bean.
@@ -63,7 +62,7 @@ public interface WireFeedParser {
      * @throws FeedException thrown if a feed bean cannot be created out of the XML document (JDOM).
      *
      */
-    public WireFeed parse(Document document, boolean validate) throws IllegalArgumentException,FeedException;
+    WireFeed parse(Document document, boolean validate) throws IllegalArgumentException,FeedException;
 
 
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/impl/DCModuleGenerator.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/impl/DCModuleGenerator.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/impl/DCModuleGenerator.java
index a7cdee3..b96d3e3 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/impl/DCModuleGenerator.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/impl/DCModuleGenerator.java
@@ -16,21 +16,15 @@
  */
 package com.sun.syndication.io.impl;
 
-import com.sun.syndication.feed.module.Module;
 import com.sun.syndication.feed.module.DCModule;
 import com.sun.syndication.feed.module.DCSubject;
+import com.sun.syndication.feed.module.Module;
 import com.sun.syndication.io.ModuleGenerator;
 import org.jdom2.Attribute;
 import org.jdom2.Element;
 import org.jdom2.Namespace;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Collections;
+import java.util.*;
 
 
 /**
@@ -64,15 +58,15 @@ public class DCModuleGenerator implements ModuleGenerator {
         return DC_URI;
     }
     
-    private final Namespace getDCNamespace() {
+    private Namespace getDCNamespace() {
         return DC_NS;
     }
 
-    private final Namespace getRDFNamespace() {
+    private Namespace getRDFNamespace() {
         return RDF_NS;
     }
 
-    private final Namespace getTaxonomyNamespace() {
+    private Namespace getTaxonomyNamespace() {
         return TAXO_NS;
     }
 

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/impl/DCModuleParser.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/impl/DCModuleParser.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/impl/DCModuleParser.java
index 10173d5..d42828e 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/impl/DCModuleParser.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/impl/DCModuleParser.java
@@ -16,13 +16,8 @@
  */
 package com.sun.syndication.io.impl;
 
-import com.sun.syndication.feed.module.DCModuleImpl;
-import com.sun.syndication.feed.module.DCSubjectImpl;
-import com.sun.syndication.feed.module.Module;
-import com.sun.syndication.feed.module.DCModule;
-import com.sun.syndication.feed.module.DCSubject;
+import com.sun.syndication.feed.module.*;
 import com.sun.syndication.io.ModuleParser;
-import com.sun.syndication.io.WireFeedParser;
 import org.jdom2.Attribute;
 import org.jdom2.Element;
 import org.jdom2.Namespace;
@@ -47,15 +42,15 @@ public class DCModuleParser implements ModuleParser {
         return DCModule.URI;
     }
 
-    private final Namespace getDCNamespace() {
+    private Namespace getDCNamespace() {
         return DC_NS;
     }
 
-    private final Namespace getRDFNamespace() {
+    private Namespace getRDFNamespace() {
         return RDF_NS;
     }
 
-    private final Namespace getTaxonomyNamespace() {
+    private Namespace getTaxonomyNamespace() {
         return TAXO_NS;
     }
 

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/impl/RSS094Parser.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/impl/RSS094Parser.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/impl/RSS094Parser.java
index 61c5c86..a95b924 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/impl/RSS094Parser.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/com/sun/syndication/io/impl/RSS094Parser.java
@@ -53,8 +53,8 @@ public class RSS094Parser extends RSS093Parser {
             Integer ttlValue = null;        
             try{
                  ttlValue = new Integer(eTtl.getText());
-            } catch(NumberFormatException nfe ){ 
-                ; //let it go by
+            } catch(NumberFormatException nfe ){
+                //let it go by
             }
             if (ttlValue != null) {
                 channel.setTtl(ttlValue.intValue());

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/activitystreams/ActivityStreamModule.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/activitystreams/ActivityStreamModule.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/activitystreams/ActivityStreamModule.java
index 7151995..1222b3d 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/activitystreams/ActivityStreamModule.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/activitystreams/ActivityStreamModule.java
@@ -27,17 +27,17 @@ import org.rometools.feed.module.activitystreams.types.Verb;
  */
 public interface ActivityStreamModule {
 
-    public Verb getVerb();
-    public void setVerb(Verb verb);
+    Verb getVerb();
+    void setVerb(Verb verb);
 
-    public ActivityObject getObject();
-    public void setObject(ActivityObject object);
+    ActivityObject getObject();
+    void setObject(ActivityObject object);
 
-    public ActivityObject getTarget();
-    public void setTarget(ActivityObject object);
+    ActivityObject getTarget();
+    void setTarget(ActivityObject object);
 
-    public Mood getMood();
-    public void setMood(Mood mood);
+    Mood getMood();
+    void setMood(Mood mood);
 
 
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/activitystreams/types/HasLocation.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/activitystreams/types/HasLocation.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/activitystreams/types/HasLocation.java
index 2ec3ec8..e022e73 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/activitystreams/types/HasLocation.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/activitystreams/types/HasLocation.java
@@ -79,11 +79,11 @@ import org.rometools.feed.module.portablecontacts.ContactModule;
 public interface HasLocation {
 
 
-    public GeoRSSModule getLocation();
+    GeoRSSModule getLocation();
 
-    public void setLocation(GeoRSSModule location);
+    void setLocation(GeoRSSModule location);
 
-    public ContactModule getAddress();
+    ContactModule getAddress();
 
-    public void setAddress(ContactModule address);
+    void setAddress(ContactModule address);
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Article.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Article.java b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Article.java
index 0c7dafc..956ac84 100644
--- a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Article.java
+++ b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Article.java
@@ -87,7 +87,7 @@ public interface Article extends GlobalInterface {
      * </tbody></table>
      * @param authors Array of Author Names. Limit 10.
      */
-    public void setAuthors(String[] authors);
+    void setAuthors(String[] authors);
 
     /**
      * Array of Author Names. Limit 10.
@@ -127,7 +127,7 @@ public interface Article extends GlobalInterface {
      * </tbody></table>
      * @return Array of author names.
      */
-    public String[] getAuthors();
+    String[] getAuthors();
 
     /**
      * Source for this article.
@@ -171,7 +171,7 @@ public interface Article extends GlobalInterface {
      * </tbody></table>
      * @param newsSource Source for this article
      */
-    public void setNewsSource(String newsSource);
+    void setNewsSource(String newsSource);
 
     /**
      * Source for this article.
@@ -214,7 +214,7 @@ public interface Article extends GlobalInterface {
      * </tbody></table>
      * @return source for this article.
      */
-    public String getNewsSource();
+    String getNewsSource();
 
     /**
      * Number of pages in the article.
@@ -258,7 +258,7 @@ public interface Article extends GlobalInterface {
      * </tbody></table>
      * @param pages Number of pages in the article
      */
-    public void setPages(Integer pages);
+    void setPages(Integer pages);
 
     /**
      * Number of pages in the article.
@@ -302,7 +302,7 @@ public interface Article extends GlobalInterface {
      * </tbody></table>
      * @return Number of pages in the article
      */
-    public Integer getPages();
+    Integer getPages();
 
     /**
      * Date article was published.
@@ -347,7 +347,7 @@ public interface Article extends GlobalInterface {
      * </tbody></table>
      * @param publishDate Date article was published
      */
-    public void setPublishDate(Date publishDate);
+    void setPublishDate(Date publishDate);
 
     /**
      *  Date article was published.
@@ -392,5 +392,5 @@ public interface Article extends GlobalInterface {
      * </tbody></table>
      * @return Date article was published
      */
-    public Date getPublishDate();
+    Date getPublishDate();
 }


Mime
View raw message