Fix broken static import with alias. (980449bc) · Commits · e / os / android_frameworks_base

tools/data-binding/TestApp/src/androidTest/java/com/android/databinding/testapp/FindMethodTest.java

+20 −0

Original line number	Diff line number	Diff line
		@@ -71,4 +71,24 @@ public class FindMethodTest
		TextView textView = mBinder.getTextView8();
		assertEquals("hello world", textView.getText().toString());
		}

		public void testImportStaticMethod() throws Throwable {
		TextView textView = mBinder.getTextView9();
		assertEquals("world", textView.getText().toString());
		}

		public void testImportStaticField() throws Throwable {
		TextView textView = mBinder.getTextView10();
		assertEquals("hello world", textView.getText().toString());
		}

		public void testAliasStaticMethod() throws Throwable {
		TextView textView = mBinder.getTextView11();
		assertEquals("world", textView.getText().toString());
		}

		public void testAliasStaticField() throws Throwable {
		TextView textView = mBinder.getTextView12();
		assertEquals("hello world", textView.getText().toString());
		}
		}

tools/data-binding/TestApp/src/main/res/layout/find_method_test.xml

+27 −3

Original line number	Diff line number	Diff line
		@@ -4,9 +4,8 @@
		android:layout_width="match_parent"
		android:layout_height="match_parent">
		<variable name="obj" type="com.android.databinding.testapp.vo.FindMethodBindingObject"/>
		<!--
		<import name="FMBO" type=""/>
		-->
		<import type="com.android.databinding.testapp.vo.FindMethodBindingObject"/>
		<import type="com.android.databinding.testapp.vo.FindMethodBindingObject" alias="FMBO"/>
		<TextView
		android:id="@+id/textView0"
		android:layout_width="wrap_content" android:layout_height="wrap_content"
		@@ -43,4 +42,29 @@
		android:id="@+id/textView8"
		android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="@{com.android.databinding.testapp.vo.FindMethodBindingObject.foo.bar}"/>
		<TextView
		android:id="@+id/textView9"
		android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="@{FindMethodBindingObject.staticMethod()}"/>
		<TextView
		android:id="@+id/textView10"
		android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="@{FindMethodBindingObject.foo.bar}"/>
		<TextView
		android:id="@+id/textView11"
		android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="@{FMBO.staticMethod()}"/>
		<TextView
		android:id="@+id/textView12"
		android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="@{FMBO.foo.bar}"/>
		<!-- The following are just to test duplicate expressions -->
		<TextView
		android:id="@+id/textView13"
		android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="@{FMBO.staticMethod()}"/>
		<TextView
		android:id="@+id/textView14"
		android:layout_width="wrap_content" android:layout_height="wrap_content"
		android:text="@{FMBO.foo.bar}"/>
		</LinearLayout>
		No newline at end of file

