### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
Index: dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java,v
retrieving revision 1.37
diff -u -r1.37 ASTRewriteAnalyzer.java
--- dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java	29 Sep 2005 08:31:01 -0000	1.37
+++ dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java	20 Oct 2005 08:46:14 -0000
@@ -267,14 +267,24 @@
 	}
 	
 	final int doVisit(ASTNode node) {
-		node.accept(this);
-		return getExtendedEnd(node);
+//		node.accept(this);
+//		return getExtendedEnd(node);
+		return doVisit(node, true);
 	}
 	
+	final int doVisit(ASTNode node, boolean extended) {
+		node.accept(this);
+		return extended ? getExtendedEnd(node) : node.getStartPosition()+node.getLength();
+	}
+
 	private final int doVisit(ASTNode parent, StructuralPropertyDescriptor property, int offset) {
+		return doVisit(parent, property, offset, true);
+	}
+
+	private final int doVisit(ASTNode parent, StructuralPropertyDescriptor property, int offset, boolean extended) {
 		Object node= getOriginalValue(parent, property);
 		if (property.isChildProperty() && node != null) {
-			return doVisit((ASTNode) node);
+			return doVisit((ASTNode) node, extended);
 		} else if (property.isChildListProperty()) {
 			return doVisitList((List) node, offset);
 		}
@@ -549,8 +559,11 @@
 		}
 		
 	}
-				
+
 	private int rewriteRequiredNode(ASTNode parent, StructuralPropertyDescriptor property) {
+		return rewriteRequiredNode(parent, property, true);
+	}
+	private int rewriteRequiredNode(ASTNode parent, StructuralPropertyDescriptor property, boolean extended) {
 		RewriteEvent event= getEvent(parent, property);
 		if (event != null && event.getChangeKind() == RewriteEvent.REPLACED) {
 			ASTNode node= (ASTNode) event.getOriginalValue();
@@ -562,7 +575,7 @@
 			doTextInsert(offset, (ASTNode) event.getNewValue(), getIndent(offset), true, editGroup);
 			return offset + length;	
 		}
-		return doVisit(parent, property, 0);
+		return doVisit(parent, property, 0, extended);
 	}
 		
 	private int rewriteNode(ASTNode parent, StructuralPropertyDescriptor property, int offset, Prefix prefix) {
@@ -1323,7 +1336,7 @@
 		}
 		
 		// name
-		pos= rewriteRequiredNode(node, TypeDeclaration.NAME_PROPERTY);
+		pos= rewriteRequiredNode(node, TypeDeclaration.NAME_PROPERTY, false/* do not use extended position*/);
 		
 		if (apiLevel >= AST.JLS3) {
 			pos= rewriteOptionalTypeParameters(node, TypeDeclaration.TYPE_PARAMETERS_PROPERTY, pos, "", false, true); //$NON-NLS-1$