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) @11606   7 years Don-vip fix #14374 - automatic tag conflict resolution of source for French …
(edit) @10791   8 years simon04 see #13319 - Use InputMapUtils where applicable (VK_ESCAPE)
(edit) @10762   8 years Don-vip sonar - squid:UselessParenthesesCheck
(edit) @10638   8 years Don-vip see #11390, fix #13206 - Migrate Function interface to java 8 (patch …
(edit) @10611   8 years Don-vip see #11390 - sonar - squid:S1604 - Java 8: Anonymous inner classes …
(edit) @10527   8 years Don-vip fix #12994 - Old style SideButton usage errors
(edit) @10369   8 years stoecker see #9995 - patch by strump - improve HIDPI
(edit) @10357   8 years stoecker see #9995, see #10684 - remove more hardcoded places of images
(edit) @10179   8 years Don-vip sonar - squid:AssignmentInSubExpressionCheck - Assignments should not …
(edit) @10035   8 years Don-vip code refactoring to ease creation of unit tests by avoiding as much as …
(edit) @9473   8 years simon04 fix #12343 - Display at most 20 primitives for some confirmation …
(edit) @9211   8 years Don-vip fix #12252 - combine dialog: add minimum size and better initial …
(edit) @9193   8 years simon04 see #12091 - Increase default sizes of conflict dialogs
(edit) @8974   9 years simon04 fix #12047 - Closing CombinePrimitiveResolverDialog does not abort the …
(edit) @8947   9 years Don-vip fix HeadlessException seen in unit tests
(edit) @8919   9 years Don-vip move UserCancelException class in tools package and use it where …
(edit) @8871   9 years simon04 fix #10018 fix #11945 - Improve relation member conflict resolution …
(edit) @8836   9 years Don-vip fix Checkstyle issues
(edit) @8540   9 years Don-vip fix remaining checkstyle issues
(edit) @8510   9 years Don-vip checkstyle: enable relevant whitespace checks and fix them
(edit) @8509   9 years Don-vip fix many checkstyle violations
(edit) @8373   9 years Don-vip code style - Method makes literal string comparisons passing the …
(edit) @8338   9 years Don-vip fix squid:S1319 - Declarations should use Java collection interfaces …
(edit) @8308   9 years Don-vip fix potential NPEs and Sonar issues related to serialization
(edit) @8126   9 years Don-vip fix Sonar issue squid:S2444 - Lazy initialization of "static" fields …
(edit) @7674   10 years Don-vip code refactoring to avoid hacks in merge-overlap plugin
(edit) @7661   10 years Don-vip see #10668 - code refactoring to avoid hacks in merge-overlap plugin
(edit) @7129   10 years simon04 see #10018 - Avoid broken relations after combining ways
(edit) @7005   10 years Don-vip see #8465 - use diamond operator where applicable
(edit) @6890   10 years Don-vip fix some Sonar issues (Constructor Calls Overridable Method)
(edit) @6889   10 years Don-vip fix some Sonar issues (JLS order)
(edit) @6802   10 years simon04 fix #9655 - Merge operations loosing tags (regression of r6770) …
(edit) @6770   10 years simon04 see #9104 - Do not suggest to combine conflicting values in order to …
(edit) @6679   10 years stoecker see #9110 - fix singular forms, even if they are useless
(edit) @6507   10 years simon04 fix #9110 - i18n: fix errors in usage of plural forms
(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   14 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.