java2dart improvement - use field if getter/setter are trivial.

pkg/analyzer_experimental/lib/src/generated/sdk_io.dart

 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
 library engine.sdk.io;
 import 'java_core.dart';
 import 'java_io.dart';
 import 'java_engine_io.dart';
 import 'source_io.dart';
 import 'error.dart';
 import 'scanner.dart';
 import 'ast.dart';
 import 'parser.dart';
 import 'sdk.dart';
 import 'engine.dart';
 /**
  * Instances of the class `DirectoryBasedDartSdk` represent a Dart SDK installed in a
  * specified directory.
  *
  * @coverage dart.engine.sdk
  */
 class DirectoryBasedDartSdk implements DartSdk {
 
   /**
    * The [AnalysisContext] which is used for all of the sources in this [DartSdk].
    */
   InternalAnalysisContext _analysisContext;
 
   /**
    * The directory containing the SDK.
    */
-  JavaFile _sdkDirectory;
+  JavaFile directory;
 
   /**
    * The revision number of this SDK, or `"0"` if the revision number cannot be discovered.
    */
   String _sdkVersion;
 
   /**
    * The file containing the Dartium executable.
    */
   JavaFile _dartiumExecutable;
@@ skipping 148 matching lines @@
     }
     return sdkDirectory;
   }
 
   /**
    * Initialize a newly created SDK to represent the Dart SDK installed in the given directory.
    *
    * @param sdkDirectory the directory containing the SDK
    */
   DirectoryBasedDartSdk(JavaFile sdkDirectory) {
-    this._sdkDirectory = sdkDirectory.getAbsoluteFile();
+    this.directory = sdkDirectory.getAbsoluteFile();
     initializeSdk();
     initializeLibraryMap();
     if (AnalysisEngine.instance.useExperimentalContext) {
       _analysisContext = new AnalysisContextImpl2();
     } else {
       _analysisContext = new AnalysisContextImpl();
     }
     _analysisContext.sourceFactory = new SourceFactory.con2([new DartUriResolver(this)]);
     List<String> uris = this.uris;
     ChangeSet changeSet = new ChangeSet();
     for (String uri in uris) {
       changeSet.added(_analysisContext.sourceFactory.forUri(uri));
     }
     _analysisContext.applyChanges(changeSet);
   }
 
   /**
    * Initialize a newly created SDK to represent the Dart SDK installed in the given directory.
    *
    * Added in order to test AnalysisContextImpl2.
    *
    * @param sdkDirectory the directory containing the SDK
    */
   DirectoryBasedDartSdk.con1(JavaFile sdkDirectory, bool ignored) {
-    this._sdkDirectory = sdkDirectory.getAbsoluteFile();
+    this.directory = sdkDirectory.getAbsoluteFile();
     initializeSdk();
     initializeLibraryMap();
     _analysisContext = new AnalysisContextImpl2();
     _analysisContext.sourceFactory = new SourceFactory.con2([new DartUriResolver(this)]);
     List<String> uris = this.uris;
     ChangeSet changeSet = new ChangeSet();
     for (String uri in uris) {
       changeSet.added(_analysisContext.sourceFactory.forUri(uri));
     }
     _analysisContext.applyChanges(changeSet);
@@ skipping 17 matching lines @@
     }
     return _dartiumExecutable;
   }
 
   /**
    * Return the directory where dartium can be found in the Dart SDK (the directory that will be the
    * working directory is Dartium is invoked without changing the default).
    *
    * @return the directory where dartium can be found
    */
-  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;
+  JavaFile get dartiumWorkingDirectory => new JavaFile.relative(directory.getParentFile(), _CHROMIUM_DIRECTORY_NAME);
 
   /**
    * Return the directory containing documentation for the SDK.
    *
    * @return the SDK's documentation directory
    */
-  JavaFile get docDirectory => new JavaFile.relative(_sdkDirectory, _DOCS_DIRECTORY_NAME);
+  JavaFile get docDirectory => new JavaFile.relative(directory, _DOCS_DIRECTORY_NAME);
 
   /**
    * Return the auxiliary documentation file for the given library, or `null` if no such file
    * exists.
    *
    * @param libraryName the name of the library associated with the documentation file to be
    *          returned
    * @return the auxiliary documentation file for the library
    */
   JavaFile getDocFileFor(String libraryName) {
     JavaFile dir = docDirectory;
     if (!dir.exists()) {
       return null;
     }
     JavaFile libDir = new JavaFile.relative(dir, libraryName);
     JavaFile docFile = new JavaFile.relative(libDir, "${libraryName}${_DOC_FILE_SUFFIX}");
     if (docFile.exists()) {
       return docFile;
     }
     return null;
   }
 
   /**
    * Return the directory within the SDK directory that contains the libraries.
    *
    * @return the directory that contains the libraries
    */
