From: hche10x <hche10x@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 11 Dec 2006 06:09:30 +0000 (+0000)
Subject: 1. Fix EDKT483 FrameworkWizard Should support multiple msa files in a same directory
X-Git-Tag: edk2-stable201903~23796
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=3cbeeeb8d7af8ebd795146e64fafd147b2953692;hp=4629ca40b7d22356337ba5811e9220f0dd1e14ce

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 6264a409e4..f4aebe0483 100644
--- 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!");
                 return false;
             }
-            if (GlobalData.isDuplicateRelativePath(Tools.getFilePathOnly(trg), mode)) {
-                Log.wrn("Clone", "There already exists a same directory with a module");
-                return false;
-            }
+            
+            //
+            // Check if path already exists
+            // Currently we allow user to add multiple msa files in one same directory
+            // Remove this checkpoint
+            //
+//            if (GlobalData.isDuplicateRelativePath(Tools.getFilePathOnly(trg), mode)) {
+//                Log.wrn("Clone", "There already exists a same directory with a module");
+//                return false;
+//            }
             
             return checkId(mode);
         }
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 70342e73cd..e2b306ac9e 100644
--- 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 {
             
             //
             // Check if path already exists
+            // Currently we allow user to add multiple msa files in one same directory
+            // Remove this checkpoint
             //
-            if (GlobalData.isDuplicateRelativePath(Tools.getFilePathOnly(modulePath), mode)) {
-                Log.wrn("New File", "There already exists a same directory with a module");
-                return false;
-            }
+//            if (GlobalData.isDuplicateRelativePath(Tools.getFilePathOnly(modulePath), mode)) {
+//                Log.wrn("New File", "There already exists a same directory with a module");
+//                return false;
+//            }
             
             //
             // Check if Guid+Version is unique