diff --git a/DynamicComboBox/DynamicComboBox.jar b/DynamicComboBox/DynamicComboBox.jar index 0078f7a4880d7366204ff93d2c5182ba84bb5b30..a6ac2f3146ddcc381dd38ae813d8b053d5a121d3 100644 Binary files a/DynamicComboBox/DynamicComboBox.jar and b/DynamicComboBox/DynamicComboBox.jar differ diff --git a/Ohj2HT/src/fxKaljoja/KalojaGUIController.java b/Ohj2HT/src/fxKaljoja/KalojaGUIController.java index 093dc38b160be66064e7ad3d925186aeb687635d..c865c1456edf3e6f2774fb887c8bc909534b4ed6 100644 --- a/Ohj2HT/src/fxKaljoja/KalojaGUIController.java +++ b/Ohj2HT/src/fxKaljoja/KalojaGUIController.java @@ -1,7 +1,8 @@ package fxKaljoja; -import DynamicComboBox.DynamicComboBox; import fi.jyu.mit.fxgui.Dialogs; +import fi.jyu.mit.fxgui.DynamicComboBox; +import fi.jyu.mit.fxgui.*; import fi.jyu.mit.fxgui.ModalController; import fi.jyu.mit.fxgui.ModalControllerInterface; import fxLisaaReissu.LisaaReissuGUIController; diff --git a/Ohj2HT/src/fxKaljoja/KalojaGUIView.fxml b/Ohj2HT/src/fxKaljoja/KalojaGUIView.fxml index 8e087d3a8addd89b8f11c8a91f8497e1d01ba650..97b4fcc302b6d71a452c034611c5a7cac45c6456 100644 --- a/Ohj2HT/src/fxKaljoja/KalojaGUIView.fxml +++ b/Ohj2HT/src/fxKaljoja/KalojaGUIView.fxml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<?import DynamicComboBox.DynamicComboBox?> <?import java.lang.String?> <?import javafx.geometry.Insets?> <?import javafx.scene.control.Button?> @@ -12,6 +11,7 @@ <?import javafx.scene.layout.Pane?> <?import javafx.scene.layout.RowConstraints?> +<?import fi.jyu.mit.fxgui.DynamicComboBox?> <BorderPane xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fxKaljoja.KalojaGUIController"> <left> <GridPane prefHeight="285.0" prefWidth="534.0" BorderPane.alignment="CENTER"> @@ -35,7 +35,6 @@ <String fx:value="ahven" /> <String fx:value="kuha" /> <String fx:value="kiiski" /> - <String fx:value="taimen" /> </sisalto> </DynamicComboBox> <ComboBox fx:id="koko" prefWidth="150.0" promptText="Koko" GridPane.columnIndex="1" GridPane.rowIndex="1">