Changeset 9468 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair

Timestamp:

2016-01-15T19:01:02+01:00 (8 years ago)

Author:

simon04

Message:

fix #8804 - Add version info to conflict dialog

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (modified) (20 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

@@ -27 +27 @@
 import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
+import org.openstreetmap.josm.gui.history.VersionInfoPanel;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -48 +49 @@
 
     private final transient PropertiesMergeModel model;
+    private final VersionInfoPanel mineVersionInfo = new VersionInfoPanel();
+    private final VersionInfoPanel theirVersionInfo = new VersionInfoPanel();
 
     /**
@@ -78 +81 @@
         gc.weightx = 0.0;
         gc.weighty = 0.0;
-        gc.insets = new Insets(10, 0, 10, 0);
+        gc.insets = new Insets(10, 0, 0, 0);
         JLabel lblMyVersion = new JLabel(tr("My version"));
         lblMyVersion.setToolTipText(tr("Properties in my dataset, i.e. the local dataset"));
@@ -84 +87 @@
 
         gc.gridx = 3;
-        gc.gridy = 0;
         JLabel lblMergedVersion = new JLabel(tr("Merged version"));
         lblMergedVersion.setToolTipText(
@@ -91 +93 @@
 
         gc.gridx = 5;
-        gc.gridy = 0;
         JLabel lblTheirVersion = new JLabel(tr("Their version"));
         lblTheirVersion.setToolTipText(tr("Properties in their dataset, i.e. the server dataset"));
         add(lblTheirVersion, gc);
+
+        gc.gridx = 1;
+        gc.gridy = 1;
+        gc.fill = GridBagConstraints.HORIZONTAL;
+        gc.anchor = GridBagConstraints.LINE_START;
+        gc.insets = new Insets(0, 0, 20, 0);
+        add(mineVersionInfo, gc);
+
+        gc.gridx = 5;
+        add(theirVersionInfo, gc);
+
     }
 
@@ -101 +113 @@
 
         gc.gridx = 0;
-        gc.gridy = 1;
+        gc.gridy = 2;
         gc.gridwidth = 1;
         gc.gridheight = 1;
@@ -112 +124 @@
 
         gc.gridx = 1;
-        gc.gridy = 1;
         gc.fill = GridBagConstraints.BOTH;
         gc.anchor = GridBagConstraints.CENTER;
@@ -120 +131 @@
 
         gc.gridx = 2;
-        gc.gridy = 1;
         gc.fill = GridBagConstraints.NONE;
         gc.anchor = GridBagConstraints.CENTER;
@@ -132 +142 @@
 
         gc.gridx = 3;
-        gc.gridy = 1;
         gc.fill = GridBagConstraints.BOTH;
         gc.anchor = GridBagConstraints.CENTER;
@@ -140 +149 @@
 
         gc.gridx = 4;
-        gc.gridy = 1;
         gc.fill = GridBagConstraints.NONE;
         gc.anchor = GridBagConstraints.CENTER;
@@ -151 +159 @@
 
         gc.gridx = 5;
-        gc.gridy = 1;
         gc.fill = GridBagConstraints.BOTH;
         gc.anchor = GridBagConstraints.CENTER;
@@ -160 +167 @@
         // ---------------------------------------------------
         gc.gridx = 3;
-        gc.gridy = 2;
+        gc.gridy = 3;
         gc.fill = GridBagConstraints.NONE;
         gc.anchor = GridBagConstraints.CENTER;
@@ -175 +182 @@
 
         gc.gridx = 0;
-        gc.gridy = 3;
+        gc.gridy = 4;
         gc.gridwidth = 1;
         gc.gridheight = 1;
@@ -186 +193 @@
 
         gc.gridx = 1;
-        gc.gridy = 3;
         gc.fill = GridBagConstraints.BOTH;
         gc.anchor = GridBagConstraints.CENTER;
@@ -194 +200 @@
 
         gc.gridx = 2;
-        gc.gridy = 3;
         gc.fill = GridBagConstraints.NONE;
         gc.anchor = GridBagConstraints.CENTER;
@@ -206 +211 @@
 
         gc.gridx = 3;
-        gc.gridy = 3;
         gc.fill = GridBagConstraints.BOTH;
         gc.anchor = GridBagConstraints.CENTER;
@@ -214 +218 @@
 
         gc.gridx = 4;
-        gc.gridy = 3;
         gc.fill = GridBagConstraints.NONE;
         gc.anchor = GridBagConstraints.CENTER;
@@ -226 +229 @@
 
         gc.gridx = 5;
-        gc.gridy = 3;
         gc.fill = GridBagConstraints.BOTH;
         gc.anchor = GridBagConstraints.CENTER;
@@ -235 +237 @@
         // ---------------------------------------------------
         gc.gridx = 3;
-        gc.gridy = 4;
+        gc.gridy = 5;
         gc.fill = GridBagConstraints.NONE;
         gc.anchor = GridBagConstraints.CENTER;
@@ -507 +509 @@
     public void populate(Conflict<? extends OsmPrimitive> conflict) {
         model.populate(conflict);
+        mineVersionInfo.update(conflict.getMy(), true);
+        theirVersionInfo.update(conflict.getTheir(), false);
     }