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) @17353   3 years GerdP fix #12536: Conflict window completely hides relation 'conflicts' …
(edit) @17340   3 years GerdP fix #19792: Error during conflict resolution after complex import …
(edit) @17333   3 years Don-vip see #20129 - Fix typos and misspellings in the code (patch by gaben)
(edit) @17220   4 years GerdP see #19885: memory leak with "temporary" objects in validator and …
(edit) @17140   4 years GerdP see #19885: memory leak with "temporary" objects in validator and …
(edit) @17093   4 years simon04 Use Collection.addAll
(edit) @16953   4 years simon04 Java 8: use Comparator.comparing
(edit) @16824   4 years simon04 Remove Collection.contains check for Collection.remove
(edit) @16643   4 years simon04 see #19334 - ​https://errorprone.info/bugpattern/StringSplitter
(edit) @16626   4 years simon04 see #19334 - ​https://errorprone.info/bugpattern/ImmutableEnumChecker
(edit) @16601   4 years simon04 Add TableHelper.setSelectedIndices
(edit) @16553   4 years Don-vip see #19334 - javadoc fixes + protected constructors for abstract classes
(edit) @16438   4 years simon04 see #19251 - Java 8: use Stream
(edit) @16436   4 years simon04 see #19251 - Java 8: use Stream
(edit) @16333   4 years simon04 Java 8: use Map.computeIfAbsent
(edit) @16267   4 years simon04 Use non-optional ImageResource without null check
(edit) @15729   4 years simon04 fix #18026 - Relation member conflict: render decision as radio buttons
(edit) @15586   4 years Don-vip code cleanup
(edit) @14710   5 years Don-vip fix #17207 - NPE
(edit) @14251   6 years Don-vip fix memory leaks after upload, validation and primitives combining
(edit) @14214   6 years Don-vip sonarqube - squid:S4551 - Enum values should be compared with "=="
(edit) @14153   6 years Don-vip see #15229 - deprecate Main.parent and Main itself
(edit) @13809   6 years Don-vip define InterestingTags functions in IPrimitive
(edit) @13761   6 years Don-vip see #16288 - replace similar i18n strings (removes 35 strings from …
(edit) @13647   6 years Don-vip see #16204 - Allow to start and close JOSM in WebStart sandbox mode …
(edit) @13613   6 years stoecker see #15240 - new SVG icons
(edit) @13597   6 years Don-vip fix #16145 - remove white spaces from key/values when pasting tags
(edit) @13564   6 years Don-vip introduce PrimitiveRenderer to replace OsmPrimitivRenderer (now …
(edit) @13478   6 years Don-vip fix #16034 - wrong use of SideButton
(edit) @13130   6 years Don-vip fix #15572 - use ImageProvider attach API for all JOSM actions to …
(edit) @12987   7 years bastiK see #15410 - change preferences scheme for named colors - makes …
(edit) @12940   7 years Don-vip fix #14163 - fix EDT violation when displaying conflict dialog from …
(edit) @12851   7 years bastiK see #15229 - extract "struct" handling from Preference to StructUtils
(edit) @12846   7 years bastiK see #15229 - use Config.getPref() wherever possible
(edit) @12841   7 years bastiK see #15229 - fix deprecations caused by [12840]
(edit) @12758   7 years Don-vip see #15229 - see #15182 - deprecate …
(edit) @12678   7 years Don-vip see #15182 - move WindowGeometry from tools to gui.util
(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) @12660   7 years michael2402 See #14794: Add javadoc for gui/conflict/tags 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) @11772   7 years Don-vip fix #14475 - Deadlock while starting unit tests: remove the need to …
(edit) @11747   7 years Don-vip checkstyle - NoWhiteSpaceBefore ...
(edit) @11627   7 years Don-vip fix #3346 - improve drastically the performance of fixing duplicate …
(edit) @11606   7 years Don-vip fix #14374 - automatic tag conflict resolution of source for French …
(edit) @11604   7 years Don-vip sonar - squid:S1172 - Unused method parameters should be removed
(edit) @11601   7 years Don-vip error-prone: fix FallThrough errors
(edit) @11553   7 years Don-vip refactor handling of null values - use Java 8 Optional where possible
(edit) @11489   7 years Don-vip error-prone - enums should be immutable, and cannot have non-final fields
(edit) @11463   7 years Klumbumbus * fix #14239 - typo in documentation (patch by skyper) * fix #14236 - …
(edit) @11462   7 years Don-vip sonar - squid:S1871 - Two branches in the same conditional structure …
(edit) @11452   7 years Don-vip sonar - fb-contrib:SEO_SUBOPTIMAL_EXPRESSION_ORDER - Performance - …
(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) @11354   7 years Don-vip fix #14078 - NPE
(edit) @11350   7 years Don-vip fix unit test
(edit) @11348   7 years Don-vip findbugs - fix some SIC_INNER_SHOULD_BE_STATIC_ANON
(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) @10939   8 years Don-vip sonar - pmd:ImmutableField - Immutable Field
(edit) @10824   8 years Don-vip see #13309 - Caching and notifying preferences (patch by michael2402) …
(edit) @10791   8 years simon04 see #13319 - Use InputMapUtils where applicable (VK_ESCAPE)
(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 …
Note: See TracRevisionLog for help on using the revision log.