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

Name Size Rev Age Author Last Change
../
CombinePrimitiveResolverDialog.java 25.3 KB 6084   11 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
MultiValueCellEditor.java 6.9 KB 6084   11 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
MultiValueCellRenderer.java 5.4 KB 6084   11 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
MultiValueDecisionType.java 442 bytes 3083   14 years bastiK added svn:eol-style=native to source files
MultiValueResolutionDecision.java 9.5 KB 5266   12 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
PasteTagsConflictResolverDialog.java 19.7 KB 6087   11 years Don-vip see #8902 - string.equals("") => string.isEmpty() (patch by shinigami)
RelationMemberConflictDecision.java 3.7 KB 3083   14 years bastiK added svn:eol-style=native to source files
RelationMemberConflictDecisionEditor.java 2.2 KB 6084   11 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
RelationMemberConflictDecisionRenderer.java 3.1 KB 6084   11 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
RelationMemberConflictDecisionType.java 1.1 KB 3083   14 years bastiK added svn:eol-style=native to source files
RelationMemberConflictResolver.java 8.0 KB 6087   11 years Don-vip see #8902 - string.equals("") => string.isEmpty() (patch by shinigami)
RelationMemberConflictResolverColumnModel.java 2.3 KB 3210   14 years bastiK autocompletion rework; breaks tageditor plugin and possibly other …
RelationMemberConflictResolverModel.java 10.4 KB 5988   11 years Don-vip fix EDT violations observed while merging nodes
RelationMemberConflictResolverTable.java 3.9 KB 6084   11 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
TagConflictResolutionUtil.java 2.9 KB 5700   11 years stoecker remove hardcoded created_by
TagConflictResolver.java 3.9 KB 6084   11 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
TagConflictResolverColumnModel.java 1.3 KB 3083   14 years bastiK added svn:eol-style=native to source files
TagConflictResolverModel.java 8.3 KB 6084   11 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
TagConflictResolverTable.java 4.0 KB 6084   11 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
Note: See TracBrowser for help on using the repository browser.