-  JavaFile get libraryDirectory => new JavaFile.relative(_sdkDirectory, _LIB_DIRECTORY_NAME);
+  JavaFile get libraryDirectory => new JavaFile.relative(directory, _LIB_DIRECTORY_NAME);
 
   /**
    * Return the file containing the Pub executable, or `null` if it does not exist.
    *
    * @return the file containing the Pub executable
    */
   JavaFile get pubExecutable {
     String pubBinaryName = OSUtilities.isWindows() ? _PUB_EXECUTABLE_NAME_WIN : _PUB_EXECUTABLE_NAME;
-    JavaFile file = new JavaFile.relative(new JavaFile.relative(_sdkDirectory, _BIN_DIRECTORY_NAME), pubBinaryName);
+    JavaFile file = new JavaFile.relative(new JavaFile.relative(directory, _BIN_DIRECTORY_NAME), pubBinaryName);
     return file.exists() ? file : null;
   }
   List<SdkLibrary> get sdkLibraries => _libraryMap.sdkLibraries;
   SdkLibrary getSdkLibrary(String dartUri) => _libraryMap.getLibrary(dartUri);
 
   /**
    * Return the revision number of this SDK, or `"0"` if the revision number cannot be
    * discovered.
    *
    * @return the revision number of this SDK
    */
   String get sdkVersion {
     {
       if (_sdkVersion == null) {
         _sdkVersion = DartSdk.DEFAULT_VERSION;
-        JavaFile revisionFile = new JavaFile.relative(_sdkDirectory, _REVISION_FILE_NAME);
+        JavaFile revisionFile = new JavaFile.relative(directory, _REVISION_FILE_NAME);
         try {
           String revision = revisionFile.readAsStringSync();
           if (revision != null) {
             _sdkVersion = revision;
           }
         } on JavaIOException catch (exception) {
         }
       }
     }
     return _sdkVersion;
   }
 
   /**
    * Return an array containing the library URI's for the libraries defined in this SDK.
    *
    * @return the library URI's for the libraries defined in this SDK
    */
   List<String> get uris => _libraryMap.uris;
 
   /**
    * Return the file containing the VM executable, or `null` if it does not exist.
    *
    * @return the file containing the VM executable
    */
   JavaFile get vmExecutable {
     {
       if (_vmExecutable == null) {
-        JavaFile file = new JavaFile.relative(new JavaFile.relative(_sdkDirectory, _BIN_DIRECTORY_NAME), vmBinaryName);
+        JavaFile file = new JavaFile.relative(new JavaFile.relative(directory, _BIN_DIRECTORY_NAME), vmBinaryName);
         if (file.exists()) {
           _vmExecutable = file;
         }
       }
     }
     return _vmExecutable;
   }
 
   /**
    * Return `true` if this SDK includes documentation.
@@ skipping 153 matching lines @@
   /**
    * The value of the [PLATFORMS] parameter used to specify that the library can
    * be used on the VM.
    */
   static String _VM_PLATFORM = "VM_PLATFORM";
 
   /**
    * The library map that is populated by visiting the AST structure parsed from the contents of
    * the libraries file.
    */
-  LibraryMap _librariesMap = new LibraryMap();
-
-  /**
-   * Return the library map that was populated by visiting the AST structure parsed from the
-   * contents of the libraries file.
-   *
-   * @return the library map describing the contents of the SDK
-   */
-  LibraryMap get librariesMap => _librariesMap;
+  final LibraryMap librariesMap = new LibraryMap();
   Object visitMapLiteralEntry(MapLiteralEntry node) {
     String libraryName = null;
     Expression key = node.key;
     if (key is SimpleStringLiteral) {
       libraryName = "${_LIBRARY_PREFIX}${((key as SimpleStringLiteral)).value}";
     }
     Expression value = node.value;
     if (value is InstanceCreationExpression) {
       SdkLibraryImpl library = new SdkLibraryImpl(libraryName);
       List<Expression> arguments = ((value as InstanceCreationExpression)).argumentList.arguments;
@@ skipping 14 matching lines @@
               String identifier = ((expression as SimpleIdentifier)).name;
               if (identifier == _VM_PLATFORM) {
                 library.setVmLibrary();
               } else {
                 library.setDart2JsLibrary();
               }
             }
           }
         }
       }
-      _librariesMap.setLibrary(libraryName, library);
+      librariesMap.setLibrary(libraryName, library);
     }
     return null;
   }
 }
 class AnalysisErrorListener_9 implements AnalysisErrorListener {
   List<bool> foundError;
   AnalysisErrorListener_9(this.foundError);
   void onError(AnalysisError error) {
     foundError[0] = true;
   }
 }