Add Data Validations for SPD editor.

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / packaging / ui / SpdFileContents.java

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java
index 24fab9663490337f762123f5494aaea6fa8d39d9..5bac8be0cd7c4c511824a2cd527ea9c0e45747e7 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java
@@ -19,7 +19,6 @@ import java.util.List;
 import java.util.ListIterator;\r
 import java.util.Vector;\r
 \r
-import javax.xml.namespace.QName;\r
 \r
 import org.apache.xmlbeans.XmlObject;\r
 import org.apache.xmlbeans.XmlOptions;\r
@@ -360,15 +359,24 @@ public class SpdFileContents {
             e.setCName(cName);\r
             e.setGuidValue(guid);\r
             e.setHelpText(hlp);\r
-            if (stringToList(guidTypeList) != null && !guidTypeList.equals("")) {\r
+            if (stringToList(guidTypeList) != null) {\r
                 e.setGuidTypeList(stringToList(guidTypeList));\r
             }\r
+            else{\r
+                e.setGuidTypeList(null);\r
+            }\r
             if (stringToList(archList) != null){\r
                 e.setSupArchList(stringToList(archList));\r
             }\r
+            else{\r
+                e.setSupArchList(null);\r
+            }\r
             if (stringToList(modTypeList) != null) {\r
                 e.setSupModuleList(stringToList(modTypeList));\r
             }\r
+            else{\r
+                e.setSupModuleList(null);\r
+            }\r
             \r
         }\r
         cursor.dispose();\r
@@ -394,9 +402,15 @@ public class SpdFileContents {
             if (stringToList(archList) != null){\r
                 e.setSupArchList(stringToList(archList));\r
             }\r
+            else{\r
+                e.setSupArchList(null);\r
+            }\r
             if (stringToList(modTypeList) != null) {\r
                 e.setSupModuleList(stringToList(modTypeList));\r
             }\r
+            else{\r
+                e.setSupModuleList(null);\r
+            }\r
         }\r
         cursor.dispose();\r
     }\r
@@ -421,9 +435,15 @@ public class SpdFileContents {
             if (stringToList(archList) != null){\r
                 e.setSupArchList(stringToList(archList));\r
             }\r
+            else{\r
+                e.setSupArchList(null);\r
+            }\r
             if (stringToList(modTypeList) != null) {\r
                 e.setSupModuleList(stringToList(modTypeList));\r
             }\r
+            else{\r
+                e.setSupModuleList(null);\r
+            }\r
         }\r
         cursor.dispose();\r
     }\r
@@ -1093,15 +1113,18 @@ public class SpdFileContents {
             e.setCName(cName);\r
             e.setGuidValue(guid);\r
             e.setHelpText(help);\r
-            if (guidTypeList != null && guidTypeList.size() > 0) {\r
-                e.setGuidTypeList(new ArrayList<String>(guidTypeList));\r
-            }\r
-            if (archList != null && archList.size() > 0){\r
-                e.setSupArchList(new ArrayList<String>(archList));\r
-            }\r
-            if (modTypeList != null && modTypeList.size() > 0) {\r
-                e.setSupModuleList(new ArrayList<String>(modTypeList));\r
-            }\r
+            e.setGuidTypeList(guidTypeList);\r
+            e.setSupArchList(archList);\r
+            e.setSupModuleList(modTypeList);\r
+//            if (guidTypeList != null && guidTypeList.size() > 0) {\r
+//                e.setGuidTypeList(new ArrayList<String>(guidTypeList));\r
+//            }\r
+//            if (archList != null && archList.size() > 0){\r
+//                e.setSupArchList(new ArrayList<String>(archList));\r
+//            }\r
+//            if (modTypeList != null && modTypeList.size() > 0) {\r
+//                e.setSupModuleList(new ArrayList<String>(modTypeList));\r
+//            }\r
             return;\r
         }\r
         if (parent instanceof ProtocolDeclarationsDocument.ProtocolDeclarations) {\r
@@ -1111,12 +1134,14 @@ public class SpdFileContents {
             pe.setCName(cName);\r
             pe.setGuidValue(guid);\r
             pe.setHelpText(help);\r
-            if (archList != null && archList.size() > 0){\r
-                pe.setSupArchList(new ArrayList<String>(archList));\r
-            }\r
-            if (modTypeList != null && modTypeList.size() > 0) {\r
-                pe.setSupModuleList(new ArrayList<String>(modTypeList));\r
-            }\r
+            pe.setSupArchList(archList);\r
+            pe.setSupModuleList(modTypeList);\r
+//            if (archList != null && archList.size() > 0){\r
+//                pe.setSupArchList(new ArrayList<String>(archList));\r
+//            }\r
+//            if (modTypeList != null && modTypeList.size() > 0) {\r
+//                pe.setSupModuleList(new ArrayList<String>(modTypeList));\r
+//            }\r
             return;\r
         }\r
         if (parent instanceof PpiDeclarationsDocument.PpiDeclarations) {\r
@@ -1126,12 +1151,14 @@ public class SpdFileContents {
             ppe.setCName(cName);\r
             ppe.setGuidValue(guid);\r
             ppe.setHelpText(help);\r
-            if (archList != null && archList.size() > 0){\r
-                ppe.setSupArchList(new ArrayList<String>(archList));\r
-            }\r
-            if (archList != null && modTypeList.size() > 0) {\r
-                ppe.setSupModuleList(new ArrayList<String>(modTypeList));\r
-            }\r
+            ppe.setSupArchList(archList);\r
+            ppe.setSupModuleList(modTypeList);\r
+//            if (archList != null && archList.size() > 0){\r
+//                ppe.setSupArchList(new ArrayList<String>(archList));\r
+//            }\r
+//            if (archList != null && modTypeList.size() > 0) {\r
+//                ppe.setSupModuleList(new ArrayList<String>(modTypeList));\r
+//            }\r
             return;\r
         }\r
 \r
@@ -1507,10 +1534,10 @@ public class SpdFileContents {
     }\r
     \r
     private List<String> stringToList(String s){\r
-        if (s == null) {\r
+        if (s == null || s.length() == 0) {\r
             return null;\r
         }\r
-        ArrayList<String> al = new ArrayList<String>();\r
+        Vector<String> al = new Vector<String>();\r
         String[] sArray = s.split(" ");\r
         for(int i = 0; i < sArray.length; ++i){\r
             al.add(sArray[i]);\r
@@ -1518,7 +1545,7 @@ public class SpdFileContents {
         return al; \r
     }\r
     \r
-    private String listToString(List<String> l) {\r
+    private String listToString(List l) {\r
         if (l == null) {\r
             return null;\r
         }\r