Change radio button in package header editor to a label.

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / packaging / ui / SpdGuidDecls.java

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
index 94e2e9655365baf8b4a71f5e0e273bf231c58abd..2b8f3dd1a93f5ecf73db65310739243bb192636c 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
@@ -67,7 +67,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
 \r
     private JPanel jContentPane = null;\r
 \r
-    private JTextField jTextFieldAdd = null;\r
+    private JTextField jTextFieldGuid = null;\r
 \r
     private JScrollPane jScrollPane = null;\r
 \r
@@ -107,11 +107,11 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
 \r
     private JScrollPane topScrollPane = null;  //  @jve:decl-index=0:visual-constraint="10,213"\r
 \r
-    private JLabel jLabelVer = null;\r
+    private JLabel jLabelCName = null;\r
 \r
     private GenGuidDialog guidDialog = null;\r
 \r
-    private JTextField jTextFieldVersion = null;\r
+    private JTextField jTextFieldCName = null;\r
 \r
     private JLabel jLabelHelp = null;\r
 \r
@@ -142,18 +142,18 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
     }\r
 \r
     /**\r
-      This method initializes jTextFieldAdd    \r
+      This method initializes jTextFieldGuid   \r
        \r
       @return javax.swing.JTextField   \r
      **/\r
-    protected JTextField getJTextFieldAdd() {\r
-        if (jTextFieldAdd == null) {\r
-            jTextFieldAdd = new JTextField();\r
-            jTextFieldAdd.setBounds(new java.awt.Rectangle(137,35,337,20));\r
-            jTextFieldAdd.setPreferredSize(new java.awt.Dimension(335,20));\r
+    protected JTextField getJTextFieldGuid() {\r
+        if (jTextFieldGuid == null) {\r
+            jTextFieldGuid = new JTextField();\r
+            jTextFieldGuid.setBounds(new java.awt.Rectangle(137,60,435,20));\r
+            jTextFieldGuid.setPreferredSize(new java.awt.Dimension(200,20));\r
             \r
         }\r
-        return jTextFieldAdd;\r
+        return jTextFieldGuid;\r
     }\r
 \r
     /**\r
@@ -466,11 +466,11 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
             jLabelHelp.setText("HelpText");\r
             jLabelHelp.setSize(new java.awt.Dimension(109,20));\r
             jLabelHelp.setLocation(new java.awt.Point(14,85));\r
-            jLabelVer = new JLabel();\r
-            jLabelVer.setBounds(new java.awt.Rectangle(14,60,111,20));\r
-            jLabelVer.setText("C_Name");\r
+            jLabelCName = new JLabel();\r
+            jLabelCName.setBounds(new java.awt.Rectangle(14,35,111,20));\r
+            jLabelCName.setText("C_Name");\r
             jLabelGuid = new JLabel();\r
-            jLabelGuid.setBounds(new java.awt.Rectangle(15,35,112,20));\r
+            jLabelGuid.setBounds(new java.awt.Rectangle(15,60,112,20));\r
             jLabelGuid.setText("Guid Value");\r
             jLabelName = new JLabel();\r
             jLabelName.setBounds(new java.awt.Rectangle(15,10,113,20));\r
@@ -491,9 +491,9 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
             jContentPane.add(jStarLabel2, null);\r
             jContentPane.add(jStarLabel3, null);\r
             jContentPane.add(jStarLabel4, null);\r
-            jContentPane.add(jLabelVer, null);\r
-            jContentPane.add(getJTextFieldVersion(), null);\r
-            jContentPane.add(getJTextFieldAdd(), null);\r
+            jContentPane.add(jLabelCName, null);\r
+            jContentPane.add(getJTextFieldCName(), null);\r
+            jContentPane.add(getJTextFieldGuid(), null);\r
             jContentPane.add(getJScrollPane(), null);\r
             jContentPane.add(getJButtonAdd(), null);\r
             jContentPane.add(getJButtonRemove(), null);\r
@@ -545,8 +545,8 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
             //ToDo: check before add\r
             String[] row = {"", "", "", "", "", "", ""};\r
             row[3] = jTextFieldHelp.getText();\r
-            row[2] = jTextFieldAdd.getText();\r
-            row[1] = jTextFieldVersion.getText();\r
+            row[2] = jTextFieldGuid.getText();\r
+            row[1] = jTextFieldCName.getText();\r
             row[0] = jTextFieldName.getText();\r
             row[4] = vectorToString(iCheckBoxListArch.getAllCheckedItemsString());\r
             if (row[4].length() == 0) {\r
@@ -565,9 +565,12 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
                 return;\r
             }\r
             \r
+            if (addRow(row) == -1) {\r
+                return;\r
+            }\r
             model.addRow(row);\r
             jTable.changeSelection(model.getRowCount()-1, 0, false, false);\r
-            addRow(row);\r
+            \r
         }\r
         //\r
         // remove selected line\r
@@ -592,11 +595,11 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
         }\r
         \r
         if (arg0.getSource() == jButtonGen) {\r
-            jTextFieldAdd.setText(Tools.generateUuidString());\r
+            jTextFieldGuid.setText(Tools.generateUuidString());\r
         }\r
         \r
         if (arg0.getActionCommand().equals("GenGuidValue")) {\r
-            jTextFieldAdd.setText(guidDialog.getGuid());\r
+            jTextFieldGuid.setText(guidDialog.getGuid());\r
         }\r
         \r
     }\r
@@ -621,7 +624,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
         return true;\r
     }\r
     \r
-    protected void addRow(String[] row) {\r
+    protected int addRow(String[] row) {\r
         Vector<String> vArch = iCheckBoxListArch.getAllCheckedItemsString();\r
         if (vArch.size() == 0) {\r
             vArch = null;\r
@@ -634,10 +637,15 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
         if (vguidType.size() == 0) {\r
             vguidType = null;\r
         }\r
+        if (vguidType == null) {\r
+            JOptionPane.showMessageDialog(this, "You must select one GUID type.");\r
+            return -1;\r
+        }\r
         if (docConsole != null) {\r
             docConsole.setSaved(false);\r
         }\r
         sfc.genSpdGuidDeclarations(row[0], row[1], row[2], row[3], vArch, vModType, vguidType);\r
+        return 0;\r
     }\r
     \r
     protected void removeRow(int i){\r
@@ -692,25 +700,25 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
     }\r
 \r
     /**\r
-     * This method initializes jTextFieldVersion       \r
+     * This method initializes jTextFieldCName \r
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    protected JTextField getJTextFieldVersion() {\r
-        if (jTextFieldVersion == null) {\r
-            jTextFieldVersion = new JTextField();\r
-            jTextFieldVersion.setBounds(new java.awt.Rectangle(137,60,225,20));\r
-            jTextFieldVersion.setPreferredSize(new java.awt.Dimension(225,20));\r
+    protected JTextField getJTextFieldCName() {\r
+        if (jTextFieldCName == null) {\r
+            jTextFieldCName = new JTextField();\r
+            jTextFieldCName.setBounds(new java.awt.Rectangle(137,35,337,20));\r
+            jTextFieldCName.setPreferredSize(new java.awt.Dimension(335,20));\r
         }\r
-        return jTextFieldVersion;\r
+        return jTextFieldCName;\r
     }\r
 \r
     public void componentResized(ComponentEvent arg0) {\r
         int intPreferredWidth = 500;\r
         \r
         Tools.resizeComponentWidth(this.jTextFieldName, this.getWidth(), intPreferredWidth);\r
-        Tools.resizeComponentWidth(this.jTextFieldAdd, this.getWidth(), intPreferredWidth);\r
-        Tools.resizeComponentWidth(this.jTextFieldVersion, this.getWidth(), intPreferredWidth);\r
+\r
+        Tools.resizeComponentWidth(this.jTextFieldCName, this.getWidth(), intPreferredWidth);\r
         Tools.resizeComponentWidth(this.jTextFieldHelp, this.getWidth(), intPreferredWidth);\r
         Tools.resizeComponentWidth(this.jScrollPane, this.getWidth(), intPreferredWidth);\r
         Tools.relocateComponentX(this.jButtonGen, this.getWidth(), this.getPreferredSize().width, 40);\r