Skip to content

Commit 04aeb95

Browse files
keilwkeilw
committed
OPEN - task 2: Adjust to API changes
http://github.com/JavaMoney/javamoney-examples/issues/issue/2
1 parent cda6c10 commit 04aeb95

File tree

25 files changed

+3039
-3933
lines changed

25 files changed

+3039
-3933
lines changed

‎console/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.javamoney.examples</groupId>
55
<artifactId>javamoney-examples</artifactId>
6-
<version>0.8</version>
6+
<version>0.9-SNAPSHOT</version>
77
</parent>
88
<artifactId>javamoney-examples-console</artifactId>
99

‎javafx/money-fxdemo/pom.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.javamoney.examples</groupId>
77
<artifactId>javamoney-examples-javafx</artifactId>
8-
<version>0.8</version>
8+
<version>0.9-SNAPSHOT</version>
99
<relativePath>..</relativePath>
1010
</parent>
1111

@@ -32,6 +32,12 @@
3232
<version>${javamoney.version}</version>
3333
<type>pom</type>
3434
</dependency>
35+
36+
<dependency>
37+
<groupId>org.javamoney.lib</groupId>
38+
<artifactId>javamoney-calc</artifactId>
39+
<version>${javamoney.version}</version>
40+
</dependency>
3541
</dependencies>
3642

3743
<url>http://java.net/project/javamoney</url>
@@ -46,7 +52,6 @@
4652
<plugin>
4753
<groupId>org.apache.maven.plugins</groupId>
4854
<artifactId>maven-compiler-plugin</artifactId>
49-
<version>2.3.2</version>
5055
<configuration>
5156
<source>1.7</source>
5257
<target>1.7</target>

‎javafx/money-fxdemo/src/main/java/org/javamoney/examples/fxdemo/ext/MinMaxSample.java‎

Lines changed: 71 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.io.PrintWriter;
44
import java.io.StringWriter;
5-
import java.math.BigDecimal;
65
import java.util.Arrays;
76
import java.util.HashSet;
87

@@ -29,8 +28,7 @@ public MinMaxSample() {
2928
setExampleCode(loadExample("/samples/Extensions.javatxt"));
3029
}
3130

