To fix bug T400. If user select a Repackage=false package during creating a FAR,...

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java
index feecb7167e19a594b7c36e7d64477a42e39fe1bb..c0a64be53bff83c5783ce62eb4cf3da58bb8c9d8 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java
@@ -22,6 +22,7 @@ import java.util.Vector;
 \r
 import javax.swing.JButton;\r
 import javax.swing.JLabel;\r
+import javax.swing.JOptionPane;\r
 import javax.swing.JPanel;\r
 import javax.swing.JScrollPane;\r
 import javax.swing.JTextArea;\r
@@ -101,7 +102,7 @@ public class CreateStepTwo extends IDialog implements MouseListener {
             jComboBoxPackage = new ICheckBoxList();\r
             WorkspaceTools wt = new WorkspaceTools();\r
             Vector<String> v = new Vector<String>();\r
-            packageVector = wt.getAllRepackagablePackages();\r
+            packageVector = wt.getAllPackages();\r
             Iterator<PackageIdentification> iter = packageVector.iterator();\r
             while (iter.hasNext()) {\r
                 PackageIdentification item = iter.next();\r
@@ -255,6 +256,32 @@ public class CreateStepTwo extends IDialog implements MouseListener {
                 Log.wrn("Create far", "Choose at least one package and/or platform.");\r
                 return;\r
             }\r
+            \r
+            //\r
+            // If some packages a Repackage=false, give a warning message\r
+            //\r
+            List<PackageIdentification> selectedPackages = getSelectedPackages();\r
+            WorkspaceTools wt = new WorkspaceTools();\r
+            List<PackageIdentification> allRepackablePackages = wt.getAllRepackagablePackages();\r
+            \r
+            List<PackageIdentification> unRepackablePackages = new Vector<PackageIdentification>();\r
+            String msg = "Following selected packages: \n";\r
+            Iterator<PackageIdentification> iter = selectedPackages.iterator();\r
+            while (iter.hasNext()) {\r
+                PackageIdentification item = iter.next();\r
+                if (!allRepackablePackages.contains(item)) {\r
+                    unRepackablePackages.add(item);\r
+                    msg += item.getName() + "\n";\r
+                }\r
+            }\r
+            msg += "is un-Repackagable. Do you want to continue? ";\r
+            \r
+            if (unRepackablePackages.size() > 0) {\r
+                if(JOptionPane.showConfirmDialog(null, msg, "Warning", JOptionPane.YES_NO_OPTION) == JOptionPane.NO_OPTION) {\r
+                    return ;\r
+                }\r
+            }\r
+            \r
             if (stepThree == null) {\r
                 stepThree = new CreateStepThree(this, true, this);\r
             }\r