Fixed dep.

JavaMoney · Sep 8, 2013 · f0c5221 · f0c5221
1 parent d21a73a
commit f0c5221
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 72 deletions.
diff --git a/.classpath b/.classpath
@@ -1,26 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
diff --git a/pom.xml b/pom.xml
@@ -7,17 +7,9 @@
 	<artifactId>money-extras</artifactId>
 	<name>Money and Currency - Extras not part of JSR 354</name>
 	<packaging>bundle</packaging>
-<<<<<<< HEAD
-
-=======
 
->>>>>>> branch 'master' of https://github.com/JavaMoney/javamoney-extras.git
 	<properties>
-<<<<<<< HEAD
-	  <jdkVersion>1.7</jdkVersion>
-=======
 		<jdkVersion>1.7</jdkVersion>
->>>>>>> branch 'master' of https://github.com/JavaMoney/javamoney-extras.git
 		<maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
 		<maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
 		<javamoney.version>0.5-SNAPSHOT</javamoney.version>
@@ -68,14 +60,11 @@
 		</plugins>
 	</build>
 	<dependencies>
-<<<<<<< HEAD
-=======
 		<dependency>
 			<groupId>javax.money</groupId>
-			<artifactId>money-ri-platform</artifactId>
+			<artifactId>money-api</artifactId>
 			<version>${javamoney.version}</version>
 		</dependency>
->>>>>>> branch 'master' of https://github.com/JavaMoney/javamoney-extras.git
 		<dependency>
 			<groupId>javax.money</groupId>
 			<artifactId>money-api-convert</artifactId>

diff --git a/src/main/java/net/java/javamoney/extras/BasisPoint.java b/src/main/java/net/java/javamoney/extras/BasisPoint.java
@@ -91,6 +91,7 @@ public static BasisPoint of(Number number) {
 	 * 
 	 * @return the permil result of the amount, never {@code null}
 	 */
+	@Override
 	public MonetaryAmount apply(MonetaryAmount amount) {
 		return amount.multiply(basisPointValue);
 	}

diff --git a/src/main/java/net/java/javamoney/extras/HashMapParameterObject.java b/src/main/java/net/java/javamoney/extras/HashMapParameterObject.java
@@ -1,20 +1,19 @@
 /*
- *  Copyright (c) 2012, 2013, Werner Keil, Credit Suisse (Anatole Tresch).
- *
- *  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.
- *
- * Contributors:
- *    Anatole Tresch - initial version.
+ * Copyright (c) 2012, 2013, Werner Keil, Credit Suisse (Anatole Tresch).
+ * 
+ * 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.
+ * 
+ * Contributors: Anatole Tresch - initial version.
  */
 package net.java.javamoney.extras;
 
@@ -48,7 +47,8 @@ protected HashMapParameterObject(String id, ParameterObjectType type) {
 		this.type = type;
 	}
 
-	protected HashMapParameterObject(String id, ParameterObjectType type, Map<String, Object> items) {
+	protected HashMapParameterObject(String id, ParameterObjectType type,
+			Map<String, Object> items) {
 		this(id, type);
 		type.validate(items);
 		this.putAll(items);
@@ -102,7 +102,8 @@ public Builder(String id, ParameterObjectType type) {
 
 		public Builder setParameterObjectType(ParameterObjectType type) {
 			if (type == null) {
-				throw new IllegalArgumentException("ParameterObjectType required.");
+				throw new IllegalArgumentException(
+						"ParameterObjectType required.");
 			}
 			this.type = type;
 			return this;

diff --git a/src/main/java/net/java/javamoney/extras/MonetaryAmountFlavor.java b/src/main/java/net/java/javamoney/extras/MonetaryAmountFlavor.java
@@ -18,12 +18,9 @@
 package net.java.javamoney.extras;
 
 import java.io.Serializable;
-import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.money.MonetaryAmount;
-
 /**
  * This class models the type of a given {@link FlavoredMonetaryAmount} as
  * immutable value type. Basically the types possible are determined by the
@@ -44,7 +41,8 @@ public final class MonetaryAmountFlavor implements Serializable,
 	/** The cache of types. */
 	private static final Map<String, MonetaryAmountFlavor> CACHED_INSTANCES = new ConcurrentHashMap<String, MonetaryAmountFlavor>();
 	/** Unknown amount type. */
-	public static final MonetaryAmountFlavor UNKNOWN = MonetaryAmountFlavor.of("<unknown>");
+	public static final MonetaryAmountFlavor UNKNOWN = MonetaryAmountFlavor
+			.of("<unknown>");
 
 	/**
 	 * Creates a new instance.

diff --git a/src/main/java/net/java/javamoney/extras/MonetaryCalculator.java b/src/main/java/net/java/javamoney/extras/MonetaryCalculator.java
@@ -89,13 +89,13 @@ public void init(MonetaryAmount... amounts) {
 	public void init(Collection<MonetaryAmount> amounts) {
 
 	}
-	
-	public void reset(){
-		
+
+	public void reset() {
+
 	}
-	
-	public void calculate(){
-		
+
+	public void calculate() {
+
 	}
-	
+
 }
diff --git a/src/main/java/net/java/javamoney/extras/ParameterObjectType.java b/src/main/java/net/java/javamoney/extras/ParameterObjectType.java
@@ -20,6 +20,8 @@
 
 import java.util.Map;
 
+import org.javamoney.extras.ValidationException;
+
 /**
  * Defines a {@link ParameterObjectType} containing several results. Hereby the
  * different results are identified by arbitrary keys. Additionally each