1. Change ToolCode from text field to drop down list, and user can enter their custom...

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / module / ui / dialog / PackageDepDlg.java

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java
index 15acd94f8c264e51503de6eef68e22a543ced22a..ca1e5c8671b72847e19cbdf16a9ad02acbb31c84 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java
@@ -45,69 +45,67 @@ import org.tianocore.frameworkwizard.workspace.WorkspaceTools;
  * \r
  */\r
 public class PackageDepDlg extends IDialog implements ItemListener {\r
-  // /\r
-  // / Define class Serial Version UID\r
-  // /\r
-  private static final long serialVersionUID = 3465193035145152131L;\r
+    // /\r
+    // / Define class Serial Version UID\r
+    // /\r
+    private static final long serialVersionUID = 3465193035145152131L;\r
 \r
-  //\r
-  // Define class members\r
-  //\r
-  private JPanel jContentPane = null;\r
+    //\r
+    // Define class members\r
+    //\r
+    private JPanel jContentPane = null;\r
 \r
-  private JLabel jLabelPackageName = null;\r
+    private JLabel jLabelPackageName = null;\r
 \r
-  private StarLabel jStarLabel1 = null;\r
+    private StarLabel jStarLabel1 = null;\r
 \r
-  private JComboBox jComboBoxPackageName = null;\r
+    private JComboBox jComboBoxPackageName = null;\r
 \r
-  private JLabel jLabelPackageGuid = null;\r
+    private JLabel jLabelPackageGuid = null;\r
 \r
-  private JTextField jTextFieldPackageGuid = null;\r
+    private JTextField jTextFieldPackageGuid = null;\r
 \r
-  private JButton jButtonGenerateGuid = null;\r
+    private JLabel jLabelPackageVersion = null;\r
 \r
-  private JLabel jLabelPackageVersion = null;\r
+    private JTextField jTextFieldPackageVersion = null;\r
 \r
-  private JTextField jTextFieldPackageVersion = null;\r
+    private JLabel jLabelFeatureFlag = null;\r
 \r
-  private JLabel jLabelFeatureFlag = null;\r
+    private JTextField jTextFieldFeatureFlag = null;\r
 \r
-  private JTextField jTextFieldFeatureFlag = null;\r
+    private JScrollPane jScrollPane = null;\r
 \r
-  private JScrollPane jScrollPane = null;\r
+    private JLabel jLabelArch = null;\r
 \r
-  private JLabel jLabelArch = null;\r
+    private ArchCheckBox jArchCheckBox = null;\r
 \r
-  private ArchCheckBox jArchCheckBox = null;\r
+    private JButton jButtonOk = null;\r
 \r
-  private JButton jButtonOk = null;\r
+    private JButton jButtonCancel = null;\r
 \r
-  private JButton jButtonCancel = null;\r
+    //\r
+    // Not used by UI\r
+    //\r
+    private PackageDependenciesIdentification pdid = null;\r
 \r
-  //\r
-  // Not used by UI\r
-  //\r
-  private PackageDependenciesIdentification pdid = null;\r
+    private WorkspaceTools wt = new WorkspaceTools();\r
 \r
-  private WorkspaceTools wt = new WorkspaceTools();\r
+    private Vector<PackageIdentification> vPackage = wt.getAllPackages();\r
 \r
-  private Vector<PackageIdentification> vPackage = wt.getAllPackages();\r
-\r
-  /**\r
-   * This method initializes jComboBoxPackageName\r
-   * \r
-   * @return javax.swing.JComboBox\r
-   */\r
+    /**\r
+     * This method initializes jComboBoxPackageName\r
+     * \r
+     * @return javax.swing.JComboBox\r
+     */\r
     private JComboBox getJComboBoxPackageName() {\r
-      if (jComboBoxPackageName == null) {\r
-        jComboBoxPackageName = new JComboBox();\r
-        jComboBoxPackageName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
-        jComboBoxPackageName.setPreferredSize(new java.awt.Dimension(320, 20));\r
-        jComboBoxPackageName.setToolTipText("If your Module requires a package list that here.");\r
-        jComboBoxPackageName.addItemListener(this);\r
-      }\r
-      return jComboBoxPackageName;\r
+        if (jComboBoxPackageName == null) {\r
+            jComboBoxPackageName = new JComboBox();\r
+            jComboBoxPackageName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
+            jComboBoxPackageName.setPreferredSize(new java.awt.Dimension(320, 20));\r
+            jComboBoxPackageName.setToolTipText("If your Module requires a package list that here.");\r
+            jComboBoxPackageName.addItemListener(this);\r
+        }\r
+        return jComboBoxPackageName;\r
     }\r
 \r
     /**\r
@@ -126,23 +124,6 @@ public class PackageDepDlg extends IDialog implements ItemListener {
         return jTextFieldPackageGuid;\r
     }\r
 \r
-    /**\r
-     * This method initializes jButtonGenerateGuid\r
-     * \r
-     * @return javax.swing.JButton\r
-     */\r
-    private JButton getJButtonGenerateGuid() {\r
-        if (jButtonGenerateGuid == null) {\r
-            jButtonGenerateGuid = new JButton();\r
-            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(415, 35, 65, 20));\r
-            jButtonGenerateGuid.setPreferredSize(new java.awt.Dimension(65, 20));\r
-            jButtonGenerateGuid.setText("GEN");\r
-            jButtonGenerateGuid.addActionListener(this);\r
-            jButtonGenerateGuid.setVisible(false);\r
-        }\r
-        return jButtonGenerateGuid;\r
-    }\r
-\r
     /**\r
      * This method initializes jTextFieldPackageVersion\r
      * \r
@@ -154,7 +135,11 @@ public class PackageDepDlg extends IDialog implements ItemListener {
             jTextFieldPackageVersion.setBounds(new java.awt.Rectangle(160, 35, 320, 20));\r
             jTextFieldPackageVersion.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jTextFieldPackageVersion\r
-                                    .setToolTipText("If this module depends on a specific version of a package, enter the package version here.  If the module can use the latest version that does not break backward compatibility, leave this field blank");\r
+                                    .setToolTipText("<html>If this module depends on a specific version of a package, <br>" +\r
+                                            "enter the package version here.  <br>" +\r
+                                            "If the module can use the latest version <br>" +\r
+                                            "that does not break backward compatibility, <br>" +\r
+                                            "leave this field blank</html>");\r
         }\r
         return jTextFieldPackageVersion;\r
     }\r
@@ -281,36 +266,36 @@ public class PackageDepDlg extends IDialog implements ItemListener {
      */\r
     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r
