1. Fix EDKT463: When wizard new or clone a msa/spd/fpd, should follow these rules

[mirror_edk2.git] / Tools / Java / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / Clone.java

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 d8030f775ac5cbe6803718133d4aae2564595271..6264a409e42be58166e275b3d680883452336e49 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java
@@ -621,21 +621,21 @@ public class Clone extends IDialog {
         if (mode == DataType.RETURN_TYPE_MODULE_SURFACE_AREA) {\r
             String packageGuid = packages.elementAt(this.jComboBoxExistingPackage.getSelectedIndex()).getGuid();\r
             String packageVersion = packages.elementAt(this.jComboBoxExistingPackage.getSelectedIndex()).getVersion();\r
-            if (GlobalData.findModuleIdByGuidVersion(guid, version, packageGuid, packageVersion) != null) {\r
+            if (GlobalData.findModuleId(guid, version, packageGuid, packageVersion) != null) {\r
                 Log.wrn("Clone", "A module with same Guid and same Version already exists, please selece a new Guid or Version!");\r
                 return false;\r
             }\r
         }\r
 \r
         if (mode == DataType.RETURN_TYPE_PACKAGE_SURFACE_AREA) {\r
-            if (GlobalData.findPackageIdByGuidVersion(guid, version) != null) {\r
+            if (GlobalData.findPackageId(guid, version) != null) {\r
                 Log.wrn("Clone", "A package with same Guid and same Version already exists, please selece a new Guid or Version!");\r
                 return false;\r
             }\r
         }\r
 \r
         if (mode == DataType.RETURN_TYPE_PLATFORM_SURFACE_AREA) {\r
-            if (GlobalData.findPlatformIdByGuidVersion(guid, version) != null) {\r
+            if (GlobalData.findPlatformId(guid, version) != null) {\r
                 Log.wrn("Clone", "A platform with same Guid and same Version already exists, please selece a new Guid or Version!");\r
                 return false;\r
             }\r
@@ -709,6 +709,11 @@ 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
             return checkId(mode);\r
         }\r
 \r
@@ -730,6 +735,11 @@ public class Clone extends IDialog {
                 Log.wrn("Clone", "The target package 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 package");\r
+                return false;\r
+            }\r
+            \r
             return checkId(mode);\r
         }\r
 \r
@@ -750,6 +760,11 @@ public class Clone extends IDialog {
                 Log.wrn("Clone", "The target platform 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 platform");\r
+                return false;\r
+            }\r
+            \r
             return checkId(mode);\r
         }\r
 \r