From f01484b73485e504dd0dae05064412e7bffd7415 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sun, 28 Feb 2016 14:21:18 +0000
Subject: Ensure superclass is first in super type collection

---
 src/main/java/org/zwobble/couscous/frontends/java/JavaTypes.java | 2 +-
 src/main/java/org/zwobble/couscous/util/ExtraSets.java           | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/main/java')

diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaTypes.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaTypes.java
index 19a9126..226e05d 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaTypes.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaTypes.java
@@ -44,10 +44,10 @@ class JavaTypes {
 
     private static Set<TypeName> superTypes(ITypeBinding typeBinding) {
         ImmutableSet.Builder<TypeName> superTypes = ImmutableSet.builder();
+        superTypes.add(superClass(typeBinding));
         superTypes.addAll(transform(
             asList(typeBinding.getInterfaces()),
             JavaTypes::typeOf));
-        superTypes.add(superClass(typeBinding));
         return superTypes.build();
     }
 
diff --git a/src/main/java/org/zwobble/couscous/util/ExtraSets.java b/src/main/java/org/zwobble/couscous/util/ExtraSets.java
index ab3dd16..3012da5 100644
--- a/src/main/java/org/zwobble/couscous/util/ExtraSets.java
+++ b/src/main/java/org/zwobble/couscous/util/ExtraSets.java
@@ -14,4 +14,8 @@ public class ExtraSets {
     public static <T> Set<T> set(T value1) {
         return ImmutableSet.of(value1);
     }
+
+    public static <T> Set<T> set(T value1, T value2) {
+        return ImmutableSet.of(value1, value2);
+    }
 }
-- 
cgit v1.2.3