Merge pull request #73 from daneko/master

mperry · mperry · commit 7f8330bbb9aa · 2015-01-15T14:16:57.000+10:00
fix Option#fromNull javadoc
diff --git a/core/src/main/java/fj/data/Option.java b/core/src/main/java/fj/data/Option.java
@@ -683,7 +683,7 @@ public static <T> Option<T> none() {
    * return none, otherwise, return the given value in some.
    *
    * @param t The unsafe nullable value.
-   * @return If <code>t == null</code> then return it in some, otherwise, return none.
+   * @return If <code>t == null</code> then return none, otherwise, return it in some.
    */
   public static <T> Option<T> fromNull(final T t) {
     return t == null ? Option.<T>none() : some(t);
@@ -693,7 +693,7 @@ public static <T> Option<T> fromNull(final T t) {
    * Turns an unsafe nullable value into a safe optional value. If <code>t == null</code> then
    * return none, otherwise, return the given value in some.
    *
-   * @return If <code>t == null</code> then return it in some, otherwise, return none.
+   * @return If <code>t == null</code> then return none, otherwise, return it in some.
    */
   public static <T> F<T, Option<T>> fromNull() {
     return t -> fromNull(t);
