Changeset 12799 in josm


Ignore:
Timestamp:
2017-09-09T14:13:56+02:00 (20 months ago)
Author:
Don-vip
Message:

see #15229 - see #15182 - see #14794 - move Multi* GUI classes from tools to gui.util

Location:
trunk
Files:
6 edited
4 moved

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java

    r12630 r12799  
    4343import org.openstreetmap.josm.gui.MapFrame;
    4444import org.openstreetmap.josm.gui.MapFrame.MapModeChangeListener;
     45import org.openstreetmap.josm.gui.util.MultikeyActionsHandler;
     46import org.openstreetmap.josm.gui.util.MultikeyShortcutAction;
    4547import org.openstreetmap.josm.gui.SideButton;
    4648import org.openstreetmap.josm.tools.ImageProvider;
    4749import org.openstreetmap.josm.tools.InputMapUtils;
    48 import org.openstreetmap.josm.tools.MultikeyActionsHandler;
    49 import org.openstreetmap.josm.tools.MultikeyShortcutAction;
    5050import org.openstreetmap.josm.tools.Shortcut;
    5151
  • trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

    r12748 r12799  
    6666import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
    6767import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
     68import org.openstreetmap.josm.gui.util.MultikeyActionsHandler;
     69import org.openstreetmap.josm.gui.util.MultikeyShortcutAction.MultikeyInfo;
    6870import org.openstreetmap.josm.gui.layer.NativeScaleLayer;
    6971import org.openstreetmap.josm.gui.widgets.DisableShortcutsOnFocusGainedTextField;
     
    7375import org.openstreetmap.josm.tools.ImageProvider;
    7476import org.openstreetmap.josm.tools.InputMapUtils;
    75 import org.openstreetmap.josm.tools.MultikeyActionsHandler;
    76 import org.openstreetmap.josm.tools.MultikeyShortcutAction.MultikeyInfo;
    7777import org.openstreetmap.josm.tools.Shortcut;
    7878
  • trunk/src/org/openstreetmap/josm/gui/dialogs/layer/ActivateLayerAction.java

    r10611 r12799  
    1818import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
    1919import org.openstreetmap.josm.gui.util.GuiHelper;
     20import org.openstreetmap.josm.gui.util.MultikeyShortcutAction;
    2021import org.openstreetmap.josm.tools.CheckParameterUtil;
    2122import org.openstreetmap.josm.tools.ImageProvider;
    22 import org.openstreetmap.josm.tools.MultikeyShortcutAction;
    2323import org.openstreetmap.josm.tools.Shortcut;
    2424
  • trunk/src/org/openstreetmap/josm/gui/dialogs/layer/ShowHideLayerAction.java

    r10600 r12799  
    1919import org.openstreetmap.josm.gui.layer.Layer;
    2020import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
     21import org.openstreetmap.josm.gui.util.MultikeyShortcutAction;
    2122import org.openstreetmap.josm.tools.ImageProvider;
    22 import org.openstreetmap.josm.tools.MultikeyShortcutAction;
    2323import org.openstreetmap.josm.tools.Shortcut;
    2424
  • trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

    r12719 r12799  
    5555import org.openstreetmap.josm.gui.help.HelpUtil;
    5656import org.openstreetmap.josm.gui.util.GuiHelper;
     57import org.openstreetmap.josm.gui.util.MultiLineFlowLayout;
    5758import org.openstreetmap.josm.gui.util.WindowGeometry;
    5859import org.openstreetmap.josm.io.OsmApi;
     
    6465import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
    6566import org.openstreetmap.josm.tools.InputMapUtils;
    66 import org.openstreetmap.josm.tools.MultiLineFlowLayout;
    6767import org.openstreetmap.josm.tools.Utils;
    6868
  • trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java

    r12460 r12799  
    1212
    1313import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
    14 import org.openstreetmap.josm.tools.MultikeyActionsHandler;
    15 import org.openstreetmap.josm.tools.MultikeyShortcutAction;
     14import org.openstreetmap.josm.gui.util.MultikeyActionsHandler;
     15import org.openstreetmap.josm.gui.util.MultikeyShortcutAction;
    1616import org.openstreetmap.josm.tools.Shortcut;
    1717
  • trunk/src/org/openstreetmap/josm/gui/util/MultiLineFlowLayout.java

    r12795 r12799  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.tools;
     2package org.openstreetmap.josm.gui.util;
    33
    44import java.awt.Component;
  • trunk/src/org/openstreetmap/josm/gui/util/MultikeyActionsHandler.java

    r12798 r12799  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.tools;
     2package org.openstreetmap.josm.gui.util;
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     
    2525import org.openstreetmap.josm.Main;
    2626import org.openstreetmap.josm.gui.MainApplication;
    27 import org.openstreetmap.josm.tools.MultikeyShortcutAction.MultikeyInfo;
     27import org.openstreetmap.josm.gui.util.MultikeyShortcutAction.MultikeyInfo;
     28import org.openstreetmap.josm.tools.Shortcut;
    2829
    2930public final class MultikeyActionsHandler {
  • trunk/src/org/openstreetmap/josm/gui/util/MultikeyShortcutAction.java

    r12795 r12799  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.tools;
     2package org.openstreetmap.josm.gui.util;
    33
    44import java.util.List;
    55
    66import javax.swing.Action;
     7
     8import org.openstreetmap.josm.tools.Shortcut;
    79
    810public interface MultikeyShortcutAction extends Action {
  • trunk/test/unit/org/openstreetmap/josm/gui/util/MultiLineFlowLayoutTest.java

    r12795 r12799  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.tools;
     2package org.openstreetmap.josm.gui.util;
    33
    44import static org.junit.Assert.assertEquals;
     
    1313import org.junit.Rule;
    1414import org.junit.Test;
     15import org.openstreetmap.josm.gui.util.MultiLineFlowLayout;
    1516import org.openstreetmap.josm.testutils.JOSMTestRules;
    1617
Note: See TracChangeset for help on using the changeset viewer.