You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by ha...@apache.org on 2019/02/13 19:46:35 UTC

[clerezza] branch reunited updated: CLEREZZA-1026: Update api pom.xml to export package and reformat codes

This is an automated email from the ASF dual-hosted git repository.

hasan pushed a commit to branch reunited
in repository https://gitbox.apache.org/repos/asf/clerezza.git


The following commit(s) were added to refs/heads/reunited by this push:
     new e855395  CLEREZZA-1026: Update api pom.xml to export package and reformat codes
e855395 is described below

commit e85539530c7296b5fc3a8b0ed2ef83fb2e15182f
Author: Hasan <ha...@apache.org>
AuthorDate: Wed Feb 13 20:46:19 2019 +0100

    CLEREZZA-1026: Update api pom.xml to export package and reformat codes
---
 api/pom.xml                                        | 55 +++++++++-------
 api/src/main/assembly/bin.xml                      | 75 ----------------------
 api/src/main/assembly/src.xml                      | 45 -------------
 .../java/org/apache/clerezza/api/BlankNode.java    | 36 +++++------
 .../org/apache/clerezza/api/BlankNodeOrIRI.java    | 29 ++++-----
 .../main/java/org/apache/clerezza/api/Graph.java   | 49 +++++++-------
 api/src/main/java/org/apache/clerezza/api/IRI.java | 41 ++++++------
 .../org/apache/clerezza/api/ImmutableGraph.java    | 54 ++++++++--------
 .../java/org/apache/clerezza/api/Language.java     | 25 ++++----
 .../main/java/org/apache/clerezza/api/Literal.java | 64 +++++++++---------
 .../main/java/org/apache/clerezza/api/RDFTerm.java | 25 ++++----
 .../main/java/org/apache/clerezza/api/Triple.java  | 37 +++++------
 .../org/apache/clerezza/api/WatchableGraph.java    | 49 +++++++-------
 .../org/apache/clerezza/api/event/AddEvent.java    | 29 ++++-----
 .../apache/clerezza/api/event/FilterTriple.java    | 42 ++++++------
 .../org/apache/clerezza/api/event/GraphEvent.java  | 28 ++++----
 .../apache/clerezza/api/event/GraphListener.java   | 26 ++++----
 .../org/apache/clerezza/api/event/RemoveEvent.java | 27 ++++----
 .../java/org/apache/clerezza/api/package-info.java | 26 ++++----
 19 files changed, 315 insertions(+), 447 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index 5c19e7d..8fbc4ac 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -1,33 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor  license  agreements.  See the NOTICE file distributed
+  with this work  for  additional  information  regarding  copyright
+  ownership.  The ASF  licenses  this file to you under  the  Apache
+  License, Version 2.0 (the "License"); you may not  use  this  file
+  except in compliance with the License.  You may obtain  a copy  of
+  the License at
 
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+    http://www.apache.org/licenses/LICENSE-2.0
 
+  Unless  required  by  applicable law  or  agreed  to  in  writing,
+  software  distributed  under  the  License  is  distributed  on an
+  "AS IS"  BASIS,  WITHOUT  WARRANTIES  OR  CONDITIONS  OF ANY KIND,
+  either  express  or implied.  See  the License  for  the  specific
+  language governing permissions and limitations under  the License.
 -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.apache.clerezza</groupId>
         <artifactId>clerezza</artifactId>
+        <groupId>org.apache.clerezza</groupId>
         <version>8-SNAPSHOT</version>
-        <relativePath/>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
+    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>api</artifactId>
     <packaging>bundle</packaging>
@@ -42,7 +40,6 @@
         <url>http://issues.apache.org/jira/browse/CLEREZZA</url>
     </issueManagement>
 
-    <inceptionYear>2015</inceptionYear>
     <scm>
         <connection>scm:git:https://git-wip-us.apache.org/repos/asf/clerezza.git</connection>
         <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/clerezza.git</developerConnection>
