misc changes in the internal builder

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / core / CopyResourceElementsOperation.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CopyResourceElementsOperation.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CopyResourceElementsOperation.java
index 2e30065..e6d149e 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CopyResourceElementsOperation.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CopyResourceElementsOperation.java
@@ -29,12 +29,12 @@ import net.sourceforge.phpdt.core.IPackageFragment;
 import net.sourceforge.phpdt.core.IPackageFragmentRoot;
 import net.sourceforge.phpdt.core.IType;
 import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.jdom.DOMException;
 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.core.jdom.IDOMPackage;
-import net.sourceforge.phpeclipse.PHPCore;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
@@ -276,7 +276,7 @@ public class CopyResourceElementsOperation extends MultiOperation {
                        // update new resource content
                        try {
                                if (newContent != null){
-                                       String encoding = source.getJavaProject().getOption(PHPCore.CORE_ENCODING, true);
+                                       String encoding = source.getJavaProject().getOption(JavaCore.CORE_ENCODING, true);
                                        destFile.setContents(
                                                new ByteArrayInputStream(encoding == null ? newContent.getBytes() : newContent.getBytes(encoding)), 
                                                fForce ? IResource.FORCE | IResource.KEEP_HISTORY : IResource.KEEP_HISTORY,
@@ -310,7 +310,7 @@ public class CopyResourceElementsOperation extends MultiOperation {
                        // see http://dev.eclipse.org/bugs/show_bug.cgi?id=9351
                        try {
                                if (newContent != null){
-                                       String encoding = source.getJavaProject().getOption(PHPCore.CORE_ENCODING, true);
+                                       String encoding = source.getJavaProject().getOption(JavaCore.CORE_ENCODING, true);
                                        destFile.setContents(
                                                new ByteArrayInputStream(encoding == null ? newContent.getBytes() : newContent.getBytes(encoding)), 
                                                fForce ? IResource.FORCE | IResource.KEEP_HISTORY : IResource.KEEP_HISTORY,