Move to public final fields instead of getters for Views. (efff1c24) · Commits · e / os / android_frameworks_base

tools/data-binding/compiler/src/main/java/android/databinding/tool/BindingTarget.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,8 @@ public class BindingTarget {
		List<Binding> mBindings = new ArrayList<Binding>();
		ExprModel mModel;
		ModelClass mResolvedClass;
		String mFieldName;

		// if this target presents itself in multiple layout files with different view types,
		// it receives an interface type and should use it in the getter instead.
		private ResourceBundle.BindingTargetBundle mBundle;
		@@ -98,4 +100,12 @@ public class BindingTarget {
		public void setModel(ExprModel model) {
		mModel = model;
		}

		public void setFieldName(String fieldName) {
		mFieldName = fieldName;
		}

		public String getFieldName() {
		return mFieldName;
		}
		}

tools/data-binding/compiler/src/main/java/android/databinding/tool/LayoutBinder.java

+14 −1

Original line number	Diff line number	Diff line
		@@ -23,10 +23,14 @@ import android.databinding.tool.expr.Expr;
		import android.databinding.tool.expr.ExprModel;
		import android.databinding.tool.expr.IdentifierExpr;
		import android.databinding.tool.store.ResourceBundle;
		import android.databinding.tool.store.ResourceBundle.BindingTargetBundle;
		import android.databinding.tool.util.ParserHelper;
		import android.databinding.tool.writer.LayoutBinderWriter;
		import android.databinding.tool.writer.WriterPackage;

		import java.util.ArrayList;
		import java.util.Collections;
		import java.util.Comparator;
		import java.util.HashMap;
		import java.util.List;
		import java.util.Map;
		@@ -35,6 +39,14 @@ import java.util.Map;
		* Keeps all information about the bindings per layout file
		*/
		public class LayoutBinder {
		private static final Comparator<BindingTarget> COMPARE_FIELD_NAME = new Comparator<BindingTarget>() {
		@Override
		public int compare(BindingTarget first, BindingTarget second) {
		final String fieldName1 = WriterPackage.getFieldName(first);
		final String fieldName2 = WriterPackage.getFieldName(second);
		return fieldName1.compareTo(fieldName2);
		}
		};

		/*
		* val pkg: String, val projectPackage: String, val baseClassName: String,
		@@ -69,13 +81,14 @@ public class LayoutBinder {
		for (Map.Entry<String, String> userImport : mBundle.getImports().entrySet()) {
		mExprModel.addImport(userImport.getKey(), userImport.getValue());
		}
		for (ResourceBundle.BindingTargetBundle targetBundle : mBundle.getBindingTargetBundles()) {
		for (BindingTargetBundle targetBundle : mBundle.getBindingTargetBundles()) {
		final BindingTarget bindingTarget = createBindingTarget(targetBundle);
		for (ResourceBundle.BindingTargetBundle.BindingBundle bindingBundle : targetBundle
		.getBindingBundleList()) {
		bindingTarget.addBinding(bindingBundle.getName(), parse(bindingBundle.getExpr()));
		}
		}
		Collections.sort(mBindingTargets, COMPARE_FIELD_NAME);
		}

		public void resolveWhichExpressionsAreUsed() {

tools/data-binding/compiler/src/main/java/android/databinding/tool/store/ResourceBundle.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -135,6 +135,7 @@ public class ResourceBundle implements Serializable {
		Set<String> includeBindingIds = new HashSet<String>();
		Set<String> viewBindingIds = new HashSet<String>();
		Map<String, String> viewTypes = new HashMap<String, String>();
		Map<String, String> includes = new HashMap<String, String>();
		L.d("validating ids for %s", bundles.getKey());
		for (LayoutFileBundle bundle : bundles.getValue()) {
		for (BindingTargetBundle target : bundle.mBindingTargetBundles) {
		@@ -154,11 +155,15 @@ public class ResourceBundle implements Serializable {
		if (existingType == null) {
		L.d("assigning %s as %s", target.getId(), target.mFullClassName);
		viewTypes.put(target.mId, target.mFullClassName);
		if (target.isBinder()) {
		includes.put(target.mId, target.getIncludedLayout());
		}
		} else if (!existingType.equals(target.mFullClassName)) {
		if (target.isBinder()) {
		L.d("overriding %s as base binder", target.getId());
		viewTypes.put(target.mId,
		"android.databinding.ViewDataBinding");
		includes.put(target.mId, target.getIncludedLayout());
		} else {
		L.d("overriding %s as base view", target.getId());
		viewTypes.put(target.mId, "android.view.View");
		@@ -172,7 +177,7 @@ public class ResourceBundle implements Serializable {
		BindingTargetBundle target = bundle.getBindingTargetById(viewType.getKey());
		if (target == null) {
		bundle.createBindingTarget(viewType.getKey(), viewType.getValue(), false,
		null, null);
		null, null).setIncludedLayout(includes.get(viewType.getKey()));
		} else {
		L.d("setting interface type on %s (%s) as %s", target.mId, target.mFullClassName, viewType.getValue());
		target.setInterfaceType(viewType.getValue());

tools/data-binding/compiler/src/main/kotlin/android/databinding/tool/writer/LayoutBinderWriter.kt

+84 −49

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ import android.databinding.tool.expr.BracketExpr
		import android.databinding.tool.reflection.Callable
		import android.databinding.tool.expr.CastExpr
		import android.databinding.tool.reflection.ModelAnalyzer
		import java.util.HashMap

		fun String.stripNonJava() = this.split("[^a-zA-Z0-9]").map{ it.trim() }.joinToCamelCaseAsVar()

		@@ -84,7 +85,15 @@ val BindingTarget.readableUniqueName by Delegates.lazy {(target: BindingTarget)
		}

		val BindingTarget.fieldName by Delegates.lazy { (target : BindingTarget) ->
		"m${target.readableUniqueName.capitalize()}"
		if (target.getFieldName() == null) {
		if (target.getId() == null) {
		target.setFieldName("m${target.readableUniqueName.capitalize()}")
		} else {
		target.androidId.stripNonJava();
		target.setFieldName(target.readableUniqueName);
		}
		}
		target.getFieldName();
		}

		val BindingTarget.getterName by Delegates.lazy { (target : BindingTarget) ->
		@@ -299,6 +308,7 @@ fun <T> FlagSet.mapOr(other : FlagSet, cb : (suffix : String, index : Int) -> T)

		class LayoutBinderWriter(val layoutBinder : LayoutBinder) {
		val model = layoutBinder.getModel()
		val indices = HashMap<BindingTarget, kotlin.Int>()
		val mDirtyFlags by Delegates.lazy {
		val fs = FlagSet(BitSet(), model.getFlagBucketCount());
		Arrays.fill(fs.buckets, -1)
		@@ -330,6 +340,7 @@ class LayoutBinderWriter(val layoutBinder : LayoutBinder) {

		public fun write() : String {
		layoutBinder.resolveWhichExpressionsAreUsed()
		calculateIndices();
		return kcode("package ${layoutBinder.getPackage()};") {
		nl("import ${layoutBinder.getModulePackage()}.R;")
		nl("import ${layoutBinder.getModulePackage()}.BR;")
		@@ -343,7 +354,6 @@ class LayoutBinderWriter(val layoutBinder : LayoutBinder) {
		tab(declareLog())
		tab(declareSetVariable())
		tab(variableSettersAndGetters())
		tab(viewGetters())
		tab(onFieldChange())

		tab(executePendingBindings())
		@@ -355,6 +365,16 @@ class LayoutBinderWriter(val layoutBinder : LayoutBinder) {
		tab("//end")
		}.generate()
		}
		fun calculateIndices() : Unit {
		val numTaggedViews = layoutBinder.getBindingTargets().
		filter{it.isUsed() && !it.isBinder()}.count()
		layoutBinder.getBindingTargets().filter{ it.isUsed() && it.getTag() != null }.forEach {
		indices.put(it, Integer.parseInt(it.getTag()));
		}
		layoutBinder.getBindingTargets().filter{ it.isUsed() && it.isBinder()}.withIndex().forEach {
		indices.put(it.value, it.index + numTaggedViews);
		}
		}
		fun declareIncludeViews() = kcode("") {
		nl("private static final android.util.SparseIntArray sIncludes;")
		nl("private static final android.util.SparseIntArray sViewsWithIds;")
		@@ -364,11 +384,8 @@ class LayoutBinderWriter(val layoutBinder : LayoutBinder) {
		tab("sIncludes = null;")
		} else {
		tab("sIncludes = new android.util.SparseIntArray();")
		val numTaggedViews = layoutBinder.getBindingTargets().
		filter{it.isUsed() && !it.isBinder()}.count()
		layoutBinder.getBindingTargets().filter{ it.isUsed() && it.isBinder()}.withIndex()
		.forEach {
		tab("sIncludes.put(${it.value.androidId}, ${it.index + numTaggedViews});")
		layoutBinder.getBindingTargets().filter{ it.isUsed() && it.isBinder()}.forEach {
		tab("sIncludes.put(${it.androidId}, ${indices.get(it)});")
		}
		}
		val hasViewsWithIds = layoutBinder.getBindingTargets().firstOrNull{ it.isUsed() && !it.supportsTag()} != null
		@@ -378,24 +395,39 @@ class LayoutBinderWriter(val layoutBinder : LayoutBinder) {
		tab("sViewsWithIds = new android.util.SparseIntArray();")
		layoutBinder.getBindingTargets().filter{ it.isUsed() && !it.supportsTag() }.
		forEach {
		tab("sViewsWithIds.put(${it.androidId}, ${it.getTag()});")
		tab("sViewsWithIds.put(${it.androidId}, ${indices.get(it)});")
		}
		}
		}
		nl("}")
		}
		fun declareConstructor() = kcode("") {
		nl("public ${className}(View root) {") {
		tab("super(root, ${model.getObservables().size()});")
		val viewCount = layoutBinder.getBindingTargets().filter{it.isUsed()}.count()
		tab("View[] views = new View[${viewCount}];")
		tab("mapTaggedChildViews(root, views, sIncludes, sViewsWithIds);");
		nl("private ${className}(View root, View[] views) {") {
		tab("super(root, ${model.getObservables().size()}") {
		layoutBinder.getBindingTargets().filter{it.getId() != null}.forEach {
		val index = indices.get(it)
		if (!it.isUsed()) {
		tab(", null")
		} else if (index == null) {
		tab(", (${it.getInterfaceType()}) root")
		} else if (it.isBinder()) {
		tab(", ${it.getViewClass()}.bind(views[${index}])")
		} else {
		tab(", (${it.getInterfaceType()}) views[${index}]")
		}
		}
		tab(");")
		}
		val taggedViews = layoutBinder.getBindingTargets().filter{it.isUsed() && !it.isBinder()}
		taggedViews.forEach {
		if (it.getTag() == null) {
		if (it.getId() == null) {
		tab("this.${it.fieldName} = (${it.getViewClass()}) root;")
		}
		} else {
		if (it.getId() == null) {
		tab("this.${it.fieldName} = (${it.getViewClass()}) views[${it.getTag()}];")
		}
		if (it.supportsTag()) {
		val originalTag = it.getOriginalTag();
		var tagValue = "null"
		@@ -415,12 +447,13 @@ class LayoutBinderWriter(val layoutBinder : LayoutBinder) {
		}
		}
		}
		val taggedCount = taggedViews.count()
		layoutBinder.getBindingTargets().filter{it.isUsed() && it.isBinder()}.withIndex()
		.forEach {
		tab("this.${it.value.fieldName} = ${it.value.getViewClass()}.bind(views[${it.index + taggedCount}]);")
		}
		tab("invalidateAll();");
		nl("}")
		}
		nl("")
		nl("public ${className}(View root) {") {
		val viewCount = layoutBinder.getBindingTargets().filter{it.isUsed()}.count()
		tab("this(root, mapChildViews(root, ${viewCount}, sIncludes, sViewsWithIds));")
		}
		nl("}")
		}
		@@ -501,8 +534,8 @@ class LayoutBinderWriter(val layoutBinder : LayoutBinder) {
		}

		fun onFieldChange() = kcode("") {
		tab("@Override")
		tab("protected boolean onFieldChange(int localFieldId, Object object, int fieldId) {") {
		nl("@Override")
		nl("protected boolean onFieldChange(int localFieldId, Object object, int fieldId) {") {
		tab("switch (localFieldId) {") {
		model.getObservables().forEach {
		tab("case ${it.getId()} :") {
		@@ -513,10 +546,11 @@ class LayoutBinderWriter(val layoutBinder : LayoutBinder) {
		tab("}")
		tab("return false;")
		}
		tab("}")
		nl("}")
		nl("")

		model.getObservables().forEach {
		tab("private boolean ${it.onChangeName}(${it.getResolvedType().toJavaCode()} ${it.readableUniqueName}, int fieldId) {") {
		nl("private boolean ${it.onChangeName}(${it.getResolvedType().toJavaCode()} ${it.readableUniqueName}, int fieldId) {") {
		tab("switch (fieldId) {", {
		val accessedFields: List<FieldAccessExpr> = it.getParents().filterIsInstance(javaClass<FieldAccessExpr>())
		accessedFields.filter { it.canBeInvalidated() }
		@@ -543,28 +577,14 @@ class LayoutBinderWriter(val layoutBinder : LayoutBinder) {
		tab("}")
		tab("return false;")
		}
		tab("}")
		nl("}")
		nl("")
		}
		}

		fun declareViews() = kcode("// views") {
		layoutBinder.getBindingTargets().filter{it.isUsed()}.forEach {
		nl("private final ${it.getViewClass()} ${it.fieldName};")
		}
		}

		fun viewGetters() = kcode("// view getters") {
		layoutBinder.getBindingTargets().filter{it.getId() != null}.forEach {
		nl("@Override")
		nl("public ${it.getInterfaceType()} ${it.getterName}() {") {
		if (it.isUsed()) {
		tab("return ${it.fieldName};")
		} else {
		tab("return null;")
		}

		}
		nl("}")
		layoutBinder.getBindingTargets().filter {it.isUsed() && (it.getId() == null)}.forEach {
		nl("private final ${it.getInterfaceType()} ${it.fieldName};")
		}
		}

		@@ -638,7 +658,14 @@ class LayoutBinderWriter(val layoutBinder : LayoutBinder) {
		}) {") {
		it.value.forEach { binding ->
		tab("// api target ${binding.getMinApi()}")
		val bindingCode = binding.toJavaCode(binding.getTarget().fieldName, binding.getExpr().toCode().generate())
		val fieldName : String
		if (binding.getTarget().getViewClass().
		equals(binding.getTarget().getInterfaceType())) {
		fieldName = "this.${binding.getTarget().fieldName}"
		} else {
		fieldName = "((${binding.getTarget().getViewClass()}) this.${binding.getTarget().fieldName})"
		}
		val bindingCode = binding.toJavaCode(fieldName, binding.getExpr().toCode().generate())
		if (binding.getMinApi() > 1) {
		tab("if(getBuildSdkInt() >= ${binding.getMinApi()}) {") {
		tab("$bindingCode;")
		@@ -732,8 +759,20 @@ class LayoutBinderWriter(val layoutBinder : LayoutBinder) {
		nl("import android.databinding.DataBindingUtil;")
		nl("import android.databinding.ViewDataBinding;")
		nl("public abstract class ${baseClassName} extends ViewDataBinding {")
		tab("protected ${baseClassName}(android.view.View root, int localFieldCount) {") {
		tab("super(root, localFieldCount);")
		layoutBinder.getBindingTargets().filter{it.getId() != null}.forEach {
		tab("public final ${it.getInterfaceType()} ${it.fieldName};")
		}
		nl("")
		tab("protected ${baseClassName}(android.view.View root_, int localFieldCount") {
		layoutBinder.getBindingTargets().filter{it.getId() != null}.forEach {
		tab(", ${it.getInterfaceType()} ${it.readableUniqueName}")
		}
		}
		tab(") {") {
		tab("super(root_, localFieldCount);")
		layoutBinder.getBindingTargets().filter{it.getId() != null}.forEach {
		tab("this.${it.fieldName} = ${it.readableUniqueName};")
		}
		}
		tab("}")
		nl("")
		@@ -745,10 +784,6 @@ class LayoutBinderWriter(val layoutBinder : LayoutBinder) {
		tab("public abstract void ${it.setterName}(${type} ${it.readableUniqueName});")
		}
		}
		layoutBinder.getBindingTargets().filter{ it.getId() != null }.forEach {
		tab("public abstract ${it.getInterfaceType()} ${it.getterName}();")
		}
		nl("")
		tab("public static ${baseClassName} inflate(android.view.ViewGroup root) {") {
		tab("return DataBindingUtil.<${baseClassName}>inflate(root.getContext(), ${layoutBinder.getModulePackage()}.R.layout.${layoutBinder.getLayoutname()}, root, true);")
		}

tools/data-binding/databinding.properties

+1 −1

Original line number	Diff line number	Diff line
		# global settings for projects
		kotlinVersion = 0.10.195
		kotlinVersion = 0.11.91
		releaseVersion = 0.3
		snapshotVersion = 0.3-SNAPSHOT
		androidPluginVersion = 1.0.1