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

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @9192   8 years simon04 fix #12091 - Merging of nodes show conflict in case that one node is …
(edit) @9143   8 years Don-vip fix #12217 - conflict resolver does not update apply button after …
(edit) @9078   8 years Don-vip sonar - Immutable Field
(edit) @9059   8 years Don-vip checkstyle
(edit) @8974   8 years simon04 fix #12047 - Closing CombinePrimitiveResolverDialog does not abort the …
(edit) @8947   8 years Don-vip fix HeadlessException seen in unit tests
(edit) @8919   8 years Don-vip move UserCancelException class in tools package and use it where …
(edit) @8880   9 years Don-vip checkstyle + remove call to org.hamcrest.CoreMatchers.is (generating …
(edit) @8871   9 years simon04 fix #10018 fix #11945 - Improve relation member conflict resolution …
(edit) @8855   9 years Don-vip sonar - Unused private method should be removed sonar - Unused …
(edit) @8849   9 years Don-vip sonar - squid:S1643 - Strings should not be concatenated using '+' in …
(edit) @8840   9 years Don-vip sonar - squid:S3052 - Fields should not be initialized to default values
(edit) @8836   9 years Don-vip fix Checkstyle issues
(edit) @8785   9 years simon04 see #11852 - Disallow resolving null coordinate in conflict dialog
(edit) @8674   9 years Don-vip fix Checkstyle issues
(edit) @8540   9 years Don-vip fix remaining checkstyle issues
(edit) @8513   9 years Don-vip checkstyle: blocks
(edit) @8512   9 years Don-vip checkstyle: redundant modifiers
(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) @8470   9 years Don-vip javadoc fixes. Removed one duplicated method in exception handling
(edit) @8468   9 years Don-vip fix some minor sonar/code style issues: - Avoid Protected Field In …
(edit) @8465   9 years Don-vip minor code style issues
(edit) @8444   9 years Don-vip remove extra whitespaces
(edit) @8426   9 years Don-vip Accessibility - global use of JLabel.setLabelFor() + various fixes …
(edit) @8419   9 years Don-vip Sonar: various code style cleanup: - fix copyright - classes that …
(edit) @8413   9 years Don-vip code style - A close curly brace should be located at the beginning of …
(edit) @8401   9 years Don-vip fix some minor Sonar issues
(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) @8377   9 years Don-vip performance - remove useless boxing of boolean constants
(edit) @8375   9 years Don-vip code style - Method stores return result in local before immediately …
(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) @8332   9 years Don-vip fix various issues: - performance - inefficient use of keySet iterator …
(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) @8285   9 years Don-vip fix sonar squid:S2039 - Member variable visibility should be specified
(edit) @8126   9 years Don-vip fix Sonar issue squid:S2444 - Lazy initialization of "static" fields …
(edit) @8061   9 years bastiK see #11096 - strip .png
(edit) @8056   9 years bastiK fixed #11096 - png -> svg
(edit) @8047   9 years bastiK see #11096 - fix png -> svg
(edit) @8005   9 years Don-vip fix #11064 - disable undo/redo feature for table cell editors
(edit) @7937   9 years bastiK add subversion property svn:eol=native
(edit) @7864   9 years Don-vip global cleanup of IllegalArgumentExceptions thrown by JOSM
(edit) @7801   9 years Don-vip fix some Sonar issues
(edit) @7751   9 years Don-vip see #10775 - allow to sum all numeric values as conflict resolution …
(edit) @7743   9 years Don-vip fix #10775 - allow to sum all numeric values as conflict resolution of …
(edit) @7674   9 years Don-vip code refactoring to avoid hacks in merge-overlap plugin
(edit) @7668   9 years stoecker cleanup icons, mark undetected icons, set proper mimetype, delete …
(edit) @7661   9 years Don-vip see #10668 - code refactoring to avoid hacks in merge-overlap plugin
(edit) @7643   9 years Don-vip avoid potential NPE
(edit) @7642   9 years Don-vip fix #10156 - combine ways: conflicts not shown when no conflicting …
(edit) @7610   10 years Don-vip see #10626 - make rebuild() method public to allow reuse in plugins
(edit) @7509   10 years stoecker remove tabs
(edit) @7129   10 years simon04 see #10018 - Avoid broken relations after combining ways
(edit) @7029   10 years Don-vip fix more warnings, remove unused code
(edit) @7027   10 years Don-vip fix more warnings (-Xlint:rawtypes), remove deprecated method and …
(edit) @7022   10 years Don-vip see #8465 - enable and fix more warnings
(edit) @7018   10 years Don-vip refactor duplicated code
(edit) @7017   10 years Don-vip see #8465 - fix easy compilation warnings
(edit) @7015   10 years Don-vip see #8465 - fix generics for JComboBox/JList
(edit) @7005   10 years Don-vip see #8465 - use diamond operator where applicable
(edit) @7001   10 years Don-vip see #8465 - switch core to Java 7
(edit) @6991   10 years Balaitous fix little bug: In TagConflictResolver dialog, when user select a …
(edit) @6912   10 years Don-vip Refactor duplicated code
(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) @6887   10 years Don-vip package refactoring of conflict commands => move all of them to new …
(edit) @6883   10 years Don-vip fix some Sonar issues
(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) @6814   10 years Don-vip fix #8234 - remove duplicated/unused icons + javadoc
(edit) @6806   10 years Don-vip fix some Sonar issues introduced recently
(edit) @6802   10 years simon04 fix #9655 - Merge operations loosing tags (regression of r6770) …
(edit) @6792   10 years Don-vip Sonar - fix various issues
(edit) @6770   10 years simon04 see #9104 - Do not suggest to combine conflicting values in order to …
(edit) @6739   10 years simon04 Fix NPE when cycling through conflicts with Tab key
(edit) @6715   10 years Don-vip fix #6633 - Needless 'No conflicts to resolve' dialog
(edit) @6699   10 years Don-vip fix #9547 - Remove multiple whitespaces inside values
(edit) @6679   10 years stoecker see #9110 - fix singular forms, even if they are useless
(edit) @6666   10 years Don-vip see #9508 - refactor validator preferences + handling of JScrollPane
(edit) @6624   10 years Don-vip fix #9521 - Colors no more displayed in preferences dialog since …
(edit) @6623   10 years Don-vip fix Sonar issues
(edit) @6616   10 years Don-vip fix #4073 - colour coding of conflicting tags/memberships in way …
(edit) @6565   10 years simon04 fix #9484 - source in upload dialog: add knowledge, survey to …
(edit) @6524   10 years Don-vip global use of Utils.joinAsHtmlUnorderedList()
(edit) @6507   10 years simon04 fix #9110 - i18n: fix errors in usage of plural forms
(edit) @6388   10 years simon04 fix #9111 - fix wording/typos in English strings
(edit) @6362   10 years Don-vip Checkstyle: - private constructors for util classes - final classes - …
(edit) @6340   10 years Don-vip refactor of some GUI/widgets classes (impacts some plugins): - …
(edit) @6317   11 years Don-vip Sonar/FindBugs - Loose coupling
(edit) @6316   11 years Don-vip Sonar/FindBugs - Loose coupling
(edit) @6267   11 years Don-vip Sonar/FindBugs - Replace singular fields by local variables
(edit) @6265   11 years Don-vip Sonar/FindBugs: - Dodgy - Redundant nullcheck of value known to be …
(edit) @6264   11 years Don-vip Sonar/FindBugs - Performance - Method concatenates strings using + in …
(edit) @6258   11 years Don-vip Sonar/Findbugs - Performance - Inefficient use of keySet iterator …
(edit) @6248   11 years Don-vip Rework console output: - new log level "error" - Replace nearly all …
Note: See TracRevisionLog for help on using the revision log.