Changeset 5288 in josm


Ignore:
Timestamp:
2012-06-20T23:03:18+02:00 (7 years ago)
Author:
Don-vip
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

    r5266 r5288  
    254254        }
    255255        updateResolvedCompletely();
     256        selectFirstTabWithConflicts();
     257    }
     258   
     259    public void selectFirstTabWithConflicts() {
     260        for (int i = 0; i < tabbedPane.getTabCount(); i++) {
     261            if (tabbedPane.isEnabledAt(i) && mergeIncomplete.equals(tabbedPane.getIconAt(i))) {
     262                tabbedPane.setSelectedIndex(i);
     263                break;
     264            }
     265        }
    256266    }
    257267
Note: See TracChangeset for help on using the changeset viewer.