7: Fix wrongly named getInstance()

Task-Url: http://github.com/JavaMoney/javamoney-lib/issues/issue/7

Author: keilw

bundles/java-se-cdi/src/main/java/org/javamoney/cdi/impl/CDIAmountProvider.java

@@ -9,10 +9,10 @@
 import javax.money.MonetaryAmount;
 import javax.money.MonetaryAmountFactory;
 import javax.money.MonetaryContext;
-import javax.money.spi.MonetaryAmountsSpi;
+import javax.money.spi.MonetaryAmountsSingletonSpi;
 
 @Singleton
-public class CDIAmountProvider implements MonetaryAmountsSpi {
+public class CDIAmountProvider implements MonetaryAmountsSingletonSpi {
 
 	@Inject
 	private Instance<MonetaryAmountFactory<?>> factories;
@@ -48,7 +48,6 @@ public Class<? extends MonetaryAmount> getDefaultAmountType() {
 		return null;
 	}
 
-	@Override
 	public Class<? extends MonetaryAmount> queryAmountType(
 			MonetaryContext requiredContext) {
 		// TODO Auto-generated method stub

calc/src/main/java/org/javamoney/calc/common/CompoundInterest.java

@@ -35,7 +35,7 @@ public final class CompoundInterest extends AbstractPeriodicalFunction {
 	private CompoundInterest() {
 	}
 
-	public static final CompoundInterest of() {
+	public static final CompoundInterest getInstance() {
 		return INSTANCE;
 	}
 

calc/src/main/java/org/javamoney/calc/common/ContinuousCompoundInterest.java

@@ -36,7 +36,7 @@ public final class ContinuousCompoundInterest extends AbstractPeriodicalFunction
 	private ContinuousCompoundInterest() {
 	}
 
-	public static final ContinuousCompoundInterest of() {
+	public static final ContinuousCompoundInterest getInstance() {
 		return INSTANCE;
 	}
 

calc/src/main/java/org/javamoney/calc/common/DiscountFactor.java

@@ -14,6 +14,7 @@
 /**
  * 
  * @author Anatole
+ * @author Werner
  * 
  */
 public final class DiscountFactor {
@@ -23,7 +24,7 @@ public final class DiscountFactor {
 	private DiscountFactor() {
 	}
 
-	public static final DiscountFactor of() {
+	public static final DiscountFactor getInstance() {
 		return INSTANCE;
 	}
 

calc/src/main/java/org/javamoney/calc/function/AverageWeighted.java

@@ -26,7 +26,7 @@ final class AverageWeighted implements
 
 	/**
 	 * Private constructor, there is only one instance of this class, accessible calling
-	 * {@link #of()}.
+	 * {@link #getInstance()}.
 	 */
 	AverageWeighted() {
 	}

calc/src/main/java/org/javamoney/calc/function/Composition.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2012, 2013, Credit Suisse (Anatole Tresch), Werner Keil.
+ *  Copyright (c) 2012, 2014, Credit Suisse (Anatole Tresch), Werner Keil.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -26,8 +26,11 @@
  * A composition is an operator that contains multiple other operators that are applied as
  * a chain of functions to a MonetaryAmount. This allows to easily encapsulate a chain of operations
  * to a higher valued operation programmatically.
+ * 
+ * @author Anatole
+ * @author Werner
  */
-public class Composition implements MonetaryOperator {
+public class Composition implements MonetaryOperator, Nameable {
 
 	private List<MonetaryOperator> functions = new ArrayList<>();
 

calc/src/main/java/org/javamoney/calc/function/CompoundType.java

@@ -30,8 +30,9 @@
  * objects or input parameters as they are common in financial applications.
  * 
  * @author Anatole Tresch
+ * @author Werner Keil
  */
-public final class CompoundType implements Serializable {
+public final class CompoundType implements Serializable, Nameable {
 	/**
 	 * serialVersionUID.
 	 */

calc/src/main/java/org/javamoney/calc/function/Nameable.java

@@ -0,0 +1,37 @@
+/*
+ *  Copyright (c) 2012, 2014, Credit Suisse (Anatole Tresch), Werner Keil.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.javamoney.calc.function;
+
+/**
+ * Provides String name to implementations
+ * <p>
+ * There is no requirement that a distinct result be returned each time the
+ * supplier is invoked.
+ * 
+ * <p>
+ * This is a <b>functional interface</b> whose
+ * functional method is {@link #getName()}.
+ * 
+ * @author Werner Keil
+ * @since 0.4
+ */
+public interface Nameable {
+
+    /**
+     * @return a name
+     */
+	public String getName();
+}

data/src/main/resources/META-INF/MANIFEST.MF

@@ -7,7 +7,7 @@ Bundle-DocURL: http://javamoney.org
 Bundle-License: LICENSE.txt
 Bundle-ManifestVersion: 2
 Bundle-Name: Money and Currency - JavaMoney common parts
-Bundle-SymbolicName: org.javamoney.lib.javamoney-common
+Bundle-SymbolicName: org.javamoney.lib.javamoney-data
 Bundle-Vendor: JavaMoney
 Bundle-Version: 0.4.0.SNAPSHOT
 Created-By: Apache Maven Bundle Plugin