Changeset 14153 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
- Timestamp:
- 2018-08-13T02:18:54+02:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
r14134 r14153 17 17 import javax.swing.JPanel; 18 18 19 import org.openstreetmap.josm.Main;20 19 import org.openstreetmap.josm.data.UndoRedoHandler; 21 20 import org.openstreetmap.josm.data.osm.DefaultNameFormatter; 22 21 import org.openstreetmap.josm.data.osm.OsmPrimitive; 23 22 import org.openstreetmap.josm.gui.ExtendedDialog; 23 import org.openstreetmap.josm.gui.MainApplication; 24 24 import org.openstreetmap.josm.gui.conflict.pair.ConflictResolver; 25 25 import org.openstreetmap.josm.gui.help.HelpBrowser; … … 180 180 tr("Close anyway"), 181 181 tr("Continue resolving")}; 182 int ret = JOptionPane.showOptionDialog(Main .parent,182 int ret = JOptionPane.showOptionDialog(MainApplication.getMainFrame(), 183 183 tr("<html>You did not finish to merge the differences in this conflict.<br>" 184 184 + "Conflict resolutions will not be applied unless all differences<br>"
Note:
See TracChangeset
for help on using the changeset viewer.