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

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

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
index 6972bfd7428f0b82a67d19d0d9276bb015d559aa..416afcd51b66a9f7389b1d634457e02b0c5dc09d 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
@@ -50,6 +50,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
 import org.tianocore.frameworkwizard.platform.ui.global.SurfaceAreaQuery;\r
 import org.tianocore.frameworkwizard.module.Identifications.ModuleIdentification;\r
 \r
@@ -222,6 +223,8 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
            model.addColumn("Supported Architectures");\r
            model.addColumn("Supported Module Types");\r
            \r
+           jTable.getColumnModel().getColumn(cnHelpText).setCellEditor(new LongTextEditor());\r
+           \r
            Vector<String> vArch = new Vector<String>();\r
            vArch.add("IA32");\r
            vArch.add("X64");\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
index 289dd148a5389136fb154315a6d219626625b140..902cd26fcdc0475d35f188ef8cd563ff6fdf27f5 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
@@ -48,6 +48,7 @@ import javax.swing.JTable;
 import javax.swing.JCheckBox;\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
 import java.awt.Rectangle;\r
 import java.util.Vector;\r
@@ -688,6 +689,8 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
             jComboBoxDataType.addItem("BOOLEAN");\r
             TableColumn dataTypeColumn = jTable.getColumnModel().getColumn(3);\r
             dataTypeColumn.setCellEditor(new DefaultCellEditor(jComboBoxDataType));\r
+            \r
+            jTable.getColumnModel().getColumn(5).setCellEditor(new LongTextEditor());\r
 \r
             Vector<String> vArch = new Vector<String>();\r
             vArch.add("IA32");\r
@@ -762,7 +765,12 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
                 return;\r
             }\r
             if (column <= 10 && column >= 6) {\r
-                if (compareTwoVectors(stringToVector(usage), stringToVector(sa[6]))) {\r
+                Vector<String> v = stringToVector(usage);\r
+                if (compareTwoVectors(v, stringToVector(sa[6]))) {\r
+                    return;\r
+                }\r
+                if (v.contains("FEATURE_FLAG") && v.size() > 1) {\r
+                    JOptionPane.showMessageDialog(frame, "Usage Feature Flag can NOT co-exist with others.");\r
                     return;\r
                 }\r
             }\r
@@ -1092,11 +1100,12 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
     }\r
     \r
     protected Vector<String> stringToVector(String s){\r
+        Vector<String> v = new Vector<String>();\r
         if (s == null) {\r
-            return null;\r
+            return v;\r
         }\r
         String[] sArray = s.split(" ");\r
-        Vector<String> v = new Vector<String>();\r
+        \r
         for (int i = 0; i < sArray.length; ++i) {\r
             v.add(sArray[i]);\r
         }\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPpiDecls.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPpiDecls.java
index 9f6cec65ef235dd37dae647363656d1526134ed3..eb912f39a554ff443526802f5627e6d0af442048 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPpiDecls.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPpiDecls.java
@@ -17,6 +17,7 @@ import javax.swing.table.TableModel;
 \r
 import org.tianocore.PackageSurfaceAreaDocument;\r
 import org.tianocore.frameworkwizard.common.Identifications.OpeningPackageType;\r
+import org.tianocore.frameworkwizard.platform.ui.ListEditor;\r
 \r
 /**\r
 GUI for create library definition elements of spd file.\r
@@ -51,7 +52,8 @@ public class SpdPpiDecls extends SpdGuidDecls {
     protected void initFrame() {\r
         \r
         this.setTitle("PPI Declarations");\r
-        \r
+        starLabel.setVisible(false);\r
+        ((ListEditor)getJTable().getColumnModel().getColumn(6).getCellEditor()).setCanNotBeEmpty(false);\r
     }\r
     \r
     protected void init(SpdFileContents sfc){\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdProtocolDecls.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdProtocolDecls.java
index b188d128d5e4849dcdd5c1e6735337b2d346da4a..7bfba65b6e2f5752779ce2e6b65ce9996f57ce18 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdProtocolDecls.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdProtocolDecls.java
@@ -17,6 +17,7 @@ import javax.swing.table.TableModel;
 \r
 import org.tianocore.PackageSurfaceAreaDocument;\r
 import org.tianocore.frameworkwizard.common.Identifications.OpeningPackageType;\r
+import org.tianocore.frameworkwizard.platform.ui.ListEditor;\r
 \r
 /**\r
 GUI for create library definition elements of spd file.\r
@@ -51,7 +52,8 @@ public class SpdProtocolDecls extends SpdGuidDecls {
     protected void initFrame() {\r
         \r
         this.setTitle("Protocol Declarations");\r
-        \r
+        starLabel.setVisible(false);\r
+        ((ListEditor)getJTable().getColumnModel().getColumn(6).getCellEditor()).setCanNotBeEmpty(false);\r
     }\r
     \r
     protected void init(SpdFileContents sfc){\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/ListEditor.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/ListEditor.java
index 89523b209c718eaa4e5591cc20e6b0d614bddb08..729af57e228e95defa26420aaf8715e84e83a6de 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/ListEditor.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/ListEditor.java
@@ -21,6 +21,7 @@ import java.util.Vector;
 import javax.swing.AbstractCellEditor;\r
 import javax.swing.JButton;\r
 import javax.swing.JFrame;\r
+import javax.swing.JOptionPane;\r
 import javax.swing.JTable;\r
 import javax.swing.table.TableCellEditor;\r
 \r
@@ -35,6 +36,7 @@ public class ListEditor extends AbstractCellEditor implements TableCellEditor, A
      * \r
      */\r
     private static final long serialVersionUID = 1L;\r
+    private boolean canNotBeEmpty = false;\r
     String archs;\r
     JButton button;\r
     static JFrame frame;\r
@@ -92,6 +94,10 @@ public class ListEditor extends AbstractCellEditor implements TableCellEditor, A
         }\r
         else { //User pressed dialog's "OK" button.\r
             Vector<String> v = dialog.getList();\r
+            if (canNotBeEmpty && v.size() == 0) {\r
+                JOptionPane.showMessageDialog(frame, "You must select at least one item.");\r
+                return;\r
+            }\r
             String s = " ";\r
             for (int i = 0; i < v.size(); ++i) {\r
                 s += v.get(i);\r
@@ -103,4 +109,11 @@ public class ListEditor extends AbstractCellEditor implements TableCellEditor, A
 \r
     }\r
 \r
+    /**\r
+     * @param canNotBeEmpty The canNotBeEmpty to set.\r
+     */\r
+    public void setCanNotBeEmpty(boolean canNotBeEmpty) {\r
+        this.canNotBeEmpty = canNotBeEmpty;\r
+    }\r
+\r
 }\r