From dc279b8bd6cbe83a7114863d35a1415c4551449b Mon Sep 17 00:00:00 2001 From: samre Date: Thu, 18 Apr 2024 10:11:41 -0400 Subject: [PATCH 1/3] addition of canandian flag, and putting it first --- src/main/java/uicontrols/_16_08_ComboBoxDemo.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/uicontrols/_16_08_ComboBoxDemo.java b/src/main/java/uicontrols/_16_08_ComboBoxDemo.java index 37210bc..0ad9930 100644 --- a/src/main/java/uicontrols/_16_08_ComboBoxDemo.java +++ b/src/main/java/uicontrols/_16_08_ComboBoxDemo.java @@ -22,17 +22,19 @@ 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/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/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 +45,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] = "Description for Canada..."; + 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); From 43703a5bac6d79e17b8491b9450f627b5a73154c Mon Sep 17 00:00:00 2001 From: samre Date: Thu, 18 Apr 2024 10:13:01 -0400 Subject: [PATCH 2/3] addition of canandian flag, and putting it first --- .idea/misc.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index c3f3b0a..6788908 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,3 +1,4 @@ + @@ -6,8 +7,9 @@ + - + \ No newline at end of file From b0cb498f9cfe75ebe9f5abbe6d4fe20b6f5d79a1 Mon Sep 17 00:00:00 2001 From: samre Date: Thu, 18 Apr 2024 11:15:02 -0400 Subject: [PATCH 3/3] add italy flag --- src/main/java/uicontrols/_16_08_ComboBoxDemo.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/uicontrols/_16_08_ComboBoxDemo.java b/src/main/java/uicontrols/_16_08_ComboBoxDemo.java index ccd19d9..83dc012 100644 --- a/src/main/java/uicontrols/_16_08_ComboBoxDemo.java +++ b/src/main/java/uicontrols/_16_08_ComboBoxDemo.java @@ -32,8 +32,10 @@ public class _16_08_ComboBoxDemo extends Application { ,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") + ,new ImageView("https://upload.wikimedia.org/wikipedia/commons/4/42/Animated-Flag-USA.gif") + ,new ImageView("https://upload.wikimedia.org/wikipedia/commons/8/83/Animated-Flag-Italy-OpenSCAD.gif") + }; // Declare an array of strings for flag descriptions