Merge branch 'master' of https://github.com/mergeconflict/functionaljava into mergeconflict-master

mperry · mperry · commit 440a876c6499 · 2014-06-02T20:03:48.000+10:00
diff --git a/core/src/main/java/fj/data/Option.java b/core/src/main/java/fj/data/Option.java
@@ -668,6 +668,14 @@ public static <T> Option<T> some(final T t) {
     return new Some<T>(t);
   }
 
+  public static <T> F<T, Option<T>> none_() {
+    return new F<T, Option<T>>() {
+      public Option<T> f(final T t) {
+        return none();
+      }
+    };
+  }
+
   /**
    * Constructs an optional value that has no value.
    *

Original file line number	Diff line number	Diff line change
`@@ -668,6 +668,14 @@ public static <T> Option<T> some(final T t) {`
`668`	`668`	`return new Some<T>(t);`
`669`	`669`	`}`
`670`	`670`
	`671`	`+ public static <T> F<T, Option<T>> none_() {`
	`672`	`+ return new F<T, Option<T>>() {`
	`673`	`+ public Option<T> f(final T t) {`
	`674`	`+ return none();`
	`675`	`+ }`
	`676`	`+ };`
	`677`	`+ }`
	`678`	`+`
`671`	`679`	`/**`
`672`	`680`	`* Constructs an optional value that has no value.`
`673`	`681`	`*`