Changeset 5288 in josm for trunk/src

Timestamp:

2012-06-20T23:03:18+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7601 - Conflicts dialog is now opened at the first tab showing a conflict

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

@@ -254 +254 @@
         }
         updateResolvedCompletely();
+        selectFirstTabWithConflicts();
+    }
+    
+    public void selectFirstTabWithConflicts() {
+        for (int i = 0; i < tabbedPane.getTabCount(); i++) {
+            if (tabbedPane.isEnabledAt(i) && mergeIncomplete.equals(tabbedPane.getIconAt(i))) {
+                tabbedPane.setSelectedIndex(i);
+                break;
+            }
+        }
     }