using DottedChains (almost) everywhere

libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/DottedChain.java

@@ -17,80 +17,144 @@
 package com.jpexs.decompiler.graph;
 
 import com.jpexs.decompiler.flash.IdentifiersDeobfuscation;
+import com.jpexs.helpers.Helper;
+import java.io.File;
+import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
 
 /**
  *
  * @author JPEXS
  */
-public class DottedChain {
+public class DottedChain implements Serializable {
 
-    public final List<String> parts;
+    public static final DottedChain EMPTY = new DottedChain();
+
+    private final String[] parts;
+
+    private final int hash;
 
     public DottedChain(List<String> parts) {
-        this.parts = new ArrayList<>(parts);
+        this.parts = parts.toArray(new String[parts.size()]);
+        hash = calcHash();
     }
 
     public DottedChain(String... parts) {
-        this.parts = new ArrayList<>();
-        for (int i = 0; i < parts.length; i++) {
-            this.parts.add(parts[i]);
-        }
+        this.parts = parts;
+        hash = calcHash();
+    }
+
+    public boolean isEmpty() {
+        return parts.length == 0;
+    }
+
+    public int size() {
+        return parts.length;
+    }
+
+    public String get(int index) {
+        return parts[index];
+    }
+
+    public DottedChain subChain(int count) {
+        String[] nparts = Arrays.copyOfRange(parts, 0, count);
+        return new DottedChain(nparts);
     }
 
     public String getLast() {
-        if (parts.isEmpty()) {
+        if (parts.length == 0) {
             return "";
         } else {
-            return parts.get(parts.size() - 1);
+            return parts[parts.length - 1];
         }
     }
 
     public DottedChain getWithoutLast() {
-        List<String> nparts = new ArrayList<>(parts);
-        if (!nparts.isEmpty()) {
-            nparts.remove(nparts.size() - 1);
+        if (parts.length < 2) {
+            return EMPTY;
         }
+
+        String[] nparts = Arrays.copyOfRange(parts, 0, parts.length - 1);
         return new DottedChain(nparts);
     }
 
-    public String toPrintableString() {
+    public DottedChain add(String name) {
+        String[] nparts = new String[parts.length + 1];
+        if (parts.length > 0) {
+            System.arraycopy(parts, 0, nparts, 0, parts.length);
+        }
+
+        nparts[nparts.length - 1] = name;
+        return new DottedChain(nparts);
+    }
+
+    private String toString(boolean as3, boolean raw) {
+        if (parts.length == 0 || (parts.length == 1 && parts[0].isEmpty())) {
+            return "";
+        }
+
         StringBuilder ret = new StringBuilder();
-        for (int i = 0; i < parts.size(); i++) {
+        for (int i = 0; i < parts.length; i++) {
             if (i > 0) {
                 ret.append(".");
             }
-            ret.append(IdentifiersDeobfuscation.printIdentifier(true, parts.get(0)));
+
+            String part = parts[i];
+            boolean lastStar = i == parts.length - 1 && "*".equals(part);
+            ret.append((raw || lastStar) ? part : IdentifiersDeobfuscation.printIdentifier(as3, part));
         }
         return ret.toString();
     }
 
+    public String toFilePath() {
+        if (parts.length == 0 || (parts.length == 1 && parts[0].isEmpty())) {
+            return "";
+        }
+
+        StringBuilder ret = new StringBuilder();
+        for (int i = 0; i < parts.length; i++) {
+            if (i > 0) {
+                ret.append(File.separator);
+            }
+
+            ret.append(Helper.makeFileName(IdentifiersDeobfuscation.printIdentifier(true, parts[i])));
+        }
+        return ret.toString();
+    }
+
+    public List<String> toList() {
+        return new ArrayList<>(Arrays.asList(parts));
+    }
+
+    public String toPrintableString(boolean as3) {
+        return toString(as3, false);
+    }
+
+    public String toRawString() {
+        return toString(false/*ignored*/, true);
+    }
+
     @Override
     public String toString() {
-        StringBuilder ret = new StringBuilder();
-        for (int i = 0; i < parts.size(); i++) {
-            if (i > 0) {
-                ret.append(".");
-            }
-            ret.append(parts.get(i));
-        }
-        return ret.toString();
+        return toRawString();
     }
 
     @Override
     public int hashCode() {
-        int hash = 3;
-        hash = 89 * hash + Objects.hashCode(parts);
         return hash;
     }
 
+    private int calcHash() {
+        if (parts.length > 0 && parts[0].equals("§§")) {
+            int a = 1;
+        }
+        return Arrays.hashCode(parts);
+    }
+
     @Override
     public boolean equals(Object obj) {
-        if (obj instanceof String) {
-            obj = new DottedChain(((String) obj).split("\\."));
-        }
         if (obj == null) {
             return false;
         }
@@ -98,7 +162,7 @@ public class DottedChain {
             return false;
         }
         final DottedChain other = (DottedChain) obj;
-        if (!Objects.equals(parts, other.parts)) {
+        if (!Arrays.equals(parts, other.parts)) {
             return false;
         }
         return true;

libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/TypeItem.java

@@ -32,11 +32,11 @@ import java.util.Objects;
  */
 public class TypeItem extends GraphTargetItem {
 
-    public static TypeItem BOOLEAN = new TypeItem("Boolean");
+    public static TypeItem BOOLEAN = new TypeItem(new DottedChain("Boolean"));
 
-    public static TypeItem STRING = new TypeItem("String");
+    public static TypeItem STRING = new TypeItem(new DottedChain("String"));
 
-    public static TypeItem ARRAY = new TypeItem("Array");
+    public static TypeItem ARRAY = new TypeItem(new DottedChain("Array"));
 
     public static UnboundedTypeItem UNBOUNDED = new UnboundedTypeItem();
 
@@ -79,10 +79,11 @@ public class TypeItem extends GraphTargetItem {
 
     @Override
     public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
+        boolean as3 = localData.constantsAvm2 != null;
         if (localData.fullyQualifiedNames.contains(fullTypeName)) {
-            writer.hilightSpecial(IdentifiersDeobfuscation.printNamespace(localData.constantsAvm2 != null, fullTypeName.toPrintableString()), HighlightSpecialType.TYPE_NAME, fullTypeName.toPrintableString());
+            writer.hilightSpecial(fullTypeName.toPrintableString(as3), HighlightSpecialType.TYPE_NAME, fullTypeName.toPrintableString(as3));
         } else {
-            writer.hilightSpecial(IdentifiersDeobfuscation.printIdentifier(localData.constantsAvm2 != null, fullTypeName.getLast()), HighlightSpecialType.TYPE_NAME, fullTypeName.toPrintableString());
+            writer.hilightSpecial(IdentifiersDeobfuscation.printIdentifier(as3, fullTypeName.getLast()), HighlightSpecialType.TYPE_NAME, fullTypeName.toPrintableString(as3));
         }
 
         return writer;
@@ -100,7 +101,7 @@ public class TypeItem extends GraphTargetItem {
 
     @Override
     public String toString() {
-        return fullTypeName.toString();
+        return fullTypeName.toRawString();
     }
 
     @Override