Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 812d215f authored by George Mount's avatar George Mount
Browse files

Removed reflection-based implementations and renamed classes. 

Renamed Model* classes to Annotation*
Renamed Reflection* classes to Model*
Removed Class* classes -- they are no longer needed.

The names were confusing. I think this is better.
parent d872e1cd

tools/data-binding/annotationprocessor/src/main/java/com/android/databinding/annotationprocessor/ProcessBindable.java

+1 −7
Original line number Diff line number Diff line 
package com.android.databinding.annotationprocessor;



import com.android.databinding.reflection.ModelAnalyzer;

import com.android.databinding.reflection.ReflectionAnalyzer;



import android.binding.Bindable;
@@ -18,7 +17,6 @@ import java.util.Collections; 
import java.util.Enumeration;

import java.util.HashMap;

import java.util.HashSet;

import java.util.List;

import java.util.Set;



import javax.annotation.processing.AbstractProcessor;
@@ -28,15 +26,11 @@ import javax.annotation.processing.SupportedAnnotationTypes; 
import javax.annotation.processing.SupportedSourceVersion;

import javax.lang.model.SourceVersion;

import javax.lang.model.element.Element;

import javax.lang.model.element.ElementKind;

import javax.lang.model.element.ExecutableElement;

import javax.lang.model.element.Name;

import javax.lang.model.element.PackageElement;

import javax.lang.model.element.TypeElement;

import javax.lang.model.element.VariableElement;

import javax.lang.model.type.TypeKind;

import javax.lang.model.util.Elements;

import javax.lang.model.util.Types;

import javax.tools.Diagnostic;

import javax.tools.FileObject;

import javax.tools.JavaFileObject;
@@ -54,7 +48,7 @@ public class ProcessBindable extends AbstractProcessor { 
    @Override

    public synchronized void init(ProcessingEnvironment processingEnv) {

        super.init(processingEnv);

        ReflectionAnalyzer.setProcessingEnvironment(processingEnv);

        ModelAnalyzer.setProcessingEnvironment(processingEnv);

    }



    @Override

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

+6 −6
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


package com.android.databinding;



import com.android.databinding.reflection.ReflectionAnalyzer;

import com.android.databinding.reflection.ReflectionClass;

import com.android.databinding.reflection.ModelAnalyzer;

import com.android.databinding.reflection.ModelClass;

import com.android.databinding.store.SetterStore;

import com.android.databinding.expr.Expr;
@@ -39,15 +39,15 @@ public class Binding { 
    }



    public String toJavaCode(String targetViewName, String expressionCode) {

        ReflectionClass viewType = mTarget.getResolvedType();

        return SetterStore.get(ReflectionAnalyzer.getInstance()).getSetterCall(mName, viewType,

        ModelClass viewType = mTarget.getResolvedType();

        return SetterStore.get(ModelAnalyzer.getInstance()).getSetterCall(mName, viewType,

                mExpr.getResolvedType(), targetViewName, expressionCode);

    }



//    private String resolveJavaCode(ReflectionAnalyzer reflectionAnalyzer) {

//    private String resolveJavaCode(ModelAnalyzer modelAnalyzer) {

//

//    }

////        return reflectionAnalyzer.findMethod(mTarget.getResolvedType(), mName,

////        return modelAnalyzer.findMethod(mTarget.getResolvedType(), mName,

////                Arrays.asList(mExpr.getResolvedType()));

//    //}

//

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

+5 −5
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ package com.android.databinding; 


import com.android.databinding.expr.Expr;

import com.android.databinding.expr.ExprModel;

import com.android.databinding.reflection.ReflectionAnalyzer;

import com.android.databinding.reflection.ReflectionClass;

import com.android.databinding.reflection.ModelAnalyzer;

import com.android.databinding.reflection.ModelClass;

import com.android.databinding.store.ResourceBundle;



import java.util.ArrayList;
@@ -28,7 +28,7 @@ import java.util.List; 
public class BindingTarget {

    List<Binding> mBindings = new ArrayList<>();

    ExprModel mModel;

    ReflectionClass mResolvedClass;

    ModelClass mResolvedClass;

    // 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;
@@ -57,9 +57,9 @@ public class BindingTarget { 
        return mBundle.getFullClassName();

    }



    public ReflectionClass getResolvedType() {

    public ModelClass getResolvedType() {

        if (mResolvedClass == null) {

            mResolvedClass = ReflectionAnalyzer.getInstance().findClass(mBundle.getFullClassName());

            mResolvedClass = ModelAnalyzer.getInstance().findClass(mBundle.getFullClassName());

        }

        return mResolvedClass;

    }

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

+2 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import com.google.common.base.Preconditions; 


import com.android.databinding.expr.Expr;

import com.android.databinding.expr.ExprModel;

import com.android.databinding.reflection.ReflectionAnalyzer;



import org.antlr.v4.runtime.misc.NotNull;

import org.antlr.v4.runtime.tree.ParseTree;
@@ -241,8 +240,8 @@ public class ExpressionVisitor extends BindingExpressionBaseVisitor<Expr> { 
//                @org.jetbrains.annotations.NotNull

//                @Override

//                public Class<? extends Object> resolveValueType(

//                        @org.jetbrains.annotations.NotNull ReflectionAnalyzer reflectionAnalyzer) {

//                    return reflectionAnalyzer.commonParentOf(aggregate.getResolvedClass(), nextResult.getResolvedClass());

//                        @org.jetbrains.annotations.NotNull ModelAnalyzer modelAnalyzer) {

//                    return modelAnalyzer.commonParentOf(aggregate.getResolvedClass(), nextResult.getResolvedClass());

//                }

//

//                @org.jetbrains.annotations.NotNull

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

+4 −6
Original line number Diff line number Diff line
@@ -16,12 +16,10 @@ 


package com.android.databinding.expr;



import com.android.databinding.reflection.ClassClass;

import com.android.databinding.reflection.ReflectionAnalyzer;

import com.android.databinding.reflection.ReflectionClass;

import com.android.databinding.reflection.ModelAnalyzer;

import com.android.databinding.reflection.ModelClass;



import java.util.List;

import java.util.Map;



public class BracketExpr extends Expr {
@@ -38,8 +36,8 @@ public class BracketExpr extends Expr { 
    }



    @Override

    protected ReflectionClass resolveType(ReflectionAnalyzer reflectionAnalyzer) {

        ReflectionClass targetType = getTarget().resolveType(reflectionAnalyzer);

    protected ModelClass resolveType(ModelAnalyzer modelAnalyzer) {

        ModelClass targetType = getTarget().resolveType(modelAnalyzer);

        if (targetType.isArray()) {

            mAccessor = BracketAccessor.ARRAY;

        } else if (targetType.isList()) {