From 0581a953b43cfc72b84ceb62d68d01a865ce23cb Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 1 Dec 2008 03:49:09 +0000 Subject: [PATCH] Code formatting. --- .../core/pdom/dom/PDOMQualifierType.java | 15 ++++++------ .../core/pdom/dom/c/PDOMCFunctionType.java | 23 +++++++++---------- .../pdom/dom/cpp/PDOMCPPClassInstance.java | 6 ++--- .../pdom/dom/cpp/PDOMCPPReferenceType.java | 10 ++++---- 4 files changed, 25 insertions(+), 29 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMQualifierType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMQualifierType.java index 30b158b000f..c74d848920d 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMQualifierType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMQualifierType.java @@ -74,7 +74,6 @@ public class PDOMQualifierType extends PDOMNode implements IQualifierType, ICQua } catch (DOMException e) { throw new CoreException(Util.createStatus(e)); } - } @Override @@ -129,19 +128,19 @@ public class PDOMQualifierType extends PDOMNode implements IQualifierType, ICQua } public boolean isSameType(IType type) { - if( type instanceof ITypedef ) - return type.isSameType( this ); - if( !( type instanceof IQualifierType ) ) + if (type instanceof ITypedef) + return type.isSameType(this); + if (!(type instanceof IQualifierType)) return false; IQualifierType pt = (IQualifierType) type; try { boolean flagsMatch= isConst() == pt.isConst() && isVolatile() == pt.isVolatile(); - if(flagsMatch && (type instanceof ICQualifierType)) - flagsMatch &= isRestrict() == ((ICQualifierType)type).isRestrict(); - if(flagsMatch) { + if (flagsMatch && type instanceof ICQualifierType) + flagsMatch &= isRestrict() == ((ICQualifierType) type).isRestrict(); + if (flagsMatch) { IType myType= getType(); - return myType != null && myType.isSameType( pt.getType() ); + return myType != null && myType.isSameType(pt.getType()); } } catch (DOMException e) { } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCFunctionType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCFunctionType.java index ab4ab5456bf..79916b7cf5a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCFunctionType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCFunctionType.java @@ -73,7 +73,7 @@ public class PDOMCFunctionType extends PDOMNode implements IIndexType, IFunction } list.addMember(typeNode); } - } catch(DOMException de) { + } catch (DOMException de) { } } @@ -81,7 +81,7 @@ public class PDOMCFunctionType extends PDOMNode implements IIndexType, IFunction public void delete(final PDOMLinkage linkage) throws CoreException { linkage.deleteType(getReturnType(), record); PDOMNodeLinkedList list = new PDOMNodeLinkedList(pdom, record + TYPELIST, getLinkageImpl(), true); - list.accept(new IPDOMVisitor(){ + list.accept(new IPDOMVisitor() { public void leave(IPDOMNode node) throws CoreException { } public boolean visit(IPDOMNode node) throws CoreException { @@ -123,17 +123,17 @@ public class PDOMCFunctionType extends PDOMNode implements IIndexType, IFunction IType[] params1= getParameterTypes(); IType[] params2= ft.getParameterTypes(); - if( params1.length == 1 && params2.length == 0 ){ - if( !(params1[0] instanceof IBasicType) || ((IBasicType)params1[0]).getType() != IBasicType.t_void ) + if (params1.length == 1 && params2.length == 0) { + if (!(params1[0] instanceof IBasicType) || ((IBasicType)params1[0]).getType() != IBasicType.t_void) return false; - } else if( params2.length == 1 && params1.length == 0 ){ - if( !(params2[0] instanceof IBasicType) || ((IBasicType)params2[0]).getType() != IBasicType.t_void ) + } else if (params2.length == 1 && params1.length == 0) { + if (!(params2[0] instanceof IBasicType) || ((IBasicType) params2[0]).getType() != IBasicType.t_void) return false; - } else if( params1.length != params2.length ){ + } else if (params1.length != params2.length) { return false; } else { - for( int i = 0; i < params1.length; i++ ){ - if (params1[i] == null || ! params1[i].isSameType( params2[i] ) ) + for (int i = 0; i < params1.length; i++) { + if (params1[i] == null || !params1[i].isSameType(params2[i])) return false; } } @@ -146,12 +146,11 @@ public class PDOMCFunctionType extends PDOMNode implements IIndexType, IFunction return false; } - public IType[] getParameterTypes() { final List result= new ArrayList(); try { PDOMNodeLinkedList list = new PDOMNodeLinkedList(pdom, record + TYPELIST, getLinkageImpl(), true); - list.accept(new IPDOMVisitor(){ + list.accept(new IPDOMVisitor() { public void leave(IPDOMNode node) throws CoreException { result.add((IType)node); } @@ -159,7 +158,7 @@ public class PDOMCFunctionType extends PDOMNode implements IIndexType, IFunction return false; } }); - } catch(CoreException ce) { + } catch (CoreException ce) { CCorePlugin.log(ce); } return result.toArray(new IType[result.size()]); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassInstance.java index 27c51d32852..9ad03719239 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassInstance.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassInstance.java @@ -92,10 +92,10 @@ class PDOMCPPClassInstance extends PDOMCPPClassSpecialization implements ICPPTem // require a class instance if (type instanceof ICPPClassSpecialization == false || - type instanceof ICPPTemplateInstance == false || type instanceof IProblemBinding) + type instanceof ICPPTemplateInstance == false || type instanceof IProblemBinding) { return false; - - + } + final ICPPClassSpecialization classSpec2 = (ICPPClassSpecialization) type; final ICPPClassType orig1= getSpecializedBinding(); final ICPPClassType orig2= classSpec2.getSpecializedBinding(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPReferenceType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPReferenceType.java index 90afb7f3813..cd8b4e9b10a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPReferenceType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPReferenceType.java @@ -30,8 +30,7 @@ import org.eclipse.cdt.internal.core.pdom.dom.PDOMNode; import org.eclipse.cdt.internal.core.pdom.dom.PDOMNotImplementedError; import org.eclipse.core.runtime.CoreException; -class PDOMCPPReferenceType extends PDOMNode implements ICPPReferenceType, - ITypeContainer, IIndexType { +class PDOMCPPReferenceType extends PDOMNode implements ICPPReferenceType, ITypeContainer, IIndexType { private static final int TYPE = PDOMNode.RECORD_SIZE + 0; @@ -71,8 +70,7 @@ class PDOMCPPReferenceType extends PDOMNode implements ICPPReferenceType, public int getNodeType() { return IIndexCPPBindingConstants.CPP_REFERENCE_TYPE; } - - + public IType getType() { try { PDOMNode node = getLinkageImpl().getNode(pdom.getDB().getInt(record + TYPE)); @@ -84,10 +82,10 @@ class PDOMCPPReferenceType extends PDOMNode implements ICPPReferenceType, } public boolean isSameType(IType type) { - if( type instanceof ITypedef ) + if (type instanceof ITypedef) return type.isSameType(this); - if( !( type instanceof ICPPReferenceType )) + if (!(type instanceof ICPPReferenceType)) return false; ICPPReferenceType rhs = (ICPPReferenceType) type;