From 4e254412e32cec135791ed3cba09e9f1f5706ad3 Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Wed, 27 Aug 2014 16:38:45 +0400 Subject: [PATCH] cleanup --- .../codeInsight/override/PyOverrideImplementUtil.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/python/src/com/jetbrains/python/codeInsight/override/PyOverrideImplementUtil.java b/python/src/com/jetbrains/python/codeInsight/override/PyOverrideImplementUtil.java index 48a42753ebe5..e11f3e01e916 100644 --- a/python/src/com/jetbrains/python/codeInsight/override/PyOverrideImplementUtil.java +++ b/python/src/com/jetbrains/python/codeInsight/override/PyOverrideImplementUtil.java @@ -143,7 +143,7 @@ public class PyOverrideImplementUtil { return; } new WriteCommandAction(pyClass.getProject(), pyClass.getContainingFile()) { - protected void run(final Result result) throws Throwable { + protected void run(@NotNull final Result result) throws Throwable { write(pyClass, membersToOverride, editor, implement); } }.execute(); @@ -173,9 +173,7 @@ public class PyOverrideImplementUtil { PyPsiUtils.removeRedundantPass(statementList); if (element != null) { final PyStatementList targetStatementList = element.getStatementList(); - final int start = targetStatementList != null - ? targetStatementList.getTextRange().getStartOffset() - : element.getTextRange().getStartOffset(); + final int start = targetStatementList.getTextRange().getStartOffset(); editor.getCaretModel().moveToOffset(start); editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE); editor.getSelectionModel().setSelection(start, element.getTextRange().getEndOffset()); @@ -238,7 +236,7 @@ public class PyOverrideImplementUtil { PsiElement outerClass = PsiTreeUtil.getParentOfType(pyClass, PyClass.class, true, PyFunction.class); String className = pyClass.getName(); final List nameResult = Lists.newArrayList(className); - while(outerClass instanceof PyClass) { + while(outerClass != null) { nameResult.add(0, ((PyClass)outerClass).getName()); outerClass = PsiTreeUtil.getParentOfType(outerClass, PyClass.class, true, PyFunction.class); }