Skip to content

Commit f0c5221

Browse files
atsticksatsticks
committed
Fixed dep.
1 parent d21a73a commit f0c5221

8 files changed

+63
-72
lines changed

‎.classpath

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,31 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<classpath>
3-
<classpathentry kind="src" output="target/classes" path="src/main/java">
4-
<attributes>
5-
<attribute name="optional" value="true"/>
6-
<attribute name="maven.pomderived" value="true"/>
7-
</attributes>
8-
</classpathentry>
9-
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
10-
<attributes>
11-
<attribute name="optional" value="true"/>
12-
<attribute name="maven.pomderived" value="true"/>
13-
</attributes>
14-
</classpathentry>
15-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
16-
<attributes>
17-
<attribute name="maven.pomderived" value="true"/>
18-
</attributes>
19-
</classpathentry>
20-
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
21-
<attributes>
22-
<attribute name="maven.pomderived" value="true"/>
23-
</attributes>
24-
</classpathentry>
25-
<classpathentry kind="output" path="target/classes"/>
26-
</classpath>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" output="target/classes" path="src/main/java">
4+
<attributes>
5+
<attribute name="optional" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
7+
</attributes>
8+
</classpathentry>
9+
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
10+
<attributes>
11+
<attribute name="optional" value="true"/>
12+
<attribute name="maven.pomderived" value="true"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
16+
<attributes>
17+
<attribute name="maven.pomderived" value="true"/>
18+
</attributes>
19+
</classpathentry>
20+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
21+
<attributes>
22+
<attribute name="maven.pomderived" value="true"/>
23+
</attributes>
24+
</classpathentry>
25+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
26+
<attributes>
27+
<attribute name="maven.pomderived" value="true"/>
28+
</attributes>
29+
</classpathentry>
30+
<classpathentry kind="output" path="target/classes"/>
31+
</classpath>

‎.settings/org.eclipse.core.resources.prefs

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎pom.xml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,9 @@
77
<artifactId>money-extras</artifactId>
88
<name>Money and Currency - Extras not part of JSR 354</name>
99
<packaging>bundle</packaging>
10-
<<<<<<< HEAD
11-
12-
=======
1310

14-
>>>>>>> branch 'master' of https://github.com/JavaMoney/javamoney-extras.git
1511
<properties>
16-
<<<<<<< HEAD
17-
<jdkVersion>1.7</jdkVersion>
18-
=======
1912
<jdkVersion>1.7</jdkVersion>
20-
>>>>>>> branch 'master' of https://github.com/JavaMoney/javamoney-extras.git
2113
<maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
2214
<maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
2315
<javamoney.version>0.5-SNAPSHOT</javamoney.version>
@@ -68,14 +60,11 @@
6860
</plugins>
6961
</build>
7062
<dependencies>
71-
<<<<<<< HEAD
72-
=======
7363
<dependency>
7464
<groupId>javax.money</groupId>
75-
<artifactId>money-ri-platform</artifactId>
65+
<artifactId>money-api</artifactId>
7666
<version>${javamoney.version}</version>
7767
</dependency>
78-
>>>>>>> branch 'master' of https://github.com/JavaMoney/javamoney-extras.git
7968
<dependency>
8069
<groupId>javax.money</groupId>
8170
<artifactId>money-api-convert</artifactId>

‎src/main/java/net/java/javamoney/extras/BasisPoint.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ public static BasisPoint of(Number number) {
9191
*
9292
* @return the permil result of the amount, never {@code null}
9393
*/
94+
@Override
9495
public MonetaryAmount apply(MonetaryAmount amount) {
9596
return amount.multiply(basisPointValue);
9697
}

‎src/main/java/net/java/javamoney/extras/HashMapParameterObject.java

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
/*
2-
* Copyright (c) 2012, 2013, Werner Keil, Credit Suisse (Anatole Tresch).
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*
16-
* Contributors:
17-
* Anatole Tresch - initial version.
2+
* Copyright (c) 2012, 2013, Werner Keil, Credit Suisse (Anatole Tresch).
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
5+
* use this file except in compliance with the License. You may obtain a copy of
6+
* the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13+
* License for the specific language governing permissions and limitations under
14+
* the License.
15+
*
16+
* Contributors: Anatole Tresch - initial version.
1817
*/
1918
package net.java.javamoney.extras;
2019

@@ -48,7 +47,8 @@ protected HashMapParameterObject(String id, ParameterObjectType type) {
4847
this.type = type;
4948
}
5049

51-
protected HashMapParameterObject(String id, ParameterObjectType type, Map<String, Object> items) {
50+
protected HashMapParameterObject(String id, ParameterObjectType type,
51+
Map<String, Object> items) {
5252
this(id, type);
5353
type.validate(items);
5454
this.putAll(items);
@@ -102,7 +102,8 @@ public Builder(String id, ParameterObjectType type) {
102102

103103
public Builder setParameterObjectType(ParameterObjectType type) {
104104
if (type == null) {
105-
throw new IllegalArgumentException("ParameterObjectType required.");
105+
throw new IllegalArgumentException(
106+
"ParameterObjectType required.");
106107
}
107108
this.type = type;
108109
return this;

‎src/main/java/net/java/javamoney/extras/MonetaryAmountFlavor.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,9 @@
1818
package net.java.javamoney.extras;
1919

2020
import java.io.Serializable;
21-
import java.util.Collection;
2221
import java.util.Map;
2322
import java.util.concurrent.ConcurrentHashMap;
2423

25-
import javax.money.MonetaryAmount;
26-
2724
/**
2825
* This class models the type of a given {@link FlavoredMonetaryAmount} as
2926
* immutable value type. Basically the types possible are determined by the
@@ -44,7 +41,8 @@ public final class MonetaryAmountFlavor implements Serializable,
4441
/** The cache of types. */
4542
private static final Map<String, MonetaryAmountFlavor> CACHED_INSTANCES = new ConcurrentHashMap<String, MonetaryAmountFlavor>();
4643
/** Unknown amount type. */
47-
public static final MonetaryAmountFlavor UNKNOWN = MonetaryAmountFlavor.of("<unknown>");
44+
public static final MonetaryAmountFlavor UNKNOWN = MonetaryAmountFlavor
45+
.of("<unknown>");
4846

4947
/**
5048
* Creates a new instance.

‎src/main/java/net/java/javamoney/extras/MonetaryCalculator.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@ public void init(MonetaryAmount... amounts) {
8989
public void init(Collection<MonetaryAmount> amounts) {
9090

9191
}
92-
93-
public void reset(){
94-
92+
93+
public void reset() {
94+
9595
}
96-
97-
public void calculate(){
98-
96+
97+
public void calculate() {
98+
9999
}
100-
100+
101101
}

‎src/main/java/net/java/javamoney/extras/ParameterObjectType.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020

2121
import java.util.Map;
2222

23+
import org.javamoney.extras.ValidationException;
24+
2325
/**
2426
* Defines a {@link ParameterObjectType} containing several results. Hereby the
2527
* different results are identified by arbitrary keys. Additionally each

0 commit comments

Comments
 (0)