Merge branch 'look-and-feel-refresh'

This branches fixes the component refresh of the Look & Feel
options pane to be more robust and more correct.

Author: ctrueden

pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>10.1.0</version>
+		<version>12.0.0</version>
 		<relativePath />
 	</parent>
 
@@ -14,7 +14,12 @@
 
 	<name>SciJava UI: Swing</name>
 	<description>SciJava user interface components for Java Swing.</description>
+	<url>https://github.com/scijava/scijava-ui-swing</url>
 	<inceptionYear>2010</inceptionYear>
+	<organization>
+		<name>SciJava</name>
+		<url>http://www.scijava.org/</url>
+	</organization>
 	<licenses>
 		<license>
 			<name>Simplified BSD License</name>
@@ -56,6 +61,16 @@
 		</contributor>
 	</contributors>
 
+	<mailingLists>
+		<mailingList>
+			<name>SciJava</name>
+			<subscribe>https://groups.google.com/group/scijava</subscribe>
+			<unsubscribe>https://groups.google.com/group/scijava</unsubscribe>
+			<post>scijava@googlegroups.com</post>
+			<archive>https://groups.google.com/group/scijava</archive>
+		</mailingList>
+	</mailingLists>
+
 	<scm>
 		<connection>scm:git:git://github.com/scijava/scijava-ui-swing</connection>
 		<developerConnection>scm:git:git@github.com:scijava/scijava-ui-swing</developerConnection>
@@ -71,6 +86,14 @@
 		<url>http://jenkins.imagej.net/job/SciJava-UI-Swing/</url>
 	</ciManagement>
 
+	<properties>
+		<package-name>org.scijava.ui.swing</package-name>
+		<license.licenseName>bsd_2</license.licenseName>
+		<license.copyrightOwners>Board of Regents of the University of
+			Wisconsin-Madison.</license.copyrightOwners>
+		<license.projectName>SciJava UI components for Java Swing.</license.projectName>
+	</properties>
+
 	<repositories>
 		<repository>
 			<id>imagej.public</id>
@@ -116,29 +139,4 @@
 			<artifactId>junit</artifactId>
 		</dependency>
 	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<packageName>org.scijava.ui.swing</packageName>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>license-maven-plugin</artifactId>
-				<configuration>
-					<licenseName>bsd_2</licenseName>
-					<organizationName>Board of Regents of the University of
-Wisconsin-Madison.</organizationName>
-					<projectName>SciJava UI components for Java Swing.</projectName>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 </project>

src/main/java/org/scijava/ui/swing/options/OptionsLookAndFeel.java

@@ -30,23 +30,31 @@
 
 package org.scijava.ui.swing.options;
 
+import java.awt.Component;
 import java.awt.EventQueue;
+import java.awt.Window;
 import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.UIManager.LookAndFeelInfo;
 import javax.swing.UnsupportedLookAndFeelException;
 
+import org.scijava.display.Display;
+import org.scijava.display.DisplayService;
 import org.scijava.log.LogService;
 import org.scijava.menu.MenuConstants;
 import org.scijava.module.MutableModuleItem;
 import org.scijava.options.OptionsPlugin;
 import org.scijava.plugin.Menu;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
+import org.scijava.ui.UIService;
 import org.scijava.ui.UserInterface;
-import org.scijava.ui.swing.SwingApplicationFrame;
+import org.scijava.ui.viewer.DisplayViewer;
+import org.scijava.widget.UIComponent;
 
 /**
  * Runs the Edit::Options::Look and Feel dialog.
@@ -67,7 +75,10 @@ public class OptionsLookAndFeel extends OptionsPlugin {
 	// -- Parameters --
 
 	@Parameter
-	private UserInterface ui;
+	private UIService uiService;
+
+	@Parameter
+	private DisplayService displayService;
 
 	@Parameter
 	private LogService log;
@@ -78,18 +89,10 @@ public class OptionsLookAndFeel extends OptionsPlugin {
 
 	// -- OptionsLookAndFeel methods --
 
-	public UserInterface getUI() {
-		return ui;
-	}
-
 	public String getLookAndFeel() {
 		return lookAndFeel;
 	}
 
-	public void setUI(final UserInterface ui) {
-		this.ui = ui;
-	}
-
 	public void setLookAndFeel(final String lookAndFeel) {
 		this.lookAndFeel = lookAndFeel;
 	}
@@ -108,11 +111,7 @@ public void run() {
 
 						@Override
 						public void run() {
-							// FIXME: Get all windows from UIService rather than just app.
-							final SwingApplicationFrame swingAppFrame =
-								(SwingApplicationFrame) ui.getApplicationFrame();
-							SwingUtilities.updateComponentTreeUI(swingAppFrame);
-							swingAppFrame.pack();
+							refreshSwingComponents();
 						}
 					});
 				}
@@ -141,7 +140,7 @@ protected void initLookAndFeel() {
 		final String lafClass = UIManager.getLookAndFeel().getClass().getName();
 
 		final LookAndFeelInfo[] lookAndFeels = UIManager.getInstalledLookAndFeels();
-		final ArrayList<String> lookAndFeelChoices = new ArrayList<String>();
+		final ArrayList<String> lookAndFeelChoices = new ArrayList<>();
 		for (final LookAndFeelInfo lafInfo : lookAndFeels) {
 			final String lafName = lafInfo.getName();
 			lookAndFeelChoices.add(lafInfo.getName());
@@ -155,4 +154,62 @@ protected void initLookAndFeel() {
 		lookAndFeelItem.setChoices(lookAndFeelChoices);
 	}
 
+	// -- Helper methods --
+
+	/** Tells all known Swing components to change to the new Look &amp; Feel. */
+	private void refreshSwingComponents() {
+		// TODO: Change this hacky logic to call a clean UIService API
+		// for window retrieval. But does not exist as of this writing.
+
+		final Set<Component> components = new HashSet<>();
+
+		// add Swing UI components from visible UIs
+		for (final UserInterface ui : uiService.getVisibleUIs()) {
+			findComponents(components, ui.getApplicationFrame());
+			findComponents(components, ui.getConsolePane());
+		}
+
+		// add Swing UI components from visible displays
+		for (final Display<?> d : displayService.getDisplays()) {
+			final DisplayViewer<?> viewer = uiService.getDisplayViewer(d);
+			if (viewer == null) continue;
+			findComponents(components, viewer.getWindow());
+		}
+
+		// refresh all discovered components
+		for (final Component c : components) {
+			SwingUtilities.updateComponentTreeUI(c);
+			if (c instanceof Window) ((Window) c).pack();
+		}
+	}
+
+	/**
+	 * Extracts Swing components from the given object, adding them to
+	 * the specified set.
+	 */
+	private void findComponents(final Set<Component> set, final Object o) {
+		if (o == null) return;
+		if (o instanceof UIComponent) {
+			final UIComponent<?> c = (UIComponent<?>) o;
+			findComponents(set, c.getComponent());
+		}
+		if (o instanceof Window) set.add((Window) o);
+		else if (o instanceof Component) {
+			final Component c = (Component) o;
+			final Window w = SwingUtilities.getWindowAncestor(c);
+			set.add(w == null ? c : w);
+		}
+	}
+
+	// -- Deprecated methods --
+
+	@Deprecated
+	public UserInterface getUI() {
+		return uiService.getDefaultUI();
+	}
+
+	@Deprecated
+	public void setUI(@SuppressWarnings("unused") final UserInterface ui) {
+		throw new UnsupportedOperationException();
+	}
 }