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

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @6264   12 years Don-vip Sonar/FindBugs - Performance - Method concatenates strings using + in …
(edit) @6084   12 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
(edit) @5481   13 years stoecker some cleanup, mainly javadoc
(edit) @5266   13 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
(edit) @4310   14 years stoecker fix #6680, fix #6677 - i18n issues
(edit) @4162   14 years stoecker fix #4140 - make colors in conflict dialog configurable
(edit) @4116   14 years stoecker fix #4564 - conflict manager: highlight conflict on properties
(edit) @4115   14 years stoecker fix #4564 - conflict manager: highlight conflict on properties
(edit) @3786   15 years Upliner remove OperationCancelledException class which is unused since [3362]
(edit) @3408   15 years jttt Show only actions that can work on all selected layers in …
(edit) @3362   15 years stoecker fix #5182 - Conflict system simplification - patch by Upliner
(edit) @3218   15 years stoecker typos, close #4989 - patch by mikalaari
(edit) @3083   16 years bastiK added svn:eol-style=native to source files
(edit) @3061   16 years jttt Fix #4612 delete members while relation dialog is open leads to data …
(edit) @3034   16 years jttt Fix #4467 Don't silently drop locally deleted member primitives from …
(edit) @2945   16 years jttt Improvements in conflicts gui
(edit) @2940   16 years mjulius display list of referrers in ConflictResolutionDialog
(edit) @2938   16 years jttt Addition to #4408 (don't require to merge coordinates after primitive …
(edit) @2936   16 years jttt Fixed #4408 confict manager: do not have to solve tag- and …
(edit) @2846   16 years mjulius fix messages for gui/conflict
(edit) @2612   16 years mjulius Fixes #4083 - exception when copying relation with incomplete node …
(edit) @2512   16 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2273   16 years jttt Replace testing for id <= 0 with isNew() method
(edit) @2181   16 years stoecker lots of i18n fixes
(edit) @2070   16 years Gubaer new: rewrite of CombineWay action new: conflict resolution dialog for …
(edit) @2017   16 years Gubaer removed OptionPaneUtil cleanup of deprecated Layer API cleanup of …
(edit) @1989   16 years Gubaer fixed #3281: OsmPrimitiveType fails for fusional and/or agglutinative …
(copy) @1954   16 years Gubaer Moved package org.openstreetmap.josm.gui.conflict to …
copied from trunk/src/org/openstreetmap/josm/gui/conflict/properties
(edit) @1938   16 years jttt Replace some occurrences of RelationMember.member with getters
Note: See TracRevisionLog for help on using the revision log.