source: josm/trunk/src/org/openstreetmap/josm/gui/conflict/tags @ 6770

Name Size Rev Age Author Last Change
../
CombinePrimitiveResolverDialog.java 25.5 KB 6770   8 years simon04 see #9104 - Do not suggest to combine conflicting values in order to …
MultiValueCellEditor.java 6.9 KB 6362   9 years Don-vip Checkstyle: - private constructors for util classes - final classes - …
MultiValueCellRenderer.java 6.4 KB 6623   8 years Don-vip fix Sonar issues
MultiValueDecisionType.java 442 bytes 3083   12 years bastiK added svn:eol-style=native to source files
MultiValueResolutionDecision.java 9.5 KB 6316   9 years Don-vip Sonar/FindBugs - Loose coupling
PasteTagsConflictResolverDialog.java 19.9 KB 6264   9 years Don-vip Sonar/FindBugs - Performance - Method concatenates strings using + in …
RelationMemberConflictDecision.java 3.7 KB 6362   9 years Don-vip Checkstyle: - private constructors for util classes - final classes - …
RelationMemberConflictDecisionEditor.java 2.2 KB 6084   9 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
RelationMemberConflictDecisionRenderer.java 3.2 KB 6616   8 years Don-vip fix #4073 - colour coding of conflicting tags/memberships in way …
RelationMemberConflictDecisionType.java 1.1 KB 3083   12 years bastiK added svn:eol-style=native to source files
RelationMemberConflictResolver.java 8.3 KB 6699   8 years Don-vip fix #9547 - Remove multiple whitespaces inside values
RelationMemberConflictResolverColumnModel.java 4.6 KB 6623   8 years Don-vip fix Sonar issues
RelationMemberConflictResolverModel.java 10.4 KB 5988   9 years Don-vip fix EDT violations observed while merging nodes
RelationMemberConflictResolverTable.java 3.9 KB 6524   9 years Don-vip global use of Utils.joinAsHtmlUnorderedList()
TagConflictResolutionUtil.java 3.1 KB 6715   8 years Don-vip fix #6633 - Needless 'No conflicts to resolve' dialog
TagConflictResolver.java 3.9 KB 6616   8 years Don-vip fix #4073 - colour coding of conflicting tags/memberships in way …
TagConflictResolverColumnModel.java 1.4 KB 6616   8 years Don-vip fix #4073 - colour coding of conflicting tags/memberships in way …
TagConflictResolverModel.java 9.2 KB 6770   8 years simon04 see #9104 - Do not suggest to combine conflicting values in order to …
TagConflictResolverTable.java 4.0 KB 6739   8 years simon04 Fix NPE when cycling through conflicts with Tab key
Note: See TracBrowser for help on using the repository browser.