Ticket #2928: ConflictResolutionDialog.patch

File ConflictResolutionDialog.patch, 932 bytes (added by Michi, 17 years ago)

Patch for standardized button order

  • ConflictResolutionDialog.java

     
    109109     */
    110110    protected JPanel buildButtonRow() {
    111111        JPanel pnl = new JPanel();
    112         pnl.setLayout(new FlowLayout(FlowLayout.RIGHT));
     112        pnl.setLayout(new FlowLayout(FlowLayout.CENTER));
    113113
    114         JButton btn = new JButton(new CancelAction());
    115         btn.setName("button.cancel");
     114        JButton btn = new JButton(new ApplyResolutionAction());
     115        btn.setName("button.apply");
    116116        pnl.add(btn);
    117117
    118         btn = new JButton(new ApplyResolutionAction());
    119         btn.setName("button.apply");
     118        btn = new JButton(new CancelAction());
     119        btn.setName("button.cancel");
    120120        pnl.add(btn);
    121121
    122122        pnl.setBorder(BorderFactory.createLoweredBevelBorder());