32-
public final static class ExamplePane extends
33-
AbstractSingleSamplePane {
31+
public final static class ExamplePane extends AbstractSingleSamplePane {
3432

3533
private HBox exPane = new HBox();
3634
private AmountEntry amount1 = new AmountEntry("Amount 1");
@@ -43,78 +41,79 @@ public ExamplePane() {
4341
AnchorPane.setLeftAnchor(exPane, 10d);
4442
AnchorPane.setTopAnchor(exPane, 10d);
4543
Button minButton = new Button("Calculate MIN");
46-
minButton
47-
.setOnAction(new javafx.event.EventHandler<ActionEvent>() {
48-
public void handle(ActionEvent action) {
49-
StringWriter sw = new StringWriter();
50-
PrintWriter pw = new PrintWriter(sw);
51-
try {
52-
MonetaryAmount min = MonetaryCalculations.minimum().calculate(new HashSet(Arrays.asList(
53-
amount1.getAmount(), amount2.getAmount(),
54-
amount3.getAmount())));
55-
pw.println("MonetaryAmount (Min)");
56-
pw.println("--------------------");
57-
pw.println();
58-
printSummary(min, pw);
59-
} catch (Exception e) {
60-
e.printStackTrace(pw);
61-
}
62-
pw.flush();
63-
ExamplePane.this.outputArea.setText(sw
64-
.toString());
65-
}
44+
minButton.setOnAction(new javafx.event.EventHandler<ActionEvent>() {
45+
public void handle(ActionEvent action) {
46+
StringWriter sw = new StringWriter();
47+
PrintWriter pw = new PrintWriter(sw);
48+
try {
49+
MonetaryAmount min = MonetaryCalculations.minimum()
50+
.calculate(
51+
new HashSet<MonetaryAmount>(Arrays
52+
.asList(amount1.getAmount(),
53+
amount2.getAmount(),
54+
amount3.getAmount())));
55+
pw.println("MonetaryAmount (Min)");
56+
pw.println("--------------------");
57+
pw.println();
58+
printSummary(min, pw);
59+
} catch (Exception e) {
60+
e.printStackTrace(pw);
61+
}
62+
pw.flush();
63+
ExamplePane.this.outputArea.setText(sw.toString());
64+
}
6665

67-
private void printSummary(MonetaryAmount amount,
68-
PrintWriter pw) {
69-
pw.println("Class: " + amount.getClass().getName());
70-
if (amount instanceof Money) {
71-
Money asMoney = (Money)amount;
72-
pw.println("Value (BD): "
73-
+ asMoney.getNumber());
74-
pw.println("Value (double): "
75-
+ asMoney.getNumber().doubleValue());
76-
pw.println("Precision: " + asMoney.getNumber().getPrecision());
77-
pw.println("Scale: " + asMoney.getNumber().getScale());
78-
}
79-
}
80-
});
66+
private void printSummary(MonetaryAmount amount, PrintWriter pw) {
67+
pw.println("Class: " + amount.getClass().getName());
68+
if (amount instanceof Money) {
69+
Money asMoney = (Money) amount;
70+
pw.println("Value (BD): " + asMoney.getNumber());
71+
pw.println("Value (double): "
72+
+ asMoney.getNumber().doubleValue());
73+
pw.println("Precision: "
74+
+ asMoney.getNumber().getPrecision());
75+
pw.println("Scale: " + asMoney.getNumber().getScale());
76+
}
77+
}
78+
});
8179
Button maxButton = new Button("Calculate MAX");
82-
maxButton
83-
.setOnAction(new javafx.event.EventHandler<ActionEvent>() {
84-
public void handle(ActionEvent action) {
85-
StringWriter sw = new StringWriter();
86-
PrintWriter pw = new PrintWriter(sw);
87-
try {
88-
MonetaryAmount max = MonetaryCalculations.maximum().calculate(new HashSet(Arrays.asList(
89-
amount1.getAmount(), amount2.getAmount(),
90-
amount3.getAmount())));
91-
pw.println("MonetaryAmount (Max)");
92-
pw.println("--------------------");
93-
pw.println();
94-
printSummary(max, pw);
95-
} catch (Exception e) {
96-
e.printStackTrace(pw);
97-
}
98-
pw.flush();
99-
ExamplePane.this.outputArea.setText(sw
100-
.toString());
101-
}
80+
maxButton.setOnAction(new javafx.event.EventHandler<ActionEvent>() {
81+
public void handle(ActionEvent action) {
82+
StringWriter sw = new StringWriter();
83+
PrintWriter pw = new PrintWriter(sw);
84+
try {
85+
MonetaryAmount max = MonetaryCalculations.maximum()
86+
.calculate(
87+
new HashSet<MonetaryAmount>(Arrays
88+
.asList(amount1.getAmount(),
89+
amount2.getAmount(),
90+
amount3.getAmount())));
91+
pw.println("MonetaryAmount (Max)");
92+
pw.println("--------------------");
93+
pw.println();
94+
printSummary(max, pw);
95+
} catch (Exception e) {
96+
e.printStackTrace(pw);
97+
}
98+
pw.flush();
99+
ExamplePane.this.outputArea.setText(sw.toString());
100+
}
102101

103-
private void printSummary(MonetaryAmount amount,
104-
PrintWriter pw) {
105-
pw.println("Class: " + amount.getClass().getName());
106-
if (amount instanceof Money) {
107-
Money asMoney = (Money)amount;
108-
pw.println("Value (BD): "
109-
+ asMoney.getNumber());
110-
pw.println("Value (double): "
111-
+ asMoney.getNumber().doubleValue());
112-
pw.println("Precision: " + asMoney.getNumber().getPrecision());
113-
pw.println("Scale: " + asMoney.getNumber().getScale());
114-
}
115-
}
116-
});
117-
buttonPane.getChildren().addAll(minButton, new Label(" "), maxButton);
102+
private void printSummary(MonetaryAmount amount, PrintWriter pw) {
103+
pw.println("Class: " + amount.getClass().getName());
104+
if (amount instanceof Money) {
105+
Money asMoney = (Money) amount;
106+
pw.println("Value (BD): " + asMoney.getNumber());
107+
pw.println("Value (double): "
108+
+ asMoney.getNumber().doubleValue());
109+
pw.println("Precision: "
110+
+ asMoney.getNumber().getPrecision());
111+
pw.println("Scale: " + asMoney.getNumber().getScale());
112+
}
113+
}
114+
});
115+
buttonPane.getChildren().addAll(minButton, new Label(" "),
116+
maxButton);
118117
}
119118
}
120119
}

