Skip to content

Commit e28c4e4

Browse files
committed
issue #138: fix the orders problem
1 parent 8ec8d3e commit e28c4e4

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

dart-common/src/main/java/com/f2prateek/dart/common/InjectionTarget.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.Map;
2222
import javax.lang.model.type.TypeMirror;
2323

24-
public final class InjectionTarget {
24+
public final class InjectionTarget implements Comparable<InjectionTarget> {
2525
public final Map<String, ExtraInjection> injectionMap = new LinkedHashMap<>();
2626
public final String classPackage;
2727
public final String className;
@@ -57,4 +57,10 @@ private ExtraInjection getOrCreateExtraBinding(String key) {
5757
public String getFqcn() {
5858
return classPackage + "." + className;
5959
}
60+
61+
@Override
62+
public int compareTo(InjectionTarget o) {
63+
if (o == null) return 0;
64+
return - this.targetClass.compareTo(o.targetClass);
65+
}
6066
}

henson-processor/src/main/java/com/f2prateek/dart/henson/processor/HensonNavigatorGenerator.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import com.squareup.javapoet.TypeName;
1111
import com.squareup.javapoet.TypeSpec;
1212
import java.util.Collection;
13-
import java.util.HashSet;
13+
import java.util.TreeSet;
1414
import javax.lang.model.element.Modifier;
1515

1616
/**
@@ -78,7 +78,7 @@ private void emitNavigationMethods(TypeSpec.Builder hensonNavigatorTypeBuilder)
7878
.addParameter(ClassName.get("android.content", "Context"), "context")
7979
.addStatement("this.context = context")
8080
.build());
81-
for (InjectionTarget target: targets) {
81+
for (InjectionTarget target : targets) {
8282
emitNavigationMethod(withContextSetStateBuilder, target);
8383
}
8484
hensonNavigatorTypeBuilder.addType(withContextSetStateBuilder.build());
@@ -150,8 +150,8 @@ private String findCommonPackage(String commonPackageName, String packageName) {
150150
}
151151

152152
private Collection<InjectionTarget> getTargetsWhereHensonCanGoto(Collection<InjectionTarget> targets) {
153-
Collection<InjectionTarget> canGotoTargets = new HashSet<>();
154-
for (InjectionTarget injectionTarget: targets) {
153+
Collection<InjectionTarget> canGotoTargets = new TreeSet<>();
154+
for (InjectionTarget injectionTarget : targets) {
155155
if (!injectionTarget.isAbstractTargetClass) {
156156
canGotoTargets.add(injectionTarget);
157157
}

0 commit comments

Comments
 (0)