Fixed Bug 92806 - Clean up C & C++ Syntax AST Nodes for array usage.

1 files changed, 3 insertions, 31 deletions

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateDeclaration.java
index 490605bbe1c..a01e6d76bd6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateDeclaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateDeclaration.java
@@ -15,6 +15,7 @@ import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateDeclaration;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateParameter;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateScope;
+import org.eclipse.cdt.core.parser.util.ArrayUtil;
 
 /**
  * @author jcamelon
@@ -59,46 +60,17 @@ public class CPPASTTemplateDeclaration extends CPPASTNode implements
      */
     public ICPPASTTemplateParameter [] getTemplateParameters() {
         if( parameters == null ) return ICPPASTTemplateParameter.EMPTY_TEMPLATEPARAMETER_ARRAY;
-        removeNullParameters();
-        return parameters;
+        return (ICPPASTTemplateParameter[]) ArrayUtil.removeNulls( ICPPASTTemplateParameter.class, parameters );
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateDeclaration#addTemplateParamter(org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTemplateParameter)
      */
     public void addTemplateParamter(ICPPASTTemplateParameter parm) {
-        if( parameters == null )
-        {
-            parameters = new ICPPASTTemplateParameter[ DEFAULT_PARMS_LIST_SIZE ];
-            currentIndex = 0;
-        }
-        if( parameters.length == currentIndex )
-        {
-            ICPPASTTemplateParameter [] old = parameters;
-            parameters = new ICPPASTTemplateParameter[ old.length * 2 ];
-            for( int i = 0; i < old.length; ++i )
-                parameters[i] = old[i];
-        }
-        parameters[ currentIndex++ ] = parm;
-    }
-    private void removeNullParameters() {
-        int nullCount = 0; 
-        for( int i = 0; i < parameters.length; ++i )
-            if( parameters[i] == null )
-                ++nullCount;
-        if( nullCount == 0 ) return;
-        ICPPASTTemplateParameter[] old = parameters;
-        int newSize = old.length - nullCount;
-        parameters = new ICPPASTTemplateParameter[ newSize ];
-        for( int i = 0; i < newSize; ++i )
-            parameters[i] = old[i];
-        currentIndex = newSize;
+        parameters = (ICPPASTTemplateParameter[]) ArrayUtil.append( ICPPASTTemplateParameter.class, parameters, parm );
     }
 
-    private int currentIndex = 0;    
     private ICPPASTTemplateParameter [] parameters = null;
-    private static final int DEFAULT_PARMS_LIST_SIZE = 4;
-
     public boolean accept( ASTVisitor action ){
         if( action.shouldVisitDeclarations ){
 		    switch( action.visit( this ) ){