source: josm/trunk/test/unit/org/openstreetmap/josm/gui/conflict

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @8513   7 years Don-vip checkstyle: blocks
(edit) @8511   7 years Don-vip checkstyle: modifiers order
(edit) @8510   7 years Don-vip checkstyle: enable relevant whitespace checks and fix them
(edit) @8509   7 years Don-vip fix many checkstyle violations
(edit) @8450   7 years Don-vip unit tests - simplify assertions
(edit) @8391   7 years Don-vip fix unit tests
(edit) @7937   8 years bastiK add subversion property svn:eol=native
(edit) @7088   8 years Don-vip more fixes in unit tests
(edit) @7081   8 years Don-vip fixes for unit tests
(edit) @7005   8 years Don-vip see #8465 - use diamond operator where applicable
(edit) @6881   9 years Don-vip javadoc/code style/minor refactorization
(edit) @6471   9 years Don-vip Sonar - remove warnings related to the static preferences …
(edit) @5556   10 years Don-vip see #8172 - fix JUnit tests
(edit) @5299   10 years Don-vip conflict dialog: better display of empty rows in members tab, like …
(edit) @4126   11 years bastiK memory optimizations for Node & WayPoint (Patch by Gubaer, modified) …
(edit) @3577   12 years jttt Fix tests
(edit) @3095   13 years jttt Changes in multipolygon handling (see #4661), cosmetics
(edit) @3034   13 years jttt Fix #4467 Don't silently drop locally deleted member primitives from …
(edit) @3025   13 years jttt Fix tests
(edit) @2990   13 years jttt Fix some eclipse warnings
(edit) @2676   13 years jttt Fix some of the warnings found by FindBugs
(edit) @2626   13 years jttt Fixed some of the warnings found by FindBugs
(edit) @2620   13 years jttt Remove OsmPrimitive.setIncomplete()
(edit) @2578   13 years jttt Encalupse OsmPrimitive.incomplete
(edit) @2077   13 years Gubaer Had to replace DataSet:getPrimitiveById(id) with …
(edit) @1954   13 years Gubaer Moved package org.openstreetmap.josm.gui.conflict to …
(edit) @1910   13 years jttt Way refactoring - finish replacing Way.nodes with the new api
(edit) @1703   13 years Gubaer added test cases
(edit) @1654   13 years Gubaer added merge support for coordinate conflicts added merge support for …
(edit) @1650   13 years Gubaer added concept of "merge pairs" (my vs. merged, my vs. their, their vs. …
(edit) @1631   13 years Gubaer added support for merging member lists of relations in extended …
(add) @1622   13 years Gubaer first version of extended conflict resolution dialog.
Note: See TracRevisionLog for help on using the revision log.