Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractMergePanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractMergePanel.java (revision 12046) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractMergePanel.java (revision 12047) @@ -7,4 +7,6 @@ import java.util.List; +import javax.swing.AbstractAction; +import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JLabel; @@ -152,4 +154,30 @@ } + /** + * Add the undecide button to the middle of the merged row. + */ + protected abstract static class AbstractUndecideRow extends AbstractMergePanel.MergeRow { + @Override + protected JComponent merged() { + AbstractAction actUndecide = createAction(); + JButton button = new JButton(actUndecide); + button.setName(getButtonName()); + return button; + } + + protected abstract AbstractAction createAction(); + + protected abstract String getButtonName(); + + @Override + protected void addConstraints(GBC constraints, int columnIndex) { + super.addConstraints(constraints, columnIndex); + constraints.fill(GBC.NONE); + } + } + + /** + * The current row counter. Used when adding new rows. + */ protected int currentRow = 0; Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (revision 12046) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (revision 12047) @@ -273,30 +273,10 @@ } - private abstract class AbstractUndecideRow extends AbstractMergePanel.MergeRow { - @Override - protected JComponent merged() { - // we add the undecide button below this text field - T actUndecideCoordinates = createAction(); - model.addChangeListener(actUndecideCoordinates); - JButton button = new JButton(actUndecideCoordinates); - button.setName(getButtonName()); - return button; - } - - protected abstract T createAction(); - - protected abstract String getButtonName(); - - @Override - protected void addConstraints(GBC constraints, int columnIndex) { - super.addConstraints(constraints, columnIndex); - constraints.fill(GBC.NONE); - } - } - - private final class UndecideCoordinatesRow extends AbstractUndecideRow { + private final class UndecideCoordinatesRow extends AbstractUndecideRow { @Override protected UndecideCoordinateConflictAction createAction() { - return new UndecideCoordinateConflictAction(); + UndecideCoordinateConflictAction action = new UndecideCoordinateConflictAction(); + model.addChangeListener(action); + return action; } @@ -307,8 +287,10 @@ } - private final class UndecideDeletedStateRow extends AbstractUndecideRow { + private final class UndecideDeletedStateRow extends AbstractUndecideRow { @Override protected UndecideDeletedStateConflictAction createAction() { - return new UndecideDeletedStateConflictAction(); + UndecideDeletedStateConflictAction action = new UndecideDeletedStateConflictAction(); + model.addChangeListener(action); + return action; } Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (revision 12046) +++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (revision 12047) @@ -5,7 +5,4 @@ import java.awt.Adjustable; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.AdjustmentEvent; @@ -13,5 +10,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.util.Arrays; import java.util.HashSet; +import java.util.List; import java.util.Set; @@ -20,6 +19,5 @@ import javax.swing.ImageIcon; import javax.swing.JButton; -import javax.swing.JLabel; -import javax.swing.JPanel; +import javax.swing.JComponent; import javax.swing.JScrollPane; import javax.swing.JTable; @@ -29,7 +27,9 @@ import org.openstreetmap.josm.data.conflict.Conflict; import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.gui.conflict.pair.AbstractMergePanel; import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver; import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType; import org.openstreetmap.josm.gui.tagging.TagTableColumnModelBuilder; +import org.openstreetmap.josm.tools.GBC; import org.openstreetmap.josm.tools.ImageProvider; @@ -38,12 +38,21 @@ * @since 1622 */ -public class TagMerger extends JPanel implements IConflictResolver { - - private JTable mineTable; - private JTable mergedTable; - private JTable theirTable; - private final TagMergeModel model; - private final String[] keyvalue; - private transient AdjustmentSynchronizer adjustmentSynchronizer; +public class TagMerger extends AbstractMergePanel implements IConflictResolver { + private static final String[] KEY_VALUE = new String[] {tr("Key"), tr("Value")}; + + private final TagMergeModel model = new TagMergeModel(); + + /** + * the table for my tag set + */ + private final JTable mineTable = generateTable(model, new MineTableCellRenderer()); + /** + * the table for the merged tag set + */ + private final JTable mergedTable = generateTable(model, new MergedTableCellRenderer()); + /** + * the table for their tag set + */ + private final JTable theirTable = generateTable(model, new TheirTableCellRenderer()); /** @@ -51,162 +60,7 @@ */ public TagMerger() { - model = new TagMergeModel(); - keyvalue = new String[]{tr("Key"), tr("Value")}; - build(); - } - - /** - * embeds table in a new {@link JScrollPane} and returns th scroll pane - * - * @param table the table - * @return the scroll pane embedding the table - */ - protected JScrollPane embeddInScrollPane(JTable table) { - JScrollPane pane = new JScrollPane(table); - adjustmentSynchronizer.synchronizeAdjustment(pane.getVerticalScrollBar()); - return pane; - } - - /** - * builds the table for my tag set (table already embedded in a scroll pane) - * - * @return the table (embedded in a scroll pane) - */ - protected JScrollPane buildMineTagTable() { - mineTable = new JTable(model, new TagTableColumnModelBuilder(new MineTableCellRenderer(), keyvalue).build()); mineTable.setName("table.my"); - return embeddInScrollPane(mineTable); - } - - /** - * builds the table for their tag set (table already embedded in a scroll pane) - * - * @return the table (embedded in a scroll pane) - */ - protected JScrollPane buildTheirTable() { - theirTable = new JTable(model, new TagTableColumnModelBuilder(new TheirTableCellRenderer(), keyvalue).build()); theirTable.setName("table.their"); - return embeddInScrollPane(theirTable); - } - - /** - * builds the table for the merged tag set (table already embedded in a scroll pane) - * - * @return the table (embedded in a scroll pane) - */ - - protected JScrollPane buildMergedTable() { - mergedTable = new JTable(model, new TagTableColumnModelBuilder(new MergedTableCellRenderer(), keyvalue).build()); mergedTable.setName("table.merged"); - return embeddInScrollPane(mergedTable); - } - - /** - * build the user interface - */ - protected final void build() { - GridBagConstraints gc = new GridBagConstraints(); - setLayout(new GridBagLayout()); - - adjustmentSynchronizer = new AdjustmentSynchronizer(); - - gc.gridx = 0; - gc.gridy = 0; - gc.gridwidth = 1; - gc.gridheight = 1; - gc.fill = GridBagConstraints.NONE; - gc.anchor = GridBagConstraints.CENTER; - gc.weightx = 0.0; - gc.weighty = 0.0; - gc.insets = new Insets(10, 0, 10, 0); - JLabel lblMy = new JLabel(tr("My version (local dataset)")); - add(lblMy, gc); - - gc.gridx = 2; - gc.gridy = 0; - gc.gridwidth = 1; - gc.gridheight = 1; - gc.fill = GridBagConstraints.NONE; - gc.anchor = GridBagConstraints.CENTER; - gc.weightx = 0.0; - gc.weighty = 0.0; - JLabel lblMerge = new JLabel(tr("Merged version")); - add(lblMerge, gc); - - gc.gridx = 4; - gc.gridy = 0; - gc.gridwidth = 1; - gc.gridheight = 1; - gc.fill = GridBagConstraints.NONE; - gc.anchor = GridBagConstraints.CENTER; - gc.weightx = 0.0; - gc.weighty = 0.0; - gc.insets = new Insets(0, 0, 0, 0); - JLabel lblTheir = new JLabel(tr("Their version (server dataset)")); - add(lblTheir, gc); - - gc.gridx = 0; - gc.gridy = 1; - gc.gridwidth = 1; - gc.gridheight = 1; - gc.fill = GridBagConstraints.BOTH; - gc.anchor = GridBagConstraints.FIRST_LINE_START; - gc.weightx = 0.3; - gc.weighty = 1.0; - JScrollPane tabMy = buildMineTagTable(); - lblMy.setLabelFor(tabMy); - add(tabMy, gc); - - gc.gridx = 1; - gc.gridy = 1; - gc.gridwidth = 1; - gc.gridheight = 1; - gc.fill = GridBagConstraints.NONE; - gc.anchor = GridBagConstraints.CENTER; - gc.weightx = 0.0; - gc.weighty = 0.0; - KeepMineAction keepMineAction = new KeepMineAction(); - mineTable.getSelectionModel().addListSelectionListener(keepMineAction); - JButton btnKeepMine = new JButton(keepMineAction); - btnKeepMine.setName("button.keepmine"); - add(btnKeepMine, gc); - - gc.gridx = 2; - gc.gridy = 1; - gc.gridwidth = 1; - gc.gridheight = 1; - gc.fill = GridBagConstraints.BOTH; - gc.anchor = GridBagConstraints.FIRST_LINE_START; - gc.weightx = 0.3; - gc.weighty = 1.0; - JScrollPane tabMerge = buildMergedTable(); - lblMerge.setLabelFor(tabMerge); - add(tabMerge, gc); - - gc.gridx = 3; - gc.gridy = 1; - gc.gridwidth = 1; - gc.gridheight = 1; - gc.fill = GridBagConstraints.NONE; - gc.anchor = GridBagConstraints.CENTER; - gc.weightx = 0.0; - gc.weighty = 0.0; - KeepTheirAction keepTheirAction = new KeepTheirAction(); - JButton btnKeepTheir = new JButton(keepTheirAction); - btnKeepTheir.setName("button.keeptheir"); - add(btnKeepTheir, gc); - - gc.gridx = 4; - gc.gridy = 1; - gc.gridwidth = 1; - gc.gridheight = 1; - gc.fill = GridBagConstraints.BOTH; - gc.anchor = GridBagConstraints.FIRST_LINE_START; - gc.weightx = 0.3; - gc.weighty = 1.0; - JScrollPane tabTheir = buildTheirTable(); - lblTheir.setLabelFor(tabTheir); - add(tabTheir, gc); - theirTable.getSelectionModel().addListSelectionListener(keepTheirAction); DoubleClickAdapter dblClickAdapter = new DoubleClickAdapter(); @@ -214,17 +68,14 @@ theirTable.addMouseListener(dblClickAdapter); - gc.gridx = 2; - gc.gridy = 2; - gc.gridwidth = 1; - gc.gridheight = 1; - gc.fill = GridBagConstraints.NONE; - gc.anchor = GridBagConstraints.CENTER; - gc.weightx = 0.0; - gc.weighty = 0.0; - UndecideAction undecidedAction = new UndecideAction(); - mergedTable.getSelectionModel().addListSelectionListener(undecidedAction); - JButton btnUndecide = new JButton(undecidedAction); - btnUndecide.setName("button.undecide"); - add(btnUndecide, gc); + buildRows(); + } + + private JTable generateTable(TagMergeModel model2, TagMergeTableCellRenderer renderer) { + return new JTable(model, new TagTableColumnModelBuilder(renderer, KEY_VALUE).build()); + } + + @Override + protected List getRows() { + return Arrays.asList(new TitleRow(), new TagTableRow(), new UndecidedRow()); } @@ -251,4 +102,74 @@ mineTable.getSelectionModel().setSelectionInterval(index, index); theirTable.getSelectionModel().setSelectionInterval(index, index); + } + + private final class TagTableRow extends MergeRow { + private transient AdjustmentSynchronizer adjustmentSynchronizer = new AdjustmentSynchronizer(); + + /** + * embeds table in a new {@link JScrollPane} and returns th scroll pane + * + * @param table the table + * @return the scroll pane embedding the table + */ + protected JScrollPane embeddInScrollPane(JTable table) { + JScrollPane pane = new JScrollPane(table); + adjustmentSynchronizer.synchronizeAdjustment(pane.getVerticalScrollBar()); + return pane; + } + + @Override + protected JComponent mineField() { + return embeddInScrollPane(mineTable); + } + + @Override + protected JComponent mineButton() { + KeepMineAction keepMineAction = new KeepMineAction(); + mineTable.getSelectionModel().addListSelectionListener(keepMineAction); + JButton btnKeepMine = new JButton(keepMineAction); + btnKeepMine.setName("button.keepmine"); + return btnKeepMine; + } + + @Override + protected JComponent merged() { + return embeddInScrollPane(mergedTable); + } + + @Override + protected JComponent theirsButton() { + KeepTheirAction keepTheirAction = new KeepTheirAction(); + theirTable.getSelectionModel().addListSelectionListener(keepTheirAction); + JButton btnKeepTheir = new JButton(keepTheirAction); + btnKeepTheir.setName("button.keeptheir"); + return btnKeepTheir; + } + + @Override + protected JComponent theirsField() { + return embeddInScrollPane(theirTable); + } + + @Override + protected void addConstraints(GBC constraints, int columnIndex) { + super.addConstraints(constraints, columnIndex); + // Fill to bottom + constraints.weighty = 1; + } + } + + private final class UndecidedRow extends AbstractUndecideRow { + @Override + protected AbstractAction createAction() { + UndecideAction undecidedAction = new UndecideAction(); + mergedTable.getSelectionModel().addListSelectionListener(undecidedAction); + return undecidedAction; + } + + @Override + protected String getButtonName() { + return "button.undecide"; + } }