fixed outline refresh bug

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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java
index c99dfcc..6ed2fdb 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaModelManager.java
@@ -38,16 +38,21 @@ import net.sourceforge.phpdt.core.IJavaModel;
 import net.sourceforge.phpdt.core.IJavaProject;
 import net.sourceforge.phpdt.core.IPackageFragment;
 import net.sourceforge.phpdt.core.IPackageFragmentRoot;
+import net.sourceforge.phpdt.core.IParent;
+import net.sourceforge.phpdt.core.IProblemRequestor;
 import net.sourceforge.phpdt.core.IWorkingCopy;
-import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.JavaCore;
-import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.WorkingCopyOwner;
+import net.sourceforge.phpdt.core.compiler.IProblem;
 import net.sourceforge.phpdt.internal.core.builder.PHPBuilder;
 import net.sourceforge.phpdt.internal.core.util.Util;
+import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
+import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceDelta;
@@ -68,23 +73,7 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Preferences;
 import org.eclipse.core.runtime.Status;
-
-import net.sourceforge.phpdt.internal.core.DefaultWorkingCopyOwner;
-
-import net.sourceforge.phpdt.internal.core.DeltaProcessingState;
-
-import net.sourceforge.phpdt.internal.core.DeltaProcessor;
-
-import net.sourceforge.phpdt.core.IParent;
-import net.sourceforge.phpdt.internal.core.JavaElementInfo;
-
-import net.sourceforge.phpdt.core.IProblemRequestor;
-import net.sourceforge.phpdt.core.WorkingCopyOwner;
-import net.sourceforge.phpdt.core.compiler.IProblem;
-import net.sourceforge.phpdt.internal.core.CompilationUnit;
-import net.sourceforge.phpdt.internal.core.JavaElement;
-import net.sourceforge.phpdt.internal.core.JavaElementDeltaBuilder;
-import net.sourceforge.phpdt.internal.core.JavaModelManager.PerWorkingCopyInfo;
+import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
 
 /**
  * The <code>JavaModelManager</code> manages instances of <code>IJavaModel</code>.
@@ -95,8 +84,7 @@ import net.sourceforge.phpdt.internal.core.JavaModelManager.PerWorkingCopyInfo;
  * the static method <code>JavaModelManager.getJavaModelManager()</code>.
  */
 public class JavaModelManager implements ISaveParticipant {    
- 
-       /**
+       /**
         * Unique handle onto the JavaModel
         */
        final JavaModel javaModel = new JavaModel();
@@ -311,9 +299,9 @@ public class JavaModelManager implements ISaveParticipant {
                        if (PHPFileUtil.isValidPHPUnitName(name))
                        //if (PHPFileUtil.isPHPFile(file))
                                return createCompilationUnitFrom(file, project);
-//                     if (Util.isValidClassFileName(name))
+//                     if (ProjectPrefUtil.isValidClassFileName(name))
 //                             return createClassFileFrom(file, project);
-//                     if (Util.isArchiveFileName(name))
+//                     if (ProjectPrefUtil.isArchiveFileName(name))
 //                             return createJarPackageFragmentRootFrom(file, project);
                }
                return null;
@@ -531,7 +519,7 @@ public class JavaModelManager implements ISaveParticipant {
        /**
         * Used to update the JavaModel for <code>IJavaElementDelta</code>s.
         */
-//     private final ModelUpdater modelUpdater =new ModelUpdater();
+       private final ModelUpdater modelUpdater =new ModelUpdater();
        /**
         * Workaround for bug 15168 circular errors not reported  
         * This is a cache of the projects before any project addition/deletion has started.
@@ -608,7 +596,7 @@ public class JavaModelManager implements ISaveParticipant {
                        return buffer.toString();
                }
        }
-       public static boolean VERBOSE = true;
+       public static boolean VERBOSE = false;
        public static boolean CP_RESOLVE_VERBOSE = false;
        public static boolean ZIP_ACCESS_VERBOSE = false;
        
@@ -840,7 +828,7 @@ public class JavaModelManager implements ISaveParticipant {
                        
                // Refresh internal scopes
                if (deltaToNotify != null) {
-//             TODO khartlage temp-del
+//             TODO  temp-del
 //                     Iterator scopes = this.scopes.keySet().iterator();
 //                     while (scopes.hasNext()) {
 //                             AbstractSearchScope scope = (AbstractSearchScope)scopes.next();
@@ -1019,7 +1007,7 @@ public class JavaModelManager implements ISaveParticipant {
                        return proj;
                }
                int rootEnd= memento.indexOf(JavaElement.JEM_PACKAGEFRAGMENT, projectEnd + 1);
-//     TODO khartlage temp-del
+//     TODO  temp-del
 //             if (rootEnd == -1) {
 //                     return model.getHandleFromMementoForRoot(memento, proj, projectEnd, memento.length());
 //             }
@@ -1203,6 +1191,7 @@ public class JavaModelManager implements ISaveParticipant {
                IPath workingLocation = project.getWorkingLocation(JavaCore.PLUGIN_ID);
                return workingLocation.append("state.dat").toFile(); //$NON-NLS-1$
        }
+       
        /*
         * Returns the temporary cache for newly opened elements for the current thread.
         * Creates it if not already created.
@@ -1329,8 +1318,8 @@ public class JavaModelManager implements ISaveParticipant {
 //             }
 //             
 //             // load variables and containers from preferences into cache
-//             Preferences preferences = PHPCore.getPlugin().getPluginPreferences();
-//
+//             Preferences preferences = PHPeclipsePlugin.getDefault().getPluginPreferences();
+
 //             // only get variable from preferences not set to their default
 //             String[] propertyNames = preferences.propertyNames();
 //             int variablePrefixLength = CP_VARIABLE_PREFERENCES_PREFIX.length();
@@ -1805,7 +1794,7 @@ public class JavaModelManager implements ISaveParticipant {
        }
 
        public void shutdown () {
-//     TODO khartlage temp-del
+//     TODO  temp-del
 //             if (this.deltaProcessor.indexManager != null){ // no more indexing
 //                     this.deltaProcessor.indexManager.shutdown();
 //             }
@@ -1838,17 +1827,17 @@ public class JavaModelManager implements ISaveParticipant {
        /**
         * Update Java Model given some delta
         */
-//     public void updateJavaModel(IJavaElementDelta customDelta) {
-//
-//             if (customDelta == null){
-//                     for (int i = 0, length = this.javaModelDeltas.size(); i < length; i++){
-//                             IJavaElementDelta delta = (IJavaElementDelta)this.javaModelDeltas.get(i);
-//                             this.modelUpdater.processJavaDelta(delta);
-//                     }
-//             } else {
-//                     this.modelUpdater.processJavaDelta(customDelta);
-//             }
-//     }
+       public void updateJavaModel(IJavaElementDelta customDelta) {
+
+               if (customDelta == null){
+                       for (int i = 0, length = this.javaModelDeltas.size(); i < length; i++){
+                               IJavaElementDelta delta = (IJavaElementDelta)this.javaModelDeltas.get(i);
+                               this.modelUpdater.processJavaDelta(delta);
+                       }
+               } else {
+                       this.modelUpdater.processJavaDelta(customDelta);
+               }
+       }