1. Fix EDKT483 FrameworkWizard Should support multiple msa files in a same directory

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java
index 6264a409e42be58166e275b3d680883452336e49..f4aebe0483680d6252592c2a21932197713a48cb 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java
@@ -709,10 +709,16 @@ public class Clone extends IDialog {
                 Log.wrn("Clone", "The target module already exists!");\r
                 return false;\r
             }\r
-            if (GlobalData.isDuplicateRelativePath(Tools.getFilePathOnly(trg), mode)) {\r
-                Log.wrn("Clone", "There already exists a same directory with a module");\r
-                return false;\r
-            }\r
+            \r
+            //\r
+            // Check if path already exists\r
+            // Currently we allow user to add multiple msa files in one same directory\r
+            // Remove this checkpoint\r
+            //\r
+//            if (GlobalData.isDuplicateRelativePath(Tools.getFilePathOnly(trg), mode)) {\r
+//                Log.wrn("Clone", "There already exists a same directory with a module");\r
+//                return false;\r
+//            }\r
             \r
             return checkId(mode);\r
         }\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
index 70342e73cdc2098f999613f599282dfaff69068b..e2b306ac9e43a83af3f7aac5422879b88701339c 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
@@ -540,11 +540,13 @@ public class SelectModuleBelong extends IDialog {
             \r
             //\r
             // Check if path already exists\r
+            // Currently we allow user to add multiple msa files in one same directory\r
+            // Remove this checkpoint\r
             //\r
-            if (GlobalData.isDuplicateRelativePath(Tools.getFilePathOnly(modulePath), mode)) {\r
-                Log.wrn("New File", "There already exists a same directory with a module");\r
-                return false;\r
-            }\r
+//            if (GlobalData.isDuplicateRelativePath(Tools.getFilePathOnly(modulePath), mode)) {\r
+//                Log.wrn("New File", "There already exists a same directory with a module");\r
+//                return false;\r
+//            }\r
             \r
             //\r
             // Check if Guid+Version is unique\r