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

Name Size Rev Age Author Last Change
../
CombinePrimitiveResolverDialog.java 27.0 KB 7661   5 years Don-vip see #10668 - code refactoring to avoid hacks in merge-overlap plugin
MultiValueCellEditor.java 8.4 KB 7015   6 years Don-vip see #8465 - fix generics for JComboBox/JList
MultiValueCellRenderer.java 6.4 KB 7017   6 years Don-vip see #8465 - fix easy compilation warnings
MultiValueDecisionType.java 442 bytes 3083   10 years bastiK added svn:eol-style=native to source files
MultiValueResolutionDecision.java 9.3 KB 7005   6 years Don-vip see #8465 - use diamond operator where applicable
PasteTagsConflictResolverDialog.java 19.8 KB 7005   6 years Don-vip see #8465 - use diamond operator where applicable
RelationMemberConflictDecision.java 3.7 KB 6362   6 years Don-vip Checkstyle: - private constructors for util classes - final classes - …
RelationMemberConflictDecisionEditor.java 2.4 KB 7015   6 years Don-vip see #8465 - fix generics for JComboBox/JList
RelationMemberConflictDecisionRenderer.java 3.2 KB 7509   5 years stoecker remove tabs
RelationMemberConflictDecisionType.java 1.1 KB 6883   6 years Don-vip fix some Sonar issues
RelationMemberConflictResolver.java 8.4 KB 7661   5 years Don-vip see #10668 - code refactoring to avoid hacks in merge-overlap plugin
RelationMemberConflictResolverColumnModel.java 4.6 KB 7509   5 years stoecker remove tabs
RelationMemberConflictResolverModel.java 10.8 KB 7661   5 years Don-vip see #10668 - code refactoring to avoid hacks in merge-overlap plugin
RelationMemberConflictResolverTable.java 3.9 KB 7027   6 years Don-vip fix more warnings (-Xlint:rawtypes), remove deprecated method and …
TagConflictResolutionUtil.java 3.0 KB 7005   6 years Don-vip see #8465 - use diamond operator where applicable
TagConflictResolver.java 3.9 KB 6890   6 years Don-vip fix some Sonar issues (Constructor Calls Overridable Method)
TagConflictResolverColumnModel.java 1.4 KB 6890   6 years Don-vip fix some Sonar issues (Constructor Calls Overridable Method)
TagConflictResolverModel.java 9.2 KB 7643   5 years Don-vip avoid potential NPE
TagConflictResolverTable.java 4.0 KB 7022   6 years Don-vip see #8465 - enable and fix more warnings
Note: See TracBrowser for help on using the repository browser.