From 99cdc84b19a814a72832bddeae5a61bff003620f Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Tue, 5 Apr 2011 05:10:09 +0000 Subject: [PATCH] Cosmetics. --- .../gettersandsetters/FunctionFactory.java | 30 +++++------- .../GetterSetterInsertEditProvider.java | 7 ++- .../ui/refactoring/utils/NamespaceHelper.java | 49 +++++++++---------- 3 files changed, 37 insertions(+), 49 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/FunctionFactory.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/FunctionFactory.java index ca5166c2ccf..1ff242c4da8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/FunctionFactory.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/FunctionFactory.java @@ -7,7 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Institute for Software - initial API and implementation + * Institute for Software - initial API and implementation *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.gettersandsetters; @@ -41,8 +41,8 @@ import org.eclipse.cdt.internal.ui.refactoring.utils.NameHelper; public class FunctionFactory { - public static IASTFunctionDefinition createGetterDefinition(String varName, IASTSimpleDeclaration fieldDeclaration, ICPPASTQualifiedName name) { - + public static IASTFunctionDefinition createGetterDefinition(String varName, + IASTSimpleDeclaration fieldDeclaration, ICPPASTQualifiedName name) { IASTFunctionDefinition getter = new CPPASTFunctionDefinition(); getter.setDeclSpecifier(fieldDeclaration.getDeclSpecifier().copy(CopyStyle.withLocations)); @@ -52,9 +52,7 @@ public class FunctionFactory { getterDeclarator = getterDeclarator.getNestedDeclarator(); } getter.setDeclarator((IASTFunctionDeclarator) getterDeclarator); - getter.setBody(getGetterBody(varName)); - return getter; } @@ -72,7 +70,6 @@ public class FunctionFactory { private static IASTDeclarator getGetterDeclarator(String varName, IASTSimpleDeclaration fieldDeclaration, ICPPASTQualifiedName name) { - CPPASTName getterName = new CPPASTName(); String varPartOfGetterName = NameHelper.makeFirstCharUpper(NameHelper.trimFieldName(varName)); getterName.setName("get".concat(varPartOfGetterName).toCharArray()); //$NON-NLS-1$ @@ -89,13 +86,13 @@ public class FunctionFactory { // create a new innermost function declarator basing on the field declarator CPPASTFunctionDeclarator functionDeclarator = new CPPASTFunctionDeclarator(); functionDeclarator.setConst(true); - if(name != null) { + if (name != null) { name.addName(getterName); functionDeclarator.setName(name); - }else { + } else { functionDeclarator.setName(getterName); } - for(IASTPointerOperator pointer : innermost.getPointerOperators()){ + for (IASTPointerOperator pointer : innermost.getPointerOperators()){ functionDeclarator.addPointerOperator(pointer.copy(CopyStyle.withLocations)); } @@ -107,18 +104,15 @@ public class FunctionFactory { IASTDeclarator parent = (IASTDeclarator) innermost.getParent(); parent.setNestedDeclarator(functionDeclarator); return topDeclarator; - } } - public static IASTFunctionDefinition createSetterDefinition(String varName, IASTSimpleDeclaration fieldDeclaration, ICPPASTQualifiedName name) { - + public static IASTFunctionDefinition createSetterDefinition(String varName, + IASTSimpleDeclaration fieldDeclaration, ICPPASTQualifiedName name) { IASTFunctionDefinition setter = new CPPASTFunctionDefinition(); - setter.setDeclSpecifier(getVoidDeclSpec()); setter.setDeclarator(getSetterDeclarator(varName, fieldDeclaration, name)); setter.setBody(getSetterBody(fieldDeclaration)); - return setter; } @@ -153,15 +147,14 @@ public class FunctionFactory { String varPartOfSetterName = NameHelper.makeFirstCharUpper(NameHelper.trimFieldName(varName)); setterName.setName("set".concat(varPartOfSetterName).toCharArray()); //$NON-NLS-1$ CPPASTFunctionDeclarator declarator = new CPPASTFunctionDeclarator(); - if(name != null) { + if (name != null) { name.addName(setterName); declarator.setName(name); - }else { + } else { declarator.setName(setterName); } CPPASTParameterDeclaration parameterDeclaration = new CPPASTParameterDeclaration(); - parameterDeclaration - .setDeclarator(fieldDeclaration.getDeclarators()[0].copy(CopyStyle.withLocations)); + parameterDeclaration.setDeclarator(fieldDeclaration.getDeclarators()[0].copy(CopyStyle.withLocations)); parameterDeclaration.setDeclSpecifier(fieldDeclaration.getDeclSpecifier().copy( CopyStyle.withLocations)); declarator.addParameterDeclaration(parameterDeclaration.copy(CopyStyle.withLocations)); @@ -190,5 +183,4 @@ public class FunctionFactory { setter.addDeclarator(getSetterDeclarator(name, fieldDeclaration, null)); return setter; } - } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterInsertEditProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterInsertEditProvider.java index a0d31776b13..d0b76f23f35 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterInsertEditProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/gettersandsetters/GetterSetterInsertEditProvider.java @@ -7,7 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Institute for Software - initial API and implementation + * Institute for Software - initial API and implementation *******************************************************************************/ package org.eclipse.cdt.internal.ui.refactoring.gettersandsetters; @@ -21,7 +21,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTQualifiedName; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTQualifiedName; -public class GetterSetterInsertEditProvider implements Comparable{ +public class GetterSetterInsertEditProvider implements Comparable { public enum Type { getter, setter; @@ -35,7 +35,6 @@ public class GetterSetterInsertEditProvider implements Comparable= nodeOffset && offset < nodeOffset + nodeLocation.getNodeLength(); - if(locationOk) { + if (locationOk) { return true; } } @@ -95,11 +92,11 @@ public class NamespaceHelper { parentName = ((ICPPASTCompositeTypeSpecifier) declarationParent).getName().copy( CopyStyle.withLocations); - if(classHasTemplates(declarationParent)) { + if (classHasTemplates(declarationParent)) { CPPASTTemplateId templateId = new CPPASTTemplateId(); templateId.setTemplateName(parentName); - for(ICPPASTTemplateParameter templateParameter : ((ICPPASTTemplateDeclaration) declarationParent.getParent().getParent() ).getTemplateParameters()) { + for (ICPPASTTemplateParameter templateParameter : ((ICPPASTTemplateDeclaration) declarationParent.getParent().getParent() ).getTemplateParameters()) { if (templateParameter instanceof CPPASTSimpleTypeTemplateParameter) { CPPASTSimpleTypeTemplateParameter simpleTypeTemplateParameter = (CPPASTSimpleTypeTemplateParameter) templateParameter;