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

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @12663   7 years Don-vip see #15182 - move NameFormatter* from gui to data.osm
(edit) @12641   7 years Don-vip see #15182 - deprecate Main.main.undoRedo. Replacement: …
(edit) @12279   7 years Don-vip sonar - squid:S3878 - Arrays should not be created for varargs parameters
(edit) @12046   7 years michael2402 In conflict resolution dialog, only scroll tab contents and prevent …
(edit) @10958   8 years Don-vip fix #13479 - safer management of listeners
(edit) @10957   8 years Don-vip see #13479 - make ConflictResolutionDialog inherit from ExtendedDialog
(edit) @10454   8 years Don-vip fix #12999 - Exception after resolving conflicts (patch by …
(edit) @10369   8 years stoecker see #9995 - patch by strump - improve HIDPI
(edit) @10357   8 years stoecker see #9995, see #10684 - remove more hardcoded places of images
(edit) @10035   8 years Don-vip code refactoring to ease creation of unit tests by avoiding as much as …
(edit) @9543   8 years Don-vip refactoring - global simplification of use of setLayout method - …
(edit) @8836   9 years Don-vip fix Checkstyle issues
(edit) @8510   9 years Don-vip checkstyle: enable relevant whitespace checks and fix them
(edit) @8444   9 years Don-vip remove extra whitespaces
(edit) @7586   10 years Don-vip fix #10462 - Include object type and id in conflict dialog for …
(edit) @6084   11 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
(edit) @5998   11 years Don-vip fix #8775 - IllegalComponentStateException when remembering position …
(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) @4189   13 years stoecker unify geometry code
(edit) @3767   13 years stoecker fix help
(edit) @3765   13 years stoecker fix help
(edit) @3501   14 years bastiK fixed #4632 - Button Help puts help window under main window
(edit) @3362   14 years stoecker fix #5182 - Conflict system simplification - patch by Upliner
(edit) @3083   14 years bastiK added svn:eol-style=native to source files
(edit) @2930   14 years jttt Make sure ConflictResolutionDialog is disposed when closed
(edit) @2915   14 years stoecker close #4458 - text fixes - patch by Andre
(edit) @2895   14 years mjulius Fix some messages
(edit) @2847   14 years mjulius fix messages for gui/dialogs
(edit) @2715   14 years stoecker fixed #3772, #4139 - fixed help browser - the external start never …
(edit) @2626   14 years jttt Fixed some of the warnings found by FindBugs
(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) @2308   14 years Gubaer fixed #3762: Deleted relation still referenced when deleting former …
(edit) @2301   14 years Gubaer fixed #3765: Unable to resolve conflict Improved warning message for …
(edit) @2274   15 years Gubaer Improved help browser layout (now uses custom CSS shipped with JOSM) …
(edit) @2252   15 years Gubaer Refactored JOSM help system, slightly extended Fixed problem with new …
(edit) @2017   15 years Gubaer removed OptionPaneUtil cleanup of deprecated Layer API cleanup of …
(edit) @1990   15 years Gubaer fixed #3261: Use the "name:$CURRENT_LOCALE" name in the JOSM UI …
(edit) @1987   15 years Gubaer removed all occurences of setAlwaysOnTop(). See …
(edit) @1954   15 years Gubaer Moved package org.openstreetmap.josm.gui.conflict to …
(edit) @1904   15 years Gubaer fixed #3141: conflict resolution: "apply partial resolution" doesn't work
(edit) @1857   15 years Gubaer replaced JOptionDialog.show... by OptionPaneUtil.show.... improved …
(edit) @1847   15 years Gubaer replaced calls to JOptionPane.* by calls to OptionPaneUtil.*
(edit) @1782   15 years stoecker fixed #2928 - patch by Michi - unify GUI
(edit) @1690   15 years Gubaer new: MultiFetchServerObjectReader using APIs Multi Fetch method …
(edit) @1677   15 years stoecker remove all these ugly tab stops introduced in the last half year
(edit) @1654   15 years Gubaer added merge support for coordinate conflicts added merge support for …
(edit) @1642   15 years Gubaer added row numbers and synchronized scrolling in conflict resolution …
(edit) @1631   15 years Gubaer added support for merging member lists of relations in extended …
(edit) @1627   15 years ce removed two @Override to make it compile with java 1.5
(add) @1622   15 years Gubaer first version of extended conflict resolution dialog.
Note: See TracRevisionLog for help on using the revision log.