1. Fix EDKT330 Source files in sub-directories are not added to MSA correctly

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1752 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 33dc521eda14dc710cd69a40842e09a006d896dd..b29bfe8a7e9aee40997af20c5aaf5863a5ade61e 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
@@ -230,10 +230,10 @@ public class Tools {
         //\r
         // remove file separator of rear\r
         //\r
         //\r
         // remove file separator of rear\r
         //\r

-        if (path.indexOf(DataType.DOS_FILE_SEPARATOR) == path.length() - DataType.DOS_FILE_SEPARATOR.length()) {\r
+        if (path.length() > 0 && path.indexOf(DataType.DOS_FILE_SEPARATOR) == path.length() - DataType.DOS_FILE_SEPARATOR.length()) {\r

             path = path.substring(0, path.length() - DataType.DOS_FILE_SEPARATOR.length());\r
         }\r
             path = path.substring(0, path.length() - DataType.DOS_FILE_SEPARATOR.length());\r
         }\r

-        if (path.indexOf(DataType.UNIX_FILE_SEPARATOR) == path.length() - DataType.UNIX_FILE_SEPARATOR.length()) {\r
+        if (path.length() > 0 && path.indexOf(DataType.UNIX_FILE_SEPARATOR) == path.length() - DataType.UNIX_FILE_SEPARATOR.length()) {\r

             path = path.substring(0, path.length() - DataType.DOS_FILE_SEPARATOR.length());\r
         }\r
         //\r
             path = path.substring(0, path.length() - DataType.DOS_FILE_SEPARATOR.length());\r
         }\r
         //\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java
index 6ca65fa04e7a96a97ec70ad70468878a74ac1645..d7df17eeb67f54e1abe2e4d02f0e24eeed2d20ae 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java
@@ -526,7 +526,12 @@ public class SourceFilesDlg extends IDialog {
             File f[] = fc.getSelectedFiles();\r
             String s = "";\r
             for (int index = 0; index < f.length; index++) {\r
             File f[] = fc.getSelectedFiles();\r
             String s = "";\r
             for (int index = 0; index < f.length; index++) {\r

-                s = s + f[index].getName() + ";";\r
+                String relativePath = "";\r
+                relativePath = Tools.getRelativePath(Tools.getFilePathOnly(f[index].getPath()), Tools.getFilePathOnly(msaFileName));\r
+                if (!Tools.isEmpty(relativePath)) {\r
+                    relativePath = relativePath + DataType.UNIX_FILE_SEPARATOR;\r
+                }\r
+                s = s + relativePath + f[index].getName() + ";";\r

             }\r
             this.jTextFieldFileName.setText(s);\r
         }\r
             }\r
             this.jTextFieldFileName.setText(s);\r
         }\r