Changeset 5330 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2012-07-13T23:41:04+02:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
r5325 r5330 26 26 import java.util.ArrayList; 27 27 import java.util.Collection; 28 import java.util.Collections; 28 29 import java.util.List; 29 30 … … 46 47 import org.openstreetmap.josm.Main; 47 48 import org.openstreetmap.josm.actions.JosmAction; 49 import org.openstreetmap.josm.data.Preferences; 48 50 import org.openstreetmap.josm.data.preferences.ParametrizedEnumProperty; 49 51 import org.openstreetmap.josm.gui.MainMenu; … … 757 759 @SuppressWarnings("unchecked") 758 760 protected Component createLayout(Component data, boolean scroll, Collection<SideButton> buttons) { 759 return createLayout(data, scroll, new Collection[]{buttons});760 } 761 762 protected Component createLayout(Component data, boolean scroll, Collection<SideButton>...buttons) {761 return createLayout(data, scroll, Collections.singletonList(buttons)); 762 } 763 764 protected Component createLayout(Component data, boolean scroll, List<Collection<SideButton>> buttons) { 763 765 if (scroll) { 764 766 data = new JScrollPane(data); 765 767 } 766 768 add(data, BorderLayout.CENTER); 767 if (buttons != null && buttons. length > 0 && buttons[0] != null && !buttons[0].isEmpty()) {768 buttonsPanel = new JPanel(new GridLayout(buttons. length, 1));769 if (buttons != null && buttons.size() > 0 && buttons.get(0) != null && !buttons.get(0).isEmpty()) { 770 buttonsPanel = new JPanel(new GridLayout(buttons.size(), 1)); 769 771 for (Collection<SideButton> buttonRow : buttons) { 770 772 final JPanel buttonRowPanel = new JPanel(Main.pref.getBoolean("dialog.align.left", false)
Note:
See TracChangeset
for help on using the changeset viewer.