MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-01 19:02:13 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (warnings; typos)

Browse Source
This commit is contained in:
Roman Shevchenko
2015-07-29 22:11:03 +02:00
parent 98705046f5
commit 1e91e575e9
1 changed files with 30 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java
+30 -39
View File
@@ -46,7 +46,6 @@ import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.HashMap;
import com.intellij.util.ui.MouseEventAdapter;
import com.intellij.util.ui.UIUtil;
import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -120,10 +119,8 @@ public class IdeEventQueue extends EventQueue {
* <p/>
* Swing event.
*/
private int myEventCount;
private boolean myIsInInputEvent = false;
private AWTEvent myCurrentEvent = null;
@@ -132,7 +129,6 @@ public class IdeEventQueue extends EventQueue {
private WindowManagerEx myWindowManager;
private final Set<EventDispatcher> myDispatchers = new LinkedHashSet<EventDispatcher>();
private final Set<EventDispatcher> myPostProcessors = new LinkedHashSet<EventDispatcher>();
private final Set<Runnable> myReady = ContainerUtil.newHashSet();
@@ -175,7 +171,7 @@ public class IdeEventQueue extends EventQueue {
}
});
addDispatcher(new WindowsAltSupressor(), null);
addDispatcher(new WindowsAltSuppressor(), null);
}
@@ -220,24 +216,18 @@ public class IdeEventQueue extends EventQueue {
mySuspendModeAlarm.addRequest(myExitSuspendModeRunnable, 750);
}
/**
* Exits supend mode and pumps all suspended events.
* Exits suspend mode and pumps all suspended events.
*/
private void exitSuspendMode() {
if (shallEnterSuspendMode()) {
// We have to exit from suspend mode (focus owner changes or alarm is triggered) but
// WINDOW_OPENED isn't dispatched yet. In this case we have to restart the alarm until
// all WINDOW_OPENED event will be processed.
mySuspendModeAlarm.cancelAllRequests();
mySuspendModeAlarm.addRequest(myExitSuspendModeRunnable, 250);
}
else {
// Now we can pump all suspended events.
mySuspendMode = false;
myFocusOwner = null; // to prevent memory leaks
@@ -255,7 +245,6 @@ public class IdeEventQueue extends EventQueue {
}
}
public void removeIdleListener(@NotNull final Runnable runnable) {
synchronized (myLock) {
final boolean wasRemoved = myIdleListeners.remove(runnable);
@@ -268,7 +257,8 @@ public class IdeEventQueue extends EventQueue {
}
}
/** @deprecated use {@link #addActivityListener(Runnable, Disposable)} (to be removed in IDEA 17) */
@SuppressWarnings("unused")
public void addActivityListener(@NotNull final Runnable runnable) {
synchronized (myLock) {
myActivityListeners.add(runnable);
@@ -281,7 +271,6 @@ public class IdeEventQueue extends EventQueue {
}
}
public void removeActivityListener(@NotNull final Runnable runnable) {
synchronized (myLock) {
myActivityListeners.remove(runnable);
@@ -325,7 +314,6 @@ public class IdeEventQueue extends EventQueue {
return myEventCount;
}
public void setEventCount(int evCount) {
myEventCount = evCount;
}
@@ -347,10 +335,8 @@ public class IdeEventQueue extends EventQueue {
}
lastMouseWheel = System.currentTimeMillis();
MouseWheelEvent newMouseWheelEvent = MouseEventAdapter.convert(mwe,
wheelDestinationComponent, mwe.getID(), lastMouseWheel, mwe.getModifiers() | mwe.getModifiersEx(), mwe.getX(), mwe.getY()
);
return newMouseWheelEvent;
int modifiers = mwe.getModifiers() | mwe.getModifiersEx();
return MouseEventAdapter.convert(mwe, wheelDestinationComponent, mwe.getID(), lastMouseWheel, modifiers, mwe.getX(), mwe.getY());
}
return awtEvent;
}
@@ -569,7 +555,7 @@ public class IdeEventQueue extends EventQueue {
if (e instanceof MouseWheelEvent) {
final MenuElement[] selectedPath = MenuSelectionManager.defaultManager().getSelectedPath();
if (selectedPath != null && selectedPath.length > 0 && !(selectedPath[0] instanceof ComboPopup)) {
if (selectedPath.length > 0 && !(selectedPath[0] instanceof ComboPopup)) {
((MouseWheelEvent)e).consume();
return;
}
@@ -587,8 +573,9 @@ public class IdeEventQueue extends EventQueue {
if (request == null) {
LOG.error("There is no request for " + idleListener);
}
int timeout = request.getTimeout();
myIdleRequestsAlarm.addRequest(request, timeout, ModalityState.NON_MODAL);
else {
myIdleRequestsAlarm.addRequest(request, request.getTimeout(), ModalityState.NON_MODAL);
}
}
if (KeyEvent.KEY_PRESSED == e.getID() ||
KeyEvent.KEY_TYPED == e.getID() ||
@@ -639,6 +626,7 @@ public class IdeEventQueue extends EventQueue {
final MouseEvent toDispatch =
new MouseEvent(me.getComponent(), me.getID(), System.currentTimeMillis(), me.getModifiers(), me.getX(), me.getY(), 1,
me.isPopupTrigger(), me.getButton());
//noinspection SSBasedInspection
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
@@ -840,27 +828,30 @@ public class IdeEventQueue extends EventQueue {
}
}
private static Field stickyAltField;
//IDEA-17359
private static Field ourStickyAltField;
private static void fixStickyAlt(AWTEvent e) {
if (Registry.is("actionSystem.win.suppressAlt.new")) {
if (SystemInfo.isWindows
&& UIManager.getLookAndFeel() instanceof WindowsLookAndFeel
&& e instanceof InputEvent
&& (((InputEvent)e).getModifiers() & (InputEvent.ALT_MASK | InputEvent.ALT_DOWN_MASK)) != 0
&& !(e instanceof KeyEvent && ((KeyEvent)e).getKeyCode() == KeyEvent.VK_ALT)) {
if (UIUtil.isUnderWindowsLookAndFeel() &&
e instanceof InputEvent &&
(((InputEvent)e).getModifiers() & (InputEvent.ALT_MASK | InputEvent.ALT_DOWN_MASK)) != 0 &&
!(e instanceof KeyEvent && ((KeyEvent)e).getKeyCode() == KeyEvent.VK_ALT)) {
try {
if (stickyAltField == null) {
stickyAltField = ReflectionUtil.getDeclaredField(Class.forName("com.sun.java.swing.plaf.windows.WindowsRootPaneUI$AltProcessor"), "menuCanceledOnPress");
if (ourStickyAltField == null) {
Class<?> aClass = Class.forName("com.sun.java.swing.plaf.windows.WindowsRootPaneUI$AltProcessor");
ourStickyAltField = ReflectionUtil.getDeclaredField(aClass, "menuCanceledOnPress");
}
if (ourStickyAltField != null) {
ourStickyAltField.set(null, true);
}
stickyAltField.set(null, true);
}
catch (Exception exception) {
LOG.error(exception);
}
}
} else if (SystemInfo.isWindowsXP && e instanceof KeyEvent && ((KeyEvent)e).getKeyCode() == KeyEvent.VK_ALT) {
((KeyEvent)e).consume();
}
else if (SystemInfo.isWindowsXP && e instanceof KeyEvent && ((KeyEvent)e).getKeyCode() == KeyEvent.VK_ALT) {
((KeyEvent)e).consume(); // IDEA-17359
}
}
@@ -984,8 +975,7 @@ public class IdeEventQueue extends EventQueue {
}
/**
* Same as {@link #blockNextEvents(java.awt.event.MouseEvent, com.intellij.ide.IdeEventQueue.BlockMode)} with <code>blockMode</code> equal
* to <code>COMPLETE</code>.
* Same as {@link #blockNextEvents(MouseEvent, IdeEventQueue.BlockMode)} with <code>blockMode</code> equal to <code>COMPLETE</code>.
*/
public void blockNextEvents(final MouseEvent e) {
blockNextEvents(e, BlockMode.COMPLETE);
@@ -1032,6 +1022,7 @@ public class IdeEventQueue extends EventQueue {
maybeReady();
}
else {
//noinspection SSBasedInspection
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
@@ -1046,7 +1037,7 @@ public class IdeEventQueue extends EventQueue {
return myPopupManager.isPopupActive();
}
private static class WindowsAltSupressor implements EventDispatcher {
private static class WindowsAltSuppressor implements EventDispatcher {
private boolean myWaitingForAltRelease;
private Robot myRobot;
@@ -1155,7 +1146,7 @@ public class IdeEventQueue extends EventQueue {
}
/**
* @see com.intellij.ide.IdeEventQueue#blockNextEvents(java.awt.event.MouseEvent, com.intellij.ide.IdeEventQueue.BlockMode)
* @see IdeEventQueue#blockNextEvents(MouseEvent, IdeEventQueue.BlockMode)
*/
public enum BlockMode {
COMPLETE, ACTIONS