Skip to content

Commit 129316f

Browse files
atsticksatsticks
committed
Updated javaFx example. Compiling now, but still errors, when running...
1 parent 93ad1aa commit 129316f

File tree

13 files changed

+90
-157
lines changed

13 files changed

+90
-157
lines changed

‎javafx/money-fxdemo/javamoney-fxdemo.iml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
9+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
10+
<excludeFolder url="file://$MODULE_DIR$/target" />
11+
</content>
12+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
13+
<orderEntry type="sourceFolder" forTests="false" />
14+
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1" level="project" />
15+
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.6.1" level="project" />
16+
<orderEntry type="module" module-name="money-api" />
17+
<orderEntry type="module" module-name="moneta" />
18+
<orderEntry type="library" name="Maven: com.ibm.icu:icu4j:51.2" level="project" />
19+
<orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
20+
<orderEntry type="module" module-name="javamoney-calc" />
21+
</component>
22+
</module>
23+

‎javafx/money-fxdemo/pom.xml‎

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<groupId>org.javamoney.examples</groupId>
77
<artifactId>javamoney-examples-javafx</artifactId>
88
<version>0.8-SNAPSHOT</version>
9+
<relativePath>..</relativePath>
910
</parent>
1011

1112

@@ -25,39 +26,19 @@
2526
<artifactId>jul-to-slf4j</artifactId>
2627
</dependency>
2728

28-
<dependency>
29-
<groupId>org.javamoney.bundles</groupId>
30-
<artifactId>javamoney-se</artifactId>
31-
<version>${jsr.ri.version}</version>
32-
</dependency>
33-
<dependency>
34-
<groupId>org.javamoney.lib</groupId>
35-
<artifactId>javamoney-common</artifactId>
36-
<version>${javamoney.version}</version>
37-
</dependency>
38-
<dependency>
39-
<groupId>org.javamoney.lib</groupId>
40-
<artifactId>javamoney-calc</artifactId>
41-
<version>${javamoney.version}</version>
42-
</dependency>
4329
<dependency>
4430
<groupId>org.javamoney.lib</groupId>
45-
<artifactId>javamoney-conversion</artifactId>
31+
<artifactId>javamoney-lib</artifactId>
4632
<version>${javamoney.version}</version>
33+
<type>pom</type>
4734
</dependency>
48-
<dependency>
49-
<groupId>org.javamoney.bundles</groupId>
50-
<artifactId>javamoney-se</artifactId>
51-
<version>${javamoney.version}</version>
52-
</dependency>
53-
5435
</dependencies>
5536

5637
<url>http://java.net/project/javamoney</url>
5738
<description>JSR 354 Java Money &amp; Currency FX Sample</description>
5839
<organization>
5940
<name>JSR 354</name>
60-
<url>http://jcp.org?id=354</url>
41+
<url>http://jcp.org?name=354</url>
6142
</organization>
6243
<artifactId>javamoney-fxdemo</artifactId>
6344
<build>

‎javafx/money-fxdemo/src/main/java/org/javamoney/examples/fxdemo/MainScreen.fxml‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,41 @@
22

33
<?import java.lang.*?>
44
<?import java.util.*?>
5+
<?import javafx.geometry.*?>
56
<?import javafx.scene.control.*?>
67
<?import javafx.scene.effect.*?>
78
<?import javafx.scene.layout.*?>
89
<?import javafx.scene.paint.*?>
910
<?import javafx.scene.text.*?>
1011