@@ -58,4 +55,18 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.apache.clerezza.api.*</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/api/src/main/assembly/bin.xml b/api/src/main/assembly/bin.xml
deleted file mode 100644
index 3c114dd..0000000
--- a/api/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<assembly
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-    <id>bin</id>
-    <formats>
-        <format>tar.gz</format>
-        <format>zip</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-            <includes>
-                <include>README*</include>
-                <include>LICENSE*</include>
-                <include>NOTICE*</include>
-                <include>RELEASE-NOTES.txt</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>target</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>commons-net-${project.version}.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>target/site/apidocs</directory>
-            <outputDirectory>apidocs</outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-        </fileSet>
-        <!-- Include sources jar for IDEs -->
-        <fileSet>
-            <directory>target</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>commons-net-${project.version}-sources.jar</include>
-            </includes>
-        </fileSet>
-        <!-- Include examples as binary jar -->
-        <fileSet>
-            <directory>target</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>commons-net-examples-${project.version}.jar</include>
-            </includes>
-        </fileSet>
-        <!-- Include example sources for developers -->
-        <fileSet>
-            <directory>src/main/java/examples</directory>
-            <outputDirectory>examples</outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-</assembly>
diff --git a/api/src/main/assembly/src.xml b/api/src/main/assembly/src.xml
deleted file mode 100644
index a5f8da1..0000000
--- a/api/src/main/assembly/src.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<assembly
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-  <id>src</id>
-  <formats>
-    <format>tar.gz</format>
-    <format>zip</format>
-  </formats>
-  <baseDirectory>${artifactId}-${version}-src</baseDirectory>
-  <fileSets>
-    <fileSet>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-        <include>RELEASE-NOTES.txt</include>
-        <include>pom.xml</include>
-        <include>findbugs-exclude-filter.xml</include>
-        <include>checkstyle*.xml</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>src</directory>
-    </fileSet>
-  </fileSets>
-</assembly>
-
diff --git a/api/src/main/java/org/apache/clerezza/api/BlankNode.java b/api/src/main/java/org/apache/clerezza/api/BlankNode.java
index fab6270..9c4e2b3 100644
--- a/api/src/main/java/org/apache/clerezza/api/BlankNode.java
+++ b/api/src/main/java/org/apache/clerezza/api/BlankNode.java
@@ -1,38 +1,36 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor  license  agreements.  See the NOTICE file distributed
+ * with this work  for  additional  information  regarding  copyright
+ * ownership.  The ASF  licenses  this file to you under  the  Apache
+ * License, Version 2.0 (the "License"); you may not  use  this  file
+ * except in compliance with the License.  You may obtain  a copy  of
+ * the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless  required  by  applicable law  or  agreed  to  in  writing,
+ * software  distributed  under  the  License  is  distributed  on an
+ * "AS IS"  BASIS,  WITHOUT  WARRANTIES  OR  CONDITIONS  OF ANY KIND,
+ * either  express  or implied.  See  the License  for  the  specific
+ * language governing permissions and limitations under  the License.
  */
 package org.apache.clerezza.api;
 
 /**
- * A Blank Node represents a resource, 
- * but does not indicate a URI for the resource. Blank nodes act like 
- * existentially qualified variables in first order logic. 
- *
+ * A Blank Node represents a resource,
+ * but does not indicate a URI for the resource. Blank nodes act like
+ * existentially qualified variables in first order logic.
+ * <p>
  * An <a href= "http://www.w3.org/TR/rdf11-concepts/#dfn-blank-node" >RDF-1.1
  * Blank Node</a>, as defined by <a href=
  * "http://www.w3.org/TR/rdf11-concepts/#section-blank-nodes" >RDF-1.1 Concepts
  * and Abstract Syntax</a>, a W3C Recommendation published on 25 February 2014.<br>
- *
+ * <p>
  * Note that: Blank nodes are disjoint from IRIs and literals. Otherwise,
  * the set of possible blank nodes is arbitrary. RDF makes no reference to any
  * internal structure of blank nodes.
  *
- *
  * @see <a href= "http://www.w3.org/TR/rdf11-concepts/#dfn-blank-node">RDF-1.1
  * Blank Node</a>
  */
diff --git a/api/src/main/java/org/apache/clerezza/api/BlankNodeOrIRI.java b/api/src/main/java/org/apache/clerezza/api/BlankNodeOrIRI.java
index 0cf66ac..9d62c8e 100644
--- a/api/src/main/java/org/apache/clerezza/api/BlankNodeOrIRI.java
+++ b/api/src/main/java/org/apache/clerezza/api/BlankNodeOrIRI.java
@@ -1,26 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor  license  agreements.  See the NOTICE file distributed
+ * with this work  for  additional  information  regarding  copyright
+ * ownership.  The ASF  licenses  this file to you under  the  Apache
+ * License, Version 2.0 (the "License"); you may not  use  this  file
+ * except in compliance with the License.  You may obtain  a copy  of
+ * the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless  required  by  applicable law  or  agreed  to  in  writing,
+ * software  distributed  under  the  License  is  distributed  on an
+ * "AS IS"  BASIS,  WITHOUT  WARRANTIES  OR  CONDITIONS  OF ANY KIND,
+ * either  express  or implied.  See  the License  for  the  specific
+ * language governing permissions and limitations under  the License.
  */
 package org.apache.clerezza.api;
 
 /**
- * Represents a <code>Resource</code> that is not a <code>Literal</code>. 
- * This is a marker interface implemented by <code>UriRef</code> 
+ * Represents a <code>Resource</code> that is not a <code>Literal</code>.
+ * This is a marker interface implemented by <code>UriRef</code>
  * and <code>BNode</code>.
  *
  * @author reto
diff --git a/api/src/main/java/org/apache/clerezza/api/Graph.java b/api/src/main/java/org/apache/clerezza/api/Graph.java
index 5c5648c..a4d620e 100644
--- a/api/src/main/java/org/apache/clerezza/api/Graph.java
+++ b/api/src/main/java/org/apache/clerezza/api/Graph.java
@@ -1,20 +1,19 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor  license  agreements.  See the NOTICE file distributed
+ * with this work  for  additional  information  regarding  copyright
+ * ownership.  The ASF  licenses  this file to you under  the  Apache
+ * License, Version 2.0 (the "License"); you may not  use  this  file
+ * except in compliance with the License.  You may obtain  a copy  of
+ * the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless  required  by  applicable law  or  agreed  to  in  writing,
+ * software  distributed  under  the  License  is  distributed  on an
+ * "AS IS"  BASIS,  WITHOUT  WARRANTIES  OR  CONDITIONS  OF ANY KIND,
+ * either  express  or implied.  See  the License  for  the  specific
+ * language governing permissions and limitations under  the License.
  */
 package org.apache.clerezza.api;
 
