source: josm/trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @6093   11 years akks see #8902 - collection size ==/!= 0 -> isEmpty()/!isEmpty() (patch by …
(edit) @6084   11 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
(edit) @6070   11 years stoecker see #8853 remove tabs, trailing spaces, windows line ends, strange …
(edit) @5998   11 years Don-vip fix #8775 - IllegalComponentStateException when remembering position …
(edit) @5988   11 years Don-vip fix EDT violations observed while merging nodes
(edit) @5792   11 years Don-vip code style - fix non-static access to static member
(edit) @5700   11 years stoecker remove hardcoded created_by
(edit) @5400   12 years Don-vip fix #7925 - tag conflict dialog shows wrong information in title
(edit) @5266   12 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
(edit) @5132   12 years simon04 fix #7513 - Warn non-experts when combining ways with conflicting tags …
(edit) @4310   13 years stoecker fix #6680, fix #6677 - i18n issues
(edit) @3719   13 years bastiK added missing license information
(edit) @3501   14 years bastiK fixed #4632 - Button Help puts help window under main window
(edit) @3083   14 years bastiK added svn:eol-style=native to source files
(edit) @2996   14 years jttt Fix #4406 tags disapear: merging node with ID:0 and tag to existing …
(edit) @2779   14 years mjulius fixes #4253 - Combine way conflict dialog - check box for "Show tags …
(edit) @2712   14 years mjulius fixes #4252 - Handling relations of way combining unintuitive For both …
(edit) @2626   14 years jttt Fixed some of the warnings found by FindBugs
(edit) @2512   15 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2326   15 years Gubaer Slightly improved dialogs for way combining and node merging. Added …
(edit) @2220   15 years Gubaer fixed #3556: False positive conflicts when merging nodes fixed #3460: …
(edit) @2157   15 years Gubaer fixed #3534: Merge dialog "remembers" old relations
(edit) @2104   15 years Gubaer fixed #3402: Conflict in created_by when merging nodes or ways …
(edit) @2099   15 years Gubaer added auto completion to combine way dialog fixed #3461: Value …
(copy) @2095   15 years Gubaer rewrite of MergeNodesAction new: new conflict resolution dialog for …
copied from trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombineWaysConflictResolverDialog.java
(add) @2070   15 years Gubaer new: rewrite of CombineWay action new: conflict resolution dialog for …
Note: See TracRevisionLog for help on using the revision log.