Ignore:
Timestamp:
2018-08-13T02:18:54+02:00 (6 years ago)
Author:
Don-vip
Message:

see #15229 - deprecate Main.parent and Main itself

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

    r12940 r14153  
    3131import javax.swing.JSplitPane;
    3232
    33 import org.openstreetmap.josm.Main;
    3433import org.openstreetmap.josm.actions.ExpertToggleAction;
    3534import org.openstreetmap.josm.command.Command;
    … …  
    4140import org.openstreetmap.josm.data.osm.Way;
    4241import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
     42import org.openstreetmap.josm.gui.MainApplication;
    4343import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
    4444import org.openstreetmap.josm.gui.help.HelpUtil;
    … …  
    6666 * Models have to be <strong>populated</strong> before the dialog is launched. Example:
    6767 * <pre>
    68  *    CombinePrimitiveResolverDialog dialog = new CombinePrimitiveResolverDialog(Main.parent);
     68 *    CombinePrimitiveResolverDialog dialog = new CombinePrimitiveResolverDialog(MainApplication.getMainFrame());
    6969 *    dialog.getTagConflictResolverModel().populate(aTagCollection);
    7070 *    dialog.getRelationMemberConflictResolverModel().populate(aRelationLinkCollection);
    … …  
    370370            prepareGUIBeforeConflictResolutionStarts();
    371371            setMinimumSize(new Dimension(400, 400));
    372             new WindowGeometry(getClass().getName() + ".geometry", WindowGeometry.centerInWindow(Main.parent,
     372            new WindowGeometry(getClass().getName() + ".geometry", WindowGeometry.centerInWindow(MainApplication.getMainFrame(),
    373373                    new Dimension(800, 600))).applySafe(this);
    374374            setApplied(false);
    … …  
    521521            UserCancelException canceled = GuiHelper.runInEDTAndWaitAndReturn(() -> {
    522522                // Build conflict resolution dialog
    523                 final CombinePrimitiveResolverDialog dialog = new CombinePrimitiveResolverDialog(Main.parent, tagModel, relModel);
     523                final CombinePrimitiveResolverDialog dialog = new CombinePrimitiveResolverDialog(
     524                        MainApplication.getMainFrame(), tagModel, relModel);
    524525
    525526                // Ensure a proper title is displayed instead of a previous target (fix #7925)
    … …  
    580581        if (!ConditionalOptionPaneUtil.showConfirmationDialog(
    581582                "combine_tags",
    582                 Main.parent,
     583                MainApplication.getMainFrame(),
    583584                "<html>" + msg + "</html>",
    584585                tr("Combine confirmation"),
    … …  
    614615        if (!ConditionalOptionPaneUtil.showConfirmationDialog(
    615616                "combine_tags",
    616                 Main.parent,
     617                MainApplication.getMainFrame(),
    617618                "<html>" + msg + "</html>",
    618619                tr("Combine confirmation"),
Note: See TracChangeset for help on using the changeset viewer.