1 | // License: GPL. For details, see LICENSE file.
|
---|
2 | package org.openstreetmap.josm.gui.conflict.pair.properties;
|
---|
3 |
|
---|
4 | import static org.openstreetmap.josm.tools.I18n.tr;
|
---|
5 |
|
---|
6 | import java.awt.event.ActionEvent;
|
---|
7 | import java.text.DecimalFormat;
|
---|
8 | import java.util.Arrays;
|
---|
9 | import java.util.List;
|
---|
10 |
|
---|
11 | import javax.swing.AbstractAction;
|
---|
12 | import javax.swing.Action;
|
---|
13 | import javax.swing.BorderFactory;
|
---|
14 | import javax.swing.JButton;
|
---|
15 | import javax.swing.JComponent;
|
---|
16 | import javax.swing.JLabel;
|
---|
17 | import javax.swing.JPanel;
|
---|
18 | import javax.swing.event.ChangeEvent;
|
---|
19 | import javax.swing.event.ChangeListener;
|
---|
20 |
|
---|
21 | import org.openstreetmap.josm.data.conflict.Conflict;
|
---|
22 | import org.openstreetmap.josm.data.coor.LatLon;
|
---|
23 | import org.openstreetmap.josm.data.osm.OsmPrimitive;
|
---|
24 | import org.openstreetmap.josm.gui.DefaultNameFormatter;
|
---|
25 | import org.openstreetmap.josm.gui.conflict.ConflictColors;
|
---|
26 | import org.openstreetmap.josm.gui.conflict.pair.AbstractMergePanel;
|
---|
27 | import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver;
|
---|
28 | import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
|
---|
29 | import org.openstreetmap.josm.gui.history.VersionInfoPanel;
|
---|
30 | import org.openstreetmap.josm.tools.GBC;
|
---|
31 | import org.openstreetmap.josm.tools.ImageProvider;
|
---|
32 | import org.openstreetmap.josm.tools.Utils;
|
---|
33 |
|
---|
34 | /**
|
---|
35 | * This class represents a UI component for resolving conflicts in some properties of {@link OsmPrimitive}.
|
---|
36 | * @since 1654
|
---|
37 | */
|
---|
38 | public class PropertiesMerger extends AbstractMergePanel implements ChangeListener, IConflictResolver {
|
---|
39 | private static final DecimalFormat COORD_FORMATTER = new DecimalFormat("###0.0000000");
|
---|
40 |
|
---|
41 | private final JLabel lblMyCoordinates = buildValueLabel("label.mycoordinates");
|
---|
42 | private final JLabel lblMergedCoordinates = buildValueLabel("label.mergedcoordinates");
|
---|
43 | private final JLabel lblTheirCoordinates = buildValueLabel("label.theircoordinates");
|
---|
44 |
|
---|
45 | private final JLabel lblMyDeletedState = buildValueLabel("label.mydeletedstate");
|
---|
46 | private final JLabel lblMergedDeletedState = buildValueLabel("label.mergeddeletedstate");
|
---|
47 | private final JLabel lblTheirDeletedState = buildValueLabel("label.theirdeletedstate");
|
---|
48 |
|
---|
49 | private final JLabel lblMyReferrers = buildValueLabel("label.myreferrers");
|
---|
50 | private final JLabel lblTheirReferrers = buildValueLabel("label.theirreferrers");
|
---|
51 |
|
---|
52 | private final transient PropertiesMergeModel model = new PropertiesMergeModel();
|
---|
53 | private final VersionInfoPanel mineVersionInfo = new VersionInfoPanel();
|
---|
54 | private final VersionInfoPanel theirVersionInfo = new VersionInfoPanel();
|
---|
55 |
|
---|
56 | /**
|
---|
57 | * Constructs a new {@code PropertiesMerger}.
|
---|
58 | */
|
---|
59 | public PropertiesMerger() {
|
---|
60 | model.addChangeListener(this);
|
---|
61 | buildRows();
|
---|
62 | }
|
---|
63 |
|
---|
64 | @Override
|
---|
65 | protected List<? extends MergeRow> getRows() {
|
---|
66 | return Arrays.asList(
|
---|
67 | new AbstractMergePanel.TitleRow(),
|
---|
68 | new VersionInfoRow(),
|
---|
69 | new MergeCoordinatesRow(),
|
---|
70 | new UndecideCoordinatesRow(),
|
---|
71 | new MergeDeletedStateRow(),
|
---|
72 | new UndecideDeletedStateRow(),
|
---|
73 | new ReferrersRow(),
|
---|
74 | new EmptyFillRow());
|
---|
75 | }
|
---|
76 |
|
---|
77 | protected static JLabel buildValueLabel(String name) {
|
---|
78 | JLabel lbl = new JLabel();
|
---|
79 | lbl.setName(name);
|
---|
80 | lbl.setHorizontalAlignment(JLabel.CENTER);
|
---|
81 | lbl.setOpaque(true);
|
---|
82 | lbl.setBorder(BorderFactory.createLoweredBevelBorder());
|
---|
83 | return lbl;
|
---|
84 | }
|
---|
85 |
|
---|
86 | protected static String coordToString(LatLon coord) {
|
---|
87 | if (coord == null)
|
---|
88 | return tr("(none)");
|
---|
89 | StringBuilder sb = new StringBuilder();
|
---|
90 | sb.append('(')
|
---|
91 | .append(COORD_FORMATTER.format(coord.lat()))
|
---|
92 | .append(',')
|
---|
93 | .append(COORD_FORMATTER.format(coord.lon()))
|
---|
94 | .append(')');
|
---|
95 | return sb.toString();
|
---|
96 | }
|
---|
97 |
|
---|
98 | protected static String deletedStateToString(Boolean deleted) {
|
---|
99 | if (deleted == null)
|
---|
100 | return tr("(none)");
|
---|
101 | if (deleted)
|
---|
102 | return tr("deleted");
|
---|
103 | else
|
---|
104 | return tr("not deleted");
|
---|
105 | }
|
---|
106 |
|
---|
107 | protected static String referrersToString(List<OsmPrimitive> referrers) {
|
---|
108 | if (referrers.isEmpty())
|
---|
109 | return tr("(none)");
|
---|
110 | StringBuilder str = new StringBuilder("<html>");
|
---|
111 | for (OsmPrimitive r: referrers) {
|
---|
112 | str.append(Utils.escapeReservedCharactersHTML(r.getDisplayName(DefaultNameFormatter.getInstance()))).append("<br>");
|
---|
113 | }
|
---|
114 | str.append("</html>");
|
---|
115 | return str.toString();
|
---|
116 | }
|
---|
117 |
|
---|
118 | protected void updateCoordinates() {
|
---|
119 | lblMyCoordinates.setText(coordToString(model.getMyCoords()));
|
---|
120 | lblMergedCoordinates.setText(coordToString(model.getMergedCoords()));
|
---|
121 | lblTheirCoordinates.setText(coordToString(model.getTheirCoords()));
|
---|
122 | if (!model.hasCoordConflict()) {
|
---|
123 | lblMyCoordinates.setBackground(ConflictColors.BGCOLOR_NO_CONFLICT.get());
|
---|
124 | lblMergedCoordinates.setBackground(ConflictColors.BGCOLOR_NO_CONFLICT.get());
|
---|
125 | lblTheirCoordinates.setBackground(ConflictColors.BGCOLOR_NO_CONFLICT.get());
|
---|
126 | } else {
|
---|
127 | if (!model.isDecidedCoord()) {
|
---|
128 | lblMyCoordinates.setBackground(ConflictColors.BGCOLOR_UNDECIDED.get());
|
---|
129 | lblMergedCoordinates.setBackground(ConflictColors.BGCOLOR_NO_CONFLICT.get());
|
---|
130 | lblTheirCoordinates.setBackground(ConflictColors.BGCOLOR_UNDECIDED.get());
|
---|
131 | } else {
|
---|
132 | lblMyCoordinates.setBackground(
|
---|
133 | model.isCoordMergeDecision(MergeDecisionType.KEEP_MINE)
|
---|
134 | ? ConflictColors.BGCOLOR_DECIDED.get() : ConflictColors.BGCOLOR_NO_CONFLICT.get()
|
---|
135 | );
|
---|
136 | lblMergedCoordinates.setBackground(ConflictColors.BGCOLOR_DECIDED.get());
|
---|
137 | lblTheirCoordinates.setBackground(
|
---|
138 | model.isCoordMergeDecision(MergeDecisionType.KEEP_THEIR)
|
---|
139 | ? ConflictColors.BGCOLOR_DECIDED.get() : ConflictColors.BGCOLOR_NO_CONFLICT.get()
|
---|
140 | );
|
---|
141 | }
|
---|
142 | }
|
---|
143 | }
|
---|
144 |
|
---|
145 | protected void updateDeletedState() {
|
---|
146 | lblMyDeletedState.setText(deletedStateToString(model.getMyDeletedState()));
|
---|
147 | lblMergedDeletedState.setText(deletedStateToString(model.getMergedDeletedState()));
|
---|
148 | lblTheirDeletedState.setText(deletedStateToString(model.getTheirDeletedState()));
|
---|
149 |
|
---|
150 | if (!model.hasDeletedStateConflict()) {
|
---|
151 | lblMyDeletedState.setBackground(ConflictColors.BGCOLOR_NO_CONFLICT.get());
|
---|
152 | lblMergedDeletedState.setBackground(ConflictColors.BGCOLOR_NO_CONFLICT.get());
|
---|
153 | lblTheirDeletedState.setBackground(ConflictColors.BGCOLOR_NO_CONFLICT.get());
|
---|
154 | } else {
|
---|
155 | if (!model.isDecidedDeletedState()) {
|
---|
156 | lblMyDeletedState.setBackground(ConflictColors.BGCOLOR_UNDECIDED.get());
|
---|
157 | lblMergedDeletedState.setBackground(ConflictColors.BGCOLOR_NO_CONFLICT.get());
|
---|
158 | lblTheirDeletedState.setBackground(ConflictColors.BGCOLOR_UNDECIDED.get());
|
---|
159 | } else {
|
---|
160 | lblMyDeletedState.setBackground(
|
---|
161 | model.isDeletedStateDecision(MergeDecisionType.KEEP_MINE)
|
---|
162 | ? ConflictColors.BGCOLOR_DECIDED.get() : ConflictColors.BGCOLOR_NO_CONFLICT.get()
|
---|
163 | );
|
---|
164 | lblMergedDeletedState.setBackground(ConflictColors.BGCOLOR_DECIDED.get());
|
---|
165 | lblTheirDeletedState.setBackground(
|
---|
166 | model.isDeletedStateDecision(MergeDecisionType.KEEP_THEIR)
|
---|
167 | ? ConflictColors.BGCOLOR_DECIDED.get() : ConflictColors.BGCOLOR_NO_CONFLICT.get()
|
---|
168 | );
|
---|
169 | }
|
---|
170 | }
|
---|
171 | }
|
---|
172 |
|
---|
173 | protected void updateReferrers() {
|
---|
174 | lblMyReferrers.setText(referrersToString(model.getMyReferrers()));
|
---|
175 | lblMyReferrers.setBackground(ConflictColors.BGCOLOR_NO_CONFLICT.get());
|
---|
176 | lblTheirReferrers.setText(referrersToString(model.getTheirReferrers()));
|
---|
177 | lblTheirReferrers.setBackground(ConflictColors.BGCOLOR_NO_CONFLICT.get());
|
---|
178 | }
|
---|
179 |
|
---|
180 | @Override
|
---|
181 | public void stateChanged(ChangeEvent e) {
|
---|
182 | updateCoordinates();
|
---|
183 | updateDeletedState();
|
---|
184 | updateReferrers();
|
---|
185 | }
|
---|
186 |
|
---|
187 | /**
|
---|
188 | * Returns properties merge model.
|
---|
189 | * @return properties merge model
|
---|
190 | */
|
---|
191 | public PropertiesMergeModel getModel() {
|
---|
192 | return model;
|
---|
193 | }
|
---|
194 |
|
---|
195 | private final class MergeDeletedStateRow extends AbstractMergePanel.MergeRow {
|
---|
196 | @Override
|
---|
197 | protected JComponent rowTitle() {
|
---|
198 | return new JLabel(tr("Deleted State:"));
|
---|
199 | }
|
---|
200 |
|
---|
201 | @Override
|
---|
202 | protected JComponent mineField() {
|
---|
203 | return lblMyDeletedState;
|
---|
204 | }
|
---|
205 |
|
---|
206 | @Override
|
---|
207 | protected JComponent mineButton() {
|
---|
208 | KeepMyDeletedStateAction actKeepMyDeletedState = new KeepMyDeletedStateAction();
|
---|
209 | model.addChangeListener(actKeepMyDeletedState);
|
---|
210 | JButton btnKeepMyDeletedState = new JButton(actKeepMyDeletedState);
|
---|
211 | btnKeepMyDeletedState.setName("button.keepmydeletedstate");
|
---|
212 | return btnKeepMyDeletedState;
|
---|
213 | }
|
---|
214 |
|
---|
215 | @Override
|
---|
216 | protected JComponent merged() {
|
---|
217 | return lblMergedDeletedState;
|
---|
218 | }
|
---|
219 |
|
---|
220 | @Override
|
---|
221 | protected JComponent theirsButton() {
|
---|
222 | KeepTheirDeletedStateAction actKeepTheirDeletedState = new KeepTheirDeletedStateAction();
|
---|
223 | model.addChangeListener(actKeepTheirDeletedState);
|
---|
224 | JButton btnKeepTheirDeletedState = new JButton(actKeepTheirDeletedState);
|
---|
225 | btnKeepTheirDeletedState.setName("button.keeptheirdeletedstate");
|
---|
226 | return btnKeepTheirDeletedState;
|
---|
227 | }
|
---|
228 |
|
---|
229 | @Override
|
---|
230 | protected JComponent theirsField() {
|
---|
231 | return lblTheirDeletedState;
|
---|
232 | }
|
---|
233 | }
|
---|
234 |
|
---|
235 | private final class MergeCoordinatesRow extends AbstractMergePanel.MergeRow {
|
---|
236 | @Override
|
---|
237 | protected JComponent rowTitle() {
|
---|
238 | return new JLabel(tr("Coordinates:"));
|
---|
239 | }
|
---|
240 |
|
---|
241 | @Override
|
---|
242 | protected JComponent mineField() {
|
---|
243 | return lblMyCoordinates;
|
---|
244 | }
|
---|
245 |
|
---|
246 | @Override
|
---|
247 | protected JComponent mineButton() {
|
---|
248 | KeepMyCoordinatesAction actKeepMyCoordinates = new KeepMyCoordinatesAction();
|
---|
249 | model.addChangeListener(actKeepMyCoordinates);
|
---|
250 | JButton btnKeepMyCoordinates = new JButton(actKeepMyCoordinates);
|
---|
251 | btnKeepMyCoordinates.setName("button.keepmycoordinates");
|
---|
252 | return btnKeepMyCoordinates;
|
---|
253 | }
|
---|
254 |
|
---|
255 | @Override
|
---|
256 | protected JComponent merged() {
|
---|
257 | return lblMergedCoordinates;
|
---|
258 | }
|
---|
259 |
|
---|
260 | @Override
|
---|
261 | protected JComponent theirsButton() {
|
---|
262 | KeepTheirCoordinatesAction actKeepTheirCoordinates = new KeepTheirCoordinatesAction();
|
---|
263 | model.addChangeListener(actKeepTheirCoordinates);
|
---|
264 | JButton btnKeepTheirCoordinates = new JButton(actKeepTheirCoordinates);
|
---|
265 | btnKeepTheirCoordinates.setName("button.keeptheircoordinates");
|
---|
266 | return btnKeepTheirCoordinates;
|
---|
267 | }
|
---|
268 |
|
---|
269 | @Override
|
---|
270 | protected JComponent theirsField() {
|
---|
271 | return lblTheirCoordinates;
|
---|
272 | }
|
---|
273 | }
|
---|
274 |
|
---|
275 | private abstract class AbstractUndecideRow<T extends AbstractAction & ChangeListener> extends AbstractMergePanel.MergeRow {
|
---|
276 | @Override
|
---|
277 | protected JComponent merged() {
|
---|
278 | // we add the undecide button below this text field
|
---|
279 | T actUndecideCoordinates = createAction();
|
---|
280 | model.addChangeListener(actUndecideCoordinates);
|
---|
281 | JButton button = new JButton(actUndecideCoordinates);
|
---|
282 | button.setName(getButtonName());
|
---|
283 | return button;
|
---|
284 | }
|
---|
285 |
|
---|
286 | protected abstract T createAction();
|
---|
287 |
|
---|
288 | protected abstract String getButtonName();
|
---|
289 |
|
---|
290 | @Override
|
---|
291 | protected void addConstraints(GBC constraints, int columnIndex) {
|
---|
292 | super.addConstraints(constraints, columnIndex);
|
---|
293 | constraints.fill(GBC.NONE);
|
---|
294 | }
|
---|
295 | }
|
---|
296 |
|
---|
297 | private final class UndecideCoordinatesRow extends AbstractUndecideRow<UndecideCoordinateConflictAction> {
|
---|
298 | @Override
|
---|
299 | protected UndecideCoordinateConflictAction createAction() {
|
---|
300 | return new UndecideCoordinateConflictAction();
|
---|
301 | }
|
---|
302 |
|
---|
303 | @Override
|
---|
304 | protected String getButtonName() {
|
---|
305 | return "button.undecidecoordinates";
|
---|
306 | }
|
---|
307 | }
|
---|
308 |
|
---|
309 | private final class UndecideDeletedStateRow extends AbstractUndecideRow<UndecideDeletedStateConflictAction> {
|
---|
310 | @Override
|
---|
311 | protected UndecideDeletedStateConflictAction createAction() {
|
---|
312 | return new UndecideDeletedStateConflictAction();
|
---|
313 | }
|
---|
314 |
|
---|
315 | @Override
|
---|
316 | protected String getButtonName() {
|
---|
317 | return "button.undecidedeletedstate";
|
---|
318 | }
|
---|
319 | }
|
---|
320 |
|
---|
321 | private final class VersionInfoRow extends AbstractMergePanel.MergeRowWithoutButton {
|
---|
322 | @Override
|
---|
323 | protected JComponent mineField() {
|
---|
324 | return mineVersionInfo;
|
---|
325 | }
|
---|
326 |
|
---|
327 | @Override
|
---|
328 | protected JComponent theirsField() {
|
---|
329 | return theirVersionInfo;
|
---|
330 | }
|
---|
331 | }
|
---|
332 |
|
---|
333 | private final class ReferrersRow extends AbstractMergePanel.MergeRow {
|
---|
334 | @Override
|
---|
335 | protected JComponent rowTitle() {
|
---|
336 | return new JLabel(tr("Referenced by:"));
|
---|
337 | }
|
---|
338 |
|
---|
339 | @Override
|
---|
340 | protected JComponent mineField() {
|
---|
341 | return lblMyReferrers;
|
---|
342 | }
|
---|
343 |
|
---|
344 | @Override
|
---|
345 | protected JComponent theirsField() {
|
---|
346 | return lblTheirReferrers;
|
---|
347 | }
|
---|
348 | }
|
---|
349 |
|
---|
350 | private final class EmptyFillRow extends AbstractMergePanel.MergeRow {
|
---|
351 | @Override
|
---|
352 | protected JComponent merged() {
|
---|
353 | return new JPanel();
|
---|
354 | }
|
---|
355 |
|
---|
356 | @Override
|
---|
357 | protected void addConstraints(GBC constraints, int columnIndex) {
|
---|
358 | super.addConstraints(constraints, columnIndex);
|
---|
359 | // fill to bottom
|
---|
360 | constraints.weighty = 1;
|
---|
361 | }
|
---|
362 | }
|
---|
363 |
|
---|
364 | class KeepMyCoordinatesAction extends AbstractAction implements ChangeListener {
|
---|
365 | KeepMyCoordinatesAction() {
|
---|
366 | putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeepmine"));
|
---|
367 | putValue(Action.SHORT_DESCRIPTION, tr("Keep my coordinates"));
|
---|
368 | }
|
---|
369 |
|
---|
370 | @Override
|
---|
371 | public void actionPerformed(ActionEvent e) {
|
---|
372 | model.decideCoordsConflict(MergeDecisionType.KEEP_MINE);
|
---|
373 | }
|
---|
374 |
|
---|
375 | @Override
|
---|
376 | public void stateChanged(ChangeEvent e) {
|
---|
377 | setEnabled(model.hasCoordConflict() && !model.isDecidedCoord() && model.getMyCoords() != null);
|
---|
378 | }
|
---|
379 | }
|
---|
380 |
|
---|
381 | class KeepTheirCoordinatesAction extends AbstractAction implements ChangeListener {
|
---|
382 | KeepTheirCoordinatesAction() {
|
---|
383 | putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeeptheir"));
|
---|
384 | putValue(Action.SHORT_DESCRIPTION, tr("Keep their coordinates"));
|
---|
385 | }
|
---|
386 |
|
---|
387 | @Override
|
---|
388 | public void actionPerformed(ActionEvent e) {
|
---|
389 | model.decideCoordsConflict(MergeDecisionType.KEEP_THEIR);
|
---|
390 | }
|
---|
391 |
|
---|
392 | @Override
|
---|
393 | public void stateChanged(ChangeEvent e) {
|
---|
394 | setEnabled(model.hasCoordConflict() && !model.isDecidedCoord() && model.getTheirCoords() != null);
|
---|
395 | }
|
---|
396 | }
|
---|
397 |
|
---|
398 | class UndecideCoordinateConflictAction extends AbstractAction implements ChangeListener {
|
---|
399 | UndecideCoordinateConflictAction() {
|
---|
400 | putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagundecide"));
|
---|
401 | putValue(Action.SHORT_DESCRIPTION, tr("Undecide conflict between different coordinates"));
|
---|
402 | }
|
---|
403 |
|
---|
404 | @Override
|
---|
405 | public void actionPerformed(ActionEvent e) {
|
---|
406 | model.decideCoordsConflict(MergeDecisionType.UNDECIDED);
|
---|
407 | }
|
---|
408 |
|
---|
409 | @Override
|
---|
410 | public void stateChanged(ChangeEvent e) {
|
---|
411 | setEnabled(model.hasCoordConflict() && model.isDecidedCoord());
|
---|
412 | }
|
---|
413 | }
|
---|
414 |
|
---|
415 | class KeepMyDeletedStateAction extends AbstractAction implements ChangeListener {
|
---|
416 | KeepMyDeletedStateAction() {
|
---|
417 | putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeepmine"));
|
---|
418 | putValue(Action.SHORT_DESCRIPTION, tr("Keep my deleted state"));
|
---|
419 | }
|
---|
420 |
|
---|
421 | @Override
|
---|
422 | public void actionPerformed(ActionEvent e) {
|
---|
423 | model.decideDeletedStateConflict(MergeDecisionType.KEEP_MINE);
|
---|
424 | }
|
---|
425 |
|
---|
426 | @Override
|
---|
427 | public void stateChanged(ChangeEvent e) {
|
---|
428 | setEnabled(model.hasDeletedStateConflict() && !model.isDecidedDeletedState());
|
---|
429 | }
|
---|
430 | }
|
---|
431 |
|
---|
432 | class KeepTheirDeletedStateAction extends AbstractAction implements ChangeListener {
|
---|
433 | KeepTheirDeletedStateAction() {
|
---|
434 | putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeeptheir"));
|
---|
435 | putValue(Action.SHORT_DESCRIPTION, tr("Keep their deleted state"));
|
---|
436 | }
|
---|
437 |
|
---|
438 | @Override
|
---|
439 | public void actionPerformed(ActionEvent e) {
|
---|
440 | model.decideDeletedStateConflict(MergeDecisionType.KEEP_THEIR);
|
---|
441 | }
|
---|
442 |
|
---|
443 | @Override
|
---|
444 | public void stateChanged(ChangeEvent e) {
|
---|
445 | setEnabled(model.hasDeletedStateConflict() && !model.isDecidedDeletedState());
|
---|
446 | }
|
---|
447 | }
|
---|
448 |
|
---|
449 | class UndecideDeletedStateConflictAction extends AbstractAction implements ChangeListener {
|
---|
450 | UndecideDeletedStateConflictAction() {
|
---|
451 | putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagundecide"));
|
---|
452 | putValue(Action.SHORT_DESCRIPTION, tr("Undecide conflict between deleted state"));
|
---|
453 | }
|
---|
454 |
|
---|
455 | @Override
|
---|
456 | public void actionPerformed(ActionEvent e) {
|
---|
457 | model.decideDeletedStateConflict(MergeDecisionType.UNDECIDED);
|
---|
458 | }
|
---|
459 |
|
---|
460 | @Override
|
---|
461 | public void stateChanged(ChangeEvent e) {
|
---|
462 | setEnabled(model.hasDeletedStateConflict() && model.isDecidedDeletedState());
|
---|
463 | }
|
---|
464 | }
|
---|
465 |
|
---|
466 | @Override
|
---|
467 | public void deletePrimitive(boolean deleted) {
|
---|
468 | if (deleted) {
|
---|
469 | if (model.getMergedCoords() == null) {
|
---|
470 | model.decideCoordsConflict(MergeDecisionType.KEEP_MINE);
|
---|
471 | }
|
---|
472 | } else {
|
---|
473 | model.decideCoordsConflict(MergeDecisionType.UNDECIDED);
|
---|
474 | }
|
---|
475 | }
|
---|
476 |
|
---|
477 | @Override
|
---|
478 | public void populate(Conflict<? extends OsmPrimitive> conflict) {
|
---|
479 | model.populate(conflict);
|
---|
480 | mineVersionInfo.update(conflict.getMy(), true);
|
---|
481 | theirVersionInfo.update(conflict.getTheir(), false);
|
---|
482 | }
|
---|
483 |
|
---|
484 | @Override
|
---|
485 | public void decideRemaining(MergeDecisionType decision) {
|
---|
486 | if (!model.isDecidedCoord()) {
|
---|
487 | model.decideDeletedStateConflict(decision);
|
---|
488 | }
|
---|
489 | if (!model.isDecidedCoord()) {
|
---|
490 | model.decideCoordsConflict(decision);
|
---|
491 | }
|
---|
492 | }
|
---|
493 | }
|
---|