1 files changed, 12 insertions, 3 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlJavaClassRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlJavaClassRef.java
index 47a0881b54..876b169bcb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlJavaClassRef.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlJavaClassRef.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2011 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2012 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -241,9 +241,18 @@ public class XmlJavaClassRef extends AbstractJpaEObject implements JpaEObject
 		return new ReplaceEdit(offset + nameIndex, originalName.length(), newName);
 	}
 
-	public ReplaceEdit createRenamePackageEdit(String newName) {
+	public ReplaceEdit createRenamePackageEdit(String newPackageName) {
 		int packageLength = this.javaClass.lastIndexOf('.');
+		if (newPackageName == "") {//$NON-NLS-1$
+			//moving to the default package, remove the '.'
+			packageLength++;
+		}
+		if (packageLength == -1) {
+			//moving from the default package or unspecified package
+			packageLength = 0;
+			newPackageName = newPackageName + '.';
+		}
 		int offset = getTextNode().getStartOffset();
-		return new ReplaceEdit(offset, packageLength, newName);
+		return new ReplaceEdit(offset, packageLength, newPackageName);
 	}
 }