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

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @19295   8 months stoecker remove most of the new PMD messages
(edit) @19050   18 months taylor.smock Revert most var changes from r19048, fix most new compile warnings …
(edit) @18489   3 years Don-vip see #22104 - fix deprecation warnings
(edit) @17340   5 years GerdP fix #19792: Error during conflict resolution after complex import …
(edit) @16438   5 years simon04 see #19251 - Java 8: use Stream
(edit) @14214   7 years Don-vip sonarqube - squid:S4551 - Enum values should be compared with "=="
(edit) @13130   8 years Don-vip fix #15572 - use ImageProvider attach API for all JOSM actions to …
(edit) @12663   8 years Don-vip see #15182 - move NameFormatter* from gui to data.osm
(edit) @12058   8 years Don-vip fix Java/PMD/Checkstyle warnings
(edit) @12047   8 years michael2402 Make TagMerger use the row based layout. Make merge buttons higher and …
(edit) @12044   8 years michael2402 Make conflict merge dialog layout more universal, make row titles in …
(edit) @11848   9 years Don-vip fix #14613 - Special HTML characters not escaped in GUI error messages
(edit) @11112   9 years Don-vip sonar - squid:S1228 - Packages should have a javadoc file …
(edit) @10378   9 years Don-vip Checkstyle 6.19: enable SingleSpaceSeparator and fix violations
(edit) @10210   9 years Don-vip see #11924 - Java 9 - replace calls to deprecated classes …
(edit) @10179   9 years Don-vip sonar - squid:AssignmentInSubExpressionCheck - Assignments should not …
(edit) @9996   10 years Don-vip sonar - use JLabel.setLabelFor where applicable + add/update unit tests
(edit) @9468   10 years simon04 fix #8804 - Add version info to conflict dialog
(edit) @9440   10 years simon04 see #12338 - Conflict resolution: add expert actions "Resolve to …
(edit) @9243   10 years Don-vip javadoc update
(edit) @8836   10 years Don-vip fix Checkstyle issues
(edit) @8785   10 years simon04 see #11852 - Disallow resolving null coordinate in conflict dialog
(edit) @8510   10 years Don-vip checkstyle: enable relevant whitespace checks and fix them
(edit) @8509   10 years Don-vip fix many checkstyle violations
(edit) @8444   10 years Don-vip remove extra whitespaces
(edit) @8426   10 years Don-vip Accessibility - global use of JLabel.setLabelFor() + various fixes …
(edit) @8390   10 years Don-vip Sonar - various performance improvements
(edit) @8308   10 years Don-vip fix potential NPEs and Sonar issues related to serialization
(edit) @8291   10 years Don-vip fix squid:RedundantThrowsDeclarationCheck + consistent Javadoc for …
(edit) @7005   11 years Don-vip see #8465 - use diamond operator where applicable
(edit) @6890   12 years Don-vip fix some Sonar issues (Constructor Calls Overridable Method)
(edit) @6887   12 years Don-vip package refactoring of conflict commands => move all of them to new …
(edit) @6883   12 years Don-vip fix some Sonar issues
(edit) @6792   12 years Don-vip Sonar - fix various issues
(edit) @6267   12 years Don-vip Sonar/FindBugs - Replace singular fields by local variables
(edit) @6264   12 years Don-vip Sonar/FindBugs - Performance - Method concatenates strings using + in …
(edit) @6084   12 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
(edit) @5481   13 years stoecker some cleanup, mainly javadoc
(edit) @5266   13 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
(edit) @4310   14 years stoecker fix #6680, fix #6677 - i18n issues
(edit) @4162   14 years stoecker fix #4140 - make colors in conflict dialog configurable
(edit) @4116   14 years stoecker fix #4564 - conflict manager: highlight conflict on properties
(edit) @4115   14 years stoecker fix #4564 - conflict manager: highlight conflict on properties
(edit) @3786   15 years Upliner remove OperationCancelledException class which is unused since [3362] …
(edit) @3408   15 years jttt Show only actions that can work on all selected layers in …
(edit) @3362   15 years stoecker fix #5182 - Conflict system simplification - patch by Upliner
(edit) @3218   15 years stoecker typos, close #4989 - patch by mikalaari
(edit) @3083   16 years bastiK added svn:eol-style=native to source files
(edit) @3061   16 years jttt Fix #4612 delete members while relation dialog is open leads to data …
(edit) @3034   16 years jttt Fix #4467 Don't silently drop locally deleted member primitives from …
(edit) @2945   16 years jttt Improvements in conflicts gui
(edit) @2940   16 years mjulius display list of referrers in ConflictResolutionDialog
(edit) @2938   16 years jttt Addition to #4408 (don't require to merge coordinates after primitive …
(edit) @2936   16 years jttt Fixed #4408 confict manager: do not have to solve tag- and …
(edit) @2846   16 years mjulius fix messages for gui/conflict
(edit) @2612   16 years mjulius Fixes #4083 - exception when copying relation with incomplete node …
(edit) @2512   16 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2273   16 years jttt Replace testing for id <= 0 with isNew() method
(edit) @2181   16 years stoecker lots of i18n fixes
(edit) @2070   16 years Gubaer new: rewrite of CombineWay action new: conflict resolution dialog for …
(edit) @2017   16 years Gubaer removed OptionPaneUtil cleanup of deprecated Layer API cleanup of …
(edit) @1989   16 years Gubaer fixed #3281: OsmPrimitiveType fails for fusional and/or agglutinative …
(copy) @1954   16 years Gubaer Moved package org.openstreetmap.josm.gui.conflict to …
copied from trunk/src/org/openstreetmap/josm/gui/conflict/properties
(edit) @1938   16 years jttt Replace some occurrences of RelationMember.member with getters
Note: See TracRevisionLog for help on using the revision log.