fixed update conflict and outline update bug

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / phpeditor / WorkingCopyManager.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/WorkingCopyManager.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/WorkingCopyManager.java
index 4df75cd..341108e 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/WorkingCopyManager.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/WorkingCopyManager.java
@@ -15,17 +15,15 @@ package net.sourceforge.phpeclipse.phpeditor;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.jface.text.Assert;
-
-import org.eclipse.ui.IEditorInput;
-
 import net.sourceforge.phpdt.core.ICompilationUnit;
-
 import net.sourceforge.phpdt.ui.IWorkingCopyManager;
 import net.sourceforge.phpdt.ui.IWorkingCopyManagerExtension;
 
+import org.eclipse.core.runtime.CoreException;
+import net.sourceforge.phpeclipse.phpeditor.ICompilationUnitDocumentProvider;
+import org.eclipse.jface.text.Assert;
+import org.eclipse.ui.IEditorInput;
+
 
 /**
  * This working copy manager works together with a given compilation unit document provider and
@@ -33,7 +31,7 @@ import net.sourceforge.phpdt.ui.IWorkingCopyManagerExtension;
  */
 public class WorkingCopyManager implements IWorkingCopyManager, IWorkingCopyManagerExtension {
        
-       private PHPDocumentProvider fDocumentProvider;
+       private ICompilationUnitDocumentProvider fDocumentProvider;
        private Map fMap;
        private boolean fIsShuttingDown;
 
@@ -43,7 +41,7 @@ public class WorkingCopyManager implements IWorkingCopyManager, IWorkingCopyMana
         * 
         * @param provider the provider
         */
-       public WorkingCopyManager(PHPDocumentProvider provider) {
+       public WorkingCopyManager(ICompilationUnitDocumentProvider provider) {
                Assert.isNotNull(provider);
                fDocumentProvider= provider;
        }