MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

clean up, fix NPE (http://ea.jetbrains.com/browser/ea_problems/18498)

Browse Source
This commit is contained in:
Eugene Kudelevsky
2010-02-03 11:15:06 +03:00
parent 0c377cb0be
commit fc023d4248
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java
+13 -12
View File
@@ -87,9 +87,7 @@ public class ListTemplatesHandler implements CodeInsightActionHandler {
return key + argument;
}
public static void showTemplatesLookup(final Project project,
final Editor editor,
Map<TemplateImpl, String> template2Argument) {
public static void showTemplatesLookup(final Project project, final Editor editor, Map<TemplateImpl, String> template2Argument) {
ArrayList<LookupItem> array = new ArrayList<LookupItem>();
for (TemplateImpl template : template2Argument.keySet()) {
String argument = template2Argument.get(template);
@@ -109,7 +107,7 @@ public class ListTemplatesHandler implements CodeInsightActionHandler {
return true;
}
private String getPrefix(Document document, int offset) {
private static String getPrefix(Document document, int offset) {
CharSequence chars = document.getCharsSequence();
int start = offset;
while (true) {
@@ -121,7 +119,7 @@ public class ListTemplatesHandler implements CodeInsightActionHandler {
return chars.subSequence(start, offset).toString();
}
private boolean isInPrefix(final char c) {
private static boolean isInPrefix(final char c) {
return Character.isJavaIdentifierPart(c) || c == '.';
}
@@ -137,13 +135,16 @@ public class ListTemplatesHandler implements CodeInsightActionHandler {
}
public void itemSelected(LookupEvent event) {
final TemplateImpl template = (TemplateImpl)event.getItem().getObject();
final String argument = myTemplate2Argument != null ? myTemplate2Argument.get(template) : null;
new WriteCommandAction(myProject) {
protected void run(Result result) throws Throwable {
((TemplateManagerImpl)TemplateManager.getInstance(myProject)).startTemplateWithPrefix(myEditor, template, null, argument);
}
}.execute();
LookupElement item = event.getItem();
if (item != null) {
final TemplateImpl template = (TemplateImpl)item.getObject();
final String argument = myTemplate2Argument != null ? myTemplate2Argument.get(template) : null;
new WriteCommandAction(myProject) {
protected void run(Result result) throws Throwable {
((TemplateManagerImpl)TemplateManager.getInstance(myProject)).startTemplateWithPrefix(myEditor, template, null, argument);
}
}.execute();
}
}
}
}