issue #138: fix the orders problem

f2prateek · Jan 4, 2017 · e28c4e4 · e28c4e4
1 parent 8ec8d3e
commit e28c4e4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/dart-common/src/main/java/com/f2prateek/dart/common/InjectionTarget.java b/dart-common/src/main/java/com/f2prateek/dart/common/InjectionTarget.java
@@ -21,7 +21,7 @@
 import java.util.Map;
 import javax.lang.model.type.TypeMirror;
 
-public final class InjectionTarget {
+public final class InjectionTarget implements Comparable<InjectionTarget> {
   public final Map<String, ExtraInjection> injectionMap = new LinkedHashMap<>();
   public final String classPackage;
   public final String className;
@@ -57,4 +57,10 @@ private ExtraInjection getOrCreateExtraBinding(String key) {
   public String getFqcn() {
     return classPackage + "." + className;
   }
+
+  @Override
+  public int compareTo(InjectionTarget o) {
+    if (o == null) return 0;
+    return - this.targetClass.compareTo(o.targetClass);
+  }
 }
diff --git a/...processor/src/main/java/com/f2prateek/dart/henson/processor/HensonNavigatorGenerator.java b/...processor/src/main/java/com/f2prateek/dart/henson/processor/HensonNavigatorGenerator.java
@@ -10,7 +10,7 @@
 import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
 import java.util.Collection;
-import java.util.HashSet;
+import java.util.TreeSet;
 import javax.lang.model.element.Modifier;
 
 /**
@@ -78,7 +78,7 @@ private void emitNavigationMethods(TypeSpec.Builder hensonNavigatorTypeBuilder)
         .addParameter(ClassName.get("android.content", "Context"), "context")
         .addStatement("this.context = context")
         .build());
-    for (InjectionTarget target: targets) {
+    for (InjectionTarget target : targets) {
       emitNavigationMethod(withContextSetStateBuilder, target);
     }
     hensonNavigatorTypeBuilder.addType(withContextSetStateBuilder.build());
@@ -150,8 +150,8 @@ private String findCommonPackage(String commonPackageName, String packageName) {
   }
 
   private Collection<InjectionTarget> getTargetsWhereHensonCanGoto(Collection<InjectionTarget> targets) {
-    Collection<InjectionTarget> canGotoTargets = new HashSet<>();
-    for (InjectionTarget injectionTarget: targets) {
+    Collection<InjectionTarget> canGotoTargets = new TreeSet<>();
+    for (InjectionTarget injectionTarget : targets) {
       if (!injectionTarget.isAbstractTargetClass) {
         canGotoTargets.add(injectionTarget);
       }