Changeset 6890 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
- Timestamp:
- 2014-02-27T02:50:12+01:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
r6887 r6890 86 86 * loads the required icons 87 87 */ 88 protected void loadIcons() {88 protected final void loadIcons() { 89 89 mergeComplete = ImageProvider.get("dialogs", "valid.png" ); 90 90 mergeIncomplete = ImageProvider.get("dialogs/conflict", "mergeincomplete.png" ); … … 94 94 * builds the UI 95 95 */ 96 protected void build() {96 protected final void build() { 97 97 tabbedPane = new JTabbedPane(); 98 98
Note:
See TracChangeset
for help on using the changeset viewer.