Changeset 12643 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs
- Timestamp:
- 2017-08-25T10:18:53+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/dialogs
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r12641 r12643 141 141 createLayout(lstConflicts, true, Arrays.asList(btnResolve, btnSelect)); 142 142 143 popupMenuHandler.addAction(Main .main.menu.autoScaleActions.get("conflict"));143 popupMenuHandler.addAction(MainApplication.getMenu().autoScaleActions.get("conflict")); 144 144 145 145 ResolveToMyVersionAction resolveToMyVersionAction = new ResolveToMyVersionAction(); -
trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
r12634 r12643 134 134 } 135 135 }); 136 cbWireframe.addActionListener(e -> Main .main.menu.wireFrameToggleAction.actionPerformed(null));136 cbWireframe.addActionListener(e -> MainApplication.getMenu().wireFrameToggleAction.actionPerformed(null)); 137 137 cbWireframe.setBorder(new EmptyBorder(new Insets(1, 1, 1, 1))); 138 138 … … 180 180 public void showNotify() { 181 181 MapPaintStyles.addMapPaintSylesUpdateListener(model); 182 Main .main.menu.wireFrameToggleAction.addButtonModel(cbWireframe.getModel());182 MainApplication.getMenu().wireFrameToggleAction.addButtonModel(cbWireframe.getModel()); 183 183 } 184 184 185 185 @Override 186 186 public void hideNotify() { 187 Main .main.menu.wireFrameToggleAction.removeButtonModel(cbWireframe.getModel());187 MainApplication.getMenu().wireFrameToggleAction.removeButtonModel(cbWireframe.getModel()); 188 188 MapPaintStyles.removeMapPaintSylesUpdateListener(model); 189 189 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java
r12300 r12643 17 17 import org.openstreetmap.josm.actions.JosmAction; 18 18 import org.openstreetmap.josm.gui.ExtendedDialog; 19 import org.openstreetmap.josm.gui.MainApplication; 19 20 import org.openstreetmap.josm.gui.MainMenu; 20 21 import org.openstreetmap.josm.gui.widgets.SearchTextResultListPanel; … … 27 28 28 29 private final Selector selector; 29 private static final MenuItemSearchDialog INSTANCE = new MenuItemSearchDialog(Main .main.menu);30 private static final MenuItemSearchDialog INSTANCE = new MenuItemSearchDialog(MainApplication.getMenu()); 30 31 31 32 private MenuItemSearchDialog(MainMenu menu) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
r12636 r12643 198 198 updateButtonStates(); 199 199 // TODO make a proper listener mechanism to handle change of note selection 200 Main .main.menu.infoweb.noteSelectionChanged();200 MainApplication.getMenu().infoweb.noteSelectionChanged(); 201 201 } 202 202 -
trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
r12636 r12643 182 182 183 183 // Do not hide copy action because of default JList override (fix #9815) 184 displaylist.getActionMap().put("copy", Main .main.menu.copy);184 displaylist.getActionMap().put("copy", MainApplication.getMenu().copy); 185 185 displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_C, GuiHelper.getMenuShortcutKeyMaskEx()), "copy"); 186 186 -
trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
r12636 r12643 268 268 protected void registerInWindowMenu() { 269 269 if (Main.main != null) { 270 windowMenuItem = MainMenu.addWithCheckbox(Main .main.menu.windowMenu,270 windowMenuItem = MainMenu.addWithCheckbox(MainApplication.getMenu().windowMenu, 271 271 (JosmAction) getToggleAction(), 272 272 MainMenu.WINDOW_MENU_GROUP.TOGGLE_DIALOG); … … 465 465 } 466 466 if (Main.main != null) { 467 Main .main.menu.windowMenu.remove(windowMenuItem);467 MainApplication.getMenu().windowMenu.remove(windowMenuItem); 468 468 } 469 469 Toolkit.getDefaultToolkit().removeAWTEventListener(this); -
trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
r12641 r12643 101 101 KeyEvent.VK_V, Shortcut.ALT_SHIFT), 150, false, ValidatorPreference.class); 102 102 103 popupMenuHandler.addAction(Main .main.menu.autoScaleActions.get("problem"));103 popupMenuHandler.addAction(MainApplication.getMenu().autoScaleActions.get("problem")); 104 104 popupMenuHandler.addAction(new EditRelationAction()); 105 105 -
trunk/src/org/openstreetmap/josm/gui/dialogs/layer/MergeAction.java
r10600 r12643 11 11 import javax.swing.JMenuItem; 12 12 13 import org.openstreetmap.josm.Main; 13 import org.openstreetmap.josm.actions.MergeLayerAction; 14 import org.openstreetmap.josm.gui.MainApplication; 14 15 import org.openstreetmap.josm.gui.dialogs.IEnabledStateUpdating; 15 16 import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel; … … 69 70 @Override 70 71 public void actionPerformed(ActionEvent e) { 72 MergeLayerAction mergeLayerAction = MainApplication.getMenu().merge; 71 73 if (layer != null) { 72 Main.main.menu.merge.merge(layer);74 mergeLayerAction.merge(layer); 73 75 } else if (layers != null) { 74 Main.main.menu.merge.merge(layers);76 mergeLayerAction.merge(layers); 75 77 } else { 76 78 if (model.getSelectedLayers().size() == 1) { 77 79 Layer selectedLayer = model.getSelectedLayers().get(0); 78 Main.main.menu.merge.merge(selectedLayer);80 mergeLayerAction.merge(selectedLayer); 79 81 } else { 80 Main.main.menu.merge.merge(model.getSelectedLayers());82 mergeLayerAction.merge(model.getSelectedLayers()); 81 83 } 82 84 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
r12620 r12643 59 59 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil; 60 60 import org.openstreetmap.josm.gui.DefaultNameFormatter; 61 import org.openstreetmap.josm.gui.MainApplication; 61 62 import org.openstreetmap.josm.gui.MainMenu; 62 63 import org.openstreetmap.josm.gui.ScrollViewport; … … 768 769 memberTable.unregisterListeners(); 769 770 if (windowMenuItem != null) { 770 Main .main.menu.windowMenu.remove(windowMenuItem);771 MainApplication.getMenu().windowMenu.remove(windowMenuItem); 771 772 windowMenuItem = null; 772 773 } … … 798 799 }; 799 800 focusAction.putValue("relationEditor", re); 800 return MainMenu.add(Main .main.menu.windowMenu, focusAction, MainMenu.WINDOW_MENU_GROUP.VOLATILE);801 return MainMenu.add(MainApplication.getMenu().windowMenu, focusAction, MainMenu.WINDOW_MENU_GROUP.VOLATILE); 801 802 } 802 803
Note:
See TracChangeset
for help on using the changeset viewer.