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) @13647   20 months Don-vip see #16204 - Allow to start and close JOSM in WebStart sandbox mode …
(edit) @13613   20 months stoecker see #15240 - new SVG icons
(edit) @13597   21 months Don-vip fix #16145 - remove white spaces from key/values when pasting tags
(edit) @13564   21 months Don-vip introduce PrimitiveRenderer to replace OsmPrimitivRenderer (now …
(edit) @13478   22 months Don-vip fix #16034 - wrong use of SideButton
(edit) @13130   2 years Don-vip fix #15572 - use ImageProvider attach API for all JOSM actions to …
(edit) @12987   2 years bastiK see #15410 - change preferences scheme for named colors - makes …
(edit) @12940   2 years Don-vip fix #14163 - fix EDT violation when displaying conflict dialog from …
(edit) @12851   2 years bastiK see #15229 - extract "struct" handling from Preference to StructUtils
(edit) @12846   2 years bastiK see #15229 - use Config.getPref() wherever possible
(edit) @12841   2 years bastiK see #15229 - fix deprecations caused by [12840]
(edit) @12758   2 years Don-vip see #15229 - see #15182 - deprecate …
(edit) @12678   2 years Don-vip see #15182 - move WindowGeometry from tools to gui.util
(edit) @12663   2 years Don-vip see #15182 - move NameFormatter* from gui to data.osm
(edit) @12661   2 years michael2402 Fix #14794: Add javadoc for gui/conflict/pair package.
(edit) @12660   2 years michael2402 See #14794: Add javadoc for gui/conflict/tags package.
(edit) @12636   2 years Don-vip see #15182 - deprecate Main.getLayerManager(). Replacement: …
(edit) @12620   2 years Don-vip see #15182 - deprecate all Main logging methods and introduce …
(edit) @12279   3 years Don-vip sonar - squid:S3878 - Arrays should not be created for varargs parameters
(edit) @12151   3 years michael2402 AbstractListMergeModel: Add documentation
(edit) @12058   3 years Don-vip fix Java/PMD/Checkstyle warnings
(edit) @12050   3 years michael2402 Fix sonar warnings (modifiers, parameters)
(edit) @12047   3 years michael2402 Make TagMerger use the row based layout. Make merge buttons higher and …
(edit) @12046   3 years michael2402 In conflict resolution dialog, only scroll tab contents and prevent …
(edit) @12044   3 years michael2402 Make conflict merge dialog layout more universal, make row titles in …
(edit) @11879   3 years Don-vip findbugs - EI_EXPOSE_REP
(edit) @11848   3 years Don-vip fix #14613 - Special HTML characters not escaped in GUI error messages
(edit) @11772   3 years Don-vip fix #14475 - Deadlock while starting unit tests: remove the need to …
(edit) @11747   3 years Don-vip checkstyle - NoWhiteSpaceBefore ...
(edit) @11627   3 years Don-vip fix #3346 - improve drastically the performance of fixing duplicate …
(edit) @11606   3 years Don-vip fix #14374 - automatic tag conflict resolution of source for French …
(edit) @11604   3 years Don-vip sonar - squid:S1172 - Unused method parameters should be removed
(edit) @11601   3 years Don-vip error-prone: fix FallThrough errors
(edit) @11553   3 years Don-vip refactor handling of null values - use Java 8 Optional where possible
(edit) @11489   3 years Don-vip error-prone - enums should be immutable, and cannot have non-final fields
(edit) @11463   3 years Klumbumbus * fix #14239 - typo in documentation (patch by skyper) * fix #14236 - …
(edit) @11462   3 years Don-vip sonar - squid:S1871 - Two branches in the same conditional structure …
(edit) @11452   3 years Don-vip sonar - fb-contrib:SEO_SUBOPTIMAL_EXPRESSION_ORDER - Performance - …
(edit) @11381   3 years Don-vip findbugs - RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE
(edit) @11365   3 years Don-vip fix #14090 - use DefaultListSelectionModel adjusting selection mode to …
(edit) @11354   3 years Don-vip fix #14078 - NPE
(edit) @11350   3 years Don-vip fix unit test
(edit) @11348   3 years Don-vip findbugs - fix some SIC_INNER_SHOULD_BE_STATIC_ANON
(edit) @11331   3 years Don-vip findbugs - RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE
(edit) @11330   3 years Don-vip sonar - fix recent issues
(edit) @11318   3 years Don-vip refactor conflict classes
(edit) @11121   3 years Don-vip checkstyle
(edit) @11115   3 years simon04 fix #13785 - Use streams, add unit tests (patch by alno, modified)
(edit) @11112   3 years Don-vip sonar - squid:S1228 - Packages should have a javadoc file …
(edit) @10939   3 years Don-vip sonar - pmd:ImmutableField - Immutable Field
(edit) @10824   3 years Don-vip see #13309 - Caching and notifying preferences (patch by michael2402) …
(edit) @10791   3 years simon04 see #13319 - Use InputMapUtils where applicable (VK_ESCAPE)
(edit) @10762   3 years Don-vip sonar - squid:UselessParenthesesCheck
(edit) @10754   3 years Don-vip sonar - squid:S1228 - Packages should have a javadoc file …
(edit) @10737   3 years Don-vip fix #12900 - Conflicts in pasted tags cannot be resolved, cannot be …
(edit) @10717   3 years simon04 see #11390, see #12890 - Lambda can be replaced with method reference
(edit) @10716   3 years simon04 see #11390, see #12890 - Deprecate predicates in OsmPrimitive class
(edit) @10680   3 years Don-vip sonar - pmd:UseVarargs - Use Varargs
(edit) @10670   3 years Don-vip see #12472 - fix "OperatorPrecedence" warnings
(edit) @10667   3 years Don-vip fix javadoc warning (missing override)
(edit) @10657   3 years Don-vip see #11390, see #12890 - use Java 8 Predicates
(edit) @10638   3 years Don-vip see #11390, fix #13206 - Migrate Function interface to java 8 (patch …
(edit) @10619   3 years Don-vip see #11390 - Java 8: use List.sort(Comparator) instead of …
(edit) @10611   3 years Don-vip see #11390 - sonar - squid:S1604 - Java 8: Anonymous inner classes …
(edit) @10593   3 years Don-vip see #11390 - sonar - squid:S2293 - improved use of diamond operator …
(edit) @10527   3 years Don-vip fix #12994 - Old style SideButton usage errors
(edit) @10454   3 years Don-vip fix #12999 - Exception after resolving conflicts (patch by …
(edit) @10413   3 years Don-vip fix #12983 - replace calls to Main.main.get[Active|Edit]Layer() by …
(edit) @10378   4 years Don-vip Checkstyle 6.19: enable SingleSpaceSeparator and fix violations
(edit) @10369   4 years stoecker see #9995 - patch by strump - improve HIDPI
(edit) @10364   4 years stoecker gsoc-core - patch by Michael Zangl - see #12953 - remove deprecation usage
(edit) @10357   4 years stoecker see #9995, see #10684 - remove more hardcoded places of images
(edit) @10308   4 years Don-vip sonar - squid:S1854 - Dead stores should be removed
(edit) @10217   4 years Don-vip findbugs - SF_SWITCH_NO_DEFAULT + various sonar fixes
(edit) @10210   4 years Don-vip see #11924 - Java 9 - replace calls to deprecated classes …
(edit) @10179   4 years Don-vip sonar - squid:AssignmentInSubExpressionCheck - Assignments should not …
(edit) @10134   4 years Don-vip sonar, javadoc
(edit) @10035   4 years Don-vip code refactoring to ease creation of unit tests by avoiding as much as …
(edit) @10001   4 years Don-vip sonar - Local variable and method parameter names should comply with a …
(edit) @10000   4 years Don-vip sonar - fix various issues
(edit) @9996   4 years Don-vip sonar - use JLabel.setLabelFor where applicable + add/update unit tests
(edit) @9990   4 years Don-vip sonar - Inner classes which do not reference their owning classes …
(edit) @9849   4 years Don-vip add more unit tests
(edit) @9847   4 years Don-vip code refactoring
(edit) @9548   4 years Don-vip fix #12405 - wrong JPanel initialization (regression from r9543)
(edit) @9543   4 years Don-vip refactoring - global simplification of use of setLayout method - …
(edit) @9497   4 years Don-vip reduce duplicated code
(edit) @9482   4 years simon04 see #12338 fix #12381 - AssertionError on "Resolve to their versions"
(edit) @9473   4 years simon04 fix #12343 - Display at most 20 primitives for some confirmation …
(edit) @9468   4 years simon04 fix #8804 - Add version info to conflict dialog
(edit) @9440   4 years simon04 see #12338 - Conflict resolution: add expert actions "Resolve to …
(edit) @9371   4 years simon04 Java 7: use Objects.equals and Objects.hash
(edit) @9243   4 years Don-vip javadoc update
(edit) @9212   4 years Don-vip checkstyle 6.14 + tune xml validation settings in Eclipse project
(edit) @9211   4 years Don-vip fix #12252 - combine dialog: add minimum size and better initial …
(edit) @9193   4 years simon04 see #12091 - Increase default sizes of conflict dialogs
(edit) @9192   4 years simon04 fix #12091 - Merging of nodes show conflict in case that one node is …
(edit) @9143   4 years Don-vip fix #12217 - conflict resolver does not update apply button after …
(edit) @9078   4 years Don-vip sonar - Immutable Field
(edit) @9059   4 years Don-vip checkstyle
Note: See TracRevisionLog for help on using the revision log.