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

Merge branch 'master' of git.labs.intellij.net:idea/community

Browse Source
This commit is contained in:
Alexey Pegov
2010-05-31 16:10:56 +04:00
parent 5ce2f97d0c 6cf54e7c0c
commit d3ecbe2d8a
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/openapi/src/com/intellij/codeInsight/intention/AddAnnotationFix.java
View File

@@ -139,7 +139,7 @@ public class AddAnnotationFix extends PsiElementBaseIntentionAction implements L
final int position = caretModel.getOffset();
element = file.findElementAt(position);
}
return isAvailable(project, editor, element);
return element != null && isAvailable(project, editor, element);
}
public void invoke(@NotNull final Project project, Editor editor, PsiFile file) throws IncorrectOperationException {

6
platform/platform-resources/src/idea/Keymap_Default.xml
View File

@@ -919,6 +919,7 @@
<action id="Jdbc.OpenConsole"><keyboard-shortcut first-keystroke="control shift F10"/></action>
<action id="Hibernate.OpenConsole"><keyboard-shortcut first-keystroke="control shift F10"/></action>
<action id="Jpa.OpenConsole"><keyboard-shortcut first-keystroke="control shift F10"/></action>
<action id="Console.TableResult.PreviousPage"><keyboard-shortcut first-keystroke="control alt UP"/></action>
<action id="Console.TableResult.NextPage"><keyboard-shortcut first-keystroke="control alt DOWN"/></action>
@@ -941,6 +942,11 @@
<action id="Console.Hibernate.Close"><keyboard-shortcut first-keystroke="control alt shift F4"/></action>
<action id="Console.Hibernate.Terminate"><keyboard-shortcut first-keystroke="control alt shift DELETE"/></action>
<action id="Console.Jpa.Execute"><keyboard-shortcut first-keystroke="control ENTER"/></action>
<action id="Console.Jpa.Properties"><keyboard-shortcut first-keystroke="alt ENTER"/></action>
<action id="Console.Jpa.Close"><keyboard-shortcut first-keystroke="control alt shift F4"/></action>
<action id="Console.Jpa.Terminate"><keyboard-shortcut first-keystroke="control alt shift DELETE"/></action>
<action id="Jdbc.RunSqlScript"><keyboard-shortcut first-keystroke="control shift F10"/></action>
<action id="Console.Execute"><keyboard-shortcut first-keystroke="ENTER"/></action>

2
platform/util/src/com/intellij/util/lang/UrlClassLoader.java
View File

@@ -34,7 +34,7 @@ public class UrlClassLoader extends ClassLoader {
protected static final long NS_THRESHOLD = 10000000;
public UrlClassLoader(ClassLoader parent) {
this(Arrays.asList(((URLClassLoader)parent).getURLs()), null, true, true);
this(Arrays.asList(((URLClassLoader)parent).getURLs()), parent.getParent(), true, true);
}
public UrlClassLoader(List<URL> urls, ClassLoader parent) {