Mark Guid Type as required in Guid declaration editor. Set cell editor to long text...

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
index 8cdcedd73d3b59e3d4182553d5f26e985657676a..97c30c2ad2a41da236115962e70ab9bf358ccc35 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
@@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 package org.tianocore.frameworkwizard.packaging.ui;\r
 \r
 import java.awt.Dimension;\r
+import java.awt.Point;\r
 import java.awt.event.ActionEvent;\r
 import java.awt.event.ComponentEvent;\r
 import java.util.Vector;\r
@@ -43,6 +44,7 @@ import org.tianocore.frameworkwizard.common.ui.IInternalFrame;
 import org.tianocore.frameworkwizard.common.ui.StarLabel;\r
 import org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList;\r
 import org.tianocore.frameworkwizard.platform.ui.ListEditor;\r
+import org.tianocore.frameworkwizard.platform.ui.LongTextEditor;\r
 \r
 /**\r
  GUI for create library definition elements of spd file.\r
@@ -131,6 +133,8 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
 \r
     protected String[][] saa = null;\r
 \r
+    protected StarLabel starLabel = null;\r
+\r
     /**\r
       This method initializes this\r
      \r
@@ -189,6 +193,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
            model.addColumn("Supported Module Types");\r
            model.addColumn("GuidTypes");\r
            jTable.getColumnModel().getColumn(2).setCellEditor(new GuidEditor());\r
+           jTable.getColumnModel().getColumn(3).setCellEditor(new LongTextEditor());\r
 \r
            Vector<String> vArch = new Vector<String>();\r
            vArch.add("IA32");\r
@@ -223,7 +228,9 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
            vGuid.add("HII_PACKAGE_LIST");\r
            vGuid.add("HOB");\r
            vGuid.add("TOKEN_SPACE_GUID");\r
-           jTable.getColumnModel().getColumn(6).setCellEditor(new ListEditor(vGuid));\r
+           ListEditor le = new ListEditor(vGuid);\r
+           le.setCanNotBeEmpty(true);\r
+           jTable.getColumnModel().getColumn(6).setCellEditor(le);\r
            \r
            jTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
            jTable.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
@@ -269,6 +276,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
        if (cellData.equals(sa[column])) {\r
            return;\r
        }\r
+       \r
        if (cellData.toString().length() == 0 && sa[column] == null) {\r
            return;\r
        }\r
@@ -450,10 +458,14 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
      **/\r
     protected JPanel getJContentPane1() {\r
         if (jContentPane == null) {\r
+            \r
             jLabelGuidType = new JLabel();\r
-            jLabelGuidType.setBounds(new java.awt.Rectangle(400,122,103,16));\r
+            jLabelGuidType.setBounds(new java.awt.Rectangle(420,122,103,16));\r
             jLabelGuidType.setText("GUID Type List");\r
             jLabelGuidType.setEnabled(true);\r
+            starLabel = new StarLabel();\r
+            starLabel.setLocation(new Point(jLabelGuidType.getX() - 20, jLabelGuidType.getY()));\r
+            starLabel.setVisible(true);\r
             jLabelSupArch = new JLabel();\r
             jLabelSupArch.setBounds(new java.awt.Rectangle(197,122,108,16));\r
             jLabelSupArch.setText("Supported Arch");\r
@@ -513,6 +525,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
             jContentPane.add(getJScrollPaneGuid(), null);\r
             jContentPane.add(getJScrollPaneModule(), null);\r
             jContentPane.add(jLabelGuidType, null);\r
+            jContentPane.add(starLabel, null);\r
         }\r
         return jContentPane;\r
     }\r
@@ -638,7 +651,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
             vguidType = null;\r
         }\r
         if (vguidType == null) {\r
-            JOptionPane.showMessageDialog(this, "You must select one GUID type.");\r
+            JOptionPane.showMessageDialog(this, "You must select at least one GUID type.");\r
             return -1;\r
         }\r
         if (docConsole != null) {\r