Moved TryN to function package

mperry · mperry · commit f17b1138e8c8 · 2014-08-28T14:44:23.000+10:00
diff --git a/core/src/main/java/fj/F1Functions.java b/core/src/main/java/fj/F1Functions.java
@@ -4,6 +4,7 @@
 import fj.control.parallel.Promise;
 import fj.control.parallel.Strategy;
 import fj.data.*;
+import fj.function.Try1;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
diff --git a/core/src/main/java/fj/F2Functions.java b/core/src/main/java/fj/F2Functions.java
@@ -2,6 +2,7 @@
 
 import fj.control.parallel.Promise;
 import fj.data.*;
+import fj.function.Try2;
 
 import static fj.P.p;
 import static fj.data.IterableW.wrap;
diff --git a/core/src/main/java/fj/F3Functions.java b/core/src/main/java/fj/F3Functions.java
@@ -1,6 +1,7 @@
 package fj;
 
 import fj.data.Validation;
+import fj.function.Try3;
 
 import static fj.data.Validation.fail;
 import static fj.data.Validation.success;
diff --git a/core/src/main/java/fj/F4Functions.java b/core/src/main/java/fj/F4Functions.java
@@ -1,6 +1,7 @@
 package fj;
 
 import fj.data.Validation;
+import fj.function.Try4;
 
 /**
  * Created by MarkPerry on 6/04/2014.
diff --git a/core/src/main/java/fj/F5Functions.java b/core/src/main/java/fj/F5Functions.java
@@ -1,6 +1,7 @@
 package fj;
 
 import fj.data.Validation;
+import fj.function.Try5;
 
 /**
  * Created by MarkPerry on 6/04/2014.
diff --git a/core/src/main/java/fj/F6Functions.java b/core/src/main/java/fj/F6Functions.java
@@ -1,6 +1,7 @@
 package fj;
 
 import fj.data.Validation;
+import fj.function.Try6;
 
 /**
  * Created by MarkPerry on 6/04/2014.
diff --git a/core/src/main/java/fj/F7Functions.java b/core/src/main/java/fj/F7Functions.java
@@ -1,6 +1,7 @@
 package fj;
 
 import fj.data.Validation;
+import fj.function.Try7;
 
 /**
  * Created by MarkPerry on 6/04/2014.
diff --git a/core/src/main/java/fj/F8Functions.java b/core/src/main/java/fj/F8Functions.java
@@ -1,6 +1,7 @@
 package fj;
 
 import fj.data.Validation;
+import fj.function.Try8;
 
 /**
  * Created by MarkPerry on 6/04/2014.
diff --git a/core/src/main/java/fj/P1.java b/core/src/main/java/fj/P1.java
@@ -6,6 +6,7 @@
 import fj.data.List;
 import fj.data.Stream;
 import fj.data.Validation;
+import fj.function.Try0;
 
 public abstract class P1<A> {
 
diff --git a/core/src/main/java/fj/Try.java b/core/src/main/java/fj/Try.java
@@ -3,6 +3,7 @@
 import fj.data.IO;
 import fj.data.IOFunctions;
 import fj.data.Validation;
+import fj.function.*;
 
 import java.io.IOException;
 
diff --git a/core/src/main/java/fj/data/IOFunctions.java b/core/src/main/java/fj/data/IOFunctions.java
@@ -16,6 +16,7 @@
 import fj.*;
 import fj.data.Iteratee.Input;
 import fj.data.Iteratee.IterV;
+import fj.function.Try0;
 
 /**
  * IO monad for processing files, with main methods {@link #enumFileLines },
diff --git a/core/src/main/java/fj/function/Try0.java b/core/src/main/java/fj/function/Try0.java
@@ -1,11 +1,11 @@
-package fj;
+package fj.function;
 
 /**
  * A product of <code>A</code> which may throw an <code>Exception</code>.
  *
  * Used to instantiate a lambda that may throw an <code>Exception</code> before converting to a <code>P1</code>.
  *
- * @see P1#toP1
+ * @see fj.P1#toP1
  * @version %build.number%
  */
 
diff --git a/core/src/main/java/fj/function/Try1.java b/core/src/main/java/fj/function/Try1.java
@@ -1,11 +1,11 @@
-package fj;
+package fj.function;
 
 /**
  * A transformation function from <code>A</code> to <code>B</code> that may throw an <code>Exception</code>.
  *
  * Used to instantiate a lambda that may throw an <code>Exception</code> before converting to an <code>F</code>.
  *
- * @see F1Functions#toF1
+ * @see fj.F1Functions#toF1
  * @version %build.number%
  */
 
