adapte to new resize interface.

rollback overrided.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1338 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
index 6b5e17ffc13a915a05445742ac5e0337fecf4ef4..310d02790aea362661595915980e6e574d58ea35 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
@@ -52,7 +52,7 @@ import org.tianocore.frameworkwizard.common.ui.IInternalFrame;
 import org.tianocore.frameworkwizard.common.ui.StarLabel;\r
 import org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList;\r
 import org.tianocore.frameworkwizard.platform.ui.ListEditor;\r
 import org.tianocore.frameworkwizard.common.ui.StarLabel;\r
 import org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList;\r
 import org.tianocore.frameworkwizard.platform.ui.ListEditor;\r

-import org.tianocore.frameworkwizard.platform.ui.global.GlobalData;\r
+import org.tianocore.frameworkwizard.platform.ui.global.WorkspaceProfile;\r

 import org.tianocore.frameworkwizard.platform.ui.global.SurfaceAreaQuery;\r
 import org.tianocore.frameworkwizard.platform.ui.id.ModuleIdentification;\r
 import org.tianocore.frameworkwizard.platform.ui.id.PackageIdentification;\r
 import org.tianocore.frameworkwizard.platform.ui.global.SurfaceAreaQuery;\r
 import org.tianocore.frameworkwizard.platform.ui.id.ModuleIdentification;\r
 import org.tianocore.frameworkwizard.platform.ui.id.PackageIdentification;\r


@@ -920,19 +920,19 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
     private void getLibInstances(String libClass){\r
         libNameGuidMap.clear();\r
         try {\r
     private void getLibInstances(String libClass){\r
         libNameGuidMap.clear();\r
         try {\r

-            GlobalData.initInfo("Tools" + File.separator + "Conf" + File.separator + "FrameworkDatabase.db", System.getenv("WORKSPACE"));\r
+            WorkspaceProfile.initInfo("Tools" + File.separator + "Conf" + File.separator + "FrameworkDatabase.db", System.getenv("WORKSPACE"));\r

         \r
         \r

-            Set<PackageIdentification> spi = GlobalData.getPackageList();\r
+            Set<PackageIdentification> spi = WorkspaceProfile.getPackageList();\r

             Iterator ispi = spi.iterator();\r
             \r
             while (ispi.hasNext()) {\r
                 PackageIdentification pi = (PackageIdentification) ispi.next();\r
 \r
             Iterator ispi = spi.iterator();\r
             \r
             while (ispi.hasNext()) {\r
                 PackageIdentification pi = (PackageIdentification) ispi.next();\r
 \r

-                Set<ModuleIdentification> smi = GlobalData.getModules(pi);\r
+                Set<ModuleIdentification> smi = WorkspaceProfile.getModules(pi);\r

                 Iterator ismi = smi.iterator();\r
                 while (ismi.hasNext()) {\r
                     ModuleIdentification mi = (ModuleIdentification) ismi.next();\r
                 Iterator ismi = smi.iterator();\r
                 while (ismi.hasNext()) {\r
                     ModuleIdentification mi = (ModuleIdentification) ismi.next();\r

-                    Map<String, XmlObject> m = GlobalData.getNativeMsa(mi);\r
+                    Map<String, XmlObject> m = WorkspaceProfile.getNativeMsa(mi);\r

                     SurfaceAreaQuery.setDoc(m);\r
                     Vector<String> classProduced = SurfaceAreaQuery.getLibraryClasses("ALWAYS_PRODUCED", mi);\r
                     for (int i = 0; i < classProduced.size(); ++i) {\r
                     SurfaceAreaQuery.setDoc(m);\r
                     Vector<String> classProduced = SurfaceAreaQuery.getLibraryClasses("ALWAYS_PRODUCED", mi);\r
                     for (int i = 0; i < classProduced.size(); ++i) {\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
index ec0339269270f3b49a90d4ad90c9aa1a76d9e5c7..cbcb5a98333e0ea392257f95ed1e90082267b775 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
@@ -910,8 +910,8 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
             JOptionPane.showMessageDialog(frame, "C_Name is NOT C_NameType.");\r
             return false;\r
         }\r
             JOptionPane.showMessageDialog(frame, "C_Name is NOT C_NameType.");\r
             return false;\r
         }\r

-        if (!(DataValidation.isHexDoubleWordDataType(row[1].toString()) || \r
-                        DataValidation.isInt(row[1].toString(), 0, 0xffffffff))) {\r
+        if (!DataValidation.isHexDoubleWordDataType(row[1].toString()) && \r
+                        !DataValidation.isInt(row[1].toString(), Integer.MIN_VALUE, Integer.MAX_VALUE)) {\r

             JOptionPane.showMessageDialog(frame, "Token is NOT correct.");\r
             return false;\r
         }\r
             JOptionPane.showMessageDialog(frame, "Token is NOT correct.");\r
             return false;\r
         }\r