Merge pull request square#1 from rice/marcelo/include_include_on_extends

Add omar import when extending

Author: Daniel Rice (Square)

compiler/src/main/java/com/squareup/omar/compiler/OmarCompiler.java

@@ -19,6 +19,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
@@ -123,7 +124,7 @@ public void compile(JavaWriter writer) throws IOException {
           protoFile.getFileName());
       writer.emitPackage(protoFile.getJavaPackage());
 
-      List<String> imports = new ArrayList<String>();
+      Set<String> imports = new LinkedHashSet<String>();
       List<Type> types = protoFile.getTypes();
       boolean hasMessage = hasMessage(types);
       boolean hasExtensions = hasExtensions(protoFile.getTypes());
@@ -148,6 +149,9 @@ public void compile(JavaWriter writer) throws IOException {
         imports.add("java.util.Map");
         imports.add("java.util.TreeMap");
       }
+      if (hasExtends) {
+        imports.add("com.squareup.omar.Omar");
+      }
       writer.emitImports(imports);
 
       if (hasExtends) {