diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignatedInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignatedInitializer.java
index a25a89c9321..096a9481fe6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignatedInitializer.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignatedInitializer.java
@@ -29,7 +29,7 @@ public interface ICASTDesignatedInitializer extends IASTInitializer, IASTInitial
 			"ICASTDesignatedInitializer.DESIGNATOR [ICASTDesignator]"); //$NON-NLS-1$
 
 	public static final ASTNodeProperty OPERAND = new ASTNodeProperty(
-		"ICASTDesignatedInitializer.OPERAND - [IASTInitializerClause]"); //$NON-NLS-1$
+			"ICASTDesignatedInitializer.OPERAND - [IASTInitializerClause]"); //$NON-NLS-1$
 
 	/**
 	 * Add a designator to this initializer.
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDesignatedInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDesignatedInitializer.java
index 7fa93f34f88..754b6c16241 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDesignatedInitializer.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDesignatedInitializer.java
@@ -6,9 +6,9 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    John Camelon (IBM) - Initial API and implementation
- *    Yuan Zhang / Beth Tibbitts (IBM Research)
- *    Markus Schorn (Wind River Systems)
+ *     John Camelon (IBM) - Initial API and implementation
+ *     Yuan Zhang / Beth Tibbitts (IBM Research)
+ *     Markus Schorn (Wind River Systems)
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.dom.parser.c;
 
@@ -25,14 +25,13 @@ import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
 import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguityParent;
 
 /**
- * Implementation for designated initializers
+ * Implementation for designated initializers.
  */
 public class CASTDesignatedInitializer extends ASTNode implements ICASTDesignatedInitializer, IASTAmbiguityParent {
-
     private IASTInitializerClause rhs;
-    private ICASTDesignator [] designators = null;
-    private int designatorsPos=-1;
-     
+    private ICASTDesignator[] designators;
+    private int designatorsPos = -1;
+
     public CASTDesignatedInitializer() {
 	}
 
@@ -44,18 +43,15 @@ public class CASTDesignatedInitializer extends ASTNode implements ICASTDesignate
 	public CASTDesignatedInitializer copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
-	
+
 	@Override
 	public CASTDesignatedInitializer copy(CopyStyle style) {
-		CASTDesignatedInitializer copy = new CASTDesignatedInitializer(rhs == null ? null
-				: rhs.copy(style));
-		for (ICASTDesignator designator : getDesignators())
+		CASTDesignatedInitializer copy =
+				new CASTDesignatedInitializer(rhs == null ? null : rhs.copy(style));
+		for (ICASTDesignator designator : getDesignators()) {
 			copy.addDesignator(designator == null ? null : designator.copy(style));
-		copy.setOffsetAndLength(this);
-		if (style == CopyStyle.withLocations) {
-			copy.setCopyLocation(this);
 		}
-		return copy;
+		return copy(copy, style);
 	}
 
 	@Override
@@ -64,20 +60,18 @@ public class CASTDesignatedInitializer extends ASTNode implements ICASTDesignate
     	if (designator != null) {
     		designator.setParent(this);
     		designator.setPropertyInParent(DESIGNATOR);
-    		designators = ArrayUtil.appendAt( ICASTDesignator.class, designators, ++designatorsPos, designator );
+    		designators = ArrayUtil.appendAt(ICASTDesignator.class, designators, ++designatorsPos, designator);
     	}
     }
 
-    
     @Override
 	public ICASTDesignator[] getDesignators() {
-        if( designators == null ) return ICASTDesignatedInitializer.EMPTY_DESIGNATOR_ARRAY;
-        designators = ArrayUtil.trimAt( ICASTDesignator.class, designators, designatorsPos );
+        if (designators == null)
+        	return ICASTDesignatedInitializer.EMPTY_DESIGNATOR_ARRAY;
+        designators = ArrayUtil.trimAt(ICASTDesignator.class, designators, designatorsPos);
         return designators;
     }
 
-    
-    
     @Override
 	public IASTInitializerClause getOperand() {
         return rhs;
@@ -121,26 +115,27 @@ public class CASTDesignatedInitializer extends ASTNode implements ICASTDesignate
     }
 
     @Override
-	public boolean accept( ASTVisitor action ){
-        if( action.shouldVisitInitializers ){
-		    switch( action.visit( this ) ){
-	            case ASTVisitor.PROCESS_ABORT : return false;
-	            case ASTVisitor.PROCESS_SKIP  : return true;
-	            default : break;
+	public boolean accept(ASTVisitor action) {
+        if (action.shouldVisitInitializers) {
+		    switch (action.visit(this)) {
+	            case ASTVisitor.PROCESS_ABORT: return false;
+	            case ASTVisitor.PROCESS_SKIP: return true;
+	            default: break;
 	        }
 		}
-        ICASTDesignator [] ds = getDesignators();
-        for ( int i = 0; i < ds.length; i++ ) {
-            if( !ds[i].accept( action ) ) return false;
+        ICASTDesignator[] ds = getDesignators();
+        for (int i = 0; i < ds.length; i++) {
+            if (!ds[i].accept(action))
+            	return false;
         }
-        if( rhs != null ) if( !rhs.accept( action ) ) return false;
+        if (rhs != null && !rhs.accept(action)) return false;
 
-        if( action.shouldVisitInitializers ){
-		    switch( action.leave( this ) ){
-	            case ASTVisitor.PROCESS_ABORT : return false;
-	            case ASTVisitor.PROCESS_SKIP  : return true;
-	            default : break;
-	        }
+        if (action.shouldVisitInitializers) {
+		    switch (action.leave(this)) {
+	            case ASTVisitor.PROCESS_ABORT: return false;
+	            case ASTVisitor.PROCESS_SKIP: return true;
+	            default: break;
+		    }
 		}
         return true;
     }
@@ -150,7 +145,7 @@ public class CASTDesignatedInitializer extends ASTNode implements ICASTDesignate
     	if (child == rhs) {
     		other.setPropertyInParent(child.getPropertyInParent());
     		other.setParent(child.getParent());
-    		rhs =  (IASTInitializerClause) other;
+    		rhs = (IASTInitializerClause) other;
     	}
     }
 }