1. Fix EDKT379: Check if Constructor exists in a library when user adds a destructor

2. Fix EDKT378: Can not add any external definitions to a new created MSA file by wizard
3. Fix a bug in function wrapStringByWord of Tools.java

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
index b29bfe8a7e9aee40997af20c5aaf5863a5ade61e..e5cce71045b1e08c7eedd8d1b47edde075c5a25b 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
@@ -332,6 +332,13 @@ public class Tools {
         String strTemp = "";\r
         boolean isCopied = true;\r
 \r
+        if (arg0 == null) {\r
+            return "";\r
+        }\r
+        if (arg0.length() <= 0) {\r
+            return "";\r
+        }\r
+        \r
         //\r
         // Convert string to array by " "\r
         //\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java
index 4b4ea0daa2067a861f996e23d8a6817201bf0633..d35bbafa59cd3126f44571095c7fc9a869b0a4f1 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java
@@ -472,11 +472,13 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
             // Save pcd and flash map information first\r
             //\r
             Externs ex = Externs.Factory.newInstance();\r
-            if (this.externs.getPcdIsDriver() != null) {\r
-                ex.setPcdIsDriver(this.externs.getPcdIsDriver());\r
-            }\r
-            if (this.externs.getTianoR8FlashMapH()) {\r
-                ex.setTianoR8FlashMapH(this.externs.getTianoR8FlashMapH());\r
+            if (this.externs != null) {\r
+                if (this.externs.getPcdIsDriver() != null) {\r
+                    ex.setPcdIsDriver(this.externs.getPcdIsDriver());\r
+                }\r
+                if (this.externs.getTianoR8FlashMapH()) {\r
+                    ex.setTianoR8FlashMapH(this.externs.getTianoR8FlashMapH());\r
+                }\r
             }\r
             this.externs = ex;\r
 \r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java
index 3a94511e1e597bd2438090c3efb9dd940307d4bc..3aa9b4a297ee73089086000d138624b1e7b680e5 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java
@@ -734,6 +734,10 @@ public class ExternsDlg extends IDialog implements ItemListener {
                 Log.wrn("Update Externs", "At least one of Constructor or Destructor should have a value");\r
                 return false;\r
             }\r
+            if (isEmpty(this.jTextFieldConstructor.getText()) && !isEmpty(this.jTextFieldDestructor.getText())) {\r
+                Log.wrn("Update Externs", "You must define a Constructor at the same time when you declare a Destructor");\r
+                return false;\r
+            }\r
             if (!isEmpty(this.jTextFieldConstructor.getText())) {\r
                 if (!DataValidation.isC_NameType(this.jTextFieldConstructor.getText())) {\r
                     Log.wrn("Update Externs", "Incorrect data type for Constructor");\r