From 54d38bde3351cf453db19fc22d97059cef14b8c2 Mon Sep 17 00:00:00 2001 From: fedorellabella Date: Mon, 15 Apr 2024 02:54:02 -0400 Subject: [PATCH 1/3] Adding another Person to the TableView --- src/main/java/uicontrols/TableViewGUI.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/uicontrols/TableViewGUI.java b/src/main/java/uicontrols/TableViewGUI.java index 522ce3c..6e0742f 100644 --- a/src/main/java/uicontrols/TableViewGUI.java +++ b/src/main/java/uicontrols/TableViewGUI.java @@ -47,6 +47,7 @@ public void start(Stage stage){ tableView.getItems().add(new Person("Dina", "Kam", "3@myemail.com")); tableView.getItems().add(new Person("Carla", "B", "4@myemail.com")); tableView.getItems().add(new Person("Sly", "Chan", "5@myemail.com")); + tableView.getItems().add(new Person("Pak", "Fed", "6@myemail.com")); tableView.setPrefHeight(180); tableView.setPrefWidth(260); }else{ From 92241f6639f4d4f74267387685587be08922c6f9 Mon Sep 17 00:00:00 2001 From: fedorellabella Date: Wed, 17 Apr 2024 19:24:36 -0400 Subject: [PATCH 2/3] Adding the Canadian flag to the ComboBox --- .../java/uicontrols/_16_08_ComboBoxDemo.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/uicontrols/_16_08_ComboBoxDemo.java b/src/main/java/uicontrols/_16_08_ComboBoxDemo.java index 37210bc..d43022e 100644 --- a/src/main/java/uicontrols/_16_08_ComboBoxDemo.java +++ b/src/main/java/uicontrols/_16_08_ComboBoxDemo.java @@ -22,17 +22,18 @@ public class _16_08_ComboBoxDemo extends Application { // Declare an array of Strings for flag titles - private String[] flagTitles = {"France", "United Kingdom", "USA"}; + private String[] flagTitles = {"Canada", "France", "United Kingdom", "USA"}; // Declare an ImageView array for the national flags of 9 countries ImageView[] flagImage = { - new ImageView("https://upload.wikimedia.org/wikipedia/commons/a/a4/Animated-Flag-France.gif") + new ImageView("https://upload.wikimedia.org/wikipedia/commons/4/42/Animated-Flag-USA.gif") + ,new ImageView("https://upload.wikimedia.org/wikipedia/commons/a/a4/Animated-Flag-France.gif") ,new ImageView("https://upload.wikimedia.org/wikipedia/commons/5/58/UK_flag_m_v.gif") ,new ImageView("https://upload.wikimedia.org/wikipedia/commons/4/42/Animated-Flag-USA.gif") }; // Declare an array of strings for flag descriptions - private String[] flagDescription = new String[3]; + private String[] flagDescription = new String[4]; // Declare and create a description pane private DescriptionPane descriptionPane = new DescriptionPane(); @@ -43,9 +44,10 @@ public class _16_08_ComboBoxDemo extends Application { @Override // Override the start method in the Application class public void start(Stage primaryStage) { // Set text description - flagDescription[0] = "Description for France ... "; - flagDescription[1] = "Description for UK ... "; - flagDescription[2] = "The USA national flag ..."; + flagDescription[0] = "Canadian flag."; + flagDescription[1] = "Description for France ... "; + flagDescription[2] = "Description for UK ... "; + flagDescription[3] = "The USA national flag ..."; // Set the first country (France) for display setDisplay(0); @@ -63,7 +65,7 @@ public void start(Stage primaryStage) { paneForComboBox.setCenter(cbo); pane.setTop(paneForComboBox); cbo.setPrefWidth(400); - cbo.setValue("France"); + cbo.setValue("Canada"); ObservableList items = FXCollections.observableArrayList(flagTitles); From def78753bb9c90b28cbea9db7694f75406bab983 Mon Sep 17 00:00:00 2001 From: fedorellabella Date: Wed, 17 Apr 2024 22:55:09 -0400 Subject: [PATCH 3/3] Fixing the indexes of the flags. Fixing mistake in Canadian flag URL. --- src/main/java/uicontrols/_16_08_ComboBoxDemo.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/uicontrols/_16_08_ComboBoxDemo.java b/src/main/java/uicontrols/_16_08_ComboBoxDemo.java index 6c2433e..ce26cb2 100644 --- a/src/main/java/uicontrols/_16_08_ComboBoxDemo.java +++ b/src/main/java/uicontrols/_16_08_ComboBoxDemo.java @@ -27,7 +27,7 @@ public class _16_08_ComboBoxDemo extends Application { // Declare an ImageView array for the national flags of 9 countries ImageView[] flagImage = { - new ImageView("https://upload.wikimedia.org/wikipedia/commons/4/42/Animated-Flag-USA.gif") + new ImageView("https://upload.wikimedia.org/wikipedia/commons/3/39/Animated-Flag-Canada.gif") ,new ImageView("https://upload.wikimedia.org/wikipedia/commons/a/a4/Animated-Flag-France.gif") ,new ImageView("https://upload.wikimedia.org/wikipedia/commons/5/58/UK_flag_m_v.gif") ,new ImageView("https://upload.wikimedia.org/wikipedia/commons/8/83/Animated-Flag-Italy-OpenSCAD.gif") @@ -49,8 +49,8 @@ public void start(Stage primaryStage) { flagDescription[0] = "Canadian flag."; flagDescription[1] = "Description for France ... "; flagDescription[2] = "Description for UK ... "; - flagDescription[2] = "Italy flag."; - flagDescription[3] = "The USA national flag ..."; + flagDescription[3] = "Italy flag."; + flagDescription[4] = "The USA national flag ..."; // Set the first country (France) for display setDisplay(0);