Changeset 5330 in josm

Timestamp:

Jul 13, 2012 11:41:04 PM (10 months ago)

Author:

simon04

Message:

Change signature of method introduced in r5322 to avoid problems such as #7851

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -26 +26 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
@@ -46 +47 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.preferences.ParametrizedEnumProperty;
 import org.openstreetmap.josm.gui.MainMenu;
@@ -757 +759 @@
     @SuppressWarnings("unchecked")
     protected Component createLayout(Component data, boolean scroll, Collection<SideButton> buttons) {
-        return createLayout(data, scroll, new Collection[]{buttons});
-    }
-
-    protected Component createLayout(Component data, boolean scroll, Collection<SideButton>... buttons) {
+        return createLayout(data, scroll, Collections.singletonList(buttons));
+    }
+
+    protected Component createLayout(Component data, boolean scroll, List<Collection<SideButton>> buttons) {
         if (scroll) {
             data = new JScrollPane(data);
         }
         add(data, BorderLayout.CENTER);
-        if (buttons != null && buttons.length > 0 && buttons[0] != null && !buttons[0].isEmpty()) {
-            buttonsPanel = new JPanel(new GridLayout(buttons.length, 1));
+        if (buttons != null && buttons.size() > 0 && buttons.get(0) != null && !buttons.get(0).isEmpty()) {
+            buttonsPanel = new JPanel(new GridLayout(buttons.size(), 1));
             for (Collection<SideButton> buttonRow : buttons) {
                 final JPanel buttonRowPanel = new JPanel(Main.pref.getBoolean("dialog.align.left", false)