‎javafx/money-fxdemo/src/main/java/org/javamoney/examples/fxdemo/widgets/AmountEntry.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
public class AmountEntry extends AbstractFXMLComponent {
2626

2727
@FXML
28-
private ComboBox codeBox;
28+
private ComboBox<String> codeBox;
2929

3030
@FXML
31-
private ChoiceBox numberType;
31+
private ChoiceBox<String> numberType;
3232

3333
@FXML
3434
private TextField numberValue;
@@ -80,7 +80,7 @@ public void setAmount(MonetaryAmount amount) {
8080
}
8181
}
8282

83-
public ComboBox getCodeBox() {
83+
public ComboBox<String> getCodeBox() {
8484
return codeBox;
8585
}
8686
}

‎javafx/money-javafx-binding/pom.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<parent>
8-
<artifactId>javamoney-examples</artifactId>
8+
<artifactId>javamoney-examples-javafx</artifactId>
99
<groupId>org.javamoney.examples</groupId>
10-
<version>0.8</version>
10+
<version>0.9-SNAPSHOT</version>
1111
<relativePath>..</relativePath>
1212
</parent>
1313

@@ -49,7 +49,6 @@
4949
<plugin>
5050
<groupId>org.apache.maven.plugins</groupId>
5151
<artifactId>maven-compiler-plugin</artifactId>
52-
<version>2.3.2</version>
5352
<configuration>
5453
<source>1.7</source>
5554
<target>1.7</target>
@@ -83,7 +82,7 @@
8382
</dependency>
8483
<dependency>
8584
<groupId>org.javamoney</groupId>
86-
<artifactId>jsr354-ri</artifactId>
85+
<artifactId>moneta</artifactId>
8786
<version>${jsr.version}</version>
8887
</dependency>
8988
</dependencies>
@@ -131,7 +130,6 @@
131130
<dependency>
132131
<groupId>org.javamoney</groupId>
133132
<artifactId>moneta</artifactId>
134-
<version>${jsr.version}</version>
135133
</dependency>
136134

137135
<dependency>

‎javafx/money-javafx-binding/src/main/java/net/java/javamoney/examples/javafx/Bill.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class Bill {
2020
private DoubleProperty amountDue = new SimpleDoubleProperty();
2121
private double doubleValue = 10d;
2222
private CurrencyUnit currency = MonetaryCurrencies.getCurrency("DKK");
23-
private Money newAmountDue = Money.of(currency, doubleValue);
23+
private Money newAmountDue = Money.of(doubleValue, currency);
2424

2525
// Define a getter for the property's value
2626
public final double getAmountDue(){return amountDue.get();}

‎javafx/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>javamoney-examples</artifactId>
55
<groupId>org.javamoney.examples</groupId>
6-
<version>0.8</version>
6+
<version>0.9-SNAPSHOT</version>
77
<relativePath>..</relativePath>
88
</parent>
99
<artifactId>javamoney-examples-javafx</artifactId>

‎pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,30 @@
44
<parent>
55
<groupId>org.javamoney</groupId>
66
<artifactId>javamoney-parent</artifactId>
7-
<version>0.4</version>
7+
<version>0.5-SNAPSHOT</version>
88
</parent>
99

1010
<groupId>org.javamoney.examples</groupId>
1111
<artifactId>javamoney-examples</artifactId>
1212
<packaging>pom</packaging>
1313
<name>Java Money and Currency Examples</name>
14-
<version>0.8</version>
14+
<version>0.9-SNAPSHOT</version>
1515

1616
<modules>
1717
<module>web</module>
1818
<!-- module>javafx</module -->
1919
<!-- TODO add profiles for Java 8/FX -->
2020
<module>console</module>
21-
<!-- module>swing</module -->
21+
<module>swing</module>
2222
</modules>
2323
<properties>
2424
<basedir>.</basedir>
2525
<!-- Dependency versions -->
2626
<junit.version>4.8.2</junit.version>
2727
<slf4j.version>1.6.1</slf4j.version>
2828
<!-- JSR versions -->
29-
<jsr.version>0.8</jsr.version>
30-
<javamoney.version>0.1-SNAPSHOT</javamoney.version>
29+
<jsr.version>0.9-SNAPSHOT</jsr.version>
30+
<javamoney.version>0.4-SNAPSHOT</javamoney.version>
3131
</properties>
3232

3333
<licenses>

0 commit comments

Comments
 (0)