diff --git a/core/src/main/java/fj/function/Try2.java b/core/src/main/java/fj/function/Try2.java
@@ -1,11 +1,11 @@
-package fj;
+package fj.function;
 
 /**
  * A transformation function of arity-2 from <code>A</code> and <code>B</code> to <code>C</code> that may throw an <code>Exception</code>.
  *
  * Used to instantiate a lambda that may throw an <code>Exception</code> before converting to an <code>F2</code>.
  *
- * @see F2Functions#toF2
+ * @see fj.F2Functions#toF2
  * @version %build.number%
  */
 
diff --git a/core/src/main/java/fj/function/Try3.java b/core/src/main/java/fj/function/Try3.java
@@ -1,11 +1,11 @@
-package fj;
+package fj.function;
 
 /**
  * A transformation function of arity-3 from <code>A</code>, <code>B</code> and <code>C</code> to <code>D</code> that may throw an <code>Exception</code>.
  *
  * Used to instantiate a lambda that may throw an <code>Exception</code> before converting to an <code>F3</code>.
  *
- * @see F3Functions#toF3
+ * @see fj.F3Functions#toF3
  * @version %build.number%
  */
 
diff --git a/core/src/main/java/fj/function/Try4.java b/core/src/main/java/fj/function/Try4.java
@@ -1,11 +1,11 @@
-package fj;
+package fj.function;
 
 /**
  * A transformation function of arity-4 from <code>A</code>, <code>B</code>, <code>C</code> and <code>D</code> to <code>E</code> that may throw an <code>Exception</code>.
  *
  * Used to instantiate a lambda that may throw an <code>Exception</code> before converting to an <code>F4</code>.
  *
- * @see F4Functions#toF4
+ * @see fj.F4Functions#toF4
  * @version %build.number%
  */
 
diff --git a/core/src/main/java/fj/function/Try5.java b/core/src/main/java/fj/function/Try5.java
@@ -1,11 +1,11 @@
-package fj;
+package fj.function;
 
 /**
  * A transformation function of arity-5 from <code>A</code>, <code>B</code>, <code>C</code>, <code>D</code> and <code>E</code> to <code>F</code> that may throw an <code>Exception</code>.
  *
  * Used to instantiate a lambda that may throw an <code>Exception</code> before converting to an <code>F5</code>.
  *
- * @see F5Functions#toF5
+ * @see fj.F5Functions#toF5
  * @version %build.number%
  */
 
diff --git a/core/src/main/java/fj/function/Try6.java b/core/src/main/java/fj/function/Try6.java
@@ -1,11 +1,11 @@
-package fj;
+package fj.function;
 
 /**
  * A transformation function of arity-6 from <code>A</code>, <code>B</code>, <code>C</code>, <code>D</code>, <code>E</code> and <code>F</code> to <code>G</code> that may throw an <code>Exception</code>.
  *
  * Used to instantiate a lambda that may throw an <code>Exception</code> before converting to an <code>F6</code>.
  *
- * @see F6Functions#toF6
+ * @see fj.F6Functions#toF6
  * @version %build.number%
  */
 
diff --git a/core/src/main/java/fj/function/Try7.java b/core/src/main/java/fj/function/Try7.java
@@ -1,12 +1,12 @@
-package fj;
+package fj.function;
 
 
 /**
  * A transformation function of arity-7 from <code>A</code>, <code>B</code>, <code>C</code>, <code>D</code>, <code>E</code>, <code>F</code> and <code>G</code> to <code>H</code> that may throw an <code>Exception</code>.
  *
  * Used to instantiate a lambda that may throw an <code>Exception</code> before converting to an <code>F7</code>.
  *
- * @see F7Functions#toF7
+ * @see fj.F7Functions#toF7
  * @version %build.number%
  */
 
diff --git a/core/src/main/java/fj/function/Try8.java b/core/src/main/java/fj/function/Try8.java
@@ -1,11 +1,11 @@
-package fj;
+package fj.function;
 
 /**
  * A transformation function of arity-8 from <code>A</code>, <code>B</code>, <code>C</code>, <code>D</code>, <code>E</code>, <code>F</code>, <code>G</code> and <code>H</code> to <code>I</code> that may throw an <code>Exception</code>.
  *
  * Used to instantiate a lambda that may throw an <code>Exception</code> before converting to an <code>F8</code>.
  *
- * @see F8Functions#toF8
+ * @see fj.F8Functions#toF8
  * @version %build.number%
  */
 
diff --git a/java8/src/main/java/fj/data/Java8.java b/java8/src/main/java/fj/data/Java8.java
@@ -1,6 +1,9 @@
 package fj.data;
 
 import fj.*;
+import fj.function.Try0;
+import fj.function.Try1;
+import fj.function.Try2;
 
 import java.util.Optional;
 import java.util.function.BiFunction;
