Change return value of getGuidInfo from globaldata. Now only guid string is returned.

[mirror_edk2.git] / Tools / Source / PcdTools / org / tianocore / pcd / action / PlatformPcdPreprocessAction.java

diff --git a/Tools/Source/PcdTools/org/tianocore/pcd/action/PlatformPcdPreprocessAction.java b/Tools/Source/PcdTools/org/tianocore/pcd/action/PlatformPcdPreprocessAction.java
index ac346d69c23da508e186301dd67e6b6b8e3b75aa..f2d52475ae0f60b04a4756317f4218ee34d7cfa0 100644 (file)
--- a/Tools/Source/PcdTools/org/tianocore/pcd/action/PlatformPcdPreprocessAction.java
+++ b/Tools/Source/PcdTools/org/tianocore/pcd/action/PlatformPcdPreprocessAction.java
@@ -96,11 +96,11 @@ public abstract class PlatformPcdPreprocessAction {
 \r
        @param guidCName the CName of GUID\r
 \r
-       @return String[]      Guid information from SPD file.\r
+       @return String        Guid information from SPD file.\r
        @throws PlatformPcdPreprocessException\r
                             Fail to get Guid information from SPD file.\r
     **/\r
-    public abstract String[]                getGuidInfoFromSpd(String guidCName)\r
+    public abstract String                  getGuidInfoFromSpd(String guidCName)\r
                                             throws PlatformPcdPreprocessException;\r
 \r
     /**\r
@@ -188,7 +188,7 @@ public abstract class PlatformPcdPreprocessAction {
         String                              moduleName        = null;\r
         String                              datum             = null;\r
         int                                 maxDatumSize      = 0;\r
-        String[]                            tokenSpaceStrRet  = null;\r
+        String                              tokenSpaceStrRet  = null;\r
 \r
         //\r
         // ----------------------------------------------\r
@@ -239,7 +239,7 @@ public abstract class PlatformPcdPreprocessAction {
                     continue;\r
                 }\r
 \r
-                primaryKey   = Token.getPrimaryKeyString(pcdBuildData.getCName(), tokenSpaceStrRet[1]);\r
+                primaryKey   = Token.getPrimaryKeyString(pcdBuildData.getCName(), tokenSpaceStrRet);\r
                 pcdType      = Token.getPcdTypeFromString(pcdBuildData.getItemType().toString());\r
                 datumType    = Token.getdatumTypeFromString(pcdBuildData.getDatumType().toString());\r
                 tokenNumber  = Long.decode(pcdBuildData.getToken().toString());\r
@@ -408,7 +408,7 @@ public abstract class PlatformPcdPreprocessAction {
                     // If the token is not in database, create a new token instance and add\r
                     // a usage instance into this token in database.\r
                     //\r
-                    tokenSpaceStrRet = this.getGuidInfoFromSpd(pcdBuildData.getTokenSpaceGuidCName());\r
+                    tokenSpaceStrRet = getGuidInfoFromSpd(pcdBuildData.getTokenSpaceGuidCName());\r
 \r
                     if (tokenSpaceStrRet == null) {\r
                         putError("Fail to get Token space guid for token" + token.cName +\r
@@ -420,7 +420,7 @@ public abstract class PlatformPcdPreprocessAction {
                         continue;\r
                     }\r
 \r
-                    token = new Token(pcdBuildData.getCName(), tokenSpaceStrRet[1]);\r
+                    token = new Token(pcdBuildData.getCName(), tokenSpaceStrRet);\r
 \r
                     token.datumType     = datumType;\r
                     token.tokenNumber   = tokenNumber;\r
@@ -512,7 +512,7 @@ public abstract class PlatformPcdPreprocessAction {
         boolean             hasSkuId0       = false;\r
         long                tokenNumber     = 0;\r
         String              hiiDefaultValue = null;\r
-        String[]            variableGuidString = null;\r
+        String              variableGuidString = null;\r
 \r
         List<DynamicPcdBuildDefinitions.PcdBuildData.SkuInfo>   skuInfoList = null;\r
         DynamicPcdBuildDefinitions.PcdBuildData                 dynamicInfo = null;\r
@@ -687,7 +687,7 @@ public abstract class PlatformPcdPreprocessAction {
                 }\r
 \r
                 skuInstance.value.setHiiData(varNameList,\r
-                                             translateSchemaStringToUUID(variableGuidString[1]),\r
+                                             translateSchemaStringToUUID(variableGuidString),\r
                                              skuInfoList.get(index).getVariableOffset(),\r
                                              skuInfoList.get(index).getHiiDefaultValue().toString());\r
                 token.skuData.add(skuInstance);\r
@@ -738,8 +738,8 @@ public abstract class PlatformPcdPreprocessAction {
         String  temp;\r
         String  exceptionString;\r
         String  hiiDefaultValue;\r
-        String  tokenSpaceStrRet[];\r
-        String  variableGuidString[];\r
+        String  tokenSpaceStrRet;\r
+        String  variableGuidString;\r
 \r
         dynamicPcdBuildDataArray = getAllDynamicPcdInfoFromFpd();\r
         if (dynamicPcdBuildDataArray == null) {\r
@@ -748,7 +748,7 @@ public abstract class PlatformPcdPreprocessAction {
 \r
         for (index2 = 0; index2 < dynamicPcdBuildDataArray.size(); index2++) {\r
             pcdBuildData = dynamicPcdBuildDataArray.get(index2);\r
-            tokenSpaceStrRet = this.getGuidInfoFromSpd(pcdBuildData.getTokenSpaceGuidCName());\r
+            tokenSpaceStrRet = getGuidInfoFromSpd(pcdBuildData.getTokenSpaceGuidCName());\r
 \r
             if (tokenSpaceStrRet == null) {\r
                 putError("Fail to get Token space guid for token" + pcdBuildData.getCName());\r
@@ -756,7 +756,7 @@ public abstract class PlatformPcdPreprocessAction {
             }\r
 \r
             primaryKey = Token.getPrimaryKeyString(pcdBuildData.getCName(),\r
-                                                   tokenSpaceStrRet[1]);\r
+                                                   tokenSpaceStrRet);\r
 \r
             if (pcdDbManager.isTokenInDatabase(primaryKey)) {\r
                 continue;\r
@@ -772,7 +772,7 @@ public abstract class PlatformPcdPreprocessAction {
             //\r
             // Create new token for unreference dynamic PCD token\r
             //\r
-            token           = new Token(pcdBuildData.getCName(), tokenSpaceStrRet[1]);\r
+            token           = new Token(pcdBuildData.getCName(), tokenSpaceStrRet);\r
             token.datumSize = pcdBuildData.getMaxDatumSize();\r
 \r
 \r
@@ -886,7 +886,7 @@ public abstract class PlatformPcdPreprocessAction {
                     //\r
                     // Get variable guid string according to the name of guid which will be mapped into a GUID in SPD file.\r
                     //\r
-                    variableGuidString = this.getGuidInfoFromSpd(skuInfoList.get(index).getVariableGuid().toString());\r
+                    variableGuidString = getGuidInfoFromSpd(skuInfoList.get(index).getVariableGuid().toString());\r
                     if (variableGuidString == null) {\r
                         exceptionString = String.format("In FPD file, for dynamic PCD %s,  the variable guid %s can be found in all SPD file!",\r
                                                         token.cName,\r
@@ -904,7 +904,7 @@ public abstract class PlatformPcdPreprocessAction {
                     }\r
 \r
                     skuInstance.value.setHiiData(varNameList,\r
-                                                 translateSchemaStringToUUID(variableGuidString[1]),\r
+                                                 translateSchemaStringToUUID(variableGuidString),\r
                                                  skuInfoList.get(index).getVariableOffset(),\r
                                                  skuInfoList.get(index).getHiiDefaultValue().toString());\r
                     token.skuData.add(skuInstance);\r