Make SourceInfo a class, rename its menthods.

editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/dom/rewrite/RewriteEventStore.java

Index: editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/dom/rewrite/RewriteEventStore.java
diff --git a/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/dom/rewrite/RewriteEventStore.java b/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/dom/rewrite/RewriteEventStore.java
index 2ad729aba6c84b06c381c419455a4d02a48bff90..3abe6f5635624d5b663f87541c35e0eb50f9dc28 100644
--- a/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/dom/rewrite/RewriteEventStore.java
+++ b/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/dom/rewrite/RewriteEventStore.java
@@ -15,6 +15,7 @@ package com.google.dart.tools.core.internal.dom.rewrite;
 
 import com.google.dart.compiler.ast.DartBlock;
 import com.google.dart.compiler.ast.DartNode;
+import com.google.dart.compiler.common.SourceInfo;
 import com.google.dart.tools.core.DartCore;
 import com.google.dart.tools.core.dom.StructuralPropertyDescriptor;
 import com.google.dart.tools.core.dom.rewrite.TargetSourceRangeComputer;
@@ -52,7 +53,8 @@ public final class RewriteEventStore {
 
     @Override
     public int compareTo(CopySourceInfo r2) {
-      int startDiff = getNode().getSourceStart() - r2.getNode().getSourceStart();
+      int startDiff = getNode().getSourceInfo().getOffset()
+          - r2.getNode().getSourceInfo().getOffset();
       if (startDiff != 0) {
         return startDiff; // insert before if start node is first
       }
@@ -174,11 +176,13 @@ public final class RewriteEventStore {
 
     @Override
     public int compareTo(NodeRangeInfo r2) {
-      int startDiff = getStartNode().getSourceStart() - r2.getStartNode().getSourceStart();
+      int startDiff = getStartNode().getSourceInfo().getOffset()
+          - r2.getStartNode().getSourceInfo().getOffset();
       if (startDiff != 0) {
         return startDiff; // insert before if start node is first
       }
-      int endDiff = getEndNode().getSourceStart() - r2.getEndNode().getSourceStart();
+      int endDiff = getEndNode().getSourceInfo().getOffset()
+          - r2.getEndNode().getSourceInfo().getOffset();
       if (endDiff != 0) {
         return -endDiff; // insert before if length is longer
       }
@@ -228,7 +232,8 @@ public final class RewriteEventStore {
       int endPos = endRange.getStartPosition() + endRange.getLength();
 
       DartBlock internalPlaceholder = getInternalPlaceholder();
-      internalPlaceholder.setSourceRange(startPos, endPos - startPos);
+      internalPlaceholder.setSourceInfo(new SourceInfo(
+          internalPlaceholder.getSourceInfo().getSource(), startPos, endPos - startPos));
     }
 
   }
@@ -766,10 +771,10 @@ public final class RewriteEventStore {
   }
 
   private boolean isNodeInEvent(RewriteEvent event, Object value, int kind) {
-    if (((kind & NEW) != 0) && event.getNewValue() == value) {
+    if ((kind & NEW) != 0 && event.getNewValue() == value) {
       return true;
     }
-    if (((kind & ORIGINAL) != 0) && event.getOriginalValue() == value) {
+    if ((kind & ORIGINAL) != 0 && event.getOriginalValue() == value) {
       return true;
     }
     return false;