source: josm/trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @14153   6 years Don-vip see #15229 - deprecate Main.parent and Main itself
(edit) @14134   6 years Don-vip see #15229 - deprecate Main*.undoRedo - make UndoRedoHandler a …
(edit) @13842   6 years Don-vip see #16319 - scale properly all icons using ButtonSpec
(edit) @13761   6 years Don-vip see #16288 - replace similar i18n strings (removes 35 strings from …
(edit) @13564   6 years Don-vip introduce PrimitiveRenderer to replace OsmPrimitivRenderer (now …
(edit) @13434   6 years Don-vip see #8039, see #10456 - support read-only data layers
(edit) @13367   6 years Don-vip fix #15332 - IndexOutOfBoundsException in ConflictDialog
(edit) @12987   7 years bastiK see #15410 - change preferences scheme for named colors - makes …
(edit) @12809   7 years bastiK replace abstract class AbstractVisitor by interface …
(edit) @12672   7 years Don-vip see #15182 - move ConflictCollection from OsmDataLayer to …
(edit) @12643   7 years Don-vip see #15182 - deprecate Main.main.menu. Replacement: …
(edit) @12641   7 years Don-vip see #15182 - deprecate Main.main.undoRedo. Replacement: …
(edit) @12636   7 years Don-vip see #15182 - deprecate Main.getLayerManager(). Replacement: …
(edit) @12630   7 years Don-vip see #15182 - deprecate Main.map and Main.isDisplayingMapView(). …
(edit) @12620   7 years Don-vip see #15182 - deprecate all Main logging methods and introduce …
(edit) @12499   7 years Don-vip findbugs:IS2_INCONSISTENT_SYNC
(edit) @12496   7 years Don-vip fix #15055 - add synchronization to conflict dialog
(edit) @12353   7 years michael2402 ConflictDialog: Do not refresh twice during show
(edit) @12352   7 years michael2402 Use new selection interface in ConflictDialog The dialog is now not …
(edit) @12279   7 years Don-vip sonar - squid:S3878 - Arrays should not be created for varargs parameters
(edit) @12178   7 years michael2402 Remove repaint on conflict resolution - SequenceCommand will do it for us.
(edit) @11396   7 years Don-vip sonar - pmd:AccessorClassGeneration
(edit) @11365   7 years Don-vip fix #14090 - use DefaultListSelectionModel adjusting selection mode to …
(edit) @11357   7 years Don-vip findbugs - SIC_INNER_SHOULD_BE_STATIC_ANON
(edit) @10957   8 years Don-vip see #13479 - make ConflictResolutionDialog inherit from ExtendedDialog
(edit) @10853   8 years Don-vip see #13309 - fix most of deprecation warnings
(edit) @10763   8 years Don-vip sonar - squid:S2156 - "final" classes should not have "protected" members
(edit) @10611   8 years Don-vip see #11390 - sonar - squid:S1604 - Java 8: Anonymous inner classes …
(edit) @10446   8 years Don-vip see #13001 - replace calls to Main.main.getCurrentDataSet() 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) @10356   8 years stoecker see #9995, see #10684 - remove more hardcoded places of images
(edit) @10332   8 years stoecker Do not use deprecated EditLayerChangedListener - patch my Michael …
(edit) @9607   8 years Don-vip ConflictDialog: fix findbugs issue, add unit test
(edit) @9601   8 years Don-vip ConflictDialog: fix Sonar/Coverity issues + add basic unit test
(edit) @9452   8 years simon04 see #12338 - Typo
(edit) @9449   8 years stoecker remove useless modifiers
(edit) @9440   8 years simon04 see #12338 - Conflict resolution: add expert actions "Resolve to …
(edit) @9059   8 years Don-vip checkstyle
(edit) @8846   9 years Don-vip sonar - fb-contrib - minor performance improvements: * Method passes …
(edit) @8836   9 years Don-vip fix Checkstyle issues
(edit) @8512   9 years Don-vip checkstyle: redundant modifiers
(edit) @8510   9 years Don-vip checkstyle: enable relevant whitespace checks and fix them
(edit) @8419   9 years Don-vip Sonar: various code style cleanup: - fix copyright - classes that …
(edit) @8378   9 years Don-vip fix copyright/license headers globally
(edit) @8308   9 years Don-vip fix potential NPEs and Sonar issues related to serialization
(edit) @7949   9 years Don-vip fix #10933 - keep the same selection in selection dialog after cliking …
(edit) @7304   10 years Don-vip fix #10238 - i18n fix (singular/plural form)
(edit) @7005   10 years Don-vip see #8465 - use diamond operator where applicable
(edit) @7001   10 years Don-vip see #8465 - switch core to Java 7
(edit) @6889   10 years Don-vip fix some Sonar issues (JLS order)
(edit) @6822   10 years bastiK see #8902 - Small performance enhancements / coding style (patch by …
(edit) @6555   10 years Don-vip fix #4183 - split number of conflicts in conflict-list header …
(edit) @6248   11 years Don-vip Rework console output: - new log level "error" - Replace nearly all …
(edit) @6104   11 years Don-vip see #8902 - Small performance enhancements / coding style (patch by …
(edit) @6084   11 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
(edit) @6070   11 years stoecker see #8853 remove tabs, trailing spaces, windows line ends, strange …
(edit) @6009   11 years Don-vip fix #8799 - Follow conventional visitor design pattern by renaming …
(edit) @5958   11 years Don-vip * Improve PopupMenuLauncher to automatically select JTable/JList/JTree …
(edit) @5775   11 years Don-vip see #8503 - Allo plugins to warn about conflicts
(edit) @5416   12 years Don-vip see #7938 - code optimization (patch by verdy_p)
(edit) @5414   12 years Don-vip fix #7942 - Unexplained NPE in Conflict Dialog
(edit) @5413   12 years Don-vip fix #7938 - fix StackOverflowError when painting conflicts of a cyclic …
(edit) @5297   12 years Don-vip fix #4493, fix #7750: conflict dialog, nodes and members tab: allow …
(edit) @5266   12 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
(edit) @4982   12 years stoecker see #7226 - patch by akks (fixed a bit) - fix shortcut deprecations
(edit) @4951   12 years stoecker fix shortcut conflict
(edit) @4363   13 years stoecker use createLayout() in all internal ToggleDialog's
(edit) @3973   13 years mjulius Zoom to conflict now zooms to first selected conflict if there is one …
(edit) @3765   13 years stoecker fix help
(edit) @3754   13 years stoecker some cleanups in help page marking
(edit) @3416   14 years jttt Add Dataset.add/removeSelectionListener methods, change eclipse …
(edit) @3078   14 years bastiK fixed #4593 - conflict list and header not updated right away after …
(edit) @3058   14 years bastiK see #4593 - conflict list not updated right away
(edit) @3034   14 years jttt Fix #4467 Don't silently drop locally deleted member primitives from …
(edit) @2945   14 years jttt Improvements in conflicts gui
(edit) @2930   14 years jttt Make sure ConflictResolutionDialog is disposed when closed
(edit) @2880   14 years jttt Fixed #4411 Can't upload due to conflicts, but conflict list is empty
(edit) @2869   14 years jttt Removed ToggleDialog.tearDown(). All listeners should be unregistered …
(edit) @2711   14 years stoecker fix bad line endings
(edit) @2710   14 years stoecker close #4222 - unify design of right menus again
(edit) @2655   14 years jttt Fixed #4161 Major slowdown in recent versions, used correct pattern …
(edit) @2621   14 years Gubaer Moved layer listener management from Layer to MapView Made sure that …
(edit) @2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2301   15 years Gubaer fixed #3765: Unable to resolve conflict Improved warning message for …
(edit) @2255   15 years Gubaer New utility class for help context aware option dialogs Improved …
(edit) @2252   15 years Gubaer Refactored JOSM help system, slightly extended Fixed problem with new …
(edit) @2131   15 years Gubaer see #3407: NPE in ConflictDialog when using OpenStreetBug plugin
(edit) @1937   15 years jttt Replace some occurrences of RelationMember.member with getters
(edit) @1925   15 years jttt Replaced Relation.members with Relation.getMembers()
(edit) @1898   15 years jttt Way refactoring - rewritten another parts of code to the new nodes api
(edit) @1814   15 years Gubaer removed dependencies to Main.ds, removed Main.ds removed AddVisitor, …
(edit) @1787   15 years stoecker unify design
(edit) @1750   15 years Gubaer new: replaced global conflict list by conflict list per layer, similar …
(edit) @1725   15 years stoecker some cleanups
(edit) @1682   15 years Gubaer removed old conflict resolution code fixed bug in OsmApi (missing …
(edit) @1677   15 years stoecker remove all these ugly tab stops introduced in the last half year
(edit) @1652   15 years stoecker make extended conflict resolving default
(edit) @1642   15 years Gubaer added row numbers and synchronized scrolling in conflict resolution …
Note: See TracRevisionLog for help on using the revision log.