| Index: packages/analyzer/lib/src/generated/java_io.dart
|
| diff --git a/packages/analyzer/lib/src/generated/java_io.dart b/packages/analyzer/lib/src/generated/java_io.dart
|
| index 000746face6003293f13ab97cdf4cccb3e72169b..3c147bfc7fe71b840908718a8c501149911f8623 100644
|
| --- a/packages/analyzer/lib/src/generated/java_io.dart
|
| +++ b/packages/analyzer/lib/src/generated/java_io.dart
|
| @@ -1,12 +1,15 @@
|
| -library java.io;
|
| +// Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file
|
| +// for details. All rights reserved. Use of this source code is governed by a
|
| +// BSD-style license that can be found in the LICENSE file.
|
| +
|
| +library analyzer.src.generated.java_io;
|
|
|
| import "dart:io";
|
|
|
| import 'package:path/path.dart' as path;
|
|
|
| -import 'java_core.dart' show JavaIOException;
|
| -
|
| class JavaFile {
|
| + @deprecated
|
| static path.Context pathContext = path.context;
|
| static final String separator = Platform.pathSeparator;
|
| static final int separatorChar = Platform.pathSeparator.codeUnitAt(0);
|
| @@ -14,15 +17,17 @@ class JavaFile {
|
| JavaFile(String path) {
|
| _path = path;
|
| }
|
| - JavaFile.fromUri(Uri uri) : this(pathContext.fromUri(uri));
|
| + JavaFile.fromUri(Uri uri) : this(path.context.fromUri(uri));
|
| JavaFile.relative(JavaFile base, String child) {
|
| if (child.isEmpty) {
|
| this._path = base._path;
|
| } else {
|
| - this._path = pathContext.join(base._path, child);
|
| + this._path = path.context.join(base._path, child);
|
| }
|
| }
|
| + @override
|
| int get hashCode => _path.hashCode;
|
| + @override
|
| bool operator ==(other) {
|
| return other is JavaFile && other._path == _path;
|
| }
|
| @@ -39,23 +44,19 @@ class JavaFile {
|
|
|
| JavaFile getAbsoluteFile() => new JavaFile(getAbsolutePath());
|
| String getAbsolutePath() {
|
| - String path = pathContext.absolute(_path);
|
| - path = pathContext.normalize(path);
|
| - return path;
|
| + String abolutePath = path.context.absolute(_path);
|
| + abolutePath = path.context.normalize(abolutePath);
|
| + return abolutePath;
|
| }
|
|
|
| JavaFile getCanonicalFile() => new JavaFile(getCanonicalPath());
|
| String getCanonicalPath() {
|
| - try {
|
| - return _newFile().resolveSymbolicLinksSync();
|
| - } catch (e) {
|
| - throw new JavaIOException('IOException', e);
|
| - }
|
| + return _newFile().resolveSymbolicLinksSync();
|
| }
|
|
|
| - String getName() => pathContext.basename(_path);
|
| + String getName() => path.context.basename(_path);
|
| String getParent() {
|
| - var result = pathContext.dirname(_path);
|
| + var result = path.context.dirname(_path);
|
| // "." or "/" or "C:\"
|
| if (result.length < 4) return null;
|
| return result;
|
| @@ -98,10 +99,11 @@ class JavaFile {
|
| }
|
|
|
| String readAsStringSync() => _newFile().readAsStringSync();
|
| + @override
|
| String toString() => _path.toString();
|
| Uri toURI() {
|
| - String path = getAbsolutePath();
|
| - return pathContext.toUri(path);
|
| + String absolutePath = getAbsolutePath();
|
| + return path.context.toUri(absolutePath);
|
| }
|
|
|
| Directory _newDirectory() => new Directory(_path);
|
| @@ -133,18 +135,15 @@ class JavaSystemIO {
|
| String sdkPath;
|
| // may be "xcodebuild/ReleaseIA32/dart" with "sdk" sibling
|
| {
|
| - var outDir =
|
| - JavaFile.pathContext.dirname(JavaFile.pathContext.dirname(exec));
|
| - sdkPath = JavaFile.pathContext
|
| - .join(JavaFile.pathContext.dirname(outDir), "sdk");
|
| + var outDir = path.context.dirname(path.context.dirname(exec));
|
| + sdkPath = path.context.join(path.context.dirname(outDir), "sdk");
|
| if (new Directory(sdkPath).existsSync()) {
|
| _properties[name] = sdkPath;
|
| return sdkPath;
|
| }
|
| }
|
| // probably be "dart-sdk/bin/dart"
|
| - sdkPath =
|
| - JavaFile.pathContext.dirname(JavaFile.pathContext.dirname(exec));
|
| + sdkPath = path.context.dirname(path.context.dirname(exec));
|
| _properties[name] = sdkPath;
|
| return sdkPath;
|
| }
|
|
|