summaryrefslogtreecommitdiff
path: root/platform/platform-impl/src/com/intellij/ide/actions
diff options
context:
space:
mode:
Diffstat (limited to 'platform/platform-impl/src/com/intellij/ide/actions')
-rw-r--r--platform/platform-impl/src/com/intellij/ide/actions/AboutAction.java3
-rw-r--r--platform/platform-impl/src/com/intellij/ide/actions/AssociateFileType.java2
-rw-r--r--platform/platform-impl/src/com/intellij/ide/actions/BaseShowRecentFilesAction.java15
-rw-r--r--platform/platform-impl/src/com/intellij/ide/actions/CreateLauncherScriptAction.java4
-rw-r--r--platform/platform-impl/src/com/intellij/ide/actions/ExitAction.java3
-rw-r--r--platform/platform-impl/src/com/intellij/ide/actions/OccurenceNavigatorActionBase.java4
-rw-r--r--platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java17
-rw-r--r--platform/platform-impl/src/com/intellij/ide/actions/ShowRecentFilesAction.java5
-rw-r--r--platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java2
-rw-r--r--platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java2
-rw-r--r--platform/platform-impl/src/com/intellij/ide/actions/SplitAction.java3
-rw-r--r--platform/platform-impl/src/com/intellij/ide/actions/Switcher.java83
12 files changed, 79 insertions, 64 deletions
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/AboutAction.java b/platform/platform-impl/src/com/intellij/ide/actions/AboutAction.java
index e0c9373bbf2b..43cc4d0be9d8 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/AboutAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/AboutAction.java
@@ -16,6 +16,7 @@
package com.intellij.ide.actions;
import com.intellij.ide.DataManager;
+import com.intellij.openapi.actionSystem.ActionPlaces;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -31,7 +32,7 @@ import java.awt.*;
public class AboutAction extends AnAction implements DumbAware {
@Override
public void update(AnActionEvent e) {
- e.getPresentation().setVisible(!SystemInfo.isMacSystemMenu);
+ e.getPresentation().setVisible(!SystemInfo.isMacSystemMenu || !ActionPlaces.MAIN_MENU.equals(e.getPlace()));
e.getPresentation().setDescription("Show information about " + ApplicationNamesInfo.getInstance().getFullProductName());
}
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/AssociateFileType.java b/platform/platform-impl/src/com/intellij/ide/actions/AssociateFileType.java
index 77544ae1d14c..8b1375d9f933 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/AssociateFileType.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/AssociateFileType.java
@@ -41,7 +41,7 @@ public class AssociateFileType extends AnAction {
// the action should also be available for files which have been auto-detected as text or as a particular language (IDEA-79574)
haveSmthToDo = FileTypeManager.getInstance().getFileTypeByFileName(file.getName()) == FileTypes.UNKNOWN;
}
- presentation.setVisible(haveSmthToDo || ActionPlaces.MAIN_MENU.equals(e.getPlace()));
+ presentation.setVisible(haveSmthToDo || ActionPlaces.isMainMenuOrActionSearch(e.getPlace()));
presentation.setEnabled(haveSmthToDo);
}
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/BaseShowRecentFilesAction.java b/platform/platform-impl/src/com/intellij/ide/actions/BaseShowRecentFilesAction.java
index 442d09b8b3bd..505d0f5eef3d 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/BaseShowRecentFilesAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/BaseShowRecentFilesAction.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -39,6 +39,7 @@ import com.intellij.ui.components.JBList;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Function;
import com.intellij.util.IconUtil;
+import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
@@ -53,11 +54,11 @@ import java.io.File;
public abstract class BaseShowRecentFilesAction extends AnAction implements DumbAware {
private static final Color BORDER_COLOR = Gray._135;
- public void actionPerformed(AnActionEvent e) {
+ public void actionPerformed(@NotNull AnActionEvent e) {
show(CommonDataKeys.PROJECT.getData(e.getDataContext()));
}
- public void update(AnActionEvent event){
+ public void update(@NotNull AnActionEvent event){
Presentation presentation = event.getPresentation();
Project project = CommonDataKeys.PROJECT.getData(event.getDataContext());
presentation.setEnabled(project != null);
@@ -93,7 +94,7 @@ public abstract class BaseShowRecentFilesAction extends AnAction implements Dumb
final JList list = new JBList(model);
list.addKeyListener(
new KeyAdapter() {
- public void keyPressed(KeyEvent e) {
+ public void keyPressed(@NotNull KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_DELETE) {
int index = list.getSelectedIndex();
if (index == -1 || index >= list.getModel().getSize()){
@@ -150,7 +151,7 @@ public abstract class BaseShowRecentFilesAction extends AnAction implements Dumb
JPanel footerPanel = new JPanel(new BorderLayout()) {
@Override
- protected void paintComponent(Graphics g) {
+ protected void paintComponent(@NotNull Graphics g) {
super.paintComponent(g);
g.setColor(BORDER_COLOR);
g.drawLine(0, 0, getWidth(), 0);
@@ -237,7 +238,7 @@ public abstract class BaseShowRecentFilesAction extends AnAction implements Dumb
}
@Override
- public void actionPerformed(ActionEvent e) {
+ public void actionPerformed(@NotNull ActionEvent e) {
if (myPopup != null) {
myPopup.cancel();
}
@@ -272,7 +273,7 @@ public abstract class BaseShowRecentFilesAction extends AnAction implements Dumb
return fullText;
}
- public void valueChanged(final ListSelectionEvent e) {
+ public void valueChanged(@NotNull final ListSelectionEvent e) {
//noinspection SSBasedInspection
SwingUtilities.invokeLater(new Runnable() {
public void run() {
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CreateLauncherScriptAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CreateLauncherScriptAction.java
index 411f2d9d93bb..0b696c8f4496 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/CreateLauncherScriptAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/CreateLauncherScriptAction.java
@@ -134,12 +134,12 @@ public class CreateLauncherScriptAction extends DumbAwareAction {
private static File createLauncherScriptFile() throws IOException, ExecutionException {
String runPath = PathManager.getHomePath();
+ final String productName = ApplicationNamesInfo.getInstance().getProductName().toLowerCase();
if (!SystemInfo.isMac) {
// for Macs just use "*.app"
- final String productName = ApplicationNamesInfo.getInstance().getProductName().toLowerCase();
runPath += "/bin/" + productName + ".sh";
} else if (runPath.endsWith(CONTENTS)) {
- runPath = runPath.substring(0, runPath.length() - CONTENTS.length());
+ runPath += "/MacOS/" + productName;
}
String launcherContents = ExecUtil.loadTemplate(CreateLauncherScriptAction.class.getClassLoader(), "launcher.py",
newHashMap(asList("$CONFIG_PATH$", "$RUN_PATH$"),
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ExitAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ExitAction.java
index 52487a57f9f2..3017b8624828 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/ExitAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/ExitAction.java
@@ -16,6 +16,7 @@
*/
package com.intellij.ide.actions;
+import com.intellij.openapi.actionSystem.ActionPlaces;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.application.ex.ApplicationManagerEx;
@@ -24,7 +25,7 @@ import com.intellij.openapi.util.SystemInfo;
public class ExitAction extends AnAction implements DumbAware {
public void update(AnActionEvent e) {
- e.getPresentation().setVisible(!SystemInfo.isMacSystemMenu);
+ e.getPresentation().setVisible(!SystemInfo.isMacSystemMenu || !ActionPlaces.MAIN_MENU.equals(e.getPlace()));
}
public void actionPerformed(AnActionEvent e) {
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/OccurenceNavigatorActionBase.java b/platform/platform-impl/src/com/intellij/ide/actions/OccurenceNavigatorActionBase.java
index f2314a728913..c7ae78f0cd59 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/OccurenceNavigatorActionBase.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/OccurenceNavigatorActionBase.java
@@ -68,14 +68,14 @@ abstract class OccurenceNavigatorActionBase extends AnAction implements DumbAwar
if (project == null) {
presentation.setEnabled(false);
// make it invisible only in main menu to avoid initial invisibility in toolbars
- presentation.setVisible(!ActionPlaces.MAIN_MENU.equals(event.getPlace()));
+ presentation.setVisible(!ActionPlaces.isMainMenuOrActionSearch(event.getPlace()));
return;
}
OccurenceNavigator navigator = getNavigator(event.getDataContext());
if (navigator == null) {
presentation.setEnabled(false);
// make it invisible only in main menu to avoid initial invisibility in toolbars
- presentation.setVisible(!ActionPlaces.MAIN_MENU.equals(event.getPlace()));
+ presentation.setVisible(!ActionPlaces.isMainMenuOrActionSearch(event.getPlace()));
return;
}
presentation.setVisible(true);
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java b/platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java
index ddfc1a3989aa..560082bf9e64 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/PinActiveTabAction.java
@@ -116,12 +116,17 @@ public class PinActiveTabAction extends ToggleAction implements DumbAware {
super.update(e);
Presentation presentation = e.getPresentation();
DataContext context = e.getDataContext();
- if (getFile(context) != null) {
- presentation.setEnabledAndVisible(true);
- }
- else {
- Content content = getContent(context);
- presentation.setEnabledAndVisible(content != null && content.isPinnable());
+ EditorWindow window = getEditorWindow(context);
+ if (window == null || window.getOwner().isPreview()) {
+ presentation.setEnabledAndVisible(false);
+ } else {
+ if (getFile(context) != null) {
+ presentation.setEnabledAndVisible(true);
+ }
+ else {
+ Content content = getContent(context);
+ presentation.setEnabledAndVisible(content != null && content.isPinnable());
+ }
}
if (ActionPlaces.EDITOR_TAB_POPUP.equals(e.getPlace()) ||
ViewContext.CELL_POPUP_PLACE.equals(e.getPlace())) {
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowRecentFilesAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowRecentFilesAction.java
index 59ac567af38a..abd875af728f 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/ShowRecentFilesAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowRecentFilesAction.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,13 +25,14 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project;
+import org.jetbrains.annotations.NotNull;
/**
* @author Konstantin Bulenkov
*/
public class ShowRecentFilesAction extends DumbAwareAction {
@Override
- public void actionPerformed(AnActionEvent e) {
+ public void actionPerformed(@NotNull AnActionEvent e) {
final Project project = e.getData(CommonDataKeys.PROJECT);
if (project != null) {
FeatureUsageTracker.getInstance().triggerFeatureUsed("navigation.recent.files");
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java
index eda6ec9f2d7c..5ced3f0db498 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java
@@ -34,7 +34,7 @@ public class ShowSettingsAction extends AnAction implements DumbAware {
@Override
public void update(AnActionEvent e) {
- if (SystemInfo.isMac && e.getPlace().equals(ActionPlaces.MAIN_MENU)) {
+ if (SystemInfo.isMac && ActionPlaces.isMainMenuOrActionSearch(e.getPlace())) {
// It's called from Preferences in App menu.
e.getPresentation().setVisible(false);
}
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java
index 2c5cc5b02282..8d6f806802c2 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java
@@ -75,7 +75,7 @@ public class ShowSettingsUtilImpl extends ShowSettingsUtil {
new IdeConfigurablesGroup()};
return Registry.is("ide.new.settings.dialog")
- ? MixedConfigurableGroup.getGroups(getConfigurables(groups, true))
+ ? new ConfigurableGroup[]{new SortedConfigurableGroup(getConfigurables(groups, true))}
: groups;
}
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/SplitAction.java b/platform/platform-impl/src/com/intellij/ide/actions/SplitAction.java
index fb55f3649484..9e9a349bb3fd 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/SplitAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/SplitAction.java
@@ -60,7 +60,8 @@ public abstract class SplitAction extends AnAction implements DumbAware {
final int minimum = myCloseSource ? 2 : 1;
final boolean enabled = project != null
&& window != null
- && window.getTabCount() >= minimum;
+ && window.getTabCount() >= minimum
+ && !window.getOwner().isPreview();
event.getPresentation().setEnabled(enabled);
}
}
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
index cb35b5a504f9..cecf0f60a803 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
@@ -94,7 +94,7 @@ public class Switcher extends AnAction implements DumbAware {
public void run() {
synchronized (Switcher.class) {
if (SWITCHER != null) {
- SWITCHER.navigate();
+ SWITCHER.navigate(false);
}
}
}
@@ -135,7 +135,7 @@ public class Switcher extends AnAction implements DumbAware {
@NonNls private static final String SWITCHER_TITLE = "Switcher";
- public void actionPerformed(AnActionEvent e) {
+ public void actionPerformed(@NotNull AnActionEvent e) {
final Project project = CommonDataKeys.PROJECT.getData(e.getDataContext());
if (project == null) return;
@@ -200,7 +200,7 @@ public class Switcher extends AnAction implements DumbAware {
jList.setSelectedIndex(jList.getAnchorSelectionIndex());
}
if (jList.getSelectedIndex() != -1) {
- navigate();
+ navigate(false);
}
}
return true;
@@ -226,7 +226,7 @@ public class Switcher extends AnAction implements DumbAware {
descriptions = new JPanel(new BorderLayout()) {
@Override
- protected void paintComponent(Graphics g) {
+ protected void paintComponent(@NotNull Graphics g) {
super.paintComponent(g);
g.setColor(UIUtil.isUnderDarcula() ? SEPARATOR_COLOR : BORDER_COLOR);
g.drawLine(0, 0, getWidth(), 0);
@@ -249,7 +249,7 @@ public class Switcher extends AnAction implements DumbAware {
final Map<ToolWindow, String> map = ContainerUtil.reverseMap(twShortcuts);
Collections.sort(windows, new Comparator<ToolWindow>() {
@Override
- public int compare(ToolWindow o1, ToolWindow o2) {
+ public int compare(@NotNull ToolWindow o1, @NotNull ToolWindow o2) {
return StringUtil.compare(map.get(o1), map.get(o2), false);
}
});
@@ -297,7 +297,7 @@ public class Switcher extends AnAction implements DumbAware {
toolWindows.addMouseMotionListener(this);
myClickListener.installOn(toolWindows);
toolWindows.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
- public void valueChanged(ListSelectionEvent e) {
+ public void valueChanged(@NotNull ListSelectionEvent e) {
if (!toolWindows.isSelectionEmpty() && !files.isSelectionEmpty()) {
files.clearSelection();
}
@@ -306,7 +306,7 @@ public class Switcher extends AnAction implements DumbAware {
separator = new JPanel() {
@Override
- protected void paintComponent(Graphics g) {
+ protected void paintComponent(@NotNull Graphics g) {
super.paintComponent(g);
g.setColor(SEPARATOR_COLOR);
g.drawLine(0, 0, 0, getHeight());
@@ -374,7 +374,7 @@ public class Switcher extends AnAction implements DumbAware {
JPanel myPanel = new JPanel(new BorderLayout());
JLabel myLabel = new JLabel() {
@Override
- protected void paintComponent(Graphics g) {
+ protected void paintComponent(@NotNull Graphics g) {
GraphicsConfig config = new GraphicsConfig(g);
((Graphics2D)g).setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f));
super.paintComponent(g);
@@ -425,7 +425,7 @@ public class Switcher extends AnAction implements DumbAware {
return fullText;
}
- public void valueChanged(final ListSelectionEvent e) {
+ public void valueChanged(@NotNull final ListSelectionEvent e) {
ApplicationManager.getApplication().invokeLater(new Runnable() {
public void run() {
updatePathLabel();
@@ -466,7 +466,7 @@ public class Switcher extends AnAction implements DumbAware {
files.setSelectionMode(pinned ? ListSelectionModel.MULTIPLE_INTERVAL_SELECTION : ListSelectionModel.SINGLE_SELECTION);
files.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
- public void valueChanged(ListSelectionEvent e) {
+ public void valueChanged(@NotNull ListSelectionEvent e) {
if (!files.isSelectionEmpty() && !toolWindows.isSelectionEmpty()) {
toolWindows.getSelectionModel().clearSelection();
}
@@ -526,21 +526,21 @@ public class Switcher extends AnAction implements DumbAware {
if (isPinnedMode()) {
new AnAction(null ,null ,null) {
@Override
- public void actionPerformed(AnActionEvent e) {
+ public void actionPerformed(@NotNull AnActionEvent e) {
changeSelection();
}
}.registerCustomShortcutSet(CustomShortcutSet.fromString("TAB"), this, myPopup);
new AnAction(null, null, null) {
@Override
- public void actionPerformed(AnActionEvent e) {
+ public void actionPerformed(@NotNull AnActionEvent e) {
//suppress all actions to activate a toolwindow : IDEA-71277
}
}.registerCustomShortcutSet(TW_SHORTCUT, this, myPopup);
new AnAction(null, null, null) {
@Override
- public void actionPerformed(AnActionEvent e) {
+ public void actionPerformed(@NotNull AnActionEvent e) {
if (mySpeedSearch != null && mySpeedSearch.isPopupActive()) {
mySpeedSearch.hidePopup();
} else {
@@ -590,24 +590,24 @@ public class Switcher extends AnAction implements DumbAware {
return ((KeyboardShortcut)shortcutSet.getShortcuts()[0]).getFirstKeyStroke().getModifiers();
}
- public void keyTyped(KeyEvent e) {
+ public void keyTyped(@NotNull KeyEvent e) {
}
public void keyReleased(KeyEvent e) {
- if ((e.getKeyCode() == CTRL_KEY && isAutoHide())
- || e.getKeyCode() == VK_ENTER) {
- navigate();
- } else
- if (e.getKeyCode() == VK_LEFT) {
+ if (e.getKeyCode() == CTRL_KEY && isAutoHide() || e.getKeyCode() == VK_ENTER) {
+ navigate(e.isShiftDown());
+ }
+ else if (e.getKeyCode() == VK_LEFT) {
goLeft();
- } else if (e.getKeyCode() == VK_RIGHT) {
+ }
+ else if (e.getKeyCode() == VK_RIGHT) {
goRight();
}
}
KeyEvent lastEvent;
- public void keyPressed(KeyEvent e) {
- if ((mySpeedSearch != null && mySpeedSearch.isPopupActive()) || lastEvent == e) return;
+ public void keyPressed(@NotNull KeyEvent e) {
+ if (mySpeedSearch != null && mySpeedSearch.isPopupActive() || lastEvent == e) return;
lastEvent = e;
switch (e.getKeyCode()) {
case VK_UP:
@@ -668,7 +668,7 @@ public class Switcher extends AnAction implements DumbAware {
if (value instanceof FileInfo) {
final FileInfo info = (FileInfo)value;
final VirtualFile virtualFile = info.first;
- final FileEditorManagerImpl editorManager = ((FileEditorManagerImpl)FileEditorManager.getInstance(project));
+ final FileEditorManagerImpl editorManager = (FileEditorManagerImpl)FileEditorManager.getInstance(project);
final JList jList = getSelectedList();
final EditorWindow wnd = findAppropriateWindow(info);
if (wnd == null) {
@@ -836,7 +836,7 @@ public class Switcher extends AnAction implements DumbAware {
}
}
- void navigate() {
+ void navigate(final boolean openInNewWindow) {
final Object[] values = getSelectedList().getSelectedValues();
myPopup.closeOk(null);
if (values.length > 0 && values[0] instanceof ToolWindow) {
@@ -850,14 +850,19 @@ public class Switcher extends AnAction implements DumbAware {
if (value instanceof FileInfo) {
final FileInfo info = (FileInfo)value;
- if (info.second != null) {
+ VirtualFile file = info.first;
+ if (openInNewWindow) {
+ manager.openFileInNewWindow(file);
+ }
+ else if (info.second != null) {
EditorWindow wnd = findAppropriateWindow(info);
if (wnd != null) {
- manager.openFileImpl2(wnd, info.first, true);
- manager.addSelectionRecord(info.first, wnd);
+ manager.openFileImpl2(wnd, file, true);
+ manager.addSelectionRecord(file, wnd);
}
- } else {
- manager.openFile(info.first, true, true);
+ }
+ else {
+ manager.openFile(file, true, true);
}
}
}
@@ -873,13 +878,13 @@ public class Switcher extends AnAction implements DumbAware {
return ArrayUtil.contains(info.second, windows) ? info.second : windows.length > 0 ? windows[0] : null;
}
- public void mouseClicked(MouseEvent e) {
+ public void mouseClicked(@NotNull MouseEvent e) {
}
private boolean mouseMovedFirstTime = true;
private JList mouseMoveSrc = null;
private int mouseMoveListIndex = -1;
- public void mouseMoved(MouseEvent e) {
+ public void mouseMoved(@NotNull MouseEvent e) {
if (mouseMovedFirstTime) {
mouseMovedFirstTime = false;
return;
@@ -907,15 +912,15 @@ public class Switcher extends AnAction implements DumbAware {
files.repaint();
}
- public void mousePressed(MouseEvent e) {}
- public void mouseReleased(MouseEvent e) {}
- public void mouseEntered(MouseEvent e) {}
- public void mouseExited(MouseEvent e) {
+ public void mousePressed(@NotNull MouseEvent e) {}
+ public void mouseReleased(@NotNull MouseEvent e) {}
+ public void mouseEntered(@NotNull MouseEvent e) {}
+ public void mouseExited(@NotNull MouseEvent e) {
mouseMoveSrc = null;
mouseMoveListIndex = -1;
repaintLists();
}
- public void mouseDragged(MouseEvent e) {}
+ public void mouseDragged(@NotNull MouseEvent e) {}
private class SwitcherSpeedSearch extends SpeedSearchBase<SwitcherPanel> implements PropertyChangeListener {
private Object[] myElements;
@@ -1031,7 +1036,7 @@ public class Switcher extends AnAction implements DumbAware {
}
@Override
- public void propertyChange(PropertyChangeEvent evt) {
+ public void propertyChange(@NotNull PropertyChangeEvent evt) {
final MyList list = getSelectedList();
final Object value = list.getSelectedValue();
if (project.isDisposed()) {
@@ -1068,7 +1073,7 @@ public class Switcher extends AnAction implements DumbAware {
private Rectangle dBounds;
@Override
- public void layoutContainer(Container target) {
+ public void layoutContainer(@NotNull Container target) {
final JScrollPane scrollPane = UIUtil.getParentOfType(JScrollPane.class, files);
JComponent filesPane = scrollPane != null ? scrollPane : files;
if (sBounds == null || !target.isShowing()) {
@@ -1142,7 +1147,7 @@ public class Switcher extends AnAction implements DumbAware {
}
@Override
- public void processKeyEvent(KeyEvent e) {
+ public void processKeyEvent(@NotNull KeyEvent e) {
super.processKeyEvent(e);
}
}