Breaking changes in 'analyzer' package.

editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/engine/MainEngine.java

 /*
  * Copyright (c) 2013, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
@@ skipping 369 matching lines @@
     }
     {
       CompilationUnit library = buildSourceLibrary();
       Files.write(
           getFormattedSource(library),
           new File(targetFolder + "/source.dart"),
           Charsets.UTF_8);
     }
     {
       CompilationUnit library = buildSourceIoLibrary();
-      Files.write(
-          getFormattedSource(library),
-          new File(targetFolder + "/source_io.dart"),
-          Charsets.UTF_8);
+      String code = getFormattedSource(library);
+      code = replaceSourceFragment(
+          code,
+          "bool isOpaque = uri.isOpaque()",
+          "bool isOpaque = uri.isAbsolute && !uri.path.startsWith('/')");
+      Files.write(code, new File(targetFolder + "/source_io.dart"), Charsets.UTF_8);
     }
     {
       CompilationUnit library = buildErrorLibrary();
       Files.write(
           getFormattedSource(library),
           new File(targetFolder + "/error.dart"),
           Charsets.UTF_8);
     }
     {
       CompilationUnit library = buildScannerLibrary();
@@ skipping 138 matching lines @@
           Charsets.UTF_8);
     }
     {
       CompilationUnit library = buildResolverTestLibrary();
       String source = getFormattedSource(library);
       // TODO(scheglov) restore this test once TestSource is not file based
       source = replaceSourceFragment(
           source,
           "AnalysisDeltaTest.dartSuite();",
           "//AnalysisDeltaTest.dartSuite();");
+      source = replaceSourceFragment(source, "on AssertionFailedError catch", "catch");
       Files.write(source, new File(targetTestFolder + "/resolver_test.dart"), Charsets.UTF_8);
     }
     {
       String projectFolder = new File(targetFolder).getParentFile().getParentFile().getParent();
       fixUnnecessaryCastHints(projectFolder);
     }
     System.out.println("Translation complete");
   }
 
   private static void addNotRemovedCompiationUnitEntries(CompilationUnit targetUnit,
@@ skipping 612 matching lines @@
 
   private static CompilationUnit buildSourceIoLibrary() throws Exception {
     CompilationUnit unit = new CompilationUnit(null, null, null, null, null);
     unit.getDirectives().add(libraryDirective("engine", "source", "io"));
     unit.getDirectives().add(importDirective("source.dart", null));
     unit.getDirectives().add(importDirective("java_core.dart", null));
     unit.getDirectives().add(importDirective("java_io.dart", null));
     unit.getDirectives().add(importDirective("utilities_general.dart", null));
     unit.getDirectives().add(importDirective("instrumentation.dart", null));
     unit.getDirectives().add(importDirective("engine.dart", null));
+    unit.getDirectives().add(importDirective("java_engine.dart", null));
     unit.getDirectives().add(exportDirective("source.dart"));
     for (Entry<File, List<CompilationUnitMember>> entry : context.getFileToMembers().entrySet()) {
       File file = entry.getKey();
       if (isEnginePath(file, "source/Source.java")
           || isEnginePath(file, "source/ContentCache.java")
           || isEnginePath(file, "source/DartUriResolver.java")
           || isEnginePath(file, "source/NonExistingSource.java")
           || isEnginePath(file, "source/SourceFactory.java")
           || isEnginePath(file, "source/SourceContainer.java")
           || isEnginePath(file, "source/SourceKind.java")
@@ skipping 11 matching lines @@
     }
     return unit;
   }
 
   private static CompilationUnit buildSourceLibrary() throws Exception {
     CompilationUnit unit = new CompilationUnit(null, null, null, null, null);
     unit.getDirectives().add(libraryDirective("engine", "source"));
     unit.getDirectives().add(importDirective("dart:collection", null));
     unit.getDirectives().add(importDirective("java_core.dart", null));
     unit.getDirectives().add(importDirective("sdk.dart", null, importShowCombinator("DartSdk")));
-    unit.getDirectives().add(
-        importDirective(
-            "engine.dart",
-            null,
-            importShowCombinator("AnalysisContext", "TimestampedData")));
+    unit.getDirectives().add(importDirective("engine.dart", null));
+    unit.getDirectives().add(importDirective("java_engine.dart", null));
     for (Entry<File, List<CompilationUnitMember>> entry : context.getFileToMembers().entrySet()) {
       File file = entry.getKey();
       if (isEnginePath(file, "source/Source.java")
           || isEnginePath(file, "source/ContentCache.java")
           || isEnginePath(file, "source/DartUriResolver.java")
           || isEnginePath(file, "source/LocalSourcePredicate.java")
           || isEnginePath(file, "source/NonExistingSource.java")
           || isEnginePath(file, "source/SourceFactory.java")
           || isEnginePath(file, "source/SourceContainer.java")
           || isEnginePath(file, "source/SourceKind.java")
@@ skipping 349 matching lines @@
           return ((ClassDeclaration) member).getName().getName();
         }
         if (member instanceof FunctionDeclaration) {
           return ((FunctionDeclaration) member).getName().getName();
         }
         throw new UnsupportedOperationException(member.toSource());
       }
     });
   }
 }