Changeset 5331 in josm

Timestamp:

Jul 13, 2012 11:57:26 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) (2 diffs)

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

@@ -25 +25 @@
 import java.awt.event.WindowEvent;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
 
@@ -757 +758 @@
     }
 
-    @SuppressWarnings("unchecked")
     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) {
+        return createLayout(data, scroll, buttons, (Collection<SideButton>[]) null);
+    }
+
+    protected Component createLayout(Component data, boolean scroll, Collection<SideButton> firstButtons, Collection<SideButton>... nextButtons) {
         if (scroll) {
             data = new JScrollPane(data);
         }
+        LinkedList<Collection<SideButton>> buttons = new LinkedList<Collection<SideButton>>();
+        buttons.addFirst(firstButtons);
+        if (nextButtons != null) {
+            buttons.addAll(Arrays.asList(nextButtons));
+        }
         add(data, BorderLayout.CENTER);
-        if (buttons != null && buttons.size() > 0 && buttons.get(0) != null && !buttons.get(0).isEmpty()) {
+        if (buttons.size() > 0 && buttons.get(0) != null && !buttons.get(0).isEmpty()) {
             buttonsPanel = new JPanel(new GridLayout(buttons.size(), 1));
             for (Collection<SideButton> buttonRow : buttons) {
+                if (buttonRow == null) {
+                    continue;
+                }
                 final JPanel buttonRowPanel = new JPanel(Main.pref.getBoolean("dialog.align.left", false)
                         ? new FlowLayout(FlowLayout.LEFT) : new GridLayout(1, buttonRow.size()));