Ignore:
Timestamp:
2016-01-20T00:05:07+01:00 (8 years ago)
Author:
Don-vip
Message:

refactoring - global simplification of use of setLayout method - simply pass layout to JPanel constructor

Location:
trunk/src/org/openstreetmap/josm/gui/io
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java

    r7358 r9543  
    44/**
    55 * This is an abstract task for uploading or saving a data layer.
    6  *
     6 * @since 2025
    77 */
    88public abstract class AbstractIOTask implements Runnable {

  • trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java

    r8836 r9543  
    5252
    5353    protected JPanel buildTopPanel() {
    54         JPanel pnl = new JPanel();
     54        JPanel pnl = new JPanel(new BorderLayout());
    5555        pnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
    56         pnl.setLayout(new BorderLayout());
    5756        pnl.add(new JLabel(tr("<html>Please select the changesets you want to close</html>")), BorderLayout.CENTER);
    5857        return pnl;
    … …  
    6059
    6160    protected JPanel buildCenterPanel() {
    62         JPanel pnl = new JPanel();
    63         pnl.setLayout(new BorderLayout());
     61        JPanel pnl = new JPanel(new BorderLayout());
    6462        model = new DefaultListModel<>();
    6563        pnl.add(new JScrollPane(lstOpenChangesets = new JList<>(model)), BorderLayout.CENTER);
    … …  
    6967
    7068    protected JPanel buildSouthPanel() {
    71         JPanel pnl = new JPanel();
    72         pnl.setLayout(new FlowLayout(FlowLayout.CENTER));
     69        JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
    7370
    7471        // -- close action

  • trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

    r9173 r9543  
    103103     */
    104104    protected JPanel buildButtonRow() {
    105         JPanel pnl = new JPanel();
    106         pnl.setLayout(new GridBagLayout());
     105        JPanel pnl = new JPanel(new GridBagLayout());
    107106
    108107        saveAndProceedAction = new SaveAndProceedAction();
    … …  
    120119        pnl.add(new JButton(cancelAction), GBC.std(1, 1).insets(5, 5, 5, 5).fill(GBC.HORIZONTAL));
    121120
    122         JPanel pnl2 = new JPanel();
    123         pnl2.setLayout(new BorderLayout());
     121        JPanel pnl2 = new JPanel(new BorderLayout());
    124122        pnl2.add(pnlUploadLayers = new UploadAndSaveProgressRenderer(), BorderLayout.CENTER);
    125123        model.addPropertyChangeListener(pnlUploadLayers);

  • trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

    r9522 r9543  
    173173     */
    174174    protected JPanel buildActionPanel() {
    175         JPanel pnl = new JPanel();
    176         pnl.setLayout(new FlowLayout(FlowLayout.CENTER));
     175        JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
    177176        pnl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
    178177

  • trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java

    r9078 r9543  
    4040 * </pre>
    4141 */
    42 public class UploadLayerTask extends AbstractIOTask implements Runnable {
     42public class UploadLayerTask extends AbstractIOTask {
    4343    private OsmServerWriter writer;
    4444    private final OsmDataLayer layer;

  • trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java

    r8836 r9543  
    6666
    6767    protected JPanel buildSelectedPrimitivesPanel() {
    68         JPanel pnl = new JPanel();
    69         pnl.setLayout(new BorderLayout());
     68        JPanel pnl = new JPanel(new BorderLayout());
    7069        JLabel lbl = new JLabel(
    7170                tr("<html>Mark modified objects <strong>from the current selection</strong> to be uploaded to the server.</html>"));
    … …  
    7877
    7978    protected JPanel buildDeletedPrimitivesPanel() {
    80         JPanel pnl = new JPanel();
    81         pnl.setLayout(new BorderLayout());
     79        JPanel pnl = new JPanel(new BorderLayout());
    8280        JLabel lbl = new JLabel(tr("<html>Mark <strong>locally deleted objects</strong> to be deleted on the server.</html>"));
    8381        lbl.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
    … …  
    8987
    9088    protected JPanel buildButtonPanel() {
    91         JPanel pnl = new JPanel();
    92         pnl.setLayout(new FlowLayout());
     89        JPanel pnl = new JPanel(new FlowLayout());
    9390        ContinueAction continueAction = new ContinueAction();
    9491        pnl.add(btnContinue = new SideButton(continueAction));

  • trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java

    r8840 r9543  
    7171
    7272    protected JPanel buildUploadStrategyPanel() {
    73         JPanel pnl = new JPanel();
    74         pnl.setLayout(new GridBagLayout());
     73        JPanel pnl = new JPanel(new GridBagLayout());
    7574        ButtonGroup bgStrategies = new ButtonGroup();
    7675        rbStrategy = new EnumMap<>(UploadStrategy.class);
    … …  
    181180
    182181    protected JPanel buildMultiChangesetPolicyPanel() {
    183         pnlMultiChangesetPolicyPanel = new JPanel();
    184         pnlMultiChangesetPolicyPanel.setLayout(new GridBagLayout());
     182        pnlMultiChangesetPolicyPanel = new JPanel(new GridBagLayout());
    185183        GridBagConstraints gc = new GridBagConstraints();
    186184        gc.gridx = 0;
Note: See TracChangeset for help on using the changeset viewer.