From 65cafca3ca4cfaa5d363d1fdcf60ef110c17cede Mon Sep 17 00:00:00 2001
From: Karl Duderstadt <duderstadt@biochem.mpg.de>
Date: Wed, 21 Oct 2020 21:53:52 +0200
Subject: [PATCH 1/2] Update JComboBox choices during SwingChoiceWidget refresh

These changes ensure JComboBox items update during DynamicCallbacks
---
 .../ui/swing/widget/SwingChoiceWidget.java    | 38 +++++++++++++++++--
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/scijava/ui/swing/widget/SwingChoiceWidget.java b/src/main/java/org/scijava/ui/swing/widget/SwingChoiceWidget.java
index 3adb50a..86d7d88 100644
--- a/src/main/java/org/scijava/ui/swing/widget/SwingChoiceWidget.java
+++ b/src/main/java/org/scijava/ui/swing/widget/SwingChoiceWidget.java
@@ -67,7 +67,10 @@ public void actionPerformed(final ActionEvent e) {
 
 	@Override
 	public String getValue() {
-		return comboBox.getSelectedItem().toString();
+		if (comboBox.getItemCount() > 0)
+			return comboBox.getSelectedItem().toString();
+		else
+			return null;
 	}
 
 	// -- WrapperPlugin methods --
@@ -97,8 +100,35 @@ public boolean supports(final WidgetModel model) {
 
 	@Override
 	public void doRefresh() {
-		final Object value = get().getValue();
-		if (value.equals(comboBox.getSelectedItem())) return; // no change
-		comboBox.setSelectedItem(value);
+		final String[] choices = get().getChoices();
+		
+		if (!areListsEqual(choices, comboBoxItems())) {
+			comboBox.removeAllItems();	
+			for (int i=0; i<choices.length; i++)
+				comboBox.addItem(choices[i]);
+		} else {
+			final Object value = get().getValue();
+			if (value.equals(comboBox.getSelectedItem())) return;
+			comboBox.setSelectedItem(value);
+		}
+	}
+	
+	private boolean areListsEqual(String[] list1, String[] list2) {
+		if (list1.length != list2.length)
+			return false;
+		
+		for (int i=0; i< list1.length; i++)
+			if (!list1[i].equals(list2[i]))
+				return false;
+		
+		return true;
+	}
+	
+	private String[] comboBoxItems() {
+		String[] comboItems = new String[comboBox.getItemCount()];
+		for (int i=0; i <comboBox.getItemCount(); i++)
+			comboItems[i] = comboBox.getItemAt(i);
+		
+		return comboItems;
 	}
 }

From 9b88a142fd66611bc5ad4c894bc5cc1efe7af836 Mon Sep 17 00:00:00 2001
From: Karl Duderstadt <duderstadt@biochem.mpg.de>
Date: Thu, 22 Oct 2020 12:43:03 +0200
Subject: [PATCH 2/2] Use Arrays.equals for comparison of choice arrays in
 SwingChoiceWidget

---
 .../scijava/ui/swing/widget/SwingChoiceWidget.java | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/scijava/ui/swing/widget/SwingChoiceWidget.java b/src/main/java/org/scijava/ui/swing/widget/SwingChoiceWidget.java
index 86d7d88..7a04b84 100644
--- a/src/main/java/org/scijava/ui/swing/widget/SwingChoiceWidget.java
+++ b/src/main/java/org/scijava/ui/swing/widget/SwingChoiceWidget.java
@@ -31,6 +31,7 @@
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.Arrays;
 
 import javax.swing.JComboBox;
 import javax.swing.JPanel;
@@ -102,7 +103,7 @@ public boolean supports(final WidgetModel model) {
 	public void doRefresh() {
 		final String[] choices = get().getChoices();
 		
-		if (!areListsEqual(choices, comboBoxItems())) {
+		if (!Arrays.equals(choices, comboBoxItems())) {
 			comboBox.removeAllItems();	
 			for (int i=0; i<choices.length; i++)
 				comboBox.addItem(choices[i]);
@@ -113,17 +114,6 @@ public void doRefresh() {
 		}
 	}
 	
-	private boolean areListsEqual(String[] list1, String[] list2) {
-		if (list1.length != list2.length)
-			return false;
-		
-		for (int i=0; i< list1.length; i++)
-			if (!list1[i].equals(list2[i]))
-				return false;
-		
-		return true;
-	}
-	
 	private String[] comboBoxItems() {
 		String[] comboItems = new String[comboBox.getItemCount()];
 		for (int i=0; i <comboBox.getItemCount(); i++)