From d8a5f2dfb43b402ac8a7caaac02b12d1e185748b Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 25 Apr 2011 05:03:31 +0000 Subject: [PATCH] Cosmetics. --- .../ExtractLocalVariableRefactoring.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoring.java index ff4fd3fa20f..109424c7091 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoring.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoring.java @@ -365,7 +365,6 @@ public class ExtractLocalVariableRefactoring extends CRefactoring { @Override public int visit(IASTExpression expression) { - // If the expression starts with a function call with a name, we should only need to guess this name if (expression == target && expression instanceof ICPPASTFunctionCallExpression) { ICPPASTFunctionCallExpression functionCallExpression = (ICPPASTFunctionCallExpression) expression; @@ -382,7 +381,7 @@ public class ExtractLocalVariableRefactoring extends CRefactoring { } if (expression instanceof CPPASTLiteralExpression) { - CPPASTLiteralExpression literal = (CPPASTLiteralExpression)expression; + CPPASTLiteralExpression literal = (CPPASTLiteralExpression) expression; String name = null; char[] value = literal.getValue(); switch (literal.getKind()) { @@ -446,13 +445,13 @@ public class ExtractLocalVariableRefactoring extends CRefactoring { String lower = name.toLowerCase(); int start = 0; for (String prefix : getPrefixes()) { - if(lower.startsWith(prefix)) { + if (lower.startsWith(prefix)) { if (name.length() > prefix.length()) { start = prefix.length(); } } prefix = prefix + "_"; //$NON-NLS-1$ - if(lower.startsWith(prefix)) { + if (lower.startsWith(prefix)) { if (name.length() > prefix.length()) { start = prefix.length(); } @@ -460,7 +459,6 @@ public class ExtractLocalVariableRefactoring extends CRefactoring { } if (start > 0) { - String nameWithoutPrefix = name.substring(start); if (Character.isUpperCase(nameWithoutPrefix.charAt(0))) { nameWithoutPrefix = nameWithoutPrefix.substring(0, 1).toLowerCase()