pkg/analyzer_experimental/lib/src/generated/engine.dart - Issue 16019002: Merge the dart:uri library into dart:core and update the Uri class

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: pkg/analyzer_experimental/lib/src/generated/engine.dart

Issue 16019002: Merge the dart:uri library into dart:core and update the Uri class (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Add missing files Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/engine/MainEngine.java ('k') | pkg/analyzer_experimental/lib/src/generated/java_core.dart » ('j') | pkg/http/lib/src/multipart_request.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: pkg/analyzer_experimental/lib/src/generated/engine.dart

diff --git a/pkg/analyzer_experimental/lib/src/generated/engine.dart b/pkg/analyzer_experimental/lib/src/generated/engine.dart

index fca4fef823fdd6ae60d4e44003feddb6f451e0f7..e9390f769115a1e4406502cfa61b7d61465024c1 100644

--- a/pkg/analyzer_experimental/lib/src/generated/engine.dart

+++ b/pkg/analyzer_experimental/lib/src/generated/engine.dart

@@ -4,7 +4,6 @@

library engine;

import 'dart:collection' show HasNextIterator;

-import 'dart:uri' show Uri;

import 'java_core.dart';

import 'java_engine.dart';

import 'instrumentation.dart';

@@ -2828,7 +2827,7 @@ class RecursiveXmlVisitor_6 extends RecursiveXmlVisitor<Object> {

for (XmlAttributeNode attribute in node.attributes) {

if (javaStringEqualsIgnoreCase(attribute.name.lexeme, AnalysisContextImpl._ATTRIBUTE_SRC)) {

try {

- Uri uri = new Uri.fromComponents(path: attribute.text);

+ Uri uri = new Uri(path: attribute.text);

String fileName = uri.path;

if (AnalysisEngine.isDartFileName(fileName)) {

Source librarySource = AnalysisContextImpl_this._sourceFactory.resolveUri(htmlSource, fileName);