@@ -33,22 +32,22 @@ import java.util.concurrent.locks.ReadWriteLock;
  * @author reto
  */
 public interface Graph extends Collection<Triple> {
-    
+
     /**
-     * Filters triples given a pattern. 
+     * Filters triples given a pattern.
      * filter(null, null, null) returns the same as iterator()
-     * 
+     *
      * @param subject
      * @param predicate
      * @param object
      * @return <code>Iterator</code>
      */
-    public Iterator<Triple> filter(BlankNodeOrIRI subject, IRI predicate, 
-            RDFTerm object);
+    public Iterator<Triple> filter(BlankNodeOrIRI subject, IRI predicate,
+                                   RDFTerm object);
 
     /**
-     * Returns true if <code>other</code> describes the same graph and will 
-     * always describe the same graph as this instance, false otherwise. 
+     * Returns true if <code>other</code> describes the same graph and will
+     * always describe the same graph as this instance, false otherwise.
      * It returns true if this == other or if it
      * is otherwise guaranteed that changes to one of the instances are
      * immediately reflected in the other or if both graphs are immutable.
@@ -60,14 +59,14 @@ public interface Graph extends Collection<Triple> {
     public boolean equals(Object other);
 
     /**
-     * Returns an ImutableGraph describing the graph at the current point in 
-     * time. if <code>this</code> is an instance of ImmutableGraph this can 
+     * Returns an ImutableGraph describing the graph at the current point in
+     * time. if <code>this</code> is an instance of ImmutableGraph this can
      * safely return <code>this</code>.
      *
      * @return the current time slice of the possibly mutable graph represented by the instance.
      */
     public ImmutableGraph getImmutableGraph();
-    
+
     /**
      * The lock provided by this methods allows to create read- and write-locks
      * that span multiple method calls. Having a read locks prevents other
@@ -75,9 +74,9 @@ public interface Graph extends Collection<Triple> {
      * threads from reading and writing. Implementations would typically
      * return a <code>java.util.concurrent.locks.ReentrantReadWriteLock</code>.
      * Immutable instances (such as instances of <code>ImmutableGraph</code>)
-     * or instances used in transaction where concurrent acces of the same 
+     * or instances used in transaction where concurrent acces of the same
      * instance is not an issue may return a no-op ReadWriteLock (i.e. one
-     * which returned ReadLock and WriteLock instances of which the methods do 
+     * which returned ReadLock and WriteLock instances of which the methods do
      * not do anything)
      *
      * @return the lock of this Graph
diff --git a/api/src/main/java/org/apache/clerezza/api/IRI.java b/api/src/main/java/org/apache/clerezza/api/IRI.java
index d17cc90..89d0f3e 100644
--- a/api/src/main/java/org/apache/clerezza/api/IRI.java
+++ b/api/src/main/java/org/apache/clerezza/api/IRI.java
@@ -1,20 +1,19 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor  license  agreements.  See the NOTICE file distributed
+ * with this work  for  additional  information  regarding  copyright
+ * ownership.  The ASF  licenses  this file to you under  the  Apache
+ * License, Version 2.0 (the "License"); you may not  use  this  file
+ * except in compliance with the License.  You may obtain  a copy  of
+ * the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless  required  by  applicable law  or  agreed  to  in  writing,
+ * software  distributed  under  the  License  is  distributed  on an
+ * "AS IS"  BASIS,  WITHOUT  WARRANTIES  OR  CONDITIONS  OF ANY KIND,
+ * either  express  or implied.  See  the License  for  the  specific
+ * language governing permissions and limitations under  the License.
  */
 package org.apache.clerezza.api;
 
@@ -22,13 +21,13 @@ import java.io.Serializable;
 
 /**
  * Represents an RDF URI Reference
- * 
+ * <p>
  * RDF URI References are defined in section 6.4 RDF URI References of
  * http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#section-Graph-URIref
- * 
- * Note that an RDF URI Reference is not the same as defined by RFC3986, 
- * RDF URI References support most unicode characters 
- * 
+ * <p>
+ * Note that an RDF URI Reference is not the same as defined by RFC3986,
+ * RDF URI References support most unicode characters
+ *
  * @author reto
  */
 public class IRI implements BlankNodeOrIRI, Serializable {
@@ -39,7 +38,7 @@ public class IRI implements BlankNodeOrIRI, Serializable {
         this.unicodeString = unicodeString;
     }
 
-    /** 
+    /**
      * @return the unicode string that produces the URI
      */
     public String getUnicodeString() {
@@ -48,9 +47,9 @@ public class IRI implements BlankNodeOrIRI, Serializable {
 
     /**
      * Returns true iff <code>obj</code> == <code>UriRef</code>
-     * 
+     *
      * @param obj
-     * @return true if obj is an instanceof UriRef with 
+     * @return true if obj is an instanceof UriRef with
      * the same unicode-string, false otherwise
      */
     @Override
diff --git a/api/src/main/java/org/apache/clerezza/api/ImmutableGraph.java b/api/src/main/java/org/apache/clerezza/api/ImmutableGraph.java
index efb7b49..f204480 100644
--- a/api/src/main/java/org/apache/clerezza/api/ImmutableGraph.java
+++ b/api/src/main/java/org/apache/clerezza/api/ImmutableGraph.java
@@ -1,53 +1,51 @@
- /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor  license  agreements.  See the NOTICE file distributed
+ * with this work  for  additional  information  regarding  copyright
+ * ownership.  The ASF  licenses  this file to you under  the  Apache
+ * License, Version 2.0 (the "License"); you may not  use  this  file
+ * except in compliance with the License.  You may obtain  a copy  of
+ * the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless  required  by  applicable law  or  agreed  to  in  writing,
+ * software  distributed  under  the  License  is  distributed  on an
+ * "AS IS"  BASIS,  WITHOUT  WARRANTIES  OR  CONDITIONS  OF ANY KIND,
+ * either  express  or implied.  See  the License  for  the  specific
+ * language governing permissions and limitations under  the License.
  */
 package org.apache.clerezza.api;
 
 /**
  * A graph, modeled as a set of triples.
- * This interface does not extend java.util.Set because of the different 
- * identity constraints, i.e. two <code>Graph</code>s may be equal (isomorphic) 
+ * This interface does not extend java.util.Set because of the different
+ * identity constraints, i.e. two <code>Graph</code>s may be equal (isomorphic)
  * even if the set of triples are not.
- * 
- * Implementations MUST be immutable and throw respective exceptions, when 
+ * <p>
+ * Implementations MUST be immutable and throw respective exceptions, when
  * add/remove-methods are called.
- * 
- * @see org.apache.clerezza.rdf.core.impl.AbstractGraph
- * @author reto
  *
+ * @author reto
+ * @see org.apache.clerezza.rdf.core.impl.AbstractGraph
  */
 public interface ImmutableGraph extends Graph {
 
-    /** 
+    /**
      * Returns true if two graphs are isomorphic
-     * 
+     *
      * @return true if two graphs are isomorphic
      */
     @Override
     public boolean equals(Object obj);
 
-    /** 
-     * Return the sum of the blank-nodes independent hashes of the triples. 
+    /**
+     * Return the sum of the blank-nodes independent hashes of the triples.
      * More precisely the hash of the triple is calculated as follows:
      * (hash(subject) >> 1) ^  hash(hashCode) ^ (hash(hashCode) << 1)
-     * Where the hash-fucntion return the hashCode of the argument 
-     * for grounded arguments and 0 otherwise. 
-     * 
+     * Where the hash-fucntion return the hashCode of the argument
+     * for grounded arguments and 0 otherwise.
+     *
      * @return hash code
      */
     @Override
diff --git a/api/src/main/java/org/apache/clerezza/api/Language.java b/api/src/main/java/org/apache/clerezza/api/Language.java
index e5d24f4..d81b8d6 100644
--- a/api/src/main/java/org/apache/clerezza/api/Language.java
+++ b/api/src/main/java/org/apache/clerezza/api/Language.java
@@ -1,20 +1,19 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor  license  agreements.  See the NOTICE file distributed
+ * with this work  for  additional  information  regarding  copyright
+ * ownership.  The ASF  licenses  this file to you under  the  Apache
+ * License, Version 2.0 (the "License"); you may not  use  this  file
+ * except in compliance with the License.  You may obtain  a copy  of
+ * the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless  required  by  applicable law  or  agreed  to  in  writing,
+ * software  distributed  under  the  License  is  distributed  on an
+ * "AS IS"  BASIS,  WITHOUT  WARRANTIES  OR  CONDITIONS  OF ANY KIND,
+ * either  express  or implied.  See  the License  for  the  specific
+ * language governing permissions and limitations under  the License.
  */
 package org.apache.clerezza.api;
 
diff --git a/api/src/main/java/org/apache/clerezza/api/Literal.java b/api/src/main/java/org/apache/clerezza/api/Literal.java
index 641a64b..8e6c38a 100644
--- a/api/src/main/java/org/apache/clerezza/api/Literal.java
+++ b/api/src/main/java/org/apache/clerezza/api/Literal.java
@@ -1,35 +1,33 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor  license  agreements.  See the NOTICE file distributed
+ * with this work  for  additional  information  regarding  copyright
+ * ownership.  The ASF  licenses  this file to you under  the  Apache
+ * License, Version 2.0 (the "License"); you may not  use  this  file
+ * except in compliance with the License.  You may obtain  a copy  of
+ * the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless  required  by  applicable law  or  agreed  to  in  writing,
+ * software  distributed  under  the  License  is  distributed  on an
+ * "AS IS"  BASIS,  WITHOUT  WARRANTIES  OR  CONDITIONS  OF ANY KIND,
+ * either  express  or implied.  See  the License  for  the  specific
+ * language governing permissions and limitations under  the License.
  */
 package org.apache.clerezza.api;
 
-
 /**
- * Represents a literal value that can be a node in an RDF Graph. 
- * Literals are used to identify values such as numbers and dates by 
- * means of a lexical representation. There are two types of literals 
- * represented by the subinterfaces {@link PlainLiteral} 
- * and {@link TypedLiteral} 
+ * Represents a literal value that can be a node in an RDF Graph.
+ * Literals are used to identify values such as numbers and dates by
+ * means of a lexical representation. There are two types of literals
+ * represented by the subinterfaces {@link PlainLiteral}
+ * and {@link TypedLiteral}
  *
  * @author reto
  */
 public interface Literal extends RDFTerm {
-    
+
     /**
      * The lexical form of this literal, represented by a <a
      * href="http://www.unicode.org/versions/latest/">Unicode string</a>.
@@ -51,7 +49,7 @@ public interface Literal extends RDFTerm {
      * Literal datatype IRI</a>
      */
     IRI getDataType();
-    
+
     /**
      * If and only if the datatype IRI is <a
      * href="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
@@ -69,24 +67,24 @@ public interface Literal extends RDFTerm {
      * Literal language tag</a>
      */
     public Language getLanguage();
-    
-    /** 
-     * Returns true if <code>obj</code> is an instance of 
+
+    /**
+     * Returns true if <code>obj</code> is an instance of
      * <code>literal</code> that is term-equal with this, false otherwise
-     * 
-     * Two literals are term-equal (the same RDF literal) if and only if the 
-     * two lexical forms, the two datatype IRIs, and the two language tags (if 
+     * <p>
+     * Two literals are term-equal (the same RDF literal) if and only if the
+     * two lexical forms, the two datatype IRIs, and the two language tags (if
      * any) compare equal, character by character.
-     * 
+     *
      * @return true if obj equals this, false otherwise.
      */
     public boolean equals(Object obj);
-    
+
     /**
-     * Returns the hash code of the lexical form plus the hash code of the 
-     * datatype plus if the literal has a language the hash code of the 
-     * language. 
-     * 
+     * Returns the hash code of the lexical form plus the hash code of the
+     * datatype plus if the literal has a language the hash code of the
+     * language.
+     *
      * @return hash code
      */
     public int hashCode();
diff --git a/api/src/main/java/org/apache/clerezza/api/RDFTerm.java b/api/src/main/java/org/apache/clerezza/api/RDFTerm.java
index 58d3e4a..39aa7fe 100644
--- a/api/src/main/java/org/apache/clerezza/api/RDFTerm.java
+++ b/api/src/main/java/org/apache/clerezza/api/RDFTerm.java
@@ -1,20 +1,19 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor  license  agreements.  See the NOTICE file distributed
+ * with this work  for  additional  information  regarding  copyright
+ * ownership.  The ASF  licenses  this file to you under  the  Apache
+ * License, Version 2.0 (the "License"); you may not  use  this  file
+ * except in compliance with the License.  You may obtain  a copy  of
+ * the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless  required  by  applicable law  or  agreed  to  in  writing,
+ * software  distributed  under  the  License  is  distributed  on an
+ * "AS IS"  BASIS,  WITHOUT  WARRANTIES  OR  CONDITIONS  OF ANY KIND,
+ * either  express  or implied.  See  the License  for  the  specific
+ * language governing permissions and limitations under  the License.
  */
 package org.apache.clerezza.api;
 
diff --git a/api/src/main/java/org/apache/clerezza/api/Triple.java b/api/src/main/java/org/apache/clerezza/api/Triple.java
index f0f6ed4..ff9d6f2 100644
--- a/api/src/main/java/org/apache/clerezza/api/Triple.java
+++ b/api/src/main/java/org/apache/clerezza/api/Triple.java
@@ -1,25 +1,24 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor  license  agreements.  See the NOTICE file distributed
+ * with this work  for  additional  information  regarding  copyright
+ * ownership.  The ASF  licenses  this file to you under  the  Apache
+ * License, Version 2.0 (the "License"); you may not  use  this  file
+ * except in compliance with the License.  You may obtain  a copy  of
+ * the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless  required  by  applicable law  or  agreed  to  in  writing,
+ * software  distributed  under  the  License  is  distributed  on an
+ * "AS IS"  BASIS,  WITHOUT  WARRANTIES  OR  CONDITIONS  OF ANY KIND,
+ * either  express  or implied.  See  the License  for  the  specific
+ * language governing permissions and limitations under  the License.
  */
 package org.apache.clerezza.api;
 
 /**
- * A structure containing a subject, a predicate, and an object. 
+ * A structure containing a subject, a predicate, and an object.
  * Also known as a statement.
  *
  * @author reto
@@ -33,7 +32,6 @@ public interface Triple {
     RDFTerm getObject();
 
     /**
-     * 
      * @param obj
      * @return true iff subject, predicate, and object of both triples are equal
      */
@@ -43,15 +41,14 @@ public interface Triple {
     /**
      * The hash code is computed as follow
      * (subject.hashCode() >> 1) ^  predicate.hashCode() ^ object.hashCode() << 1)
-     * 
-     * Note that the hash returned is computed including the hash of BNodes, so 
+     * <p>
+     * Note that the hash returned is computed including the hash of BNodes, so
      * it is not blank-node blind as in Graph.
-     * 
+     * <p>
      * This would have to change if triple should extend Graph
-     * 
+     *
      * @return hash code
      */
     @Override
     int hashCode();
-
 }
diff --git a/api/src/main/java/org/apache/clerezza/api/WatchableGraph.java b/api/src/main/java/org/apache/clerezza/api/WatchableGraph.java
index d239d2a..fb5890c 100644
--- a/api/src/main/java/org/apache/clerezza/api/WatchableGraph.java
+++ b/api/src/main/java/org/apache/clerezza/api/WatchableGraph.java
@@ -1,27 +1,25 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor  license  agreements.  See the NOTICE file distributed
+ * with this work  for  additional  information  regarding  copyright
+ * ownership.  The ASF  licenses  this file to you under  the  Apache
+ * License, Version 2.0 (the "License"); you may not  use  this  file
+ * except in compliance with the License.  You may obtain  a copy  of
+ * the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless  required  by  applicable law  or  agreed  to  in  writing,
+ * software  distributed  under  the  License  is  distributed  on an
+ * "AS IS"  BASIS,  WITHOUT  WARRANTIES  OR  CONDITIONS  OF ANY KIND,
+ * either  express  or implied.  See  the License  for  the  specific
+ * language governing permissions and limitations under  the License.
  */
 package org.apache.clerezza.api;
 
 import org.apache.clerezza.api.event.FilterTriple;
 import org.apache.clerezza.api.event.GraphListener;
 
-
 /**
  * An extension to the Graph interface that allows to add throws events
  * on modifications.
@@ -29,7 +27,7 @@ import org.apache.clerezza.api.event.GraphListener;
  * @author reto
  */
 public interface WatchableGraph extends Graph {
-   
+
 
     /**
      * Adds the specified <code>GraphListener</code> to the graph. This listener
@@ -41,27 +39,27 @@ public interface WatchableGraph extends Graph {
      * passed all together at the end of the delay period. If the the listener
      * unregisters or the platform is stopped within the period then the already
      * occurred events may not be delivered.
-     *
+     * <p>
      * All implementations support this method, immutable implementations will
      * typically provide an empty implementation, they shall not throw an
      * exception.
-     *
+     * <p>
      * Implementation of which the triples change over time without add- and
      * remove-methods being called (e.g. implementation dynamically generating
      * their triples on invocation of the filer-method) may choose not to, or
      * only partially propagate their changes to the listener. They should
      * describe the behavior in the documentation of the class.
-     *
+     * <p>
      * Implementations should keep weak references the listeners, so that the
      * listener can be garbage collected if its no longer referenced by another
      * object.
-     *
+     * <p>
      * If delay is 0 notification will happen synchroneously.
      *
      * @param listener The listener that will be notified
-     * @param filter The triple filter with which triples are tested,
-     *        that were part of the modification.
-     * @param delay The time period afer which the listener will be notified in milliseconds.
+     * @param filter   The triple filter with which triples are tested,
+     *                 that were part of the modification.
+     * @param delay    The time period afer which the listener will be notified in milliseconds.
      */
     public void addGraphListener(GraphListener listener, FilterTriple filter,
                                  long delay);
@@ -71,12 +69,12 @@ public interface WatchableGraph extends Graph {
      * will be notified, when the graph is modified and the <code>Triple</code>
      * that was part of the modifiaction matched the specified
      * <code>FilterTriple</code>. The notification will be passed without delay.
-     *
+     * <p>
      * Same as <code>addGraphListener(listener, filter, 0).
      *
      * @param listener The listener that will be notified
-     * @param filter The triple filter with which triples are tested,
-     *        that were part of the modification.
+     * @param filter   The triple filter with which triples are tested,
+     *                 that were part of the modification.
      */
     public void addGraphListener(GraphListener listener, FilterTriple filter);
 
@@ -87,5 +85,4 @@ public interface WatchableGraph extends Graph {
      * @param listener The listener to be removed.
      */
     public void removeGraphListener(GraphListener listener);
-  
 }
diff --git a/api/src/main/java/org/apache/clerezza/api/event/AddEvent.java b/api/src/main/java/org/apache/clerezza/api/event/AddEvent.java
index bf64ef9..ca055b8 100644
--- a/api/src/main/java/org/apache/clerezza/api/event/AddEvent.java
+++ b/api/src/main/java/org/apache/clerezza/api/event/AddEvent.java
@@ -1,20 +1,19 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor  license  agreements.  See the NOTICE file distributed
+ * with this work  for  additional  information  regarding  copyright
+ * ownership.  The ASF  licenses  this file to you under  the  Apache
+ * License, Version 2.0 (the "License"); you may not  use  this  file
+ * except in compliance with the License.  You may obtain  a copy  of
+ * the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless  required  by  applicable law  or  agreed  to  in  writing,
+ * software  distributed  under  the  License  is  distributed  on an
+ * "AS IS"  BASIS,  WITHOUT  WARRANTIES  OR  CONDITIONS  OF ANY KIND,
+ * either  express  or implied.  See  the License  for  the  specific
+ * language governing permissions and limitations under  the License.
  */
 package org.apache.clerezza.api.event;
 
@@ -22,16 +21,14 @@ import org.apache.clerezza.api.Graph;
 import org.apache.clerezza.api.Triple;
 
 /**
- * This class represent a addition event that occured on a
+ * This class represent an addition event that occurred on a
  * <code>TripleCollection</code>.
  *
  * @author rbn
  */
 public class AddEvent extends GraphEvent {
 
-
     public AddEvent(Graph graph, Triple triple) {
         super(graph, triple);
     }
-
 }
diff --git a/api/src/main/java/org/apache/clerezza/api/event/FilterTriple.java b/api/src/main/java/org/apache/clerezza/api/event/FilterTriple.java
index 153241c..d646613 100644
--- a/api/src/main/java/org/apache/clerezza/api/event/FilterTriple.java
+++ b/api/src/main/java/org/apache/clerezza/api/event/FilterTriple.java
@@ -1,25 +1,24 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor  license  agreements.  See the NOTICE file distributed
+ * with this work  for  additional  information  regarding  copyright
+ * ownership.  The ASF  licenses  this file to you under  the  Apache
+ * License, Version 2.0 (the "License"); you may not  use  this  file
+ * except in compliance with the License.  You may obtain  a copy  of
+ * the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless  required  by  applicable law  or  agreed  to  in  writing,
+ * software  distributed  under  the  License  is  distributed  on an
+ * "AS IS"  BASIS,  WITHOUT  WARRANTIES  OR  CONDITIONS  OF ANY KIND,
+ * either  express  or implied.  See  the License  for  the  specific
+ * language governing permissions and limitations under  the License.
  */
 package org.apache.clerezza.api.event;
 
-import org.apache.clerezza.api.IRI;
 import org.apache.clerezza.api.BlankNodeOrIRI;
+import org.apache.clerezza.api.IRI;
 import org.apache.clerezza.api.RDFTerm;
 import org.apache.clerezza.api.Triple;
 
@@ -34,17 +33,17 @@ public class FilterTriple {
     private BlankNodeOrIRI subject;
     private IRI predicate;
     private RDFTerm object;
-    
+
     /**
      * Creates a new <code>FilterTriple</code>. The specified subject,
      * predicate and object are used to test a given <code>Triple</code>. Any
      * of these values can be null, which acts as wildcard in the test.
      *
-     * @param subject  the subject.
-     * @param predicate  the predicate.
-     * @param object  the object.
+     * @param subject   the subject.
+     * @param predicate the predicate.
+     * @param object    the object.
      */
-    public FilterTriple (BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+    public FilterTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
         this.subject = subject;
         this.predicate = predicate;
         this.object = object;
@@ -55,13 +54,14 @@ public class FilterTriple {
      * <code>Triple</code> match the subject, predicate and object of this
      * <code>FilterTriple</code>. Null values in the <code>FilterTriple</code>
      * act as wildcards.
+     *
      * @param triple
      * @return
      */
     public boolean match(Triple triple) {
         boolean subjectMatch, predicateMatch, objectMatch;
         if (this.subject == null) {
-            subjectMatch = true;            
+            subjectMatch = true;
         } else {
             subjectMatch = this.subject.equals(triple.getSubject());
         }
@@ -80,7 +80,7 @@ public class FilterTriple {
 
     @Override
     public String toString() {
-        return "FilterTriples: "+subject+" "+predicate+" "+object;
+        return "FilterTriples: " + subject + " " + predicate + " " + object;
     }
 
 }
diff --git a/api/src/main/java/org/apache/clerezza/api/event/GraphEvent.java b/api/src/main/java/org/apache/clerezza/api/event/GraphEvent.java
index aeea21c..708fc57 100644
--- a/api/src/main/java/org/apache/clerezza/api/event/GraphEvent.java
+++ b/api/src/main/java/org/apache/clerezza/api/event/GraphEvent.java
@@ -1,20 +1,19 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor  license  agreements.  See the NOTICE file distributed
+ * with this work  for  additional  information  regarding  copyright
+ * ownership.  The ASF  licenses  this file to you under  the  Apache
+ * License, Version 2.0 (the "License"); you may not  use  this  file
+ * except in compliance with the License.  You may obtain  a copy  of
+ * the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless  required  by  applicable law  or  agreed  to  in  writing,
+ * software  distributed  under  the  License  is  distributed  on an
+ * "AS IS"  BASIS,  WITHOUT  WARRANTIES  OR  CONDITIONS  OF ANY KIND,
+ * either  express  or implied.  See  the License  for  the  specific
+ * language governing permissions and limitations under  the License.
  */
 package org.apache.clerezza.api.event;
 
@@ -42,15 +41,16 @@ public class GraphEvent {
 
     /**
      * Returns the <code>TripleCollection</code> that was modified in the event.
+     *
      * @return the graph
      */
     public Graph getGraph() {
         return graph;
     }
 
-
     /**
      * Return the <code>Triple</code> that was part of the modification.
+     *
      * @return the triple
      */
     public Triple getTriple() {
diff --git a/api/src/main/java/org/apache/clerezza/api/event/GraphListener.java b/api/src/main/java/org/apache/clerezza/api/event/GraphListener.java
index ce7ce5d..6bb583f 100644
--- a/api/src/main/java/org/apache/clerezza/api/event/GraphListener.java
+++ b/api/src/main/java/org/apache/clerezza/api/event/GraphListener.java
@@ -1,20 +1,19 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor  license  agreements.  See the NOTICE file distributed
+ * with this work  for  additional  information  regarding  copyright
+ * ownership.  The ASF  licenses  this file to you under  the  Apache
+ * License, Version 2.0 (the "License"); you may not  use  this  file
+ * except in compliance with the License.  You may obtain  a copy  of
+ * the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless  required  by  applicable law  or  agreed  to  in  writing,
+ * software  distributed  under  the  License  is  distributed  on an
+ * "AS IS"  BASIS,  WITHOUT  WARRANTIES  OR  CONDITIONS  OF ANY KIND,
+ * either  express  or implied.  See  the License  for  the  specific
+ * language governing permissions and limitations under  the License.
  */
 package org.apache.clerezza.api.event;
 
@@ -37,6 +36,7 @@ public interface GraphListener {
      * argument. The list contains all events in which a triple was part of
      * the modification that matched the <code>FilterTriple</code> which was passed
      * as argument when the listener was added.
+     *
      * @param events
      */
     public void graphChanged(List<GraphEvent> events);
diff --git a/api/src/main/java/org/apache/clerezza/api/event/RemoveEvent.java b/api/src/main/java/org/apache/clerezza/api/event/RemoveEvent.java
index 8f0134f..2f08908 100644
--- a/api/src/main/java/org/apache/clerezza/api/event/RemoveEvent.java
+++ b/api/src/main/java/org/apache/clerezza/api/event/RemoveEvent.java
@@ -1,20 +1,19 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor  license  agreements.  See the NOTICE file distributed
+ * with this work  for  additional  information  regarding  copyright
+ * ownership.  The ASF  licenses  this file to you under  the  Apache
+ * License, Version 2.0 (the "License"); you may not  use  this  file
+ * except in compliance with the License.  You may obtain  a copy  of
+ * the License at
  *
  *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless  required  by  applicable law  or  agreed  to  in  writing,
+ * software  distributed  under  the  License  is  distributed  on an
+ * "AS IS"  BASIS,  WITHOUT  WARRANTIES  OR  CONDITIONS  OF ANY KIND,
+ * either  express  or implied.  See  the License  for  the  specific
+ * language governing permissions and limitations under  the License.
  */
 package org.apache.clerezza.api.event;
 
@@ -29,9 +28,7 @@ import org.apache.clerezza.api.Triple;
  */
 public class RemoveEvent extends GraphEvent {
 
-
     public RemoveEvent(Graph graph, Triple triple) {
         super(graph, triple);
     }
-
 }
diff --git a/api/src/main/java/org/apache/clerezza/api/package-info.java b/api/src/main/java/org/apache/clerezza/api/package-info.java
index 0998a56..3adc92a 100644
--- a/api/src/main/java/org/apache/clerezza/api/package-info.java
+++ b/api/src/main/java/org/apache/clerezza/api/package-info.java
@@ -1,21 +1,21 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * contributor  license  agreements.  See the NOTICE file distributed
+ * with this work  for  additional  information  regarding  copyright
+ * ownership.  The ASF  licenses  this file to you under  the  Apache
+ * License, Version 2.0 (the "License"); you may not  use  this  file
+ * except in compliance with the License.  You may obtain  a copy  of
+ * the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless  required  by  applicable law  or  agreed  to  in  writing,
+ * software  distributed  under  the  License  is  distributed  on an
+ * "AS IS"  BASIS,  WITHOUT  WARRANTIES  OR  CONDITIONS  OF ANY KIND,
+ * either  express  or implied.  See  the License  for  the  specific
+ * language governing permissions and limitations under  the License.
  */
-
 /**
- * Common RDF API
+ * Apache Clerezza RDF API
  */
 package org.apache.clerezza.api;
\ No newline at end of file