From aaa236edde5f86eae82fe52583900fae33cbf2a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Tue, 16 Aug 2016 20:40:17 +0200
Subject: [PATCH] Imports from same package fixed

---
 .../jpexs/decompiler/flash/abc/types/traits/Trait.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
index 0c1446dc4..a7f082a54 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
@@ -53,6 +53,7 @@ import com.jpexs.helpers.Helper;
 import java.io.Serializable;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -230,10 +231,16 @@ public abstract class Trait implements Cloneable, Serializable {
 
         List<String> importnames = new ArrayList<>();
         importnames.addAll(namesInThisPackage);
+        importnames.addAll(Arrays.asList(builtInClasses));
         for (int i = 0; i < imports.size(); i++) {
             DottedChain ipath = imports.get(i);
+            if (ipath.getWithoutLast().equals(ignorePackage)) { //do not check classes from same package, they are imported automatically
+                imports.remove(i);
+                i--;
+                continue;
+            }
             String name = ipath.getLast();
-            if (importnames.contains(name) || isBuiltInClass(name)) {
+            if (importnames.contains(name)) {
                 imports.remove(i);
                 i--;
                 fullyQualifiedNames.add(new DottedChain(name));