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
String strTemp = "";\r
boolean isCopied = true;\r
\r
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
//\r
// Convert string to array by " "\r
//\r
// Save pcd and flash map information first\r
//\r
Externs ex = Externs.Factory.newInstance();\r
// 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
}\r
this.externs = ex;\r
\r
Log.wrn("Update Externs", "At least one of Constructor or Destructor should have a value");\r
return false;\r
}\r
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
if (!isEmpty(this.jTextFieldConstructor.getText())) {\r
if (!DataValidation.isC_NameType(this.jTextFieldConstructor.getText())) {\r
Log.wrn("Update Externs", "Incorrect data type for Constructor");\r