Move StyleElements to package bdv.ui.settings, make public

Author: tpietzsch

src/main/java/bdv/ui/appearance/AppearanceIO.java

@@ -39,6 +39,8 @@
 
 import javax.swing.UIManager.LookAndFeelInfo;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
@@ -58,6 +60,8 @@
  */
 public class AppearanceIO
 {
+	private static final Logger LOG = LoggerFactory.getLogger( AppearanceIO.class );
+
 	public static Appearance load( final String filename ) throws IOException
 	{
 		final FileReader input = new FileReader( filename );
@@ -182,7 +186,7 @@ public Object construct( final Node node )
 				}
 				catch( final Exception e )
 				{
-					e.printStackTrace();
+					LOG.info( "Error constructing Appearance", e );
 				}
 				return null;
 			}

src/main/java/bdv/ui/appearance/AppearanceManager.java

@@ -162,7 +162,7 @@ void save( final String filename )
 		catch ( final Exception e )
 		{
 			e.printStackTrace();
-			System.out.println( "Error while reading appearance settings file " + filename + ". Using defaults." );
+			System.out.println( "Error while writing appearance settings file " + filename + "." );
 		}
 	}
 

src/main/java/bdv/ui/appearance/AppearanceSettingsPage.java

@@ -30,8 +30,9 @@
 
 import bdv.ui.settings.ModificationListener;
 import bdv.ui.settings.SettingsPage;
+import bdv.ui.settings.StyleElements;
 import bdv.util.Prefs;
-import bdv.ui.appearance.StyleElements.ComboBoxEntry;
+import bdv.ui.settings.StyleElements.ComboBoxEntry;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -44,14 +45,14 @@
 import net.miginfocom.swing.MigLayout;
 import org.scijava.listeners.Listeners;
 
-import static bdv.ui.appearance.StyleElements.booleanElement;
-import static bdv.ui.appearance.StyleElements.cbentry;
-import static bdv.ui.appearance.StyleElements.colorElement;
-import static bdv.ui.appearance.StyleElements.comboBoxElement;
-import static bdv.ui.appearance.StyleElements.linkedCheckBox;
-import static bdv.ui.appearance.StyleElements.linkedColorButton;
-import static bdv.ui.appearance.StyleElements.linkedComboBox;
-import static bdv.ui.appearance.StyleElements.separator;
+import static bdv.ui.settings.StyleElements.booleanElement;
+import static bdv.ui.settings.StyleElements.cbentry;
+import static bdv.ui.settings.StyleElements.colorElement;
+import static bdv.ui.settings.StyleElements.comboBoxElement;
+import static bdv.ui.settings.StyleElements.linkedCheckBox;
+import static bdv.ui.settings.StyleElements.linkedColorButton;
+import static bdv.ui.settings.StyleElements.linkedComboBox;
+import static bdv.ui.settings.StyleElements.separator;
 
 /**
  * Preferences page for changing {@link Appearance}.
@@ -131,7 +132,7 @@ public AppearancePanel( final Appearance appearance )
 				lafs.add( cbentry( feel, feel.getName() ) );
 
 			final List< StyleElements.StyleElement > styleElements = Arrays.asList(
-					comboBoxElement( "look-and-feel", appearance::lookAndFeel, appearance::setLookAndFeel, lafs ),
+					comboBoxElement( "look-and-feel:", appearance::lookAndFeel, appearance::setLookAndFeel, lafs ),
 					separator(),
 					booleanElement( "show scalebar", appearance::showScaleBar, appearance::setShowScaleBar ),
 					booleanElement( "show scalebar in movies", appearance::showScaleBarInMovie, appearance::setShowScaleBarInMovie ),
@@ -140,7 +141,8 @@ public AppearancePanel( final Appearance appearance )
 					separator(),
 					booleanElement( "show minimap", appearance::showMultibox, appearance::setShowMultibox ),
 					booleanElement( "show source info", appearance::showTextOverlay, appearance::setShowTextOverlay ),
-					comboBoxElement( "source name position", appearance::sourceNameOverlayPosition, appearance::setSourceNameOverlayPosition, Prefs.OverlayPosition.values() )
+					separator(),
+					comboBoxElement( "source name position:", appearance::sourceNameOverlayPosition, appearance::setSourceNameOverlayPosition, Prefs.OverlayPosition.values() )
 			);
 
 			final JColorChooser colorChooser = new JColorChooser();
@@ -156,22 +158,25 @@ public void visit( final StyleElements.Separator separator )
 						@Override
 						public void visit( final StyleElements.ColorElement element )
 						{
-							add( new JLabel( element.getLabel() ), "r" );
-							add( linkedColorButton( element, colorChooser ), "l, wrap" );
+							JPanel row = new JPanel(new MigLayout( "insets 0, fillx", "[r][l]", "" ));
+							row.add( linkedColorButton( element, colorChooser ), "l" );
+							row.add( new JLabel( element.getLabel() ), "l, growx" );
+							add( row, "l, span 2, wrap" );
 						}
 
 						@Override
 						public void visit( final StyleElements.BooleanElement element )
 						{
-							add( new JLabel( element.getLabel() ), "r" );
-							add( linkedCheckBox( element ), "l, wrap" );
+							add( linkedCheckBox( element, element.getLabel() ), "l, span 2, wrap" );
 						}
 
 						@Override
 						public void visit( final StyleElements.ComboBoxElement< ? > element )
 						{
-							add( new JLabel( element.getLabel() ), "r" );
-							add( linkedComboBox( element ), "l, wrap" );
+							JPanel row = new JPanel(new MigLayout( "insets 0, fillx", "[r][l]", "" ));
+							row.add( new JLabel( element.getLabel() ), "l" );
+							row.add( linkedComboBox( element ), "l, growx" );
+							add( row, "l, span 2, wrap" );
 						}
 					} ) );
 

src/main/java/bdv/ui/appearance/StyleElements.java renamed to src/main/java/bdv/ui/settings/StyleElements.java

@@ -6,13 +6,13 @@
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -26,9 +26,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package bdv.ui.appearance;
+package bdv.ui.settings;
 
 import bdv.tools.brightness.ColorIcon;
+
 import java.awt.Color;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
@@ -38,13 +39,12 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import java.util.Vector;
 import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.function.IntConsumer;
 import java.util.function.IntSupplier;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
+
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JColorChooser;
@@ -57,11 +57,9 @@
  * Helpers for building settings pages:
  * Checkboxes, color-selection icons, ...
  */
