From fab1e9757cd8f8859ff17e494100ea2f35470710 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Tue, 6 May 2014 19:41:31 -0700 Subject: [PATCH] Cosmetics. --- .../core/dom/ast/cpp/ICPPClassTemplate.java | 3 ++ ...CPPClassTemplatePartialSpecialization.java | 7 ++-- ...CPPClassTemplatePartialSpecialization.java | 33 ++++++++----------- .../cdt/internal/core/pdom/db/ChunkCache.java | 4 +-- 4 files changed, 21 insertions(+), 26 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassTemplate.java index 107ce9e6183..b9ff08b9b72 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassTemplate.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassTemplate.java @@ -16,6 +16,9 @@ package org.eclipse.cdt.core.dom.ast.cpp; * @noimplement This interface is not intended to be implemented by clients. */ public interface ICPPClassTemplate extends ICPPTemplateDefinition, ICPPClassType { + /** + * Returns the partial specializations of this class template. + */ public ICPPClassTemplatePartialSpecialization[] getPartialSpecializations(); /** diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassTemplatePartialSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassTemplatePartialSpecialization.java index fc0224c8334..f798cfbb0c0 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassTemplatePartialSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassTemplatePartialSpecialization.java @@ -19,8 +19,8 @@ import org.eclipse.cdt.core.dom.ast.IType; * a class template in its own right. * * e.g.: - * template class A {}; //the primary class template - * template class A {}; //a partial specialization of the primary class template + * template class A {}; // the primary class template + * template class A {}; // a partial specialization of the primary class template * * @noextend This interface is not intended to be extended by clients. * @noimplement This interface is not intended to be implemented by clients. @@ -33,7 +33,6 @@ public interface ICPPClassTemplatePartialSpecialization extends ICPPClassTemplat */ public ICPPClassTemplate getPrimaryClassTemplate(); - /** * Returns the arguments of this partial specialization. * @since 5.1 @@ -44,5 +43,5 @@ public interface ICPPClassTemplatePartialSpecialization extends ICPPClassTemplat * @deprecated use {@link #getTemplateArguments()}, instead. */ @Deprecated - public IType [] getArguments() throws DOMException; + public IType[] getArguments() throws DOMException; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplatePartialSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplatePartialSpecialization.java index 066470d584a..07d7393235f 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplatePartialSpecialization.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplatePartialSpecialization.java @@ -6,8 +6,8 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Andrew Niefer (IBM) - Initial API and implementation - * Markus Schorn (Wind River Systems) + * Andrew Niefer (IBM) - Initial API and implementation + * Markus Schorn (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.core.dom.parser.cpp; @@ -28,7 +28,6 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPTemplates; */ public class CPPClassTemplatePartialSpecialization extends CPPClassTemplate implements ICPPClassTemplatePartialSpecialization { - private final ICPPTemplateArgument[] arguments; public CPPClassTemplatePartialSpecialization(ICPPASTTemplateId name, ICPPTemplateArgument[] arguments) { @@ -41,29 +40,12 @@ public class CPPClassTemplatePartialSpecialization extends CPPClassTemplate return arguments; } - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassTemplatePartialSpecialization#getPrimaryClassTemplate() - */ @Override public ICPPClassTemplate getPrimaryClassTemplate() { ICPPASTTemplateId id = (ICPPASTTemplateId) getTemplateName(); return (ICPPClassTemplate) id.getTemplateName().resolveBinding(); } - @Override - public String toString() { - return super.toString() + ASTTypeUtil.getArgumentListString(getTemplateArguments(), true); - } - - @Override - @Deprecated - public IType[] getArguments() throws DOMException { - return CPPTemplates.getArguments(getTemplateArguments()); - } - - /* (non-Javadoc) - * @see org.eclipse.cdt.core.dom.ast.IType#isSameType(org.eclipse.cdt.core.dom.ast.IType) - */ @Override public boolean isSameType(IType type) { if (type == this) @@ -96,4 +78,15 @@ public class CPPClassTemplatePartialSpecialization extends CPPClassTemplate } return true; } + + @Override + public String toString() { + return super.toString() + ASTTypeUtil.getArgumentListString(getTemplateArguments(), true); + } + + @Override + @Deprecated + public IType[] getArguments() throws DOMException { + return CPPTemplates.getArguments(getTemplateArguments()); + } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/ChunkCache.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/ChunkCache.java index 19af4eb2cf1..876559f2dd8 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/ChunkCache.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/ChunkCache.java @@ -133,7 +133,7 @@ public final class ChunkCache { } private int computeLength(long maxSize) { - long maxLength= Math.min(maxSize/Database.CHUNK_SIZE, Integer.MAX_VALUE); - return Math.max(1, (int)maxLength); + long maxLength= Math.min(maxSize / Database.CHUNK_SIZE, Integer.MAX_VALUE); + return Math.max(1, (int) maxLength); } }