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

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @8510   9 years Don-vip checkstyle: enable relevant whitespace checks and fix them
(edit) @8470   9 years Don-vip javadoc fixes. Removed one duplicated method in exception handling
(edit) @8444   9 years Don-vip remove extra whitespaces
(edit) @8399   9 years Don-vip see #11397, see #11447 - partial revert of r8308 (SONARJAVA-1061: FP …
(edit) @8390   9 years Don-vip Sonar - various performance improvements
(edit) @8388   9 years Don-vip performance - use of EnumMap / EnumSet
(edit) @8379   9 years Don-vip Consecutively calls to StringBuffer/StringBuilder .append should reuse …
(edit) @8375   9 years Don-vip code style - Method stores return result in local before immediately …
(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) @8291   9 years Don-vip fix squid:RedundantThrowsDeclarationCheck + consistent Javadoc for …
(edit) @7864   9 years Don-vip global cleanup of IllegalArgumentExceptions thrown by JOSM
(edit) @7017   10 years Don-vip see #8465 - fix easy compilation warnings
(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) @6830   10 years Don-vip javadoc fixes for jdk8 compatibility
(edit) @6822   10 years bastiK see #8902 - Small performance enhancements / coding style (patch by …
(edit) @6524   10 years Don-vip global use of Utils.joinAsHtmlUnorderedList()
(edit) @6317   11 years Don-vip Sonar/FindBugs - Loose coupling
(edit) @6316   11 years Don-vip Sonar/FindBugs - Loose coupling
(edit) @6248   11 years Don-vip Rework console output: - new log level "error" - Replace nearly all …
(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) @5903   11 years stoecker fix javadoc
(edit) @5335   12 years Don-vip fix #7855 - conflict dialog: CCE selecting a way in members tab
(edit) @5301   12 years Don-vip fix #4493, fix #7750 - conflict manager: select and zoom primitives …
(edit) @5298   12 years Don-vip see #4899, see #7266, see #7333: Resolved NPE in conflict manager when …
(edit) @5297   12 years Don-vip fix #4493, fix #7750: conflict dialog, nodes and members tab: allow …
(edit) @5266   12 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
(edit) @4191   13 years stoecker remove old debug stuff
(edit) @3995   13 years mjulius fix #3590 - Primitives or objects: Pick one
(edit) @3766   13 years stoecker fix help
(edit) @3530   14 years stoecker fix array preferences
(edit) @3083   14 years bastiK added svn:eol-style=native to source files
(edit) @3025   14 years jttt Fix tests
(edit) @2983   14 years Gubaer see #4054: Improving user feedback when trying to merge a deleted …
(edit) @2949   14 years jttt Show only one message box in conflicts dialog when multiple members …
(edit) @2945   14 years jttt Improvements in conflicts gui
(edit) @2936   14 years jttt Fixed #4408 confict manager: do not have to solve tag- and …
(edit) @2881   14 years jttt Fixed #4412 after confict management: selecting a relation does not …
(edit) @2846   14 years mjulius fix messages for gui/conflict
(edit) @2569   15 years Gubaer fixed #3684: Add "chunked" upload mode Removed support for API "0.5" …
(edit) @2512   15 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2181   15 years stoecker lots of i18n fixes
(edit) @2039   15 years Gubaer applied #3377: patch by xeen: Less warnings for JOSM
(copy) @1954   15 years Gubaer Moved package org.openstreetmap.josm.gui.conflict to …
copied from trunk/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java
(edit) @1650   15 years Gubaer added concept of "merge pairs" (my vs. merged, my vs. their, their vs. …
Note: See TracRevisionLog for help on using the revision log.