olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tbo...@apache.org
Subject [01/50] [abbrv] git commit: [OLINGO-79] enhance java doc for new feature
Date Thu, 19 Dec 2013 15:31:12 GMT
Updated Branches:
  refs/heads/ODataServlet f3d780093 -> 6ac9c5222


[OLINGO-79] enhance java doc for new feature


Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/c4706cf8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/c4706cf8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/c4706cf8

Branch: refs/heads/ODataServlet
Commit: c4706cf85bddb0af6bcbedddf9b4e348b916f326
Parents: 0947401
Author: Christian Amend <chrisam@apache.org>
Authored: Mon Dec 16 13:35:15 2013 +0100
Committer: Christian Amend <chrisam@apache.org>
Committed: Mon Dec 16 13:35:15 2013 +0100

----------------------------------------------------------------------
 .../org/apache/olingo/odata2/api/edm/EdmAnnotatable.java     | 2 +-
 .../apache/olingo/odata2/api/edm/EdmAnnotationElement.java   | 4 ++--
 .../org/apache/olingo/odata2/api/edm/EdmAnnotations.java     | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/c4706cf8/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java
index 55120c5..d61ae48 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java
@@ -28,7 +28,7 @@ public interface EdmAnnotatable {
   /**
    * Get all annotations applied to an EDM element
    * 
-   * @return {@link EdmAnnotations}
+   * @return {@link EdmAnnotations} never null
    * @throws EdmException
    */
   EdmAnnotations getAnnotations() throws EdmException;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/c4706cf8/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java
index b45b8d6..199d3dd 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java
@@ -59,14 +59,14 @@ public interface EdmAnnotationElement {
   /**
    * Get the child elements of the custom element
    * 
-   * @return child elements of this {@link EdmAnnotationElement}
+   * @return child elements of this {@link EdmAnnotationElement} or null if no child elements
exist
    */
   List<EdmAnnotationElement> getChildElements();
 
   /**
    * Get the attributes of this custom element
    * 
-   * @return the attributes of this {@link EdmAnnotationElement}
+   * @return the attributes of this {@link EdmAnnotationElement} or null if no attributes
exist
    */
   List<EdmAnnotationAttribute> getAttributes();
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/c4706cf8/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotations.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotations.java
b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotations.java
index ca18f38..0b9a890 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotations.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotations.java
@@ -30,7 +30,7 @@ public interface EdmAnnotations {
   /**
    * Get all annotation elements for the CSDL element
    * 
-   * @return List of {@link EdmAnnotationElement}
+   * @return List of {@link EdmAnnotationElement} or null if no elements exist
    */
   List<EdmAnnotationElement> getAnnotationElements();
 
@@ -39,7 +39,7 @@ public interface EdmAnnotations {
    * 
    * @param name
    * @param namespace
-   * @return String
+   * @return {@link EdmAnnotationElement} or null if no element is found for this name
    */
 
   EdmAnnotationElement getAnnotationElement(String name, String namespace);
@@ -47,7 +47,7 @@ public interface EdmAnnotations {
   /**
    * Get all annotation attributes for the CSDL element
    * 
-   * @return List of {@link EdmAnnotationAttribute}
+   * @return List of {@link EdmAnnotationAttribute} or null if no attributes exist
    */
   List<EdmAnnotationAttribute> getAnnotationAttributes();
 
@@ -56,7 +56,7 @@ public interface EdmAnnotations {
    * 
    * @param name
    * @param namespace
-   * @return String
+   * @return {@link EdmAnnotationAttribute} or null if no attribute is found for this name
    */
   EdmAnnotationAttribute getAnnotationAttribute(String name, String namespace);
 }


Mime
View raw message