tools/data-binding/compiler/src/main/java/com/android/databinding/expr/Expr.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -575,17 +575,18 @@ abstract public class Expr {
		}
		}

		protected void replaceStaticAccess(ModelAnalyzer modelAnalyzer) {
		protected void replaceStaticIdentifiers(ModelAnalyzer modelAnalyzer) {
		for (int i = 0; i < mChildren.size(); i++) {
		Expr child = mChildren.get(i);
		String packageName = child.asPackage();
		if (packageName != null) {
		ModelClass modelClass = modelAnalyzer.findClass(packageName);
		if (modelClass != null) {
		Expr staticAccessExpr = getModel().staticAccessExpr(modelClass);
		child.removeParentAndUnregisterIfOrphan(this);
		StaticIdentifierExpr staticAccessExpr = getModel().staticIdentifier(packageName);
		staticAccessExpr.setUserDefinedType(packageName);
		staticAccessExpr.getParents().add(this);
		mChildren.set(i, staticAccessExpr);
		child.removeParentAndUnregisterIfOrphan(this);
		}
		}
		}
		@@ -595,11 +596,11 @@ abstract public class Expr {
		while (mParents.remove(parent)) {
		}
		if (getParents().isEmpty()) {
		getModel().unregister(this);
		for (Expr expr : mChildren) {
		expr.removeParentAndUnregisterIfOrphan(this);
		}
		mChildren.clear();
		getModel().unregister(this);
		}
		}

tools/data-binding/compiler/src/main/java/com/android/databinding/expr/ExprModel.java

+8 −7

Original line number	Diff line number	Diff line
		@@ -146,10 +146,6 @@ public class ExprModel {
		return register(new BracketExpr(variableExpr, argExpr));
		}

		public Expr staticAccessExpr(ModelClass modelClass) {
		return register(new StaticAccessExpr(modelClass));
		}

		public Expr castExpr(String type, Expr expr) {
		return register(new CastExpr(type, expr));
		}
		@@ -166,7 +162,9 @@ public class ExprModel {
		public Expr bindingExpr(Expr bindingExpr) {
		Preconditions.checkArgument(mExprMap.containsKey(bindingExpr.getUniqueKey()),
		"Main expression should already be registered");
		if (!mBindingExpressions.contains(bindingExpr)) {
		mBindingExpressions.add(bindingExpr);
		}
		return bindingExpr;
		}

		@@ -257,6 +255,9 @@ public class ExprModel {
		}

		// non-dynamic binding expressions receive some ids so that they can be invalidated
		for (int i = 0; i < mBindingExpressions.size(); i++) {
		L.d("[" + i + "] " + mBindingExpressions.get(i));
		}
		for (Expr expr : mBindingExpressions) {
		if (!(expr.isDynamic() \|\| !expr.hasId())) {
		L.d("Expr " + expr + " is dynamic? " + expr.isDynamic() + ", has ID? " + expr.hasId());
		@@ -348,7 +349,7 @@ public class ExprModel {
		public boolean apply(Expr input) {
		return input instanceof IdentifierExpr
		&& !input.hasId()
		&& !modelAnalyzer.isObservable(input.getResolvedType())
		&& !input.isObservable()
		&& input.isDynamic();
		}
		});
		@@ -358,7 +359,7 @@ public class ExprModel {
		return Iterables.filter(mExprMap.values(), new Predicate<Expr>() {
		@Override
		public boolean apply(Expr input) {
		return modelAnalyzer.isObservable(input.getResolvedType());
		return input.isObservable();
		}
		});
		}

tools/data-binding/compiler/src/main/java/com/android/databinding/expr/FieldAccessExpr.java

+12 −11

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ public class FieldAccessExpr extends Expr {
		mIsObservableField = isObservableField;
		}

		public Expr getParent() {
		public Expr getChild() {
		return getChildren().get(0);
		}

		@@ -52,7 +52,7 @@ public class FieldAccessExpr extends Expr {

		@Override
		public boolean isDynamic() {
		if (!getParent().isDynamic()) {
		if (!getChild().isDynamic()) {
		return false;
		}
		if (mGetter == null) {
		@@ -66,7 +66,7 @@ public class FieldAccessExpr extends Expr {
		protected List<Dependency> constructDependencies() {
		final List<Dependency> dependencies = constructDynamicChildrenDependencies();
		for (Dependency dependency : dependencies) {
		if (dependency.getOther() == getParent()) {
		if (dependency.getOther() == getChild()) {
		dependency.setMandatory(true);
		}
		}
		@@ -94,16 +94,17 @@ public class FieldAccessExpr extends Expr {
		@Override
		protected ModelClass resolveType(ModelAnalyzer modelAnalyzer) {
		if (mGetter == null) {
		replaceStaticAccess(modelAnalyzer);
		Expr parent = getParent();
		boolean isStatic = parent instanceof StaticAccessExpr;
		mGetter = modelAnalyzer.findMethodOrField(parent.getResolvedType(), mName, isStatic);
		replaceStaticIdentifiers(modelAnalyzer);
		Expr child = getChild();
		child.resolveType(modelAnalyzer);
		boolean isStatic = child instanceof StaticIdentifierExpr;
		mGetter = modelAnalyzer.findMethodOrField(child.getResolvedType(), mName, isStatic);
		if (modelAnalyzer.isObservableField(mGetter.resolvedType)) {
		// Make this the ".get()" and add an extra field access for the observable field
		parent.getParents().remove(this);
		getChildren().remove(parent);
		child.getParents().remove(this);
		getChildren().remove(child);

		FieldAccessExpr observableField = getModel().observableField(parent, mName);
		FieldAccessExpr observableField = getModel().observableField(child, mName);
		observableField.mGetter = mGetter;

		getChildren().add(observableField);
		@@ -117,7 +118,7 @@ public class FieldAccessExpr extends Expr {

		@Override
		protected String asPackage() {
		String parentPackage = getParent().asPackage();
		String parentPackage = getChild().asPackage();
		return parentPackage == null ? null : parentPackage + "." + mName;
		}
		}