Changeset 17314 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

Timestamp:

2020-11-16T16:45:58+01:00 (3 years ago)

Author:

Don-vip

Message:

see #7548 - make clear which preferences settings allow new tabs from plugins. Make color preferences extensible. Hide tab area if a single tab is defined.

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.preferences.display;
 
+import static java.awt.GridBagConstraints.BOTH;
+import static java.awt.GridBagConstraints.HORIZONTAL;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -48 +50 @@
 import org.openstreetmap.josm.gui.layer.gpx.GpxDrawHelper;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
-import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.ExtensibleTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
@@ -59 +61 @@
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.I18n;
 
 /**
@@ -68 +70 @@
  * @see NamedColorProperty
  */
-public class ColorPreference extends DefaultTabPreferenceSetting implements ListSelectionListener, TableModelListener {
+public class ColorPreference extends ExtensibleTabPreferenceSetting implements ListSelectionListener, TableModelListener {
 
     /**
@@ -370 +372 @@
         JPanel panel = new JPanel(new GridBagLayout());
         panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        panel.add(colorFilter, GBC.eol().fill(GBC.HORIZONTAL));
+        panel.add(colorFilter, GBC.eol().fill(HORIZONTAL));
         JScrollPane scrollpane = new JScrollPane(colors);
         scrollpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-        panel.add(scrollpane, GBC.eol().fill(GBC.BOTH));
+        panel.add(scrollpane, GBC.eol().fill(BOTH));
         JPanel buttonPanel = new JPanel(new GridBagLayout());
-        panel.add(buttonPanel, GBC.eol().insets(5, 0, 5, 5).fill(GBC.HORIZONTAL));
-        buttonPanel.add(Box.createHorizontalGlue(), GBC.std().fill(GBC.HORIZONTAL));
+        panel.add(buttonPanel, GBC.eol().insets(5, 0, 5, 5).fill(HORIZONTAL));
+        buttonPanel.add(Box.createHorizontalGlue(), GBC.std().fill(HORIZONTAL));
         buttonPanel.add(colorEdit, GBC.std().insets(0, 5, 0, 0));
         buttonPanel.add(defaultSet, GBC.std().insets(5, 5, 5, 0));
@@ -382 +384 @@
         buttonPanel.add(remove, GBC.std().insets(0, 5, 0, 0));
 
-        createPreferenceTabWithScrollPane(gui, panel);
+        getTabPane().addTab(tr("Colors"), panel);
+        super.addGui(gui);
     }