| Index: pkg/analyzer/lib/src/generated/sdk_io.dart
|
| diff --git a/pkg/analyzer/lib/src/generated/sdk_io.dart b/pkg/analyzer/lib/src/generated/sdk_io.dart
|
| index e06e06b1ec4cdb1ecf8196104062cd9573961c2d..018b65561b0097cf6fcccb4499c58ca9b4efc139 100644
|
| --- a/pkg/analyzer/lib/src/generated/sdk_io.dart
|
| +++ b/pkg/analyzer/lib/src/generated/sdk_io.dart
|
| @@ -29,7 +29,7 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| /**
|
| * The directory containing the SDK.
|
| */
|
| - JavaFile directory;
|
| + JavaFile _sdkDirectory;
|
|
|
| /**
|
| * The revision number of this SDK, or `"0"` if the revision number cannot be discovered.
|
| @@ -173,7 +173,7 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| * @param sdkDirectory the directory containing the SDK
|
| */
|
| DirectoryBasedDartSdk(JavaFile sdkDirectory) {
|
| - this.directory = sdkDirectory.getAbsoluteFile();
|
| + this._sdkDirectory = sdkDirectory.getAbsoluteFile();
|
| initializeSdk();
|
| initializeLibraryMap();
|
| _analysisContext = new AnalysisContextImpl();
|
| @@ -194,7 +194,7 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| * @param sdkDirectory the directory containing the SDK
|
| */
|
| DirectoryBasedDartSdk.con1(JavaFile sdkDirectory, bool ignored) {
|
| - this.directory = sdkDirectory.getAbsoluteFile();
|
| + this._sdkDirectory = sdkDirectory.getAbsoluteFile();
|
| initializeSdk();
|
| initializeLibraryMap();
|
| _analysisContext = new AnalysisContextImpl();
|
| @@ -234,14 +234,21 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| *
|
| * @return the directory where dartium can be found
|
| */
|
| - JavaFile get dartiumWorkingDirectory => new JavaFile.relative(directory.getParentFile(), _CHROMIUM_DIRECTORY_NAME);
|
| + JavaFile get dartiumWorkingDirectory => new JavaFile.relative(_sdkDirectory.getParentFile(), _CHROMIUM_DIRECTORY_NAME);
|
| +
|
| + /**
|
| + * Return the directory containing the SDK.
|
| + *
|
| + * @return the directory containing the SDK
|
| + */
|
| + JavaFile get directory => _sdkDirectory;
|
|
|
| /**
|
| * Return the directory containing documentation for the SDK.
|
| *
|
| * @return the SDK's documentation directory
|
| */
|
| - JavaFile get docDirectory => new JavaFile.relative(directory, _DOCS_DIRECTORY_NAME);
|
| + JavaFile get docDirectory => new JavaFile.relative(_sdkDirectory, _DOCS_DIRECTORY_NAME);
|
|
|
| /**
|
| * Return the auxiliary documentation file for the given library, or `null` if no such file
|
| @@ -269,7 +276,7 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| *
|
| * @return the directory that contains the libraries
|
| */
|
| - JavaFile get libraryDirectory => new JavaFile.relative(directory, _LIB_DIRECTORY_NAME);
|
| + JavaFile get libraryDirectory => new JavaFile.relative(_sdkDirectory, _LIB_DIRECTORY_NAME);
|
|
|
| /**
|
| * Return the file containing the Pub executable, or `null` if it does not exist.
|
| @@ -278,7 +285,7 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| */
|
| JavaFile get pubExecutable {
|
| String pubBinaryName = OSUtilities.isWindows() ? _PUB_EXECUTABLE_NAME_WIN : _PUB_EXECUTABLE_NAME;
|
| - JavaFile file = new JavaFile.relative(new JavaFile.relative(directory, _BIN_DIRECTORY_NAME), pubBinaryName);
|
| + JavaFile file = new JavaFile.relative(new JavaFile.relative(_sdkDirectory, _BIN_DIRECTORY_NAME), pubBinaryName);
|
| return file.exists() ? file : null;
|
| }
|
|
|
| @@ -296,7 +303,7 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| {
|
| if (_sdkVersion == null) {
|
| _sdkVersion = DartSdk.DEFAULT_VERSION;
|
| - JavaFile revisionFile = new JavaFile.relative(directory, _REVISION_FILE_NAME);
|
| + JavaFile revisionFile = new JavaFile.relative(_sdkDirectory, _REVISION_FILE_NAME);
|
| try {
|
| String revision = revisionFile.readAsStringSync();
|
| if (revision != null) {
|
| @@ -324,7 +331,7 @@ class DirectoryBasedDartSdk implements DartSdk {
|
| JavaFile get vmExecutable {
|
| {
|
| if (_vmExecutable == null) {
|
| - JavaFile file = new JavaFile.relative(new JavaFile.relative(directory, _BIN_DIRECTORY_NAME), vmBinaryName);
|
| + JavaFile file = new JavaFile.relative(new JavaFile.relative(_sdkDirectory, _BIN_DIRECTORY_NAME), vmBinaryName);
|
| if (file.exists()) {
|
| _vmExecutable = file;
|
| }
|
|
|