-// TODO: Polish a bit and make public.
-//       This is a modified version of the StyleElements class from Mastodon.
-//       Currently it's only used in AppearanceSettingsPage.
+// TODO: This is a modified version of the StyleElements class from Mastodon.
 //       Eventually this should be unified with the Mastodon one and reused.
-class StyleElements
+public class StyleElements
 {
 	public static Separator separator()
 	{
@@ -115,10 +113,21 @@ public static < T extends Enum< T > > ComboBoxElement< T > comboBoxElement( fina
 			final Supplier< T > get, final Consumer< T > set,
 			final T[] entries )
 	{
-		final List< ComboBoxEntry< T > > list = Arrays.stream( entries )
-				.map( v -> new ComboBoxEntry<>( v, v.toString() ) )
-				.collect( Collectors.toList() );
-		return comboBoxElement( label, get, set, list );
+		final String[] entryLabels = new String[entries.length];
+		Arrays.setAll( entryLabels, i -> entries[ i ].toString() );
+		return comboBoxElement( label, get, set, entries, entryLabels );
+	}
+
+	public static < T extends Enum< T > > ComboBoxElement< T > comboBoxElement( final String label,
+			final Supplier< T > get, final Consumer< T > set,
+			final T[] entries,
+			final String[] entryLabels )
+	{
+		if ( entries.length != entryLabels.length )
+			throw new IllegalArgumentException( "lengths of entries and entryLabels arrays do not match" );
+		final ComboBoxEntry< T >[] cbentries = new ComboBoxEntry[ entries.length ];
+		Arrays.setAll( cbentries, i -> new ComboBoxEntry<>( entries[ i ], entryLabels[ i ] ) );
+		return comboBoxElement( label, get, set, Arrays.asList( cbentries ) );
 	}
 
 	public static < T > ComboBoxElement< T > comboBoxElement( final String label,
@@ -269,7 +278,7 @@ public void update()
 		public abstract void set( boolean b );
 	}
 
-	static class ComboBoxEntry< T >
+	public static class ComboBoxEntry< T >
 	{
 		private final T value;
 
@@ -350,7 +359,6 @@ public List< ComboBoxEntry< T > > entries()
 	public static JCheckBox linkedCheckBox( final BooleanElement element, final String label )
 	{
 		final JCheckBox checkbox = new JCheckBox( label, element.get() );
-		checkbox.setFocusable( false );
 		checkbox.addActionListener( ( e ) -> element.set( checkbox.isSelected() ) );
 		element.onSet( b -> {
 			if ( b != checkbox.isSelected() )
@@ -416,11 +424,11 @@ public void actionPerformed( final ActionEvent arg0 )
 		return button;
 	}
 
+	@SuppressWarnings( "unchecked" )
 	public static < T > JComboBox< ComboBoxEntry< T > > linkedComboBox( final ComboBoxElement< T > element )
 	{
-		Vector< ComboBoxEntry< T > > vector = new Vector<>();
-		vector.addAll( element.entries() );
-		final JComboBox< ComboBoxEntry< T > > comboBox = new JComboBox<>( vector );
+		final ComboBoxEntry< T >[] cbentries = element.entries.toArray( new ComboBoxEntry[ 0 ] );
+		final JComboBox< ComboBoxEntry< T > > comboBox = new JComboBox<>( cbentries );
 		comboBox.setEditable( false );
 		comboBox.addItemListener( e -> {
 			if ( e.getStateChange() == ItemEvent.SELECTED )
@@ -430,7 +438,7 @@ public static < T > JComboBox< ComboBoxEntry< T > > linkedComboBox( final ComboB
 			}
 		} );
 		final Consumer< T > setEntryForValue = value -> {
-			for ( ComboBoxEntry< T > entry : vector )
+			for ( ComboBoxEntry< T > entry : cbentries )
 				if ( Objects.equals( entry.value(), value ) )
 				{
 					comboBox.setSelectedItem( entry );