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

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @8390   9 years Don-vip Sonar - various performance improvements
(edit) @8308   9 years Don-vip fix potential NPEs and Sonar issues related to serialization
(edit) @6890   10 years Don-vip fix some Sonar issues (Constructor Calls Overridable Method)
(edit) @6792   10 years Don-vip Sonar - fix various issues
(edit) @6267   11 years Don-vip Sonar/FindBugs - Replace singular fields by local variables
(edit) @6264   11 years Don-vip Sonar/FindBugs - Performance - Method concatenates strings using + in …
(edit) @6084   11 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
(edit) @5266   12 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
(edit) @4310   13 years stoecker fix #6680, fix #6677 - i18n issues
(edit) @4162   13 years stoecker fix #4140 - make colors in conflict dialog configurable
(edit) @3362   14 years stoecker fix #5182 - Conflict system simplification - patch by Upliner
(edit) @3218   14 years stoecker typos, close #4989 - patch by mikalaari
(edit) @3083   14 years bastiK added svn:eol-style=native to source files
(edit) @3034   14 years jttt Fix #4467 Don't silently drop locally deleted member primitives from …
(edit) @2945   14 years jttt Improvements in conflicts gui
(edit) @2940   14 years mjulius display list of referrers in ConflictResolutionDialog
(edit) @2938   14 years jttt Addition to #4408 (don't require to merge coordinates after primitive …
(edit) @2936   14 years jttt Fixed #4408 confict manager: do not have to solve tag- and …
(edit) @2612   14 years mjulius Fixes #4083 - exception when copying relation with incomplete node …
(edit) @2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2070   15 years Gubaer new: rewrite of CombineWay action new: conflict resolution dialog for …
(edit) @2017   15 years Gubaer removed OptionPaneUtil cleanup of deprecated Layer API cleanup of …
(edit) @1989   15 years Gubaer fixed #3281: OsmPrimitiveType fails for fusional and/or agglutinative …
(copy) @1954   15 years Gubaer Moved package org.openstreetmap.josm.gui.conflict to …
copied from trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java
(edit) @1847   15 years Gubaer replaced calls to JOptionPane.* by calls to OptionPaneUtil.*
Note: See TracRevisionLog for help on using the revision log.