Tons o' renames. Expect most everything to be broken now. :(
diff --git a/bundles/org.eclipse.e4.core.functionalprog/src/org/eclipse/e4/core/functionalprog/optionmonad/None.java b/bundles/org.eclipse.e4.core.functionalprog/src/org/eclipse/e4/core/functionalprog/optionmonad/None.java
index cccec42..b81a640 100644
--- a/bundles/org.eclipse.e4.core.functionalprog/src/org/eclipse/e4/core/functionalprog/optionmonad/None.java
+++ b/bundles/org.eclipse.e4.core.functionalprog/src/org/eclipse/e4/core/functionalprog/optionmonad/None.java
@@ -8,56 +8,56 @@
* Contributors:
* David Orme - initial API and implementation
******************************************************************************/
-package org.eclipse.e4.core.functionalprog.optionmonad;
-
-/**
- * An Option instance that does not contain any value.
- *
- * @param <T> The type that this Option is encapsulating.
- */
-public final class None<T> implements Option<T> {
-
- /**
- * Construct a None<T>.
- */
- public None() {}
-
- /**
- * A convenience factory method meant to be imported statically and that
- * eliminates a lot of the boilerplate that Java generics impose.
- *
- * @param <T> The type of Option object to create. Usually inferred
- * automatically by the compiler.
- *
- * @return a new None<T>.
- */
- public static <T> Option<T> none() { return new None<T>(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.e4.enterprise.utils.functionalprog.optionmonad.Option#get()
- */
- public T get() {
- throw new UnsupportedOperationException("Cannot resolve value on None");
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.e4.enterprise.utils.functionalprog.optionmonad.Option#getOrSubstitute(java.lang.Object)
- */
- public T getOrSubstitute(T defaultValue) {
- return defaultValue;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.e4.enterprise.utils.functionalprog.optionmonad.Option#getOrThrow(java.lang.Throwable)
- */
- public <E extends Throwable> T getOrThrow(E exception) throws E {
- throw exception;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.e4.enterprise.utils.functionalprog.optionmonad.Option#hasValue()
- */
- public boolean hasValue() {
- return false;
- }
+package org.eclipse.e4.core.functionalprog.optionmonad;
+
+/**
+ * An Option instance that does not contain any value.
+ *
+ * @param <T> The type that this Option is encapsulating.
+ */
+public final class None<T> implements Option<T> {
+
+ /**
+ * Construct a None<T>.
+ */
+ public None() {}
+
+ /**
+ * A convenience factory method meant to be imported statically and that
+ * eliminates a lot of the boilerplate that Java generics impose.
+ *
+ * @param <T> The type of Option object to create. Usually inferred
+ * automatically by the compiler.
+ *
+ * @return a new None<T>.
+ */
+ public static <T> Option<T> none() { return new None<T>(); }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.e4.core.functionalprog.optionmonad.Option#get()
+ */
+ public T get() {
+ throw new UnsupportedOperationException("Cannot resolve value on None");
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.e4.core.functionalprog.optionmonad.Option#getOrSubstitute(java.lang.Object)
+ */
+ public T getOrSubstitute(T defaultValue) {
+ return defaultValue;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.e4.core.functionalprog.optionmonad.Option#getOrThrow(java.lang.Throwable)
+ */
+ public <E extends Throwable> T getOrThrow(E exception) throws E {
+ throw exception;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.e4.core.functionalprog.optionmonad.Option#hasValue()
+ */
+ public boolean hasValue() {
+ return false;
+ }
}
\ No newline at end of file
diff --git a/bundles/org.eclipse.e4.core.functionalprog/src/org/eclipse/e4/core/functionalprog/optionmonad/Some.java b/bundles/org.eclipse.e4.core.functionalprog/src/org/eclipse/e4/core/functionalprog/optionmonad/Some.java
index d5ab2d7..f6521d7 100644
--- a/bundles/org.eclipse.e4.core.functionalprog/src/org/eclipse/e4/core/functionalprog/optionmonad/Some.java
+++ b/bundles/org.eclipse.e4.core.functionalprog/src/org/eclipse/e4/core/functionalprog/optionmonad/Some.java
@@ -8,62 +8,62 @@
* Contributors:
* David Orme - initial API and implementation
******************************************************************************/
-package org.eclipse.e4.core.functionalprog.optionmonad;
-
-/**
- * An Option instance that contains a value.
- *
- * @param <T> The type that this Option is encapsulating.
- */
-public final class Some<T> implements Option<T> {
- private final T value;
-
- /**
- * Construct an Option with Some(value).
- *
- * @param value The value to encapsulate.
- */
- public Some(T value) {
- this.value = value;
- }
-
- /**
- * A convenience factory method meant to be imported statically and that
- * eliminates a lot of the boilerplate that Java generics impose.
- *
- * @param <T> The type of Option object to create. Usually inferred
- * automatically by the compiler.
- *
- * @return a new Some<T> containing the specified value.
- */
- public static <T> Option<T> some(T value) { return new Some<T>(value); }
-
- /* (non-Javadoc)
- * @see org.eclipse.e4.enterprise.utils.functionalprog.optionmonad.Option#get()
- */
- public T get() {
- return value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.e4.enterprise.utils.functionalprog.optionmonad.Option#getOrSubstitute(java.lang.Object)
- */
- public T getOrSubstitute(T defaultValue) {
- return value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.e4.enterprise.utils.functionalprog.optionmonad.Option#getOrThrow(java.lang.Throwable)
- */
- public <E extends Throwable> T getOrThrow(E exception) {
- return value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.e4.enterprise.utils.functionalprog.optionmonad.Option#hasValue()
- */
- public boolean hasValue() {
- return true;
- }
-}
-
+package org.eclipse.e4.core.functionalprog.optionmonad;
+
+/**
+ * An Option instance that contains a value.
+ *
+ * @param <T> The type that this Option is encapsulating.
+ */
+public final class Some<T> implements Option<T> {
+ private final T value;
+
+ /**
+ * Construct an Option with Some(value).
+ *
+ * @param value The value to encapsulate.
+ */
+ public Some(T value) {
+ this.value = value;
+ }
+
+ /**
+ * A convenience factory method meant to be imported statically and that
+ * eliminates a lot of the boilerplate that Java generics impose.
+ *
+ * @param <T> The type of Option object to create. Usually inferred
+ * automatically by the compiler.
+ *
+ * @return a new Some<T> containing the specified value.
+ */
+ public static <T> Option<T> some(T value) { return new Some<T>(value); }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.e4.core.functionalprog.optionmonad.Option#get()
+ */
+ public T get() {
+ return value;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.e4.core.functionalprog.optionmonad.Option#getOrSubstitute(java.lang.Object)
+ */
+ public T getOrSubstitute(T defaultValue) {
+ return value;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.e4.core.functionalprog.optionmonad.Option#getOrThrow(java.lang.Throwable)
+ */
+ public <E extends Throwable> T getOrThrow(E exception) {
+ return value;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.e4.core.functionalprog.optionmonad.Option#hasValue()
+ */
+ public boolean hasValue() {
+ return true;
+ }
+}
+
