Index: /applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java =================================================================== --- /applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java (revision 27463) +++ /applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java (revision 27464) @@ -60,5 +60,5 @@ panel.add(new JLabel(tr("Course"))); panel.add(courseLabel = new JLabel()); - add(new JScrollPane(panel), BorderLayout.CENTER); + createLayout(panel, true, null); } Index: /applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java =================================================================== --- /applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java (revision 27463) +++ /applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java (revision 27464) @@ -11,4 +11,5 @@ import java.awt.event.KeyEvent; import java.text.DecimalFormat; +import java.util.Arrays; import java.util.Collection; @@ -68,10 +69,6 @@ KeyEvent.VK_M, Shortcut.GROUP_LAYER), 150); - JPanel buttonPanel = new JPanel(new GridLayout(1,2)); - resetButton = new SideButton(marktr("Reset"), "select", "Measurement", tr("Reset current measurement results and delete measurement path."), this); - buttonPanel.add(resetButton); - add(buttonPanel, BorderLayout.SOUTH); JPanel valuePanel = new JPanel(new GridLayout(0,2)); @@ -99,7 +96,10 @@ valuePanel.add(segAngleLabel); - add(valuePanel, BorderLayout.CENTER); + this.setPreferredSize(new Dimension(0, 92)); - this.setPreferredSize(new Dimension(0, 92)); + createLayout(valuePanel, false, Arrays.asList(new SideButton[] { + resetButton + })); + final MeasurementDialog dlg = this; Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java =================================================================== --- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java (revision 27463) +++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java (revision 27464) @@ -9,4 +9,5 @@ import java.awt.event.ItemListener; import java.awt.event.MouseEvent; +import java.util.Arrays; import java.util.Collection; import java.util.HashSet; @@ -94,10 +95,7 @@ /** - * Builds the panel with the checkbox for switching between the two - * list views - * - * @return the panel - */ - protected JPanel buildInSelectionOnlyTogglePanel(){ + * Builds the UI + */ + protected void build() { JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT,0,0)); pnl.setBorder(null); @@ -106,34 +104,20 @@ "Select to display turn restrictions related to object in the current selection only.
" + "Deselect to display all turn restrictions in the current data set.")); - return pnl; - } - - /** - * Builds the panel with the action buttons - * - * @return the panel - */ - protected JPanel buildCommandPanel() { - JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT,0,0)); - pnl.setBorder(null); - pnl.add(new SideButton(actNew = new NewAction(), false /* don't show the name */)); - pnl.add(new SideButton(actEdit = new EditAction(), false /* don't show the name */)); - pnl.add(new SideButton(actDelete = new DeleteAction(), false /* don't show the name */)); - + + pnlContent = new JPanel(new BorderLayout(0,0)); + pnlContent.setBorder(null); + pnlContent.add(pnl, BorderLayout.NORTH); + + actNew = new NewAction(); + actEdit = new EditAction(); + actDelete = new DeleteAction(); actSelectSelectedTurnRestrictions = new SelectSelectedTurnRestrictions(); actZoomTo = new ZoomToAction(); - return pnl; - } - - /** - * Builds the UI - */ - protected void build() { - pnlContent = new JPanel(new BorderLayout(0,0)); - pnlContent.setBorder(null); - pnlContent.add(buildInSelectionOnlyTogglePanel(), BorderLayout.NORTH); - pnlContent.add(buildCommandPanel(), BorderLayout.SOUTH); - - add(pnlContent, BorderLayout.CENTER); + + createLayout(pnlContent, false, Arrays.asList(new SideButton[] { + new SideButton(actNew, false /* don't show the name */), + new SideButton(actEdit, false /* don't show the name */), + new SideButton(actDelete, false /* don't show the name */) + })); // create the two list views