Skip to content

Commit f403f8e

Browse files
committed
replaced german words by english words
1 parent d29f984 commit f403f8e

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

src/main/java/ch/petikoch/examples/mvvm_rxjava/example6/Example_6_View.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public void bind(final Example_6_ViewModel viewModel) {
5151
bindSwingView(cancelButton).toViewModel(viewModel.v2vm_cancelButtonEvents);
5252
bindViewModelBoolean(viewModel.vm2v_cancelButtonEnabled).toSwingViewEnabledPropertyOf(cancelButton);
5353

54-
bindViewModelString(viewModel.vm2v_resultat1).toSwingViewLabel(resultat1Label);
55-
bindViewModelString(viewModel.vm2v_resultat2).toSwingViewLabel(resultat2Label);
54+
bindViewModelString(viewModel.vm2v_result1).toSwingViewLabel(resultat1Label);
55+
bindViewModelString(viewModel.vm2v_result2).toSwingViewLabel(resultat2Label);
5656
}
5757

5858
public Example_6_View() {

src/main/java/ch/petikoch/examples/mvvm_rxjava/example6/Example_6_ViewModel.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ class Example_6_ViewModel implements IViewModel<Example_6_Model> {
4444
public final PublishSubject<ActionEvent> v2vm_cancelButtonEvents = PublishSubject.create();
4545
public final BehaviorSubject<Boolean> vm2v_cancelButtonEnabled = BehaviorSubject.create(false /* initial state */);
4646

47-
public final BehaviorSubject<String> vm2v_resultat1 = BehaviorSubject.create();
48-
public final BehaviorSubject<String> vm2v_resultat2 = BehaviorSubject.create();
47+
public final BehaviorSubject<String> vm2v_result1 = BehaviorSubject.create();
48+
public final BehaviorSubject<String> vm2v_result2 = BehaviorSubject.create();
4949

5050
public final BehaviorSubject<NameFirstname> vm2m_nameFirstname = BehaviorSubject.create();
5151

@@ -70,41 +70,41 @@ private void wireInternally() {
7070
.subscribe(vm2v_submitButtonEnabled);
7171

7272
Observable.merge(v2vm_name, v2vm_firstname).subscribe(s -> {
73-
vm2v_resultat1.onNext("Ready");
74-
vm2v_resultat2.onNext("Also ready");
73+
vm2v_result1.onNext("Ready");
74+
vm2v_result2.onNext("Also ready");
7575
});
7676
}
7777

7878
@Override
7979
public void connectTo(final Example_6_Model model) {
8080
onEventFrom(vm2m_nameFirstname).executeAsync(nameFirstname -> {
8181

82-
vm2v_resultat1.onNext("Creating acount...");
83-
vm2v_resultat2.onNext("Sending email...");
82+
vm2v_result1.onNext("Creating acount...");
83+
vm2v_result2.onNext("Sending email...");
8484

8585
final Single<FinishedIndicator> createAccountResult = model.createAcount(nameFirstname);
8686
createAccountResult.toObservable()
8787
.first()
8888
.takeUntil(v2vm_cancelButtonEvents)
8989
.subscribe(
90-
finishedIndicator -> vm2v_resultat1.onNext("Acount created for " + nameFirstname.getName() + " " + nameFirstname.getFirstname())
90+
finishedIndicator -> vm2v_result1.onNext("Acount created for " + nameFirstname.getName() + " " + nameFirstname.getFirstname())
9191
);
9292
v2vm_cancelButtonEvents
9393
.first()
9494
.takeUntil(createAccountResult.toObservable())
95-
.subscribe(actionEvent -> vm2v_resultat1.onNext("Aborted"));
95+
.subscribe(actionEvent -> vm2v_result1.onNext("Aborted"));
9696

9797
final Single<FinishedIndicator> sendEmailResult = model.sendEmail(nameFirstname);
9898
sendEmailResult.toObservable()
9999
.first()
100100
.takeUntil(v2vm_cancelButtonEvents)
101101
.subscribe(
102-
finishedIndicator -> vm2v_resultat2.onNext("Email sent to " + nameFirstname.getName() + " " + nameFirstname.getFirstname())
102+
finishedIndicator -> vm2v_result2.onNext("Email sent to " + nameFirstname.getName() + " " + nameFirstname.getFirstname())
103103
);
104104
v2vm_cancelButtonEvents
105105
.first()
106106
.takeUntil(sendEmailResult.toObservable())
107-
.subscribe(actionEvent -> vm2v_resultat2.onNext("Aborted"));
107+
.subscribe(actionEvent -> vm2v_result2.onNext("Aborted"));
108108

109109
final Single<FinishedIndicator> bothFinished = Single.zip(
110110
createAccountResult,

0 commit comments

Comments
 (0)