Index: /trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java (revision 9543) @@ -38,6 +38,5 @@ */ protected JPanel buildWarningPanel(List dep) { - JPanel pnl = new JPanel(); - pnl.setLayout(new BorderLayout()); + JPanel pnl = new JPanel(new BorderLayout()); String msg = tr("{0} relations build a cycle because they refer to each other.
" + "JOSM cannot upload them. Please edit the relations and remove the " Index: /trunk/src/org/openstreetmap/josm/gui/MapFrame.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 9543) @@ -182,6 +182,5 @@ splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true); - leftPanel = new JPanel(); - leftPanel.setLayout(new GridBagLayout()); + leftPanel = new JPanel(new GridBagLayout()); leftPanel.add(mapView, GBC.std().fill()); splitPane.setLeftComponent(leftPanel); Index: /trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java (revision 9543) @@ -48,6 +48,5 @@ pane.add(customText, GBC.eol().fill(GBC.HORIZONTAL)); pane.add(progressBar, GBC.eop().fill(GBC.HORIZONTAL)); - JPanel buttons = new JPanel(); - buttons.setLayout(new GridBagLayout()); + JPanel buttons = new JPanel(new GridBagLayout()); btnCancel = new JButton(tr("Cancel")); btnCancel.setIcon(ImageProvider.get("cancel")); Index: /trunk/src/org/openstreetmap/josm/gui/SplashScreen.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/SplashScreen.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/SplashScreen.java (revision 9543) @@ -65,8 +65,7 @@ // Add a margin from the border to the content - JPanel innerContentPane = new JPanel(); + JPanel innerContentPane = new JPanel(new GridBagLayout()); innerContentPane.setBorder(new EmptyBorder(10, 10, 2, 10)); contentPane.add(innerContentPane); - innerContentPane.setLayout(new GridBagLayout()); // Add the logo Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 9543) @@ -103,5 +103,5 @@ gc.weightx = 1.0; gc.weighty = 1.0; - getContentPane().add(pnlTagResolver = new JPanel(), gc); + getContentPane().add(pnlTagResolver = new JPanel(new BorderLayout()), gc); gc.gridx = 0; gc.gridy = 2; @@ -113,6 +113,5 @@ protected JPanel buildButtonPanel() { - JPanel pnl = new JPanel(); - pnl.setLayout(new FlowLayout(FlowLayout.CENTER)); + JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER)); // -- apply button @@ -132,6 +131,5 @@ protected JPanel buildSourceAndTargetInfoPanel() { - JPanel pnl = new JPanel(); - pnl.setLayout(new BorderLayout()); + JPanel pnl = new JPanel(new BorderLayout()); statisticsModel = new StatisticsTableModel(); pnl.add(new StatisticsInfoTable(statisticsModel), BorderLayout.CENTER); @@ -174,5 +172,4 @@ // prepare the dialog with one tag resolver - pnlTagResolver.setLayout(new BorderLayout()); pnlTagResolver.removeAll(); pnlTagResolver.add(allPrimitivesResolver, BorderLayout.CENTER); @@ -218,5 +215,4 @@ initResolver(OsmPrimitiveType.RELATION, tagsForRelations, targetStatistics); - pnlTagResolver.setLayout(new BorderLayout()); pnlTagResolver.removeAll(); pnlTagResolver.add(tpResolvers, BorderLayout.CENTER); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java (revision 9543) @@ -50,6 +50,5 @@ protected final void build() { setLayout(new GridBagLayout()); - JPanel pnl = new JPanel(); - pnl.setLayout(new BorderLayout()); + JPanel pnl = new JPanel(new BorderLayout()); pnl.add(lblHeader = new JMultilineLabel("")); GridBagConstraints gc = new GridBagConstraints(); @@ -65,6 +64,5 @@ gc.insets = new Insets(0, 0, 0, 0); add(new JScrollPane(tblResolver = new RelationMemberConflictResolverTable(model)), gc); - pnl = new JPanel(); - pnl.setLayout(new BoxLayout(pnl, BoxLayout.Y_AXIS)); + pnl = new JPanel(new BoxLayout(pnl, BoxLayout.Y_AXIS)); pnl.add(buildRoleEditingPanel()); pnl.add(buildTagRelationsPanel()); @@ -76,6 +74,5 @@ protected JPanel buildRoleEditingPanel() { - JPanel pnl = new JPanel(); - pnl.setLayout(new FlowLayout(FlowLayout.LEFT)); + JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT)); pnl.add(new JLabel(tr("Role:"))); pnl.add(tfRole = new AutoCompletingTextField(10)); @@ -95,6 +92,5 @@ protected JPanel buildTagRelationsPanel() { - JPanel pnl = new JPanel(); - pnl.setLayout(new FlowLayout(FlowLayout.LEFT)); + JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT)); cbTagRelations = new JCheckBox(tr("Tag modified relations with ")); cbTagRelations.addChangeListener(new ToggleTagRelationsAction()); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java (revision 9543) @@ -33,7 +33,6 @@ protected JPanel buildInfoPanel() { - JPanel pnl = new JPanel(); + JPanel pnl = new JPanel(new GridBagLayout()); pnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); - pnl.setLayout(new GridBagLayout()); GridBagConstraints gc = new GridBagConstraints(); gc.fill = GridBagConstraints.BOTH; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (revision 9543) @@ -77,6 +77,5 @@ */ protected JPanel buildButtonRow() { - JPanel pnl = new JPanel(); - pnl.setLayout(new FlowLayout(FlowLayout.CENTER)); + JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER)); applyResolutionAction = new ApplyResolutionAction(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java (revision 9543) @@ -75,6 +75,5 @@ protected JPanel buildRelationMemberTablePanel() { JTable table = new JTable(model, new RelationMemberTableColumnModel()); - JPanel pnl = new JPanel(); - pnl.setLayout(new BorderLayout()); + JPanel pnl = new JPanel(new BorderLayout()); pnl.add(new JScrollPane(table)); return pnl; @@ -82,6 +81,5 @@ protected JPanel buildButtonPanel() { - JPanel pnl = new JPanel(); - pnl.setLayout(new FlowLayout()); + JPanel pnl = new JPanel(new FlowLayout()); pnl.add(btnOK = new SideButton(new OKAction())); btnOK.setFocusable(true); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 9543) @@ -59,7 +59,6 @@ protected JPanel buildQueryPanel() { ItemListener stateChangeHandler = new RestrictionGroupStateChangeHandler(); - JPanel pnl = new VerticallyScrollablePanel(); + JPanel pnl = new VerticallyScrollablePanel(new GridBagLayout()); pnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); - pnl.setLayout(new GridBagLayout()); GridBagConstraints gc = new GridBagConstraints(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (revision 9543) @@ -158,5 +158,5 @@ /** JPanel containing both previous tables */ - private final JPanel bothTables = new JPanel(); + private final JPanel bothTables = new JPanel(new GridBagLayout()); // Popup menus @@ -259,5 +259,4 @@ // combine both tables and wrap them in a scrollPane boolean top = Main.pref.getBoolean("properties.presets.top", true); - bothTables.setLayout(new GridBagLayout()); if (top) { bothTables.add(presets, GBC.std().fill(GBC.HORIZONTAL).insets(5, 2, 5, 2).anchor(GBC.NORTHWEST)); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 9543) @@ -90,6 +90,5 @@ */ protected JPanel buildButtonPanel() { - JPanel pnl = new JPanel(); - pnl.setLayout(new FlowLayout(FlowLayout.LEFT)); + JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT)); // --- Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 9543) @@ -192,6 +192,5 @@ pane.setPreferredSize(new Dimension(100, 100)); - JPanel pnl = new JPanel(); - pnl.setLayout(new BorderLayout()); + JPanel pnl = new JPanel(new BorderLayout()); pnl.add(pane, BorderLayout.CENTER); pnl.setBorder(BorderFactory.createRaisedBevelBorder()); @@ -418,6 +417,5 @@ pnl.add(p3, gc); - JPanel pnl2 = new JPanel(); - pnl2.setLayout(new GridBagLayout()); + JPanel pnl2 = new JPanel(new GridBagLayout()); gc.gridx = 0; @@ -461,6 +459,5 @@ }); - JPanel pnl3 = new JPanel(); - pnl3.setLayout(new BorderLayout()); + JPanel pnl3 = new JPanel(new BorderLayout()); pnl3.add(splitPane, BorderLayout.CENTER); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (revision 9543) @@ -53,6 +53,5 @@ referrers.addMouseListener(new DblClickMouseAdapter()); - JPanel pnl = new JPanel(); - pnl.setLayout(new FlowLayout(FlowLayout.LEFT)); + JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT)); ReloadAction reloadAction = new ReloadAction(); Index: /trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java (revision 9543) @@ -58,6 +58,5 @@ */ protected JPanel buildButtonPanel() { - JPanel pnl = new JPanel(); - pnl.setLayout(new GridBagLayout()); + JPanel pnl = new JPanel(new GridBagLayout()); GridBagConstraints gc = new GridBagConstraints(); gc.gridy = 0; @@ -80,6 +79,5 @@ protected JPanel buildDownloadAreaAddPanel() { - JPanel pnl = new JPanel(); - pnl.setLayout(new GridBagLayout()); + JPanel pnl = new JPanel(new GridBagLayout()); GridBagConstraints gc = new GridBagConstraints(); Index: /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 9543) @@ -91,6 +91,5 @@ protected final JPanel buildMainPanel() { - JPanel pnl = new JPanel(); - pnl.setLayout(new GridBagLayout()); + JPanel pnl = new JPanel(new GridBagLayout()); final ChangeListener checkboxChangeListener = new ChangeListener() { @@ -187,6 +186,5 @@ protected final JPanel buildButtonPanel() { - JPanel pnl = new JPanel(); - pnl.setLayout(new FlowLayout()); + JPanel pnl = new JPanel(new FlowLayout()); // -- download button Index: /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 9543) @@ -95,8 +95,6 @@ protected JPanel buildSearchPanel() { - JPanel lpanel = new JPanel(); - lpanel.setLayout(new GridLayout(2, 2)); - JPanel panel = new JPanel(); - panel.setLayout(new GridBagLayout()); + JPanel lpanel = new JPanel(new GridLayout(2, 2)); + JPanel panel = new JPanel(new GridBagLayout()); lpanel.add(new JLabel(tr("Choose the server for searching:"))); @@ -135,6 +133,5 @@ @Override public void addGui(final DownloadDialog gui) { - JPanel panel = new JPanel(); - panel.setLayout(new BorderLayout()); + JPanel panel = new JPanel(new BorderLayout()); panel.add(buildSearchPanel(), BorderLayout.NORTH); Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java (revision 9543) @@ -39,6 +39,5 @@ */ protected JPanel createVersionTablePanel() { - JPanel pnl = new JPanel(); - pnl.setLayout(new BorderLayout()); + JPanel pnl = new JPanel(new BorderLayout()); VersionTable versionTable = new VersionTable(model); @@ -63,6 +62,5 @@ relationMemberListViewer = new RelationMemberListViewer(model); coordinateInfoViewer = new CoordinateInfoViewer(model); - JPanel pnl = new JPanel(); - pnl.setLayout(new BorderLayout()); + JPanel pnl = new JPanel(new BorderLayout()); pnl.add(tpViewers, BorderLayout.CENTER); Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (revision 9543) @@ -82,6 +82,5 @@ add(browser, BorderLayout.CENTER); - JPanel pnl = new JPanel(); - pnl.setLayout(new FlowLayout(FlowLayout.CENTER)); + JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER)); SideButton btn = new SideButton(new ReloadAction()); Index: /trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java (revision 9543) @@ -4,5 +4,5 @@ /** * This is an abstract task for uploading or saving a data layer. - * + * @since 2025 */ public abstract class AbstractIOTask implements Runnable { Index: /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java (revision 9543) @@ -52,7 +52,6 @@ protected JPanel buildTopPanel() { - JPanel pnl = new JPanel(); + JPanel pnl = new JPanel(new BorderLayout()); pnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); - pnl.setLayout(new BorderLayout()); pnl.add(new JLabel(tr("Please select the changesets you want to close")), BorderLayout.CENTER); return pnl; @@ -60,6 +59,5 @@ protected JPanel buildCenterPanel() { - JPanel pnl = new JPanel(); - pnl.setLayout(new BorderLayout()); + JPanel pnl = new JPanel(new BorderLayout()); model = new DefaultListModel<>(); pnl.add(new JScrollPane(lstOpenChangesets = new JList<>(model)), BorderLayout.CENTER); @@ -69,6 +67,5 @@ protected JPanel buildSouthPanel() { - JPanel pnl = new JPanel(); - pnl.setLayout(new FlowLayout(FlowLayout.CENTER)); + JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER)); // -- close action Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 9543) @@ -103,6 +103,5 @@ */ protected JPanel buildButtonRow() { - JPanel pnl = new JPanel(); - pnl.setLayout(new GridBagLayout()); + JPanel pnl = new JPanel(new GridBagLayout()); saveAndProceedAction = new SaveAndProceedAction(); @@ -120,6 +119,5 @@ pnl.add(new JButton(cancelAction), GBC.std(1, 1).insets(5, 5, 5, 5).fill(GBC.HORIZONTAL)); - JPanel pnl2 = new JPanel(); - pnl2.setLayout(new BorderLayout()); + JPanel pnl2 = new JPanel(new BorderLayout()); pnl2.add(pnlUploadLayers = new UploadAndSaveProgressRenderer(), BorderLayout.CENTER); model.addPropertyChangeListener(pnlUploadLayers); Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 9543) @@ -173,6 +173,5 @@ */ protected JPanel buildActionPanel() { - JPanel pnl = new JPanel(); - pnl.setLayout(new FlowLayout(FlowLayout.CENTER)); + JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER)); pnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java (revision 9543) @@ -40,5 +40,5 @@ * */ -public class UploadLayerTask extends AbstractIOTask implements Runnable { +public class UploadLayerTask extends AbstractIOTask { private OsmServerWriter writer; private final OsmDataLayer layer; Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java (revision 9543) @@ -66,6 +66,5 @@ protected JPanel buildSelectedPrimitivesPanel() { - JPanel pnl = new JPanel(); - pnl.setLayout(new BorderLayout()); + JPanel pnl = new JPanel(new BorderLayout()); JLabel lbl = new JLabel( tr("Mark modified objects from the current selection to be uploaded to the server.")); @@ -78,6 +77,5 @@ protected JPanel buildDeletedPrimitivesPanel() { - JPanel pnl = new JPanel(); - pnl.setLayout(new BorderLayout()); + JPanel pnl = new JPanel(new BorderLayout()); JLabel lbl = new JLabel(tr("Mark locally deleted objects to be deleted on the server.")); lbl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); @@ -89,6 +87,5 @@ protected JPanel buildButtonPanel() { - JPanel pnl = new JPanel(); - pnl.setLayout(new FlowLayout()); + JPanel pnl = new JPanel(new FlowLayout()); ContinueAction continueAction = new ContinueAction(); pnl.add(btnContinue = new SideButton(continueAction)); Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java (revision 9543) @@ -71,6 +71,5 @@ protected JPanel buildUploadStrategyPanel() { - JPanel pnl = new JPanel(); - pnl.setLayout(new GridBagLayout()); + JPanel pnl = new JPanel(new GridBagLayout()); ButtonGroup bgStrategies = new ButtonGroup(); rbStrategy = new EnumMap<>(UploadStrategy.class); @@ -181,6 +180,5 @@ protected JPanel buildMultiChangesetPolicyPanel() { - pnlMultiChangesetPolicyPanel = new JPanel(); - pnlMultiChangesetPolicyPanel.setLayout(new GridBagLayout()); + pnlMultiChangesetPolicyPanel = new JPanel(new GridBagLayout()); GridBagConstraints gc = new GridBagConstraints(); gc.gridx = 0; Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (revision 9543) @@ -346,6 +346,5 @@ SimpleDateFormat dateFormat = (SimpleDateFormat) DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.MEDIUM); - panel = new JPanel(); - panel.setLayout(new BorderLayout()); + panel = new JPanel(new BorderLayout()); panel.add(new JLabel(tr("Take a photo of your GPS receiver while it displays the time.
" + "Display that photo here.
" @@ -357,6 +356,5 @@ panel.add(imgDisp, BorderLayout.CENTER); - JPanel panelTf = new JPanel(); - panelTf.setLayout(new GridBagLayout()); + JPanel panelTf = new JPanel(new GridBagLayout()); GridBagConstraints gc = new GridBagConstraints(); @@ -439,6 +437,5 @@ panel.add(panelTf, BorderLayout.SOUTH); - JPanel panelLst = new JPanel(); - panelLst.setLayout(new BorderLayout()); + JPanel panelLst = new JPanel(new BorderLayout()); imgList = new JList<>(new AbstractListModel() { @@ -603,6 +600,5 @@ panelCb.add(buttonOpen); - JPanel panelTf = new JPanel(); - panelTf.setLayout(new GridBagLayout()); + JPanel panelTf = new JPanel(new GridBagLayout()); String prefTimezone = Main.pref.get("geoimage.timezone", "0:00"); @@ -735,6 +731,5 @@ panelTf.add(cbShowThumbs, gbc); - final JPanel statusBar = new JPanel(); - statusBar.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0)); + final JPanel statusBar = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); statusBar.setBorder(BorderFactory.createLoweredBevelBorder()); statusBarText = new JLabel(" "); @@ -752,6 +747,5 @@ statusBarUpdater.updateStatusBar(); - outerPanel = new JPanel(); - outerPanel.setLayout(new BorderLayout()); + outerPanel = new JPanel(new BorderLayout()); outerPanel.add(statusBar, BorderLayout.PAGE_END); Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 9543) @@ -80,6 +80,5 @@ protected void build() { - JPanel content = new JPanel(); - content.setLayout(new BorderLayout()); + JPanel content = new JPanel(new BorderLayout()); content.add(imgDisplay, BorderLayout.CENTER); @@ -176,6 +175,5 @@ buttons.add(btnCopyPath); - JPanel bottomPane = new JPanel(); - bottomPane.setLayout(new GridBagLayout()); + JPanel bottomPane = new JPanel(new GridBagLayout()); GridBagConstraints gc = new GridBagConstraints(); gc.gridx = 0; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java (revision 9543) @@ -52,6 +52,5 @@ @Override public void addGui(PreferenceTabbedPane gui) { - JPanel panel = new VerticallyScrollablePanel(); - panel.setLayout(new GridBagLayout()); + JPanel panel = new VerticallyScrollablePanel(new GridBagLayout()); panel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java (revision 9543) @@ -320,5 +320,4 @@ projPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - projPanel.setLayout(new GridBagLayout()); projPanel.add(new JLabel(tr("Projection method")), GBC.std().insets(5, 5, 0, 5)); projPanel.add(GBC.glue(5, 0), GBC.std().fill(GBC.HORIZONTAL)); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java (revision 9543) @@ -63,6 +63,5 @@ group.add(south); - JPanel bPanel = new JPanel(); - bPanel.setLayout(new GridBagLayout()); + JPanel bPanel = new JPanel(new GridBagLayout()); bPanel.add(new JLabel(tr("North")), GBC.std().insets(5, 5, 0, 5)); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java (revision 9543) @@ -100,6 +100,5 @@ remote.add(enableRemoteControl, GBC.eol()); - final JPanel wrapper = new JPanel(); - wrapper.setLayout(new GridBagLayout()); + final JPanel wrapper = new JPanel(new GridBagLayout()); wrapper.setBorder(BorderFactory.createTitledBorder(BorderFactory.createLineBorder(Color.gray))); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java (revision 9543) @@ -86,7 +86,6 @@ gc.weightx = 1.0; gc.weighty = 1.0; - pnlAuthenticationParameteters = new JPanel(); + pnlAuthenticationParameteters = new JPanel(new BorderLayout()); add(pnlAuthenticationParameteters, gc); - pnlAuthenticationParameteters.setLayout(new BorderLayout()); //-- the two panels for authentication parameters Index: /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (revision 9543) @@ -118,6 +118,5 @@ gc.weightx = 1.0; gc.insets = new Insets(10, 0, 0, 0); - add(pnlAuthorisationMessage = new JPanel(), gc); - pnlAuthorisationMessage.setLayout(new BorderLayout()); + add(pnlAuthorisationMessage = new JPanel(new BorderLayout()), gc); // create these two panels, they are going to be used later in refreshView Index: /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 9543) @@ -10,4 +10,5 @@ import java.awt.GridBagConstraints; import java.awt.GridBagLayout; +import java.awt.GridLayout; import java.awt.Insets; import java.awt.Toolkit; @@ -186,12 +187,11 @@ private void initComponents() { - JPanel listPane = new JPanel(); + JPanel listPane = new JPanel(new GridLayout()); JScrollPane listScrollPane = new JScrollPane(); - JPanel shortcutEditPane = new JPanel(); + JPanel shortcutEditPane = new JPanel(new GridLayout(5, 2)); CbAction action = new CbAction(this); setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); add(buildFilterPanel()); - listPane.setLayout(new java.awt.GridLayout()); // This is the list of shortcuts: @@ -211,5 +211,4 @@ // and here follows the edit area. I won't object to someone re-designing it, it looks, um, "minimalistic" ;) - shortcutEditPane.setLayout(new java.awt.GridLayout(5, 2)); cbDefault.setAction(action); Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java (revision 9543) @@ -49,6 +49,5 @@ */ protected JPanel buildTagTableEditorPanel() { - JPanel pnl = new JPanel(); - pnl.setLayout(new BorderLayout()); + JPanel pnl = new JPanel(new BorderLayout()); pnl.add(new JScrollPane(tagTable), BorderLayout.CENTER); if (presetHandler != null) { Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 9542) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (revision 9543) @@ -215,6 +215,5 @@ // set the content of this AddTagsDialog consisting of the tableHeader and the table itself. - JPanel tablePanel = new JPanel(); - tablePanel.setLayout(new GridBagLayout()); + JPanel tablePanel = new JPanel(new GridBagLayout()); tablePanel.add(propertyTable.getTableHeader(), GBC.eol().fill(GBC.HORIZONTAL)); tablePanel.add(propertyTable, GBC.eol().fill(GBC.BOTH));