Merge libv1.

editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/operation/DartModelOperation.java

Index: editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/operation/DartModelOperation.java
diff --git a/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/operation/DartModelOperation.java b/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/operation/DartModelOperation.java
index 307adec2844f61e2999afa6f2b7cca30ec477e2a..9cccb0f7b9360dab37e5b341bf4634b485c9925a 100644
--- a/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/operation/DartModelOperation.java
+++ b/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/operation/DartModelOperation.java
@@ -21,6 +21,7 @@ import com.google.dart.tools.core.internal.model.DartModelManager;
 import com.google.dart.tools.core.internal.model.DartModelStatusImpl;
 import com.google.dart.tools.core.internal.model.delta.DartElementDeltaImpl;
 import com.google.dart.tools.core.internal.model.delta.DeltaProcessor;
+import com.google.dart.tools.core.internal.model.delta.IDeltaProcessor;
 import com.google.dart.tools.core.internal.util.Messages;
 import com.google.dart.tools.core.model.CompilationUnit;
 import com.google.dart.tools.core.model.DartElement;
@@ -359,8 +360,8 @@ public abstract class DartModelOperation implements IWorkspaceRunnable, IProgres
   public void run(IProgressMonitor monitor) throws CoreException {
     DartCore.notYetImplemented();
     DartModelManager manager = DartModelManager.getInstance();
-    DeltaProcessor deltaProcessor = manager.getDeltaProcessor();
-    int previousDeltaCount = deltaProcessor.dartModelDeltas.size();
+    IDeltaProcessor deltaProcessor = manager.getDeltaProcessor();
+    int previousDeltaCount = deltaProcessor.getDartModelDeltas().size();
     try {
       progressMonitor = monitor;
       pushOperation(this);
@@ -385,8 +386,8 @@ public abstract class DartModelOperation implements IWorkspaceRunnable, IProgres
 
         // update DartModel using deltas that were recorded during this
         // operation
-        for (int i = previousDeltaCount, size = deltaProcessor.dartModelDeltas.size(); i < size; i++) {
-          deltaProcessor.updateDartModel(deltaProcessor.dartModelDeltas.get(i));
+        for (int i = previousDeltaCount, size = deltaProcessor.getDartModelDeltas().size(); i < size; i++) {
+          deltaProcessor.updateDartModel(deltaProcessor.getDartModelDeltas().get(i));
         }
 
         // // close the parents of the created elements and reset their
@@ -416,7 +417,7 @@ public abstract class DartModelOperation implements IWorkspaceRunnable, IProgres
         // - the operation did produce some delta(s)
         // - but the operation has not modified any resource
         if (isTopLevelOperation()) {
-          if ((deltaProcessor.dartModelDeltas.size() > previousDeltaCount || !deltaProcessor.reconcileDeltas.isEmpty())
+          if ((deltaProcessor.getDartModelDeltas().size() > previousDeltaCount || !deltaProcessor.getReconcileDeltas().isEmpty())
               && !hasModifiedResource()) {
             deltaProcessor.fire(null, DeltaProcessor.DEFAULT_CHANGE_EVENT);
           } // else deltas are fired while processing the resource delta
@@ -523,7 +524,7 @@ public abstract class DartModelOperation implements IWorkspaceRunnable, IProgres
    * @param delta the delta to be added
    */
   protected void addReconcileDelta(CompilationUnit workingCopy, DartElementDeltaImpl delta) {
-    HashMap<CompilationUnit, DartElementDelta> reconcileDeltas = DartModelManager.getInstance().getDeltaProcessor().reconcileDeltas;
+    HashMap<CompilationUnit, DartElementDelta> reconcileDeltas = DartModelManager.getInstance().getDeltaProcessor().getReconcileDeltas();
     DartElementDeltaImpl previousDelta = (DartElementDeltaImpl) reconcileDeltas.get(workingCopy);
     if (previousDelta != null) {
       DartElementDelta[] children = delta.getAffectedChildren();