source: josm/trunk/src/org/openstreetmap/josm/data/conflict

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @10662   8 years Don-vip see #12472, fix #13230, fix #13225, fix #13228 - disable …
(edit) @10659   8 years Don-vip see #12472 - fix more warnings, increase maximum number of reported …
(edit) @10657   8 years Don-vip see #11390, see #12890 - use Java 8 Predicates
(edit) @10378   9 years Don-vip Checkstyle 6.19: enable SingleSpaceSeparator and fix violations
(edit) @9371   9 years simon04 Java 7: use Objects.equals and Objects.hash
(edit) @9239   9 years Don-vip javadoc update
(edit) @9230   9 years Don-vip fix javadoc errors/warnings
(edit) @9067   9 years Don-vip sonar - Immutable Field
(edit) @9059   9 years Don-vip checkstyle
(edit) @8846   9 years Don-vip sonar - fb-contrib - minor performance improvements: * Method passes …
(edit) @8836   9 years Don-vip fix Checkstyle issues
(edit) @8512   10 years Don-vip checkstyle: redundant modifiers
(edit) @8510   10 years Don-vip checkstyle: enable relevant whitespace checks and fix them
(edit) @8465   10 years Don-vip minor code style issues
(edit) @8456   10 years Don-vip see #11508 - override hashCode() and equals() in other commands as well
(edit) @8338   10 years Don-vip fix squid:S1319 - Declarations should use Java collection interfaces …
(edit) @8291   10 years Don-vip fix squid:RedundantThrowsDeclarationCheck + consistent Javadoc for …
(edit) @7509   10 years stoecker remove tabs
(edit) @7005   11 years Don-vip see #8465 - use diamond operator where applicable
(edit) @6555   11 years Don-vip fix #4183 - split number of conflicts in conflict-list header …
(edit) @6313   11 years Don-vip cosmetics in error reporting
(edit) @6175   11 years Don-vip see #8902 - Small performance enhancements / coding style (patches by …
(edit) @6104   11 years Don-vip see #8902 - Small performance enhancements / coding style (patch by …
(edit) @6084   11 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
(edit) @6069   12 years stoecker see #8853 remove tabs, trailing spaces, windows line ends, strange …
(edit) @5909   12 years stoecker fix all remaining javadoc warnings
(edit) @5298   13 years Don-vip see #4899, see #7266, see #7333: Resolved NPE in conflict manager when …
(edit) @5266   13 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
(edit) @3530   14 years stoecker fix array preferences
(edit) @3083   15 years bastiK added svn:eol-style=native to source files
(edit) @3034   15 years jttt Fix #4467 Don't silently drop locally deleted member primitives from …
(edit) @2979   15 years Gubaer fixed #4386: "There are unsolved conflicts in layer X" holds up any …
(edit) @2949   15 years jttt Show only one message box in conflicts dialog when multiple members …
(edit) @2915   15 years stoecker close #4458 - text fixes - patch by Andre
(edit) @2881   15 years jttt Fixed #4412 after confict management: selecting a relation does not …
(edit) @2845   15 years mjulius fix messages for data
(edit) @2655   15 years jttt Fixed #4161 Major slowdown in recent versions, used correct pattern …
(edit) @2512   15 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2381   15 years jttt Change most occurrences of Dataset.nodes/ways/relations with …
(edit) @2198   15 years Gubaer fixed #3249: Resolve conflicts between invisible and deleted …
(edit) @2181   15 years stoecker lots of i18n fixes
(edit) @2017   15 years Gubaer removed OptionPaneUtil cleanup of deprecated Layer API cleanup of …
(edit) @1911   15 years Gubaer fixed #3193: No layer is left highlighted when the bottom most one is …
(edit) @1857   15 years Gubaer replaced JOptionDialog.show... by OptionPaneUtil.show.... improved …
(add) @1750   16 years Gubaer new: replaced global conflict list by conflict list per layer, similar …
Note: See TracRevisionLog for help on using the revision log.