This commit is contained in:
Alexey Kudravtsev
2011-07-08 18:11:12 +04:00
parent 4f114b6e1e
commit 84d917307f
3 changed files with 5 additions and 27 deletions
@@ -1,24 +0,0 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.codeInspection.dataFlow;
/**
* @author Gregory.Shrago
*/
public interface InstructionHandler<T extends DataFlowRunner, S extends DfaMemoryState> {
S createEmptyMemoryState(final T dataFlowRunner);
}
@@ -231,7 +231,6 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase impleme
if (endOffset <= startOffset) return null;
PsiExpression tempExpr;
PsiElement elementAt = PsiTreeUtil.findCommonParent(elementAtStart, elementAtEnd);
if (PsiTreeUtil.getParentOfType(elementAt, PsiExpression.class, false) == null) {
elementAt = null;
@@ -243,10 +242,10 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase impleme
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(project).getElementFactory();
String text = null;
PsiExpression tempExpr;
try {
text = file.getText().subSequence(startOffset, endOffset).toString();
String prefix = null;
String suffix = null;
String stripped = text;
if (startLiteralExpression != null) {
final int startExpressionOffset = startLiteralExpression.getTextOffset();
@@ -262,6 +261,7 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase impleme
}
}
String suffix = null;
if (endLiteralExpression != null) {
final int endExpressionOffset = endLiteralExpression.getTextOffset() + endLiteralExpression.getTextLength();
if (endOffset == endExpressionOffset ) {
@@ -15,10 +15,12 @@
*/
package org.jetbrains.idea.svn.config;
import org.jetbrains.annotations.NotNull;
public class CompositeRunnable implements Runnable {
private final Runnable[] myRunnables;
public CompositeRunnable(final Runnable... runnables) {
public CompositeRunnable(@NotNull Runnable... runnables) {
myRunnables = runnables;
}