fixed update conflict and outline update bug

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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaElementDelta.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaElementDelta.java
index 9cbedb3..1dfedd9 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaElementDelta.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaElementDelta.java
@@ -238,17 +238,18 @@ protected void addResourceDelta(IResourceDelta child) {
        }
        resourceDeltas[resourceDeltasCounter++] = child;
 }
+
 /**
  * Creates the nested deltas resulting from a change operation.
  * Convenience method for creating change deltas.
  * The constructor should be used to create the root delta 
  * and then a change operation should call this method.
  */
-public void changed(IJavaElement element, int changeFlag) {
+public JavaElementDelta changed(IJavaElement element, int changeFlag) {
        JavaElementDelta changedDelta = new JavaElementDelta(element);
-       changedDelta.fKind = CHANGED;
-       changedDelta.fChangeFlags |= changeFlag;
+       changedDelta.changed(changeFlag);
        insertDeltaTree(element, changedDelta);
+       return changedDelta;
 }
 /**
  * Mark this delta as a content changed delta.