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

This commit is contained in:
Kirill Kalishev
2011-07-04 16:10:58 +04:00
3 changed files with 4 additions and 2 deletions
@@ -116,7 +116,7 @@ public class ImplementationViewComponent extends JPanel {
public ImplementationViewComponent(PsiElement[] elements, final int index) {
super(new BorderLayout());
final Project project = elements[0].getProject();
final Project project = elements.length > 0 ? elements[0].getProject() : null;
EditorFactory factory = EditorFactory.getInstance();
Document doc = factory.createDocument("");
doc.setReadOnly(true);
@@ -107,6 +107,7 @@ public class HelpManagerImpl extends HelpManager {
return helpSet;
}
catch (Exception ee) {
LOG.info("Failed to create help set", ee);
return null;
}
}
@@ -149,7 +149,8 @@ public class BaseSpellChecker implements SpellCheckerEngine {
UIUtil.invokeLaterIfNeeded(new Runnable() {
@Override
public void run() {
DaemonCodeAnalyzer.getInstance(project).restart();
final DaemonCodeAnalyzer instance = DaemonCodeAnalyzer.getInstance(project);
if (instance != null) instance.restart();
}
});
}