Merge branch 'master' of https://github.com/JavaMoney/jsr354-ri

Conflicts:
	src/main/java/org/javamoney/moneta/internal/DefaultRoundingProvider.java

Signed-off-by: atsticks <[email protected]>

Author: atsticks

src/main/asciidoc/userguide.adoc

@@ -299,7 +299,7 @@ Additionally _Moneta_ also supports static factory methods on the types directly
 [source,java]
 .Creating instances of +FastMoney+ using the +MonetaryAmounts+ singleton:
 --------------------------------------------
-FastMoney m = FastMoney.of("USD", 200.20);
+FastMoney m = FastMoney.of(200.20, "USD");
 --------------------------------------------
 
 Creation of +Money+ instances is similar:
@@ -308,7 +308,7 @@ Creation of +Money+ instances is similar:
 .Creating instances of +Money+:
 --------------------------------------------
 Money m1 = Monetary.getAmountFactory(Money.class).setCurrency("USD").setNumber(200.20).create();
-Money m2 = Money.of("USD", 200.20);
+Money m2 = Money.of(200.20, "USD");
 --------------------------------------------
 
 ===== Configuring Instances of Money
@@ -321,7 +321,7 @@ explicitly by passing a +MathContext+ as part of a +MonetaryContext+:
 [source,java]
 .Creating instances of +Money+ configuring the +MathContext+ to be used.
 --------------------------------------------
-Money money = Money.of("CHF", 200, MonetaryContextBuilder.create().set(MathContext.DECIMAL128).build());
+Money money = Money.of(200, "CHF", MonetaryContextBuilder.create().set(MathContext.DECIMAL128).build());
 --------------------------------------------
 
 Using the JSR's main API allows to achieve the same as follows:

src/main/java/org/javamoney/moneta/FastMoney.java

@@ -39,8 +39,8 @@
  * different results:
  * </p>
  * <pre><code>
- * Money money1 = money1.add(Money.of("EUR", 1234567.3444));
- * money1 = money1.subtract(Money.of("EUR", 232323));
+ * Money money1 = money1.add(Money.of(1234567.3444, "EUR"));
+ * money1 = money1.subtract(Money.of(232323, "EUR"));
  * money1 = money1.multiply(3.4);
  * money1 = money1.divide(5.456);
  * </code></pre>
@@ -51,8 +51,8 @@
  * whereas
  * </p>
  * <pre><code>
- * FastMoney money1 = money1.add(FastMoney.of("EUR", 1234567.3444));
- * money1 = money1.subtract(FastMoney.of("EUR", 232323));
+ * FastMoney money1 = money1.add(FastMoney.of(1234567.3444, "EUR"));
+ * money1 = money1.subtract(FastMoney.of(232323, "EUR"));
  * money1 = money1.multiply(3.4);
  * money1 = money1.divide(5.456);
  * </code></pre>
@@ -64,8 +64,8 @@
  * code above with the following: *
  * </p>
  * <pre><code>
- * FastMoney money1 = money1.add(Money.of("EUR", 1234567.3444));
- * money1 = money1.subtract(FastMoney.of("EUR", 232323));
+ * FastMoney money1 = money1.add(Money.of(1234567.3444, "EUR"));
+ * money1 = money1.subtract(FastMoney.of(232323, "EUR"));
  * money1 = money1.multiply(3.4);
  * money1 = money1.divide(5.456);
  * </code></pre>
@@ -78,7 +78,7 @@
  *
  * @author Anatole Tresch
  * @author Werner Keil
- * @version 0.5.2
+ * @version 1.0
  */
 public final class FastMoney implements MonetaryAmount, Comparable<MonetaryAmount>, Serializable {
 

src/test/java/org/javamoney/moneta/RoundedMoneyTest.java

@@ -971,7 +971,7 @@ public void testToString() {
     // */
     // @Test
     // public void testGetAmountWhole() {
-    // assertEquals(1, RoundedMoney.of("XXX", 1.23455645d).getAmountWhole());
+    // assertEquals(1, RoundedMoney.of(1.23455645d).getAmountWhole(), "XXX");
     // assertEquals(1, RoundedMoney.of( 1).getAmountWhole());
     // assertEquals(11, RoundedMoney.of( 11.0d).getAmountWhole());
     // assertEquals(1234, RoundedMoney.of( 1234.1d).getAmountWhole());
@@ -984,7 +984,7 @@ public void testToString() {
     // */
     // @Test
     // public void testGetAmountFractionNumerator() {
-    // assertEquals(0, RoundedMoney.of("XXX", new BigDecimal("1.23455645"))
+    // assertEquals(0, RoundedMoney.of(new BigDecimal("1.23455645"), "XXX")
     // .getAmountFractionNumerator());
     // assertEquals(0, RoundedMoney.of( 1).getAmountFractionNumerator());
     // assertEquals(0, RoundedMoney.of( new BigDecimal("11.0"))
@@ -1002,7 +1002,7 @@ public void testToString() {
     // */
     // @Test
     // public void testGetAmountFractionDenominator() {
-    // assertEquals(1, RoundedMoney.of("XXX", new BigDecimal("1.23455645"))
+    // assertEquals(1, RoundedMoney.of(new BigDecimal("1.23455645"), "XXX")
     // .getAmountFractionDenominator());
     // assertEquals(100, RoundedMoney.of( 1)
     // .getAmountFractionDenominator());