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

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @12663   7 years Don-vip see #15182 - move NameFormatter* from gui to data.osm
(edit) @12661   7 years michael2402 Fix #14794: Add javadoc for gui/conflict/pair package.
(edit) @12636   7 years Don-vip see #15182 - deprecate Main.getLayerManager(). Replacement: …
(edit) @12620   7 years Don-vip see #15182 - deprecate all Main logging methods and introduce …
(edit) @12279   7 years Don-vip sonar - squid:S3878 - Arrays should not be created for varargs parameters
(edit) @12151   7 years michael2402 AbstractListMergeModel: Add documentation
(edit) @12058   7 years Don-vip fix Java/PMD/Checkstyle warnings
(edit) @12050   7 years michael2402 Fix sonar warnings (modifiers, parameters)
(edit) @12047   7 years michael2402 Make TagMerger use the row based layout. Make merge buttons higher and …
(edit) @12046   7 years michael2402 In conflict resolution dialog, only scroll tab contents and prevent …
(edit) @12044   7 years michael2402 Make conflict merge dialog layout more universal, make row titles in …
(edit) @11879   7 years Don-vip findbugs - EI_EXPOSE_REP
(edit) @11848   7 years Don-vip fix #14613 - Special HTML characters not escaped in GUI error messages
(edit) @11747   7 years Don-vip checkstyle - NoWhiteSpaceBefore ...
(edit) @11604   7 years Don-vip sonar - squid:S1172 - Unused method parameters should be removed
(edit) @11489   7 years Don-vip error-prone - enums should be immutable, and cannot have non-final fields
(edit) @11381   7 years Don-vip findbugs - RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE
(edit) @11365   7 years Don-vip fix #14090 - use DefaultListSelectionModel adjusting selection mode to …
(edit) @11331   7 years Don-vip findbugs - RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE
(edit) @11330   7 years Don-vip sonar - fix recent issues
(edit) @11318   7 years Don-vip refactor conflict classes
(edit) @11121   8 years Don-vip checkstyle
(edit) @11115   8 years simon04 fix #13785 - Use streams, add unit tests (patch by alno, modified)
(edit) @11112   8 years Don-vip sonar - squid:S1228 - Packages should have a javadoc file …
(edit) @10680   8 years Don-vip sonar - pmd:UseVarargs - Use Varargs
(edit) @10667   8 years Don-vip fix javadoc warning (missing override)
(edit) @10611   8 years Don-vip see #11390 - sonar - squid:S1604 - Java 8: Anonymous inner classes …
(edit) @10454   8 years Don-vip fix #12999 - Exception after resolving conflicts (patch by …
(edit) @10378   8 years Don-vip Checkstyle 6.19: enable SingleSpaceSeparator and fix violations
(edit) @10364   8 years stoecker gsoc-core - patch by Michael Zangl - see #12953 - remove deprecation usage
(edit) @10308   8 years Don-vip sonar - squid:S1854 - Dead stores should be removed
(edit) @10210   8 years Don-vip see #11924 - Java 9 - replace calls to deprecated classes …
(edit) @10179   8 years Don-vip sonar - squid:AssignmentInSubExpressionCheck - Assignments should not …
(edit) @10001   8 years Don-vip sonar - Local variable and method parameter names should comply with a …
(edit) @10000   8 years Don-vip sonar - fix various issues
(edit) @9996   8 years Don-vip sonar - use JLabel.setLabelFor where applicable + add/update unit tests
(edit) @9990   8 years Don-vip sonar - Inner classes which do not reference their owning classes …
(edit) @9847   8 years Don-vip code refactoring
(edit) @9482   8 years simon04 see #12338 fix #12381 - AssertionError on "Resolve to their versions"
(edit) @9468   8 years simon04 fix #8804 - Add version info to conflict dialog
(edit) @9440   8 years simon04 see #12338 - Conflict resolution: add expert actions "Resolve to …
(edit) @9243   8 years Don-vip javadoc update
(edit) @9212   8 years Don-vip checkstyle 6.14 + tune xml validation settings in Eclipse project
(edit) @9078   8 years Don-vip sonar - Immutable Field
(edit) @9059   8 years Don-vip checkstyle
(edit) @8855   9 years Don-vip sonar - Unused private method should be removed sonar - Unused …
(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) @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) @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) @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) @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) @8285   9 years Don-vip fix sonar squid:S2039 - Member variable visibility should be specified
(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) @7937   9 years bastiK add subversion property svn:eol=native
(edit) @7864   9 years Don-vip global cleanup of IllegalArgumentExceptions thrown by JOSM
(edit) @7668   10 years stoecker cleanup icons, mark undetected icons, set proper mimetype, delete …
(edit) @7509   10 years stoecker remove tabs
(edit) @7029   10 years Don-vip fix more warnings, remove unused code
(edit) @7018   10 years Don-vip refactor duplicated code
(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) @7001   10 years Don-vip see #8465 - switch core to Java 7
(edit) @6912   10 years Don-vip Refactor duplicated code
(edit) @6890   10 years Don-vip fix some Sonar issues (Constructor Calls Overridable Method)
(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) @6792   10 years Don-vip Sonar - fix various issues
(edit) @6666   10 years Don-vip see #9508 - refactor validator preferences + handling of JScrollPane …
(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) @6388   10 years simon04 fix #9111 - fix wording/typos in English strings
(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) @6248   11 years Don-vip Rework console output: - new log level "error" - Replace nearly all …
(edit) @6222   11 years Don-vip Make some more defensive copies of user-supplied arrays, javadoc
Note: See TracRevisionLog for help on using the revision log.