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) @10762   8 years Don-vip sonar - squid:UselessParenthesesCheck
(edit) @10754   8 years Don-vip sonar - squid:S1228 - Packages should have a javadoc file …
(edit) @10737   8 years Don-vip fix #12900 - Conflicts in pasted tags cannot be resolved, cannot be …
(edit) @10717   8 years simon04 see #11390, see #12890 - Lambda can be replaced with method reference
(edit) @10716   8 years simon04 see #11390, see #12890 - Deprecate predicates in OsmPrimitive class
(edit) @10680   8 years Don-vip sonar - pmd:UseVarargs - Use Varargs
(edit) @10670   8 years Don-vip see #12472 - fix "OperatorPrecedence" warnings
(edit) @10667   8 years Don-vip fix javadoc warning (missing override)
(edit) @10657   8 years Don-vip see #11390, see #12890 - use Java 8 Predicates
(edit) @10638   8 years Don-vip see #11390, fix #13206 - Migrate Function interface to java 8 (patch …
(edit) @10619   8 years Don-vip see #11390 - Java 8: use List.sort(Comparator) instead of …
(edit) @10611   8 years Don-vip see #11390 - sonar - squid:S1604 - Java 8: Anonymous inner classes …
(edit) @10593   8 years Don-vip see #11390 - sonar - squid:S2293 - improved use of diamond operator …
(edit) @10527   8 years Don-vip fix #12994 - Old style SideButton usage errors
(edit) @10454   8 years Don-vip fix #12999 - Exception after resolving conflicts (patch by …
(edit) @10413   8 years Don-vip fix #12983 - replace calls to Main.main.get[Active|Edit]Layer() by …
(edit) @10378   8 years Don-vip Checkstyle 6.19: enable SingleSpaceSeparator and fix violations
(edit) @10369   8 years stoecker see #9995 - patch by strump - improve HIDPI
(edit) @10364   8 years stoecker gsoc-core - patch by Michael Zangl - see #12953 - remove deprecation usage
(edit) @10357   8 years stoecker see #9995, see #10684 - remove more hardcoded places of images
(edit) @10308   8 years Don-vip sonar - squid:S1854 - Dead stores should be removed
(edit) @10217   8 years Don-vip findbugs - SF_SWITCH_NO_DEFAULT + various sonar fixes
(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) @10134   8 years Don-vip sonar, javadoc
(edit) @10035   8 years Don-vip code refactoring to ease creation of unit tests by avoiding as much as …
(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) @9849   8 years Don-vip add more unit tests
(edit) @9847   8 years Don-vip code refactoring
(edit) @9548   8 years Don-vip fix #12405 - wrong JPanel initialization (regression from r9543)
(edit) @9543   8 years Don-vip refactoring - global simplification of use of setLayout method - …
(edit) @9497   8 years Don-vip reduce duplicated code
(edit) @9482   8 years simon04 see #12338 fix #12381 - AssertionError on "Resolve to their versions"
(edit) @9473   8 years simon04 fix #12343 - Display at most 20 primitives for some confirmation …
(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) @9371   8 years simon04 Java 7: use Objects.equals and Objects.hash
(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) @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) @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
Note: See TracRevisionLog for help on using the revision log.