MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 11:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Alexey Kudravtsev
2012-01-06 20:12:59 +04:00
parent 18c6c63f75
commit 48cbba4996
7 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
platform/platform-api/src/com/intellij/openapi/actionSystem/CommonShortcuts.java
View File

@@ -28,17 +28,17 @@ public class CommonShortcuts {
private CommonShortcuts() {}
public static final ShortcutSet ALT_ENTER = new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.ALT_DOWN_MASK));
public static final ShortcutSet ALT_ENTER = new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.ALT_DOWN_MASK));
public static final ShortcutSet ENTER = new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0));
public static final ShortcutSet CTRL_ENTER = new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,
SystemInfo.isMac
? KeyEvent.META_DOWN_MASK
: KeyEvent.CTRL_DOWN_MASK));
? InputEvent.META_DOWN_MASK
: InputEvent.CTRL_DOWN_MASK));
public static final ShortcutSet INSERT = new CustomShortcutSet(getInsertKeystroke());
public static final ShortcutSet DELETE = new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0));
public static final ShortcutSet ESCAPE = new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0));
public static final ShortcutSet DOUBLE_CLICK_1 = new CustomShortcutSet(new Shortcut[]{new MouseShortcut(MouseEvent.BUTTON1, 0, 2)});
public static final ShortcutSet DOUBLE_CLICK_1 = new CustomShortcutSet(new MouseShortcut(MouseEvent.BUTTON1, 0, 2));
public static ShortcutSet getNewForDialogs() {
final ArrayList<Shortcut> shortcuts = new ArrayList<Shortcut>();
@@ -60,7 +60,7 @@ public class CommonShortcuts {
}
public static KeyStroke getInsertKeystroke() {
return SystemInfo.isMac ? KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_DOWN_MASK)
return SystemInfo.isMac ? KeyStroke.getKeyStroke(KeyEvent.VK_N, InputEvent.CTRL_DOWN_MASK)
: KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, 0);
}
@@ -94,7 +94,8 @@ public class CommonShortcuts {
}
public static ShortcutSet getDiff() {
return new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_D, SystemInfo.isMac ? KeyEvent.META_DOWN_MASK : KeyEvent.CTRL_DOWN_MASK));
return new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_D, SystemInfo.isMac ? InputEvent.META_DOWN_MASK
: InputEvent.CTRL_DOWN_MASK));
}
public static ShortcutSet getFind() {

2
platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java
View File

@@ -298,7 +298,7 @@ public class Tree extends JTree implements ComponentWithEmptyText, ComponentWith
protected void processMouseEvent(MouseEvent e) {
if (SystemInfo.isMac) {
if (SwingUtilities.isLeftMouseButton(e) && e.isControlDown() && e.getID() == MouseEvent.MOUSE_PRESSED) {
int modifiers = (e.getModifiers() & ~(InputEvent.CTRL_MASK | InputEvent.BUTTON1_MASK)) | InputEvent.BUTTON3_MASK;
int modifiers = e.getModifiers() & ~(InputEvent.CTRL_MASK | InputEvent.BUTTON1_MASK) | InputEvent.BUTTON3_MASK;
e = new MouseEvent(e.getComponent(), e.getID(), e.getWhen(), modifiers, e.getX(), e.getY(), e.getClickCount(), true,
MouseEvent.BUTTON3);
}

13
platform/platform-impl/src/com/intellij/ide/actions/ActivateToolWindowAction.java
View File

@@ -27,6 +27,7 @@ import com.intellij.openapi.wm.ToolWindowManager;
import org.jetbrains.annotations.NonNls;
import javax.swing.*;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
public class ActivateToolWindowAction extends AnAction implements DumbAware {
@@ -96,12 +97,12 @@ public class ActivateToolWindowAction extends AnAction implements DumbAware {
KeyStroke keyStroke = ((KeyboardShortcut)shortcut).getFirstKeyStroke();
int modifiers=keyStroke.getModifiers();
if (
(modifiers == (KeyEvent.ALT_DOWN_MASK|KeyEvent.ALT_MASK)) ||
(modifiers == KeyEvent.ALT_MASK) ||
(modifiers == KeyEvent.ALT_DOWN_MASK) ||
(modifiers == (KeyEvent.META_DOWN_MASK|KeyEvent.META_MASK)) ||
(modifiers == KeyEvent.META_MASK) ||
(modifiers == KeyEvent.META_DOWN_MASK)
modifiers == (InputEvent.ALT_DOWN_MASK | InputEvent.ALT_MASK) ||
modifiers == InputEvent.ALT_MASK ||
modifiers == InputEvent.ALT_DOWN_MASK ||
modifiers == (InputEvent.META_DOWN_MASK | InputEvent.META_MASK) ||
modifiers == InputEvent.META_MASK ||
modifiers == InputEvent.META_DOWN_MASK
) {
int keyCode = keyStroke.getKeyCode();
if (KeyEvent.VK_0 <= keyCode && keyCode <= KeyEvent.VK_9) {

4
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangesCacheFile.java
View File

@@ -67,9 +67,9 @@ public class ChangesCacheFile {
public ChangesCacheFile(Project project, File path, AbstractVcs vcs, VirtualFile root, RepositoryLocation location) {
final Calendar date = Calendar.getInstance();
date.set(2020, 1, 2);
date.set(2020, Calendar.FEBRUARY, 2);
myFirstCachedDate = date.getTime();
date.set(1970, 1, 2);
date.set(1970, Calendar.FEBRUARY, 2);
myLastCachedDate = date.getTime();
myProject = project;
myPath = path;

4
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsCommittedChangesProvider.java
View File

@@ -218,7 +218,7 @@ public class CvsCommittedChangesProvider implements CachingCommittedChangesProvi
Date dateFrom = settings.getDateAfterFilter();
if (dateFrom == null) {
final Calendar calendar = Calendar.getInstance();
calendar.set(1970, 2, 2);
calendar.set(1970, Calendar.MARCH, 2);
dateFrom = calendar.getTime();
}
final ChangeBrowserSettings.Filter filter = settings.createFilter();
@@ -265,7 +265,7 @@ public class CvsCommittedChangesProvider implements CachingCommittedChangesProvi
Date dateFrom = settings.getDateAfterFilter();
if (dateFrom == null) {
final Calendar calendar = Calendar.getInstance();
calendar.set(1970, 2, 2);
calendar.set(1970, Calendar.MARCH, 2);
dateFrom = calendar.getTime();
}
final List<LogInformationWrapper> log = new ArrayList<LogInformationWrapper>();

3
plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenPerformanceTest.java
View File

@@ -21,12 +21,13 @@ import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.idea.maven.MavenImportingTestCase;
import org.jetbrains.idea.maven.project.MavenProject;
import java.util.Calendar;
import java.util.Collections;
import java.util.List;
import java.util.Comparator;
// do not run on build server
@Bombed(year = 3000, month = 1, day = 1)
@Bombed(year = 3000, month = Calendar.FEBRUARY, day = 1)
public abstract class MavenPerformanceTest extends MavenImportingTestCase {
@Override
protected void setUp() throws Exception {

2
plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/CachedGridImage.java
View File

@@ -103,7 +103,7 @@ public class CachedGridImage {
g2d.setColor(Painter.NON_SELECTED_GRID_COLOR);
}
g2d.setStroke(new BasicStroke(1.0f, 0, 0, 1.0f, ourDashes, 0.0f));
g2d.setStroke(new BasicStroke(1.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 1.0f, ourDashes, 0.0f));
if (myHorzGridLines.length > 0) {
int lastLine = (container.getDelegee().getHeight() - myHorzGridLines [myHorzGridLines.length-1] > 4)