From 21b42c665f3881aa0c2ea0279439ca55143d10bc Mon Sep 17 00:00:00 2001 From: hche10x Date: Thu, 17 Aug 2006 18:08:07 +0000 Subject: [PATCH] 1. Gray out all "Feature Flag" fields in module and move them to the bottom of the frame 2. Make "Usage" required in PCD frame of module git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1316 6f19259b-4bc3-4df7-8a09-765794883524 --- .../frameworkwizard/common/EnumerationData.java | 1 - .../module/ui/dialog/BootModesDlg.java | 10 ++++++---- .../module/ui/dialog/DataHubsDlg.java | 10 ++++++---- .../module/ui/dialog/EventsDlg.java | 10 ++++++---- .../module/ui/dialog/ExternsDlg.java | 10 ++++++---- .../module/ui/dialog/GuidsDlg.java | 10 ++++++---- .../module/ui/dialog/HiiPackagesDlg.java | 10 ++++++---- .../module/ui/dialog/HobsDlg.java | 10 ++++++---- .../module/ui/dialog/LibraryClassDefsDlg.java | 16 +++++++++------- .../module/ui/dialog/PCDsDlg.java | 10 ++++++---- .../module/ui/dialog/PackageDepDlg.java | 10 ++++++---- .../module/ui/dialog/PpisDlg.java | 10 ++++++---- .../module/ui/dialog/ProtocolsDlg.java | 10 ++++++---- .../module/ui/dialog/SourceFilesDlg.java | 10 ++++++---- .../module/ui/dialog/SystemTablesDlg.java | 10 ++++++---- .../module/ui/dialog/VariablesDlg.java | 10 ++++++---- 16 files changed, 93 insertions(+), 64 deletions(-) diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java index e2981d0a2e..99f40384a3 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java @@ -706,7 +706,6 @@ public class EnumerationData { private void initPcdUsage() { vPcdUsage.removeAllElements(); - vPcdUsage.addElement(DataType.EMPTY_SELECT_ITEM); vPcdUsage.addElement("ALWAYS_CONSUMED"); vPcdUsage.addElement("SOMETIMES_CONSUMED"); vPcdUsage.addElement("ALWAYS_PRODUCED"); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java index 2e637eb1ee..88a010ef35 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java @@ -154,9 +154,10 @@ public class BootModesDlg extends IDialog { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 107, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); + jTextFieldFeatureFlag.setEnabled(false); } return jTextFieldFeatureFlag; } @@ -323,13 +324,14 @@ public class BootModesDlg extends IDialog { jLabelHelpText.setBounds(new java.awt.Rectangle(12, 62, 155, 20)); jLabelHelpText.setText("Help Text"); jLabelFeatureFlag = new JLabel(); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 107, 155, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 132, 155, 20)); jLabelFeatureFlag.setText("Feature Flag Expression"); + jLabelFeatureFlag.setEnabled(false); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(12, 132, 155, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 107, 155, 20)); jLabelArch.setText("Supported Archectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 107, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java index d22e80ceb7..c28c266197 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java @@ -144,9 +144,10 @@ public class DataHubsDlg extends IDialog { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 107, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); + jTextFieldFeatureFlag.setEnabled(false); } return jTextFieldFeatureFlag; } @@ -314,13 +315,14 @@ public class DataHubsDlg extends IDialog { jLabelHelpText.setBounds(new java.awt.Rectangle(12, 62, 155, 20)); jLabelHelpText.setText("Help Text"); jLabelFeatureFlag = new JLabel(); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 107, 155, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 132, 155, 20)); jLabelFeatureFlag.setText("Feature Flag Expression"); + jLabelFeatureFlag.setEnabled(false); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(12, 132, 155, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 107, 155, 20)); jLabelArch.setText("Supported Architectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 107, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java index 71af9edaf9..a37061755a 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java @@ -206,9 +206,10 @@ public class EventsDlg extends IDialog { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 157, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 182, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); + jTextFieldFeatureFlag.setEnabled(false); } return jTextFieldFeatureFlag; } @@ -381,14 +382,15 @@ public class EventsDlg extends IDialog { jLabelHelpText.setText("Help Text"); jLabelFeatureFlag = new JLabel(); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 157, 168, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 182, 168, 20)); jLabelFeatureFlag.setText("Feature Flag Expression"); + jLabelFeatureFlag.setEnabled(false); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(12, 182, 168, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 157, 168, 20)); jLabelArch.setText("Supported Architectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(168, 182, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 157, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java index 68bfec2cc1..c27c0022cb 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java @@ -154,8 +154,9 @@ public class ExternsDlg extends IDialog implements ItemListener { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 62, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 87, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); + jTextFieldFeatureFlag.setEnabled(false); } return jTextFieldFeatureFlag; } @@ -252,7 +253,7 @@ public class ExternsDlg extends IDialog implements ItemListener { private JPanel getJContentPane() { if (jContentPane == null) { jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(168, 87, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 62, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jLabelC_Name = new JLabel(); jLabelC_Name.setBounds(new java.awt.Rectangle(12, 37, 140, 20)); @@ -261,11 +262,12 @@ public class ExternsDlg extends IDialog implements ItemListener { jLabelName.setText("Choose Extern Type"); jLabelName.setBounds(new java.awt.Rectangle(12, 12, 168, 20)); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(12, 87, 168, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 62, 168, 20)); jLabelArch.setText("Supported Architectures"); jLabelFeatureFlag = new JLabel(); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 62, 168, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 87, 168, 20)); jLabelFeatureFlag.setText("Feature Flag Expression"); + jLabelFeatureFlag.setEnabled(false); jContentPane = new JPanel(); jContentPane.setLayout(null); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java index 3c1e37037f..05f2703406 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java @@ -143,9 +143,10 @@ public class GuidsDlg extends IDialog { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 107, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); + jTextFieldFeatureFlag.setEnabled(false); } return jTextFieldFeatureFlag; } @@ -317,14 +318,15 @@ public class GuidsDlg extends IDialog { jLabelHelpText.setText("Help Text"); jLabelFeatureFlag = new JLabel(); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 107, 155, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 132, 155, 20)); jLabelFeatureFlag.setText("Feature Flag Expression"); + jLabelFeatureFlag.setEnabled(false); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(12, 132, 155, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 107, 155, 20)); jLabelArch.setText("Supported Architectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 107, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java index cec910d091..9c310ad589 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java @@ -140,9 +140,10 @@ public class HiiPackagesDlg extends IDialog { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 107, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); + jTextFieldFeatureFlag.setEnabled(false); } return jTextFieldFeatureFlag; } @@ -319,13 +320,14 @@ public class HiiPackagesDlg extends IDialog { jLabelHelpText.setBounds(new java.awt.Rectangle(12, 62, 155, 20)); jLabelHelpText.setText("Help Text"); jLabelFeatureFlag = new JLabel(); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 107, 155, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 132, 155, 20)); jLabelFeatureFlag.setText("Feature Flag Expression"); + jLabelFeatureFlag.setEnabled(false); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(12, 132, 155, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 107, 155, 20)); jLabelArch.setText("Supported Architectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 107, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java index bb28db42e7..24b5e2dce5 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java @@ -187,9 +187,10 @@ public class HobsDlg extends IDialog { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 157, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); + jTextFieldFeatureFlag.setEnabled(false); } return jTextFieldFeatureFlag; } @@ -354,14 +355,15 @@ public class HobsDlg extends IDialog { jLabelHelpText.setText("Help Text"); jLabelFeatureFlag = new JLabel(); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 132, 155, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 157, 155, 20)); jLabelFeatureFlag.setText("Feature Flag Expression"); + jLabelFeatureFlag.setEnabled(false); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(12, 157, 155, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 132, 155, 20)); jLabelArch.setText("Supported Architectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(168, 157, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java index 8ac87003d3..1f825438fe 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java @@ -211,9 +211,10 @@ public class LibraryClassDefsDlg extends IDialog { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 87, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168,197,320,20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); + jTextFieldFeatureFlag.setEnabled(false); } return jTextFieldFeatureFlag; } @@ -239,7 +240,7 @@ public class LibraryClassDefsDlg extends IDialog { private JScrollPane getJScrollPaneModuleList() { if (jScrollPaneModuleList == null) { jScrollPaneModuleList = new JScrollPane(); - jScrollPaneModuleList.setBounds(new java.awt.Rectangle(168, 137, 320, 80)); + jScrollPaneModuleList.setBounds(new java.awt.Rectangle(168, 112, 320, 80)); jScrollPaneModuleList.setPreferredSize(new java.awt.Dimension(320, 80)); jScrollPaneModuleList.setViewportView(getICheckBoxListSupModuleList()); } @@ -361,22 +362,23 @@ public class LibraryClassDefsDlg extends IDialog { private JPanel getJContentPane() { if (jContentPane == null) { jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(168, 112, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 87, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jLabelHelpText = new JLabel(); jLabelHelpText.setBounds(new java.awt.Rectangle(12, 62, 168, 20)); jLabelHelpText.setText("Help Text"); jLabelModuleList = new JLabel(); - jLabelModuleList.setBounds(new java.awt.Rectangle(12, 137, 168, 20)); + jLabelModuleList.setBounds(new java.awt.Rectangle(12, 112, 168, 20)); jLabelModuleList.setText("Supported Module Types"); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(12, 112, 168, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 87, 168, 20)); jLabelArch.setText("Supported Architectures"); jLabelFeatureFlag = new JLabel(); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 87, 168, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12,197,168,20)); jLabelFeatureFlag.setText("Feature Flag Expression"); + jLabelFeatureFlag.setEnabled(false); jLabelRecommendedInstanceGuid = new JLabel(); - jLabelRecommendedInstanceGuid.setBounds(new java.awt.Rectangle(12, 112, 200, 20)); + jLabelRecommendedInstanceGuid.setBounds(new java.awt.Rectangle(12, 87, 200, 20)); jLabelRecommendedInstanceGuid.setText("Recommended Instance Guid"); jLabelRecommendedInstanceGuid.setVisible(false); jLabelRecommendedInstanceVersion = new JLabel(); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java index a9c982050f..032c9e5d1f 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java @@ -229,9 +229,10 @@ public class PCDsDlg extends IDialog implements ItemListener { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 157, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 182, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); + jTextFieldFeatureFlag.setEnabled(false); } return jTextFieldFeatureFlag; } @@ -388,7 +389,8 @@ public class PCDsDlg extends IDialog implements ItemListener { jLabelFeatureFlag = new JLabel(); jLabelFeatureFlag.setText("Feature Flag Expression"); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 157, 168, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 182, 168, 20)); + jLabelFeatureFlag.setEnabled(false); jLabelTokenSpaceGuid = new JLabel(); jLabelTokenSpaceGuid.setText("Token Space C Name"); @@ -396,10 +398,10 @@ public class PCDsDlg extends IDialog implements ItemListener { jLabelArch = new JLabel(); jLabelArch.setText("Supported Architectures"); - jLabelArch.setBounds(new java.awt.Rectangle(12, 182, 168, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 157, 168, 20)); jArchCheckBox = new ArchCheckBox(); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); - jArchCheckBox.setBounds(new java.awt.Rectangle(168, 182, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 157, 320, 20)); // Hidden field jLabelTokenSpaceGuid.setBounds(new java.awt.Rectangle(12, 62, 140, 20)); 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 2c7a355cc3..2c781dd928 100644 --- 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 @@ -151,8 +151,9 @@ public class PackageDepDlg extends IDialog implements ItemListener { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 62, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 87, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); + jTextFieldFeatureFlag.setEnabled(false); } return jTextFieldFeatureFlag; } @@ -281,14 +282,15 @@ public class PackageDepDlg extends IDialog implements ItemListener { jLabelPackageGuid.setVisible(false); jLabelFeatureFlag = new JLabel(); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 62, 168, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 87, 168, 20)); jLabelFeatureFlag.setText("Feature Flag Expression"); + jLabelFeatureFlag.setEnabled(false); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(12, 87, 168, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 62, 168, 20)); jLabelArch.setText("Supported Architectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(168, 87, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 62, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java index 5c1fb9826b..77d64f4f49 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java @@ -163,9 +163,10 @@ public class PpisDlg extends IDialog implements ItemListener { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 157, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); + jTextFieldFeatureFlag.setEnabled(false); } return jTextFieldFeatureFlag; } @@ -329,13 +330,14 @@ public class PpisDlg extends IDialog implements ItemListener { jLabelFeatureFlag = new JLabel(); jLabelFeatureFlag.setText("Feature Flag Expression"); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 132, 168, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 157, 168, 20)); + jLabelFeatureFlag.setEnabled(false); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(12, 157, 168, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 132, 168, 20)); jLabelArch.setText("Supported Architectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(168, 157, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java index 0bd5b5fcd1..72db12838c 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java @@ -114,9 +114,10 @@ public class ProtocolsDlg extends IDialog implements ItemListener { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 157, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); + jTextFieldFeatureFlag.setEnabled(false); } return jTextFieldFeatureFlag; } @@ -355,13 +356,14 @@ public class ProtocolsDlg extends IDialog implements ItemListener { jLabelFeatureFlag = new JLabel(); jLabelFeatureFlag.setText("Feature Flag Expression"); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 132, 155, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 157, 155, 20)); + jLabelFeatureFlag.setEnabled(false); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(12, 157, 155, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 132, 155, 20)); jLabelArch.setText("Supported Architectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(168, 157, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java index 81759be67c..7497d3fc4f 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java @@ -213,9 +213,10 @@ public class SourceFilesDlg extends IDialog { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 112, 340, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 137, 340, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(340, 20)); jTextFieldFeatureFlag.setToolTipText("RESERVED FOR FUTURE USE"); + jTextFieldFeatureFlag.setEnabled(false); } return jTextFieldFeatureFlag; } @@ -348,11 +349,12 @@ public class SourceFilesDlg extends IDialog { private JPanel getJContentPane() { if (jContentPane == null) { jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(168, 137, 340, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 112, 340, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(340, 20)); jLabelFeatureFlag = new JLabel(); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 112, 155, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 137, 155, 20)); jLabelFeatureFlag.setText("Feature Flag Expression"); + jLabelFeatureFlag.setEnabled(false); jLabelToolCode = new JLabel(); jLabelToolCode.setBounds(new java.awt.Rectangle(12, 62, 155, 20)); jLabelToolCode.setText("Tool Code"); @@ -360,7 +362,7 @@ public class SourceFilesDlg extends IDialog { jLabelTagName.setBounds(new java.awt.Rectangle(12, 37, 155, 20)); jLabelTagName.setText("Tag Name"); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(12, 137, 155, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 112, 155, 20)); jLabelArch.setText("Supported Architectures"); jLabelToolChainFamily = new JLabel(); jLabelToolChainFamily.setBounds(new java.awt.Rectangle(12, 87, 155, 20)); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java index d9ebc0f187..91606fd4ae 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java @@ -143,9 +143,10 @@ public class SystemTablesDlg extends IDialog { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 107, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); + jTextFieldFeatureFlag.setEnabled(false); } return jTextFieldFeatureFlag; } @@ -311,13 +312,14 @@ public class SystemTablesDlg extends IDialog { jLabelHelpText.setBounds(new java.awt.Rectangle(12, 62, 155, 20)); jLabelHelpText.setText("Help Text"); jLabelFeatureFlag = new JLabel(); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 107, 155, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 132, 155, 20)); jLabelFeatureFlag.setText("Feature Flag Expression"); + jLabelFeatureFlag.setEnabled(false); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(12, 130, 155, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 107, 155, 20)); jLabelArch.setText("Supported Architectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(168, 130, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 107, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java index eb331f8763..70b6f08513 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java @@ -165,9 +165,10 @@ public class VariablesDlg extends IDialog { private JTextField getJTextFieldFeatureFlag() { if (jTextFieldFeatureFlag == null) { jTextFieldFeatureFlag = new JTextField(); - jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); + jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 157, 320, 20)); jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE"); + jTextFieldFeatureFlag.setEnabled(false); } return jTextFieldFeatureFlag; } @@ -344,13 +345,14 @@ public class VariablesDlg extends IDialog { jLabelFeatureFlag = new JLabel(); jLabelFeatureFlag.setText("Feature Flag Expression"); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 132, 168, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 157, 168, 20)); + jLabelFeatureFlag.setEnabled(false); jLabelArch = new JLabel(); - jLabelArch.setBounds(new java.awt.Rectangle(12, 157, 168, 20)); + jLabelArch.setBounds(new java.awt.Rectangle(12, 132, 168, 20)); jLabelArch.setText("Supported Architectures"); jArchCheckBox = new ArchCheckBox(); - jArchCheckBox.setBounds(new java.awt.Rectangle(168, 157, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 132, 320, 20)); jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20)); jContentPane = new JPanel(); -- 2.39.2