-          jStarLabel1 = new StarLabel();\r
-          jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
-          jLabelPackageName = new JLabel();\r
-          jLabelPackageName.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
-          jLabelPackageName.setText("Package Name");\r
-\r
-          jLabelPackageVersion = new JLabel();\r
-          jLabelPackageVersion.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
-          jLabelPackageVersion.setText("Package Version");\r
-\r
-          jLabelPackageGuid = new JLabel();\r
-          jLabelPackageGuid.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
-          jLabelPackageGuid.setText("Package Guid");\r
-          jLabelPackageGuid.setVisible(false);\r
-\r
-          jLabelFeatureFlag = new JLabel();\r
-          jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 60, 145, 20));\r
-          jLabelFeatureFlag.setText("Feature Flag Expression");\r
-\r
-          jLabelArch = new JLabel();\r
-          jLabelArch.setBounds(new java.awt.Rectangle(15, 85, 145, 20));\r
-          jLabelArch.setText("Supported Architectures");\r
-          jArchCheckBox = new ArchCheckBox();\r
-          jArchCheckBox.setBounds(new java.awt.Rectangle(160, 85, 320, 20));\r
-          jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
+            jStarLabel1 = new StarLabel();\r
+            jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
+            jLabelPackageName = new JLabel();\r
+            jLabelPackageName.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
+            jLabelPackageName.setText("Package Name");\r
+\r
+            jLabelPackageVersion = new JLabel();\r
+            jLabelPackageVersion.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+            jLabelPackageVersion.setText("Package Version");\r
+\r
+            jLabelPackageGuid = new JLabel();\r
+            jLabelPackageGuid.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+            jLabelPackageGuid.setText("Package Guid");\r
+            jLabelPackageGuid.setVisible(false);\r
+\r
+            jLabelFeatureFlag = new JLabel();\r
+            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 60, 145, 20));\r
+            jLabelFeatureFlag.setText("Feature Flag Expression");\r
+\r
+            jLabelArch = new JLabel();\r
+            jLabelArch.setBounds(new java.awt.Rectangle(15, 85, 145, 20));\r
+            jLabelArch.setText("Supported Architectures");\r
+            jArchCheckBox = new ArchCheckBox();\r
+            jArchCheckBox.setBounds(new java.awt.Rectangle(160, 85, 320, 20));\r
+            jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
 \r
             jContentPane = new JPanel();\r
             jContentPane.setLayout(null);\r
             jContentPane.setPreferredSize(new java.awt.Dimension(485, 145));\r
-            \r
+\r
             jContentPane.add(jStarLabel1, null);\r
             jContentPane.add(jLabelPackageName, null);\r
             jContentPane.add(getJComboBoxPackageName(), null);\r
@@ -378,12 +363,12 @@ public class PackageDepDlg extends IDialog implements ItemListener {
         //\r
         // Check PackageGuid\r
         //\r
-      // if (!isEmpty(this.jTextFieldPackageGuid.getText())) {\r
-// if (!DataValidation.isGuid(this.jTextFieldPackageGuid.getText())) {\r
-// Log.err("Incorrect data type for Package Guid");\r
-// return false;\r
-// }\r
-// }\r
+        // if (!isEmpty(this.jTextFieldPackageGuid.getText())) {\r
+        // if (!DataValidation.isGuid(this.jTextFieldPackageGuid.getText())) {\r
+        // Log.err("Incorrect data type for Package Guid");\r
+        // return false;\r
+        // }\r
+        // }\r
 \r
         //\r
         // Check PackageVersion\r
@@ -407,7 +392,6 @@ public class PackageDepDlg extends IDialog implements ItemListener {
 \r
         return true;\r
     }\r
-    \r
 \r
     private PackageDependenciesIdentification getCurrentPackageDependencies() {\r
         String arg0 = this.jComboBoxPackageName.getSelectedItem().toString();\r