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

2 files changed, 7 insertions, 7 deletions

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 6b5e17f..310d027 100644
--- 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;

 import org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList;

 import org.tianocore.frameworkwizard.platform.ui.ListEditor;

-import org.tianocore.frameworkwizard.platform.ui.global.GlobalData;

+import org.tianocore.frameworkwizard.platform.ui.global.WorkspaceProfile;

 import org.tianocore.frameworkwizard.platform.ui.global.SurfaceAreaQuery;

 import org.tianocore.frameworkwizard.platform.ui.id.ModuleIdentification;

 import org.tianocore.frameworkwizard.platform.ui.id.PackageIdentification;

@@ -920,19 +920,19 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
     private void getLibInstances(String libClass){

         libNameGuidMap.clear();

         try {

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

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

         

-            Set<PackageIdentification> spi = GlobalData.getPackageList();

+            Set<PackageIdentification> spi = WorkspaceProfile.getPackageList();

             Iterator ispi = spi.iterator();

             

             while (ispi.hasNext()) {

                 PackageIdentification pi = (PackageIdentification) ispi.next();

 

-                Set<ModuleIdentification> smi = GlobalData.getModules(pi);

+                Set<ModuleIdentification> smi = WorkspaceProfile.getModules(pi);

                 Iterator ismi = smi.iterator();

                 while (ismi.hasNext()) {

                     ModuleIdentification mi = (ModuleIdentification) ismi.next();

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

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

                     SurfaceAreaQuery.setDoc(m);

                     Vector<String> classProduced = SurfaceAreaQuery.getLibraryClasses("ALWAYS_PRODUCED", mi);

                     for (int i = 0; i < classProduced.size(); ++i) {

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 ec03392..cbcb5a9 100644
--- 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.");

             return false;

         }

-        if (!(DataValidation.isHexDoubleWordDataType(row[1].toString()) || 

-                        DataValidation.isInt(row[1].toString(), 0, 0xffffffff))) {

+        if (!DataValidation.isHexDoubleWordDataType(row[1].toString()) && 

+                        !DataValidation.isInt(row[1].toString(), Integer.MIN_VALUE, Integer.MAX_VALUE)) {

             JOptionPane.showMessageDialog(frame, "Token is NOT correct.");

             return false;

         }