X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CopyElementsOperation.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CopyElementsOperation.java index ba92d34..aa9b7a2 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CopyElementsOperation.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CopyElementsOperation.java @@ -23,6 +23,7 @@ import net.sourceforge.phpdt.core.JavaModelException; import net.sourceforge.phpdt.core.jdom.DOMFactory; import net.sourceforge.phpdt.core.jdom.IDOMCompilationUnit; import net.sourceforge.phpdt.core.jdom.IDOMNode; +import net.sourceforge.phpdt.internal.core.util.Util; /** * This operation copies/moves a collection of elements from their current @@ -100,14 +101,14 @@ protected JavaModelOperation getNestedOperation(IJavaElement element) { // if (isRenamingMainType(element, dest)) { // return new RenameResourceElementsOperation(new IJavaElement[] {dest}, new IJavaElement[] {dest.getParent()}, new String[]{getNewNameFor(element) + ".php"}, fForce); //$NON-NLS-1$ // } else { -// return new CreateTypeOperation(dest, getSourceFor(element) + Util.LINE_SEPARATOR, fForce); +// return new CreateTypeOperation(dest, getSourceFor(element) + ProjectPrefUtil.LINE_SEPARATOR, fForce); // } // case IJavaElement.METHOD : -// return new CreateMethodOperation((IType) dest, getSourceFor(element) + Util.LINE_SEPARATOR, fForce); +// return new CreateMethodOperation((IType) dest, getSourceFor(element) + ProjectPrefUtil.LINE_SEPARATOR, fForce); // case IJavaElement.FIELD : -// return new CreateFieldOperation((IType) dest, getSourceFor(element) + Util.LINE_SEPARATOR, fForce); +// return new CreateFieldOperation((IType) dest, getSourceFor(element) + ProjectPrefUtil.LINE_SEPARATOR, fForce); // case IJavaElement.INITIALIZER : -// return new CreateInitializerOperation((IType) dest, getSourceFor(element) + Util.LINE_SEPARATOR); +// return new CreateInitializerOperation((IType) dest, getSourceFor(element) + ProjectPrefUtil.LINE_SEPARATOR); // default : // return null; // } @@ -181,7 +182,7 @@ protected void processElement(IJavaElement element) throws JavaModelException { } if (createElementInCUOperation && isMove() && !isRenamingMainType(element, destination)) { - DeleteElementsOperation deleteOp = new DeleteElementsOperation(new IJavaElement[] { element }, fForce); + DeleteElementsOperation deleteOp = new DeleteElementsOperation(new IJavaElement[] { element }, force); executeNestedOperation(deleteOp, 1); } }