| Index: editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/Context.java
|
| diff --git a/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/Context.java b/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/Context.java
|
| index 48753a3962f6a9429847d72dfbf1ce4d9a5d3f08..da999b1c97bc65a33f5a2af3d4e7b82c587d2784 100644
|
| --- a/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/Context.java
|
| +++ b/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/Context.java
|
| @@ -595,8 +595,9 @@ public class Context {
|
| unwrapVarArgIfAlreadyArray(dartUniverse);
|
| ensureFieldInitializers(dartUniverse);
|
| dontUseThisInFieldInitializers(dartUniverse);
|
| - ensureUniqueClassMemberNames(dartUniverse);
|
| renameAnonymousClassDeclarations();
|
| + renamePrivateClassMembers();
|
| + ensureUniqueClassMemberNames(dartUniverse);
|
| applyLocalVariableSemanticChanges(dartUniverse);
|
| new ConstructorSemanticProcessor(this).process(dartUniverse);
|
| renameConstructors(dartUniverse);
|
| @@ -979,6 +980,26 @@ public class Context {
|
| });
|
| }
|
|
|
| + private void renamePrivateClassMembers() {
|
| + for (ClassMember member : privateClassMembers) {
|
| + if (member instanceof FieldDeclaration) {
|
| + FieldDeclaration fieldDeclaration = (FieldDeclaration) member;
|
| + NodeList<VariableDeclaration> variables = fieldDeclaration.getFields().getVariables();
|
| + for (VariableDeclaration field : variables) {
|
| + SimpleIdentifier nameNode = field.getName();
|
| + String name = nameNode.getName();
|
| + renameIdentifier(nameNode, "_" + name);
|
| + }
|
| + }
|
| + if (member instanceof MethodDeclaration) {
|
| + MethodDeclaration methodDeclaration = (MethodDeclaration) member;
|
| + SimpleIdentifier nameNode = methodDeclaration.getName();
|
| + String name = nameNode.getName();
|
| + renameIdentifier(nameNode, "_" + name);
|
| + }
|
| + }
|
| + }
|
| +
|
| private void replaceInnerClassReferences(CompilationUnit unit) {
|
| for (SimpleIdentifier identifier : innerClassNames) {
|
| renameIdentifier(identifier, identifier.getName());
|
|
|