11-
<BorderPane id="BorderPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" style="-fx-background-color: rgb(100,100,100);" xmlns:fx="http://javafx.com/fxml">
12+
<BorderPane fx:id="BorderPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" style="-fx-background-color: rgb(30,60,30);" xmlns:fx="http://javafx.com/fxml">
1213
<center>
1314
<SplitPane dividerPositions="0.2993311036789298" focusTraversable="true" prefHeight="160.0" prefWidth="200.0">
1415
<items>
1516
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
1617
<children>
1718
<Accordion AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
18-
<expandedPane>
19+
<expandedPane>
20+
<TitledPane fx:id="x2" animated="false" expanded="true" text="Extensions">
21+
<content>
22+
<AnchorPane id="Content" minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
23+
<children>
24+
<VBox fx:id="extensionExamplesMenu" prefHeight="100.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
25+
</children>
26+
</AnchorPane>
27+
</content>
28+
</TitledPane>
29+
</expandedPane>
30+
<panes>
1931
<TitledPane fx:id="x1" alignment="TOP_LEFT" animated="false" text="Core Examples">
2032
<content>
2133
<AnchorPane id="Content" minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
2234
<children>
23-
<VBox fx:id="coreExamplesMenu" prefHeight="100.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
35+
<VBox id="coreExamplesMenu" prefHeight="100.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
2436
</children>
2537
</AnchorPane>
2638
</content>
2739
</TitledPane>
28-
</expandedPane>
29-
<panes>
30-
<fx:reference source="x1" />
3140
<TitledPane animated="false" text="Conversion">
3241
<content>
3342
<AnchorPane id="Content" minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
@@ -46,15 +55,7 @@
4655
</AnchorPane>
4756
</content>
4857
</TitledPane>
49-
<TitledPane animated="false" expanded="false" text="Extensions">
50-
<content>
51-
<AnchorPane id="Content" minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
52-
<children>
53-
<VBox fx:id="extensionExamplesMenu" prefHeight="100.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
54-
</children>
55-
</AnchorPane>
56-
</content>
57-
</TitledPane>
58+
<fx:reference source="x2" />
5859
</panes>
5960
</Accordion>
6061
</children>
@@ -68,7 +69,7 @@
6869
<children>
6970
<VBox id="VBox" alignment="TOP_LEFT" spacing="5.0">
7071
<children>
71-
<Label text="JavaMoney Demo Application" textFill="#fff500">
72+
<Label text="JavaMoney Demo Application" textFill="#ffe4cc">
7273
<effect>
7374
<Reflection bottomOpacity="0.23809523809523808" fraction="0.376984126984127" topOffset="-5.0" />
7475
</effect>
@@ -78,6 +79,9 @@
7879
</Label>
7980
<Label text="This application shows several use cases related to JSR 354 Money &amp; Currency." textFill="WHITE" />
8081
</children>
82+
<padding>
83+
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
84+
</padding>
8185
</VBox>
8286
<Label fx:id="clockLabel" alignment="CENTER_RIGHT" contentDisplay="RIGHT" maxWidth="1.7976931348623157E308" text="00:00:00" textAlignment="RIGHT" textFill="WHITE" textOverrun="CLIP" HBox.hgrow="ALWAYS" />
8387
</children>

‎javafx/money-fxdemo/src/main/java/org/javamoney/examples/fxdemo/core/CreateAmountsSamplePane.fxml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
77
<?import javafx.scene.layout.*?>
88
<?import javafx.scene.paint.*?>
99

10-
<BorderPane id="BorderPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns:fx="http://javafx.com/fxml">
10+
<BorderPane name="BorderPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns:fx="http://javafx.com/fxml">
1111
<bottom>
12-
<AnchorPane fx:id="actionPane" prefHeight="64.0" prefWidth="600.0">
12+
<AnchorPane fx:name="actionPane" prefHeight="64.0" prefWidth="600.0">
1313
<children>
14-
<HBox fx:id="buttonPane" alignment="CENTER" prefHeight="100.0" prefWidth="200.0" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="5.0" />
14+
<HBox fx:name="buttonPane" alignment="CENTER" prefHeight="100.0" prefWidth="200.0" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="5.0" />
1515
</children>
1616
</AnchorPane>
1717
</bottom>
1818
<center>
1919
<ScrollPane fitToHeight="true" fitToWidth="true" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="-1.0" prefWidth="-1.0" BorderPane.alignment="TOP_LEFT" BorderPane.margin="$x1">
2020
<content>
21-
<AnchorPane id="resultPane" fx:id="resultPane" minHeight="0.0" minWidth="0.0" prefHeight="200.0" prefWidth="200.0">
21+
<AnchorPane name="resultPane" fx:name="resultPane" minHeight="0.0" minWidth="0.0" prefHeight="200.0" prefWidth="200.0">
2222
<padding>
23-
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" fx:id="x1" />
23+
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" fx:name="x1" />
2424
</padding>
2525
</AnchorPane>
2626
</content>
2727
</ScrollPane>
2828
</center>
2929
<left>
30-
<AnchorPane fx:id="amountInputPane" prefHeight="200.0" prefWidth="200.0" BorderPane.margin="$x1" />
30+
<AnchorPane fx:name="amountInputPane" prefHeight="200.0" prefWidth="200.0" BorderPane.margin="$x1" />
3131
</left>
3232
</BorderPane>

‎javafx/money-fxdemo/src/main/java/org/javamoney/examples/fxdemo/exchange/ConvertAmount.java‎

Lines changed: 3 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
import javax.money.convert.RateType;
1818
import javax.money.convert.MonetaryConversions;
1919

