Chromium Code Reviews| Index: editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/engine/MainEngine.java |
| diff --git a/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/engine/MainEngine.java b/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/engine/MainEngine.java |
| index 766d502d85403a33b29b4ed022a6c9f901c2e2b2..7fc1d447e4b6ff28db70164d6e26ed284bd5198a 100644 |
| --- a/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/engine/MainEngine.java |
| +++ b/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/engine/MainEngine.java |
| @@ -141,6 +141,7 @@ public class MainEngine { |
| context.addSourceFiles(new File(engineFolder, "com/google/dart/engine/internal/parser")); |
| context.addSourceFiles(new File(engineFolder, "com/google/dart/engine/internal/resolver")); |
| context.addSourceFiles(new File(engineFolder, "com/google/dart/engine/internal/scope")); |
| + context.addSourceFiles(new File(engineFolder, "com/google/dart/engine/internal/task")); |
| context.addSourceFiles(new File(engineFolder, "com/google/dart/engine/internal/type")); |
| context.addSourceFiles(new File(engineFolder, "com/google/dart/engine/internal/verifier")); |
| context.addSourceFile(new File( |
| @@ -187,6 +188,10 @@ public class MainEngine { |
| + "Lcom/google/dart/engine/scanner/Token;Lcom/google/dart/engine/ast/Expression;" |
| + "Lcom/google/dart/engine/scanner/Token;)", |
| "forCascade"); |
| + // XXX |
|
Brian Wilkerson
2013/09/03 21:11:06
Do you still need this marker?
|
| + context.addRename( |
| + "Lcom/google/dart/engine/sdk/DirectoryBasedDartSdk;.(Ljava/io/File;)", |
| + "<empty>"); |
| context.addRename( |
| "Lcom/google/dart/engine/html/ast/XmlTagNode;.becomeParentOf<T:Lcom/google/dart/engine/html/ast/XmlNode;>(Ljava/util/List<TT;>;Ljava/util/List<TT;>;)", |
| "becomeParentOfEmpty"); |
| @@ -620,7 +625,7 @@ public class MainEngine { |
| File file = context.getMemberToFile().get(member); |
| if (isEnginePath(file, "AnalysisEngine.java") || isEnginePath(file, "utilities/logging/") |
| || isEnginePath(file, "context/") || isEnginePath(file, "internal/cache/") |
| - || isEnginePath(file, "internal/context/")) { |
| + || isEnginePath(file, "internal/context/") || isEnginePath(file, "internal/task/")) { |
| unit.getDeclarations().add(member); |
| } |
| } |
| @@ -1095,7 +1100,7 @@ public class MainEngine { |
| if (index == -1) { |
| throw new IllegalArgumentException("Not found: " + pattern); |
| } |
| - return StringUtils.replaceOnce(source, pattern, replacement); |
| + return StringUtils.replace(source, pattern, replacement); |
| } |
| /** |