1. Fix EDKT273 "Externs are not being grouped together in MSA Files"

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / module / Identifications / Externs / ExternsIdentification.java

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Externs/ExternsIdentification.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Externs/ExternsIdentification.java
index 59b85d7e160c9b4f86f2f158eb017a91364ad8d6..31979ceb8868e798f20f39e0812cda532bd3cb76 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Externs/ExternsIdentification.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/Externs/ExternsIdentification.java
@@ -17,40 +17,57 @@ package org.tianocore.frameworkwizard.module.Identifications.Externs;
 \r
 import java.util.Vector;\r
 \r
+import org.tianocore.frameworkwizard.common.EnumerationData;\r
+\r
 public class ExternsIdentification {\r
 \r
     //\r
     // Define class members\r
     //\r
-    private String name = null;\r
+    private String name0 = null;\r
+\r
+    private String name1 = null;\r
+\r
+    private String name2 = null;\r
+\r
+    private String name3 = null;\r
 \r
     private String type = null;\r
-    \r
+\r
     private Vector<String> supArchList = null;\r
 \r
     private String featureFlag = null;\r
 \r
-    public ExternsIdentification(String arg0, String arg1, String arg2, Vector<String> arg3) {\r
-        this.name = (arg0 == null ? "" : arg0);\r
+    public ExternsIdentification(String arg0, String arg1) {\r
+        this.name0 = (arg0 == null ? "" : arg0);\r
         this.type = (arg1 == null ? "" : arg1);\r
-        this.featureFlag = (arg2 == null ? "" : arg2);\r
-        this.supArchList = arg3;\r
     }\r
 \r
-    public String getFeatureFlag() {\r
-        return featureFlag;\r
+    public ExternsIdentification(String arg0, String arg1, String arg2, String arg3, Vector<String> arg4) {\r
+        this.name0 = (arg0 == null ? "" : arg0);\r
+        this.name1 = (arg1 == null ? "" : arg1);\r
+        this.type = (arg2 == null ? "" : arg2);\r
+        this.featureFlag = (arg3 == null ? "" : arg3);\r
+        this.supArchList = arg4;\r
     }\r
 \r
-    public void setFeatureFlag(String featureFlag) {\r
-        this.featureFlag = featureFlag;\r
+    public ExternsIdentification(String arg0, String arg1, String arg2, String arg3, String arg4, String arg5,\r
+                                 Vector<String> arg6) {\r
+        this.name0 = (arg0 == null ? "" : arg0);\r
+        this.name1 = (arg1 == null ? "" : arg1);\r
+        this.name2 = (arg2 == null ? "" : arg2);\r
+        this.name3 = (arg3 == null ? "" : arg3);\r
+        this.type = (arg4 == null ? "" : arg4);\r
+        this.featureFlag = (arg5 == null ? "" : arg5);\r
+        this.supArchList = arg6;\r
     }\r
 \r
-    public String getName() {\r
-        return name;\r
+    public String getFeatureFlag() {\r
+        return featureFlag;\r
     }\r
 \r
-    public void setName(String name) {\r
-        this.name = name;\r
+    public void setFeatureFlag(String featureFlag) {\r
+        this.featureFlag = featureFlag;\r
     }\r
 \r
     public Vector<String> getSupArchList() {\r
@@ -60,11 +77,36 @@ public class ExternsIdentification {
     public void setSupArchList(Vector<String> supArchList) {\r
         this.supArchList = supArchList;\r
     }\r
-    \r
+\r
     public boolean equals(ExternsIdentification pi) {\r
-        if (this.name.equals(pi.name)) {\r
-            return true;\r
+        if (this.type.equals(pi.type)) {\r
+            if (this.type.equals(EnumerationData.EXTERNS_SPECIFICATION)) {\r
+                if (this.name0.equals(pi.name0)) {\r
+                    return true;\r
+                }\r
+            }\r
+            if (this.type.equals(EnumerationData.EXTERNS_IMAGE)) {\r
+                if (this.name0.equals(pi.name0) && this.name1.equals(pi.name1)) {\r
+                    return true;\r
+                }\r
+            }\r
+            if (this.type.equals(EnumerationData.EXTERNS_LIBRARY)) {\r
+                if (this.name0.equals(pi.name0) && this.name1.equals(pi.name1)) {\r
+                    return true;\r
+                }\r
+            }\r
+            if (this.type.equals(EnumerationData.EXTERNS_CALL_BACK)) {\r
+                if (this.name0.equals(pi.name0) && this.name1.equals(pi.name1)) {\r
+                    return true;\r
+                }\r
+            }\r
+            if (this.type.equals(EnumerationData.EXTERNS_DRIVER)) {\r
+                if (this.name0.equals(pi.name0) && this.name1.equals(pi.name1) && this.name2.equals(pi.name2) && this.name3.equals(pi.name3)) {\r
+                    return true;\r
+                }\r
+            }\r
         }\r
+\r
         return false;\r
     }\r
 \r
@@ -75,4 +117,36 @@ public class ExternsIdentification {
     public void setType(String type) {\r
         this.type = type;\r
     }\r
+\r
+    public String getName0() {\r
+        return name0;\r
+    }\r
+\r
+    public void setName0(String name0) {\r
+        this.name0 = name0;\r
+    }\r
+\r
+    public String getName1() {\r
+        return name1;\r
+    }\r
+\r
+    public void setName1(String name1) {\r
+        this.name1 = name1;\r
+    }\r
+\r
+    public String getName2() {\r
+        return name2;\r
+    }\r
+\r
+    public void setName2(String name2) {\r
+        this.name2 = name2;\r
+    }\r
+\r
+    public String getName3() {\r
+        return name3;\r
+    }\r
+\r
+    public void setName3(String name3) {\r
+        this.name3 = name3;\r
+    }\r
 }\r