Changeset 14153 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs
- Timestamp:
- 2018-08-13T02:18:54+02:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/dialogs
- Files:
-
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r14134 r14153 36 36 import javax.swing.event.PopupMenuListener; 37 37 38 import org.openstreetmap.josm.Main;39 38 import org.openstreetmap.josm.actions.AbstractSelectAction; 40 39 import org.openstreetmap.josm.actions.ExpertToggleAction; … … 205 204 206 205 Conflict<? extends OsmPrimitive> c = conflicts.get(index); 207 ConflictResolutionDialog dialog = new ConflictResolutionDialog(Main .parent);206 ConflictResolutionDialog dialog = new ConflictResolutionDialog(MainApplication.getMainFrame()); 208 207 dialog.getConflictResolver().populate(c); 209 208 dialog.showDialog(); … … 627 626 GuiHelper.runInEDT(() -> { 628 627 HelpAwareOptionPane.showOptionDialog( 629 Main .parent,628 MainApplication.getMainFrame(), 630 629 sb.toString(), 631 630 tr("Conflicts detected"), -
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>" -
trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java
r13564 r14153 32 32 import javax.swing.table.TableColumn; 33 33 34 import org.openstreetmap.josm.Main;35 34 import org.openstreetmap.josm.data.osm.DefaultNameFormatter; 36 35 import org.openstreetmap.josm.data.osm.NameFormatter; 37 36 import org.openstreetmap.josm.data.osm.OsmPrimitive; 38 37 import org.openstreetmap.josm.data.osm.RelationToChildReference; 38 import org.openstreetmap.josm.gui.MainApplication; 39 39 import org.openstreetmap.josm.gui.PrimitiveRenderer; 40 40 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction; … … 132 132 */ 133 133 public DeleteFromRelationConfirmationDialog() { 134 super(GuiHelper.getFrameForComponent(Main .parent), "", ModalityType.DOCUMENT_MODAL);134 super(GuiHelper.getFrameForComponent(MainApplication.getMainFrame()), "", ModalityType.DOCUMENT_MODAL); 135 135 build(); 136 136 } … … 164 164 getClass().getName() + ".geometry", 165 165 WindowGeometry.centerInWindow( 166 Main .parent,166 MainApplication.getMainFrame(), 167 167 new Dimension(400, 200) 168 168 ) -
trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java
r13949 r14153 21 21 import javax.swing.SingleSelectionModel; 22 22 23 import org.openstreetmap.josm.Main;24 23 import org.openstreetmap.josm.data.osm.DefaultNameFormatter; 25 24 import org.openstreetmap.josm.data.osm.IPrimitive; … … 63 62 */ 64 63 public InspectPrimitiveDialog(final Collection<? extends IPrimitive> primitives, OsmData<?, ?, ?, ?> data) { 65 super(Main .parent, tr("Advanced object info"), tr("Close"));64 super(MainApplication.getMainFrame(), tr("Advanced object info"), tr("Close")); 66 65 this.primitives = new ArrayList<>(primitives); 67 66 setRememberWindowGeometry(getClass().getName() + ".geometry", 68 WindowGeometry.centerInWindow(Main .parent, new Dimension(750, 550)));67 WindowGeometry.centerInWindow(MainApplication.getMainFrame(), new Dimension(750, 550))); 69 68 70 69 setButtonIcons("ok"); -
trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java
r13130 r14153 19 19 import javax.swing.JPopupMenu; 20 20 21 import org.openstreetmap.josm.Main;22 21 import org.openstreetmap.josm.gui.ExtendedDialog; 22 import org.openstreetmap.josm.gui.MainApplication; 23 23 import org.openstreetmap.josm.gui.layer.Layer; 24 24 import org.openstreetmap.josm.gui.layer.Layer.LayerAction; … … 55 55 if (object instanceof Component) { 56 56 ExtendedDialog ed = new ExtendedDialog( 57 Main .parent, tr("Information about layer"),57 MainApplication.getMainFrame(), tr("Information about layer"), 58 58 tr("OK")); 59 59 ed.setButtonIcons("ok"); … … 65 65 } else { 66 66 JOptionPane.showMessageDialog( 67 Main .parent, object,67 MainApplication.getMainFrame(), object, 68 68 tr("Information about layer"), 69 69 JOptionPane.INFORMATION_MESSAGE -
trunk/src/org/openstreetmap/josm/gui/dialogs/LogShowDialog.java
r12279 r14153 11 11 import javax.swing.JScrollPane; 12 12 13 import org.openstreetmap.josm.Main;14 13 import org.openstreetmap.josm.gui.ExtendedDialog; 14 import org.openstreetmap.josm.gui.MainApplication; 15 15 import org.openstreetmap.josm.gui.widgets.JosmEditorPane; 16 16 import org.openstreetmap.josm.tools.GBC; … … 30 30 */ 31 31 public LogShowDialog(String title, String msg, String log) { 32 super(Main .parent, title, tr("OK"));32 super(MainApplication.getMainFrame(), title, tr("OK")); 33 33 setButtonIcons("ok"); 34 34 setContent(build(msg, log)); -
trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
r13647 r14153 52 52 import javax.swing.table.TableCellRenderer; 53 53 54 import org.openstreetmap.josm.Main;55 54 import org.openstreetmap.josm.actions.ExtensionFileFilter; 56 55 import org.openstreetmap.josm.actions.JosmAction; … … 539 538 return; 540 539 final StyleSource s = model.getRow(sel); 541 ExtendedDialog info = new ExtendedDialog(Main .parent, tr("Map Style info"), tr("Close"));540 ExtendedDialog info = new ExtendedDialog(MainApplication.getMainFrame(), tr("Map Style info"), tr("Close")); 542 541 info.setPreferredSize(new Dimension(600, 400)); 543 542 info.setButtonIcons("ok"); -
trunk/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java
r13134 r14153 14 14 import javax.swing.ListCellRenderer; 15 15 16 import org.openstreetmap.josm.Main;17 16 import org.openstreetmap.josm.actions.JosmAction; 18 17 import org.openstreetmap.josm.gui.ExtendedDialog; … … 31 30 32 31 private MenuItemSearchDialog(MainMenu menu) { 33 super(Main .parent, tr("Search menu items"), tr("Select"), tr("Cancel"));32 super(MainApplication.getMainFrame(), tr("Search menu items"), tr("Select"), tr("Cancel")); 34 33 this.selector = new MenuItemSelector(menu); 35 34 this.selector.setDblClickListener(e -> buttonAction(0, null)); -
trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
r14119 r14153 28 28 import javax.swing.SwingUtilities; 29 29 30 import org.openstreetmap.josm.Main;31 30 import org.openstreetmap.josm.actions.DownloadNotesInViewAction; 32 31 import org.openstreetmap.josm.actions.UploadNotesAction; … … 320 319 return; 321 320 } 322 NoteInputDialog dialog = new NoteInputDialog(Main .parent, tr("Comment on note"), tr("Add comment"));321 NoteInputDialog dialog = new NoteInputDialog(MainApplication.getMainFrame(), tr("Comment on note"), tr("Add comment")); 323 322 dialog.showNoteDialog(tr("Add comment to note:"), ImageProvider.get("dialogs/notes", "note_comment")); 324 323 if (dialog.getValue() != 1) { … … 344 343 @Override 345 344 public void actionPerformed(ActionEvent e) { 346 NoteInputDialog dialog = new NoteInputDialog(Main .parent, tr("Close note"), tr("Close note"));345 NoteInputDialog dialog = new NoteInputDialog(MainApplication.getMainFrame(), tr("Close note"), tr("Close note")); 347 346 dialog.showNoteDialog(tr("Close note with message:"), ImageProvider.get("dialogs/notes", "note_closed")); 348 347 if (dialog.getValue() != 1) { … … 389 388 @Override 390 389 public void actionPerformed(ActionEvent e) { 391 NoteInputDialog dialog = new NoteInputDialog(Main .parent, tr("Reopen note"), tr("Reopen note"));390 NoteInputDialog dialog = new NoteInputDialog(MainApplication.getMainFrame(), tr("Reopen note"), tr("Reopen note")); 392 391 dialog.showNoteDialog(tr("Reopen note with message:"), ImageProvider.get("dialogs/notes", "note_open")); 393 392 if (dialog.getValue() != 1) { … … 415 414 @Override 416 415 public void actionPerformed(ActionEvent e) { 417 NoteSortDialog sortDialog = new NoteSortDialog(Main .parent, tr("Sort notes"), tr("Apply"));416 NoteSortDialog sortDialog = new NoteSortDialog(MainApplication.getMainFrame(), tr("Sort notes"), tr("Apply")); 418 417 sortDialog.showSortDialog(noteData.getCurrentSortMethod()); 419 418 if (sortDialog.getValue() == 1) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
r14143 r14153 48 48 import javax.swing.SwingUtilities; 49 49 50 import org.openstreetmap.josm.Main;51 50 import org.openstreetmap.josm.actions.JosmAction; 52 51 import org.openstreetmap.josm.data.preferences.BooleanProperty; … … 569 568 pref.setBorder(BorderFactory.createEmptyBorder()); 570 569 pref.addActionListener(e -> { 571 final PreferenceDialog p = new PreferenceDialog(Main .parent);570 final PreferenceDialog p = new PreferenceDialog(MainApplication.getMainFrame()); 572 571 if (TabPreferenceSetting.class.isAssignableFrom(preferenceClass)) { 573 572 p.selectPreferencesTabByClass((Class<? extends TabPreferenceSetting>) preferenceClass); … … 677 676 private class DetachedDialog extends JDialog { 678 677 DetachedDialog() { 679 super(GuiHelper.getFrameForComponent(Main .parent));678 super(GuiHelper.getFrameForComponent(MainApplication.getMainFrame())); 680 679 getContentPane().add(ToggleDialog.this); 681 680 addWindowListener(new WindowAdapter() { … … 714 713 ToggleDialog.this.setPreferredSize(ToggleDialog.this.getDefaultDetachedSize()); 715 714 pack(); 716 setLocationRelativeTo(Main .parent);715 setLocationRelativeTo(MainApplication.getMainFrame()); 717 716 } 718 717 super.setTitle(titleBar.getTitle()); -
trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
r14134 r14153 29 29 import javax.swing.tree.TreePath; 30 30 31 import org.openstreetmap.josm.Main;32 31 import org.openstreetmap.josm.actions.AbstractSelectAction; 33 32 import org.openstreetmap.josm.actions.AutoScaleAction; … … 251 250 if (asked == JOptionPane.DEFAULT_OPTION) { 252 251 String[] a = new String[] {tr("Whole group"), tr("Single elements"), tr("Nothing")}; 253 asked = JOptionPane.showOptionDialog(Main .parent, tr("Ignore whole group or individual elements?"),252 asked = JOptionPane.showOptionDialog(MainApplication.getMainFrame(), tr("Ignore whole group or individual elements?"), 254 253 tr("Ignoring elements"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, null, 255 254 a, a[1]); -
trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java
r13849 r14153 34 34 import javax.swing.border.Border; 35 35 36 import org.openstreetmap.josm. Main;36 import org.openstreetmap.josm.gui.MainApplication; 37 37 import org.openstreetmap.josm.gui.SideButton; 38 38 import org.openstreetmap.josm.gui.dialogs.IEnabledStateUpdating; … … 117 117 // Action can be trigger either by opacity button or by popup menu (in case toggle buttons are hidden). 118 118 // In that case, show it in the middle of screen (because opacityButton is not visible) 119 popup.show(Main.parent, Main.parent.getWidth() / 2, (Main.parent.getHeight() - popup.getHeight()) / 2); 119 popup.show(MainApplication.getMainFrame(), 120 MainApplication.getMainFrame().getWidth() / 2, 121 (MainApplication.getMainFrame().getHeight() - popup.getHeight()) / 2); 120 122 } 121 123 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
r14143 r14153 48 48 import javax.swing.table.TableRowSorter; 49 49 50 import org.openstreetmap.josm.Main;51 50 import org.openstreetmap.josm.actions.JosmAction; 52 51 import org.openstreetmap.josm.actions.relation.DownloadMembersAction; … … 1029 1028 } 1030 1029 1031 ExtendedDialog ed = new ExtendedDialog(Main .parent,1030 ExtendedDialog ed = new ExtendedDialog(MainApplication.getMainFrame(), 1032 1031 tr("Change relation"), 1033 1032 tr("Delete from relation"), tr("Cancel")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/SearchBasedRowFilter.java
r12656 r14153 27 27 28 28 @Override 29 public boolean include(Entry entry) {29 public boolean include(Entry<? extends TableModel, ? extends Integer> entry) { 30 30 final String key = entry.getStringValue(0); 31 31 final String value = entry.getStringValue(1); -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
r14143 r14153 62 62 import javax.swing.text.JTextComponent; 63 63 64 import org.openstreetmap.josm.Main;65 64 import org.openstreetmap.josm.actions.JosmAction; 66 65 import org.openstreetmap.josm.actions.search.SearchAction; … … 83 82 import org.openstreetmap.josm.gui.ExtendedDialog; 84 83 import org.openstreetmap.josm.gui.IExtendedDialog; 84 import org.openstreetmap.josm.gui.MainApplication; 85 85 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils; 86 86 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles; … … 351 351 Logging.warn(parseError); 352 352 JOptionPane.showMessageDialog( 353 Main .parent,353 MainApplication.getMainFrame(), 354 354 parseError.getMessage(), 355 355 tr("Error"), … … 383 383 private static boolean warnOverwriteKey(String action, String togglePref) { 384 384 return new ExtendedDialog( 385 Main .parent,385 MainApplication.getMainFrame(), 386 386 tr("Overwrite key"), 387 387 tr("Replace"), tr("Cancel")) … … 420 420 421 421 protected EditTagDialog(String key, Map<String, Integer> map, final boolean initialFocusOnKey) { 422 super(Main .parent, trn("Change value?", "Change values?", map.size()), tr("OK"), tr("Cancel"));422 super(MainApplication.getMainFrame(), trn("Change value?", "Change values?", map.size()), tr("OK"), tr("Cancel")); 423 423 setButtonIcons("ok", "cancel"); 424 424 setCancelButton(2); … … 576 576 577 577 setRememberWindowGeometry(getClass().getName() + ".geometry", 578 WindowGeometry.centerInWindow(Main .parent, size));578 WindowGeometry.centerInWindow(MainApplication.getMainFrame(), size)); 579 579 } 580 580 … … 688 688 689 689 protected AddTagsDialog() { 690 super(Main .parent, tr("Add value?"), tr("OK"), tr("Cancel"));690 super(MainApplication.getMainFrame(), tr("Add value?"), tr("OK"), tr("Cancel")); 691 691 setButtonIcons("ok", "cancel"); 692 692 setCancelButton(2); -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
r13761 r14153 30 30 import javax.swing.tree.TreePath; 31 31 32 import org.openstreetmap.josm.Main;33 32 import org.openstreetmap.josm.data.osm.DataSet; 34 33 import org.openstreetmap.josm.data.osm.DataSetMerger; … … 335 334 if (conflictsCount > 0) { 336 335 JOptionPane.showMessageDialog( 337 Main .parent,336 MainApplication.getMainFrame(), 338 337 trn("There was {0} conflict during import.", 339 338 "There were {0} conflicts during import.", … … 374 373 375 374 JOptionPane.showMessageDialog( 376 Main .parent,375 MainApplication.getMainFrame(), 377 376 message, 378 377 tr("Relation is deleted"), -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
r14056 r14153 49 49 import javax.swing.KeyStroke; 50 50 51 import org.openstreetmap.josm.Main;52 51 import org.openstreetmap.josm.actions.JosmAction; 53 52 import org.openstreetmap.josm.command.ChangeCommand; … … 182 181 183 182 setRememberWindowGeometry(getClass().getName() + ".geometry", 184 WindowGeometry.centerInWindow(Main .parent, new Dimension(700, 650)));183 WindowGeometry.centerInWindow(MainApplication.getMainFrame(), new Dimension(700, 650))); 185 184 186 185 final TaggingPresetHandler presetHandler = new TaggingPresetHandler() { … … 780 779 int ret = ConditionalOptionPaneUtil.showOptionDialog( 781 780 "clean_relation_self_references", 782 Main .parent,781 MainApplication.getMainFrame(), 783 782 tr("<html>There is at least one member in this relation referring<br>" 784 783 + "to the relation itself.<br>" … … 853 852 int ret = ConditionalOptionPaneUtil.showOptionDialog( 854 853 "add_primitive_to_relation", 855 Main .parent,854 MainApplication.getMainFrame(), 856 855 msg, 857 856 tr("Multiple members referring to same object."), … … 885 884 Utils.escapeReservedCharactersHTML(primitive.getDisplayName(DefaultNameFormatter.getInstance()))); 886 885 JOptionPane.showMessageDialog( 887 Main .parent,886 MainApplication.getMainFrame(), 888 887 msg, 889 888 tr("Warning"), -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java
r13654 r14153 12 12 import javax.swing.SwingUtilities; 13 13 14 import org.openstreetmap.josm.Main;15 14 import org.openstreetmap.josm.data.osm.DataSet; 16 15 import org.openstreetmap.josm.data.osm.DataSetMerger; 17 16 import org.openstreetmap.josm.data.osm.Relation; 17 import org.openstreetmap.josm.gui.MainApplication; 18 18 import org.openstreetmap.josm.gui.PleaseWaitRunnable; 19 19 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 131 131 protected void showLastException() { 132 132 JOptionPane.showMessageDialog( 133 Main .parent,133 MainApplication.getMainFrame(), 134 134 Optional.ofNullable(lastException.getMessage()).orElseGet(lastException::toString), 135 135 tr("Error"), … … 174 174 getLayer().getConflicts().add(visitor.getConflicts()); 175 175 JOptionPane.showMessageDialog( 176 Main .parent,176 MainApplication.getMainFrame(), 177 177 tr("There were {0} conflicts during import.", 178 178 visitor.getConflicts().size()), -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java
r14029 r14153 8 8 import java.util.Collection; 9 9 10 import org.openstreetmap.josm.Main;11 10 import org.openstreetmap.josm.data.osm.Relation; 12 11 import org.openstreetmap.josm.data.osm.RelationMember; 13 12 import org.openstreetmap.josm.gui.ExtendedDialog; 13 import org.openstreetmap.josm.gui.MainApplication; 14 14 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 15 15 import org.openstreetmap.josm.tools.CheckParameterUtil; … … 52 52 */ 53 53 protected RelationEditor(OsmDataLayer layer, Relation relation) { 54 super(Main .parent,54 super(MainApplication.getMainFrame(), 55 55 "", 56 56 new String[] {tr("Apply Changes"), tr("Cancel")}, -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java
r14030 r14153 9 9 import javax.swing.RootPaneContainer; 10 10 11 import org.openstreetmap.josm.Main;12 11 import org.openstreetmap.josm.data.osm.Relation; 13 12 import org.openstreetmap.josm.gui.HelpAwareOptionPane; 14 13 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec; 14 import org.openstreetmap.josm.gui.MainApplication; 15 15 import org.openstreetmap.josm.spi.preferences.Config; 16 16 import org.openstreetmap.josm.tools.ImageProvider; … … 83 83 84 84 return HelpAwareOptionPane.showOptionDialog( 85 Main .parent,85 MainApplication.getMainFrame(), 86 86 tr("<html>The relation has been changed.<br><br>Do you want to save your changes?</html>"), 87 87 tr("Unsaved changes"), -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RefreshAction.java
r14138 r14153 11 11 import javax.swing.JRootPane; 12 12 13 import org.openstreetmap.josm.Main;14 13 import org.openstreetmap.josm.data.UndoRedoHandler; 15 14 import org.openstreetmap.josm.data.UndoRedoHandler.CommandQueueListener; … … 17 16 import org.openstreetmap.josm.gui.HelpAwareOptionPane; 18 17 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec; 18 import org.openstreetmap.josm.gui.MainApplication; 19 19 import org.openstreetmap.josm.gui.dialogs.relation.IRelationEditor; 20 20 import org.openstreetmap.josm.tools.ImageProvider; … … 94 94 95 95 return HelpAwareOptionPane.showOptionDialog( 96 Main .parent,96 MainApplication.getMainFrame(), 97 97 tr("<html>You have unsaved changes in this editor window.<br>"+ 98 98 "<br>Do you want to discard these changes and reload data from layer?</html>"), … … 123 123 124 124 return HelpAwareOptionPane.showOptionDialog( 125 Main .parent,125 MainApplication.getMainFrame(), 126 126 tr("<html>Relation has been deleted outside editor.<br><br>Do you want to close this window?</html>"), 127 127 tr("Deleted relation"), -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java
r14134 r14153 11 11 import javax.swing.SwingUtilities; 12 12 13 import org.openstreetmap.josm.Main;14 13 import org.openstreetmap.josm.command.AddCommand; 15 14 import org.openstreetmap.josm.command.ChangeCommand; … … 62 61 String msg = tr("One or more members of this new relation have been deleted while the relation editor\n" + 63 62 "was open. They have been removed from the relation members list."); 64 JOptionPane.showMessageDialog(Main .parent, msg, tr("Warning"), JOptionPane.WARNING_MESSAGE);63 JOptionPane.showMessageDialog(MainApplication.getMainFrame(), msg, tr("Warning"), JOptionPane.WARNING_MESSAGE); 65 64 } 66 65 // If the user wanted to create a new relation, but hasn't added any members or … … 124 123 125 124 int ret = HelpAwareOptionPane.showOptionDialog( 126 Main .parent,125 MainApplication.getMainFrame(), 127 126 tr("<html>This relation has been changed outside of the editor.<br>" 128 127 + "You cannot apply your changes and continue editing.<br>" … … 144 143 protected void warnDoubleConflict() { 145 144 JOptionPane.showMessageDialog( 146 Main .parent,145 MainApplication.getMainFrame(), 147 146 tr("<html>Layer ''{0}'' already has a conflict for object<br>" 148 147 + "''{1}''.<br>" -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SetRoleAction.java
r14030 r14153 11 11 import javax.swing.event.DocumentListener; 12 12 13 import org.openstreetmap.josm.Main;14 13 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil; 14 import org.openstreetmap.josm.gui.MainApplication; 15 15 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField; 16 16 import org.openstreetmap.josm.tools.ImageProvider; … … 61 61 int ret = ConditionalOptionPaneUtil.showOptionDialog( 62 62 "relation_editor.confirm_applying_empty_role", 63 Main .parent,63 MainApplication.getMainFrame(), 64 64 message, 65 65 tr("Confirm empty role"),
Note:
See TracChangeset
for help on using the changeset viewer.