20-
import org.javamoney.convert.provider.ECBCurrentConversionProvider;
2120
import org.javamoney.examples.fxdemo.widgets.AbstractExamplePane;
2221
import org.javamoney.examples.fxdemo.widgets.AbstractSingleSamplePane;
2322
import org.javamoney.examples.fxdemo.widgets.AmountEntry;
2423
import org.javamoney.examples.fxdemo.widgets.CurrencySelector;
2524
import org.javamoney.examples.fxdemo.widgets.RateTypeSelector;
25+
import org.javamoney.moneta.convert.internal.ECBCurrentRateProvider;
2626

2727
/**
2828
* @author Anatole Tresch
@@ -43,42 +43,8 @@ public final static class ExamplePane extends AbstractSingleSamplePane {
4343
private AmountEntry amountBox = new AmountEntry("Amount");
4444
private CurrencySelector currencySelector1 = new CurrencySelector(
4545
"Term Currency");
46-
private RateTypeSelector rateTypeSelector = new RateTypeSelector();
47-
4846
public ExamplePane() {
49-
exPane.getChildren().addAll(new Label("Rate Type"),
50-
rateTypeSelector, amountBox, currencySelector1);
5147
this.inputPane.getChildren().add(exPane);
52-
rateTypeSelector.valueProperty().addListener(
53-
new ChangeListener<RateType>() {
54-
55-
public void changed(
56-
ObservableValue<? extends RateType> observable,
57-
RateType oldERT, RateType newERT) {
58-
logger.info((observable != null ? "Obs: "
59-
+ observable : "")
60-
+ (oldERT != null ? " Old ERT: " + oldERT
61-
: "")
62-
+ (newERT != null ? " New ERT: " + newERT
63-
: ""));
64-
65-
if (newERT != null) {
66-
if (ECBCurrentConversionProvider.CONTEXT
67-
.equals(newERT)) {
68-
logger.debug("got ECB");
69-
amountBox
70-
.getCodeBox()
71-
.setValue(
72-
EZBCurrentConversionProvider.BASE_CURRENCY
73-
.getCurrencyCode());
74-
amountBox.getCodeBox().setDisable(true);
75-
} else {
76-
amountBox.getCodeBox().setDisable(false);
77-
}
78-
}
79-
}
80-
81-
});
8248

8349
AnchorPane.setLeftAnchor(exPane, 10d);
8450
AnchorPane.setTopAnchor(exPane, 10d);
@@ -89,13 +55,8 @@ public void handle(ActionEvent action) {
8955
final StringWriter sw = new StringWriter();
9056
final PrintWriter pw = new PrintWriter(sw);
9157
try {
92-
String type = rateTypeSelector
93-
.getSelectionModel().getSelectedItem();
94-
ProviderContext prov = MonetaryConversions.getProviderContext(type);
95-
96-
MonetaryAmount convertedAmount = prov.convert(
97-
amountBox.getAmount(),
98-
currencySelector1.getCurrency());
58+
CurrencyConversion conv = MonetaryConversions.getConversion(currencySelector1.getCurrency());
59+
MonetaryAmount convertedAmount = amountBox.getAmount().with(conv);
9960
pw.println("Converted Amount");
10061
pw.println("----------------");
10162
pw.println();

‎javafx/money-fxdemo/src/main/java/org/javamoney/examples/fxdemo/exchange/GetExchangeRate.java‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,11 @@
1414
import javax.money.CurrencyUnit;
1515
import javax.money.convert.ExchangeRate;
1616
import javax.money.convert.ExchangeRateProvider;
17-
import javax.money.convert.ExchangeRateType;
1817
import javax.money.convert.MonetaryConversions;
1918

20-
import org.javamoney.convert.provider.EZBCurrentConversionProvider;
2119
import org.javamoney.examples.fxdemo.widgets.AbstractExamplePane;
2220
import org.javamoney.examples.fxdemo.widgets.AbstractSingleSamplePane;
2321
import org.javamoney.examples.fxdemo.widgets.CurrencySelector;
24-
import org.javamoney.examples.fxdemo.widgets.ExchangeRateTypeSelector;
2522

2623
/**
2724
* @author Werner Keil
@@ -43,38 +40,11 @@ public final static class ExamplePane extends AbstractSingleSamplePane {
4340
"Base Currency");
4441
private CurrencySelector currencySelector2 = new CurrencySelector(
4542
"Term Currency");
46-
private ExchangeRateTypeSelector rateTypeSelector = new ExchangeRateTypeSelector();
4743

4844
public ExamplePane() {
4945
final Button swapButton = new Button("Swap");
5046
swapButton.setDisable(true);
51-
exPane.getChildren().addAll(new Label("Rate Type"),
52-
rateTypeSelector, currencySelector1, currencySelector2);
5347
this.inputPane.getChildren().add(exPane);
54-
rateTypeSelector.valueProperty().addListener(
55-
new ChangeListener<ExchangeRateType>() {
56-
public void changed(
57-
ObservableValue<? extends ExchangeRateType> observable,
58-
ExchangeRateType oldERT, ExchangeRateType newERT) {
59-
logger.info((observable !=null ? "Obs: " + observable : "")
60-
+ (oldERT !=null ? " Old ERT: " + oldERT : "")
61-
+ (newERT !=null ? " New ERT: " + newERT : ""));
62-
63-
if (newERT != null) {
64-
if (EZBCurrentConversionProvider.CONTEXT.equals(newERT)) {
65-
logger.debug("got ECB");
66-
currencySelector1.setCurrency(EZBCurrentConversionProvider.BASE_CURRENCY);
67-
currencySelector1.setDisable(true);
68-
swapButton.setDisable(true);
69-
} else {
70-
currencySelector1.setDisable(false);
71-
swapButton.setDisable(false);
72-
}
73-
}
74-
}
75-
76-
});
77-
7848
AnchorPane.setLeftAnchor(exPane, 10d);
7949
AnchorPane.setTopAnchor(exPane, 10d);
8050
Button actionButton = new Button("Create");
@@ -84,10 +54,8 @@ public void handle(ActionEvent action) {
8454
final StringWriter sw = new StringWriter();
8555
final PrintWriter pw = new PrintWriter(sw);
8656
try {
87-
ExchangeRateType type = rateTypeSelector
88-
.getSelectionModel().getSelectedItem();
8957
ExchangeRateProvider prov = MonetaryConversions
90-
.getConversionProvider(type);
58+
.getExchangeRateProvider();
9159
ExchangeRate rate = prov.getExchangeRate(
9260
currencySelector1.getCurrency(),
9361
currencySelector2.getCurrency());
@@ -113,7 +81,7 @@ private void printSummary(ExchangeRate rate,
11381
pw.println("Base Currency: " + rate.getBase());
11482
pw.println("Term Currency: " + rate.getTerm());
11583
pw.println("Factor: " + rate.getFactor());
116-
pw.println("Provider: " + rate.getProvider());
84+
pw.println("Context: " + rate.getConversionContext());
11785
pw.println("Derived: " + rate.isDerived());
11886
if (rate.isDerived()) {
11987
pw.println("Chain: "

‎javafx/money-fxdemo/src/main/java/org/javamoney/examples/fxdemo/format/FormatAmount.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@
1313
import javafx.scene.layout.VBox;
1414

1515
import javax.money.MonetaryAmount;
16+
import javax.money.format.AmountStyle;
1617
import javax.money.format.CurrencyStyle;
1718
import javax.money.format.MonetaryAmountFormat;
1819
import javax.money.format.MonetaryFormats;
1920

2021
import org.javamoney.examples.fxdemo.widgets.AbstractExamplePane;
2122
import org.javamoney.examples.fxdemo.widgets.AbstractSingleSamplePane;
2223
import org.javamoney.examples.fxdemo.widgets.AmountEntry;
23-
import org.javamoney.format.ItemFormat;
24-
import org.javamoney.format.LocalizationStyle;
2524
import org.javamoney.moneta.Money;
2625

2726

@@ -57,8 +56,7 @@ public void handle(ActionEvent action) {
5756
PrintWriter pw = new PrintWriter(sw);
5857
try {
5958
MonetaryAmount amount = amount1.getAmount();
60-
LocalizationStyle.Builder styleBuilder = new LocalizationStyle.Builder(
61-
MonetaryAmount.class);
59+
AmountStyle.Builder styleBuilder = new AmountStyle.Builder(Locale.ENGLISH);
6260
if (groupSizes.getText() != null) {
6361
String[] groups = groupSizes.getText()
6462
.split(",");
@@ -67,14 +65,12 @@ public void handle(ActionEvent action) {
6765
groupsInt[i] = Integer
6866
.parseInt(groups[i]);
6967
}
70-
// styleBuilder.setAttribute("groups",
71-
// groupsInt);
68+
styleBuilder.setGroupingSizes(groupsInt);
7269
}
7370
CurrencyStyle placement = currencyPlacement
7471
.getSelectionModel().getSelectedItem();
7572
if (placement != null) {
76-
// styleBuilder.setAttribute(
77-
// "currencyPlacement", placement);
73+
styleBuilder.setCurrencyStyle(placement);
7874
}
7975
MonetaryAmountFormat formatter = MonetaryFormats.getAmountFormat(Locale.getDefault());
8076
pw.println("Formatted Amount");

0 commit comments

Comments
 (0)