diff --git a/Ohj2HT/src/Luokat/Reissu.java b/Ohj2HT/src/Luokat/Reissu.java index 30ee6a0bdc6f821144116e976ffdee544416d14e..492574e8cafeff68dbec0968631bf2aff8dd497b 100644 --- a/Ohj2HT/src/Luokat/Reissu.java +++ b/Ohj2HT/src/Luokat/Reissu.java @@ -2,7 +2,7 @@ package Luokat; public class Reissu { private String Pvm; -private int reissunTag = 0; +public int reissunTag; private String sijainti; private String keli; @@ -14,7 +14,7 @@ private String keli; } - public int getId() { + public int getTag() { return reissunTag; } @@ -38,8 +38,7 @@ private String keli; public String toString() { String tag = Integer.toString(reissunTag); - - return tag + "|" + Pvm + "|" + sijainti + "|" + keli; + return tag + "|" + Pvm + "|" + sijainti + "|" + keli; } diff --git a/Ohj2HT/src/fxLisaaReissu/LisaaReissuGUIController.java b/Ohj2HT/src/fxLisaaReissu/LisaaReissuGUIController.java index b541b9d72b17ab388571076e9d122c4c0f5a0d9a..a78c8555cd2c0f7f6e1fa62b870d68c005ec90bc 100644 --- a/Ohj2HT/src/fxLisaaReissu/LisaaReissuGUIController.java +++ b/Ohj2HT/src/fxLisaaReissu/LisaaReissuGUIController.java @@ -42,7 +42,7 @@ public class LisaaReissuGUIController implements ModalControllerInterface<String @FXML private TextField sijainti; - private KalojaGUIController kalojaController; + @@ -68,20 +68,21 @@ public class LisaaReissuGUIController implements ModalControllerInterface<String public void liitaKaloja(String tulos) { - - //s.getLaji() + " " + s.getKoko() + " napattu : " + v.getTypyppi() + " " + v.getVari(); } private void Poista() { Dialogs.showMessageDialog("poistutaan! Mutta ei toimi vielä"); } - private void Tallenna() { + public void Tallenna() { Reissu a = new Reissu(1 , Pvm.getText(), sijainti.getText(),keli.getText()); - System.out.println(Pvm.getText() +' '+ sijainti.getText() + ' '+ keli.getText()); + System.out.println(a); + } + + @Override public String getResult() { return "";