X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fplatform%2Fui%2FFpdHeader.java;h=f065b8e1e21fb9bf867b4135fc44c27aff8d6992;hb=3658f95e1a73626ff1cdb9cde3676ebc1edc3523;hp=3f50fb6862a56c33b37f10891b670e235c0d41e6;hpb=f3b0ed9a12ec287bb336b9672a0937667f1958ec;p=mirror_edk2.git diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java index 3f50fb6862..f065b8e1e2 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java @@ -20,9 +20,12 @@ import java.awt.event.ActionEvent; import java.awt.event.ComponentEvent; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; +import java.util.Vector; import javax.swing.JButton; +import javax.swing.JFrame; import javax.swing.JLabel; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; @@ -33,8 +36,8 @@ import javax.swing.JTextField; import org.tianocore.PlatformSurfaceAreaDocument; import org.tianocore.frameworkwizard.common.DataValidation; -import org.tianocore.frameworkwizard.common.Log; import org.tianocore.frameworkwizard.common.Tools; +import org.tianocore.frameworkwizard.common.Identifications.OpeningPlatformType; import org.tianocore.frameworkwizard.common.ui.IInternalFrame; import org.tianocore.frameworkwizard.common.ui.StarLabel; @@ -52,6 +55,7 @@ public class FpdHeader extends IInternalFrame { /// private static final long serialVersionUID = -8152099582923006900L; + static JFrame frame; // //Define class members // @@ -119,9 +123,11 @@ public class FpdHeader extends IInternalFrame { private JLabel jLabel = null; - private JTextField jTextField = null; + private JTextField jTextFieldUrl = null; private FpdFileContents ffc = null; + + private OpeningPlatformType docConsole = null; /** This method initializes jTextFieldBaseName @@ -136,6 +142,14 @@ public class FpdHeader extends IInternalFrame { jTextFieldBaseName.setPreferredSize(new java.awt.Dimension(320,20)); jTextFieldBaseName.addFocusListener(new FocusAdapter(){ public void focusLost(FocusEvent e) { + if (!DataValidation.isUiNameType(jTextFieldBaseName.getText())) { + JOptionPane.showMessageDialog(frame, "Package Name does not match the UiNameType datatype."); + return; + } + if (jTextFieldBaseName.getText().equals(ffc.getFpdHdrPlatformName())) { + return; + } + docConsole.setSaved(false); ffc.setFpdHdrPlatformName(jTextFieldBaseName.getText()); } }); @@ -156,6 +170,14 @@ public class FpdHeader extends IInternalFrame { jTextFieldGuid.setPreferredSize(new java.awt.Dimension(250,20)); jTextFieldGuid.addFocusListener(new FocusAdapter(){ public void focusLost(FocusEvent e) { + if (!DataValidation.isGuid(jTextFieldGuid.getText())) { + JOptionPane.showMessageDialog(frame, "Guid must be in registry (8-4-4-4-12) format."); + return; + } + if (jTextFieldGuid.getText().equals(ffc.getFpdHdrGuidValue())) { + return; + } + docConsole.setSaved(false); ffc.setFpdHdrGuidValue(jTextFieldGuid.getText()); } }); @@ -176,6 +198,14 @@ public class FpdHeader extends IInternalFrame { jTextFieldVersion.setPreferredSize(new java.awt.Dimension(320,20)); jTextFieldVersion.addFocusListener(new FocusAdapter(){ public void focusLost(FocusEvent e) { + if (!DataValidation.isVersion(jTextFieldVersion.getText())) { + JOptionPane.showMessageDialog(frame, "Version does not match the Version datatype."); + return; + } + if (jTextFieldVersion.getText().equals(ffc.getFpdHdrVer())) { + return; + } + docConsole.setSaved(false); ffc.setFpdHdrVer(jTextFieldVersion.getText()); } }); @@ -209,10 +239,17 @@ public class FpdHeader extends IInternalFrame { if (jTextAreaLicense == null) { jTextAreaLicense = new JTextArea(); jTextAreaLicense.setText(""); - jTextAreaLicense.setPreferredSize(new java.awt.Dimension(317,77)); jTextAreaLicense.setLineWrap(true); jTextAreaLicense.addFocusListener(new FocusAdapter(){ public void focusLost(FocusEvent e) { + if (jTextAreaLicense.getText().length() == 0) { + JOptionPane.showMessageDialog(frame, "License must be entered!"); + return; + } + if (jTextAreaLicense.getText().equals(ffc.getFpdHdrLicense())) { + return; + } + docConsole.setSaved(false); ffc.setFpdHdrLicense(jTextAreaLicense.getText()); } }); @@ -230,9 +267,16 @@ public class FpdHeader extends IInternalFrame { if (jTextAreaDescription == null) { jTextAreaDescription = new JTextArea(); jTextAreaDescription.setLineWrap(true); - jTextAreaDescription.setPreferredSize(new java.awt.Dimension(317,77)); jTextAreaDescription.addFocusListener(new FocusAdapter(){ public void focusLost(FocusEvent e) { + if (jTextAreaDescription.getText().length() == 0) { + JOptionPane.showMessageDialog(frame, "Description must be entered."); + return; + } + if (jTextAreaDescription.getText().equals(ffc.getFpdHdrDescription())) { + return; + } + docConsole.setSaved(false); ffc.setFpdHdrDescription(jTextAreaDescription.getText()); } }); @@ -249,7 +293,7 @@ public class FpdHeader extends IInternalFrame { private JTextField getJTextFieldSpecification() { if (jTextFieldSpecification == null) { jTextFieldSpecification = new JTextField(); - jTextFieldSpecification.setBounds(new java.awt.Rectangle(160, 305, 320, 20)); + jTextFieldSpecification.setBounds(new java.awt.Rectangle(160,328,320,20)); jTextFieldSpecification.setEditable(false); jTextFieldSpecification.setPreferredSize(new java.awt.Dimension(320,20)); jTextFieldSpecification.addFocusListener(new FocusAdapter(){ @@ -304,7 +348,7 @@ public class FpdHeader extends IInternalFrame { private JScrollPane getJScrollPaneLicense() { if (jScrollPaneLicense == null) { jScrollPaneLicense = new JScrollPane(); - jScrollPaneLicense.setBounds(new java.awt.Rectangle(160, 85, 320, 80)); + jScrollPaneLicense.setBounds(new java.awt.Rectangle(160,107,320,80)); jScrollPaneLicense.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); jScrollPaneLicense.setPreferredSize(new java.awt.Dimension(320,80)); jScrollPaneLicense.setViewportView(getJTextAreaLicense()); @@ -321,7 +365,7 @@ public class FpdHeader extends IInternalFrame { private JScrollPane getJScrollPaneDescription() { if (jScrollPaneDescription == null) { jScrollPaneDescription = new JScrollPane(); - jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 220, 320, 80)); + jScrollPaneDescription.setBounds(new java.awt.Rectangle(160,243,320,80)); jScrollPaneDescription.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); jScrollPaneDescription.setViewportView(getJTextAreaDescription()); } @@ -337,10 +381,18 @@ public class FpdHeader extends IInternalFrame { private JTextField getJTextFieldAbstract() { if (jTextFieldAbstract == null) { jTextFieldAbstract = new JTextField(); - jTextFieldAbstract.setBounds(new java.awt.Rectangle(160,195,320,20)); + jTextFieldAbstract.setBounds(new java.awt.Rectangle(160,218,320,20)); jTextFieldAbstract.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldAbstract.addFocusListener(new FocusAdapter(){ public void focusLost(FocusEvent e) { + if (!DataValidation.isAbstract(jTextFieldAbstract.getText())) { + JOptionPane.showMessageDialog(frame, "Abstract must be entered."); + return; + } + if (jTextFieldAbstract.getText().equals(ffc.getFpdHdrAbs())) { + return; + } + docConsole.setSaved(false); ffc.setFpdHdrAbs(jTextFieldAbstract.getText()); } }); @@ -357,10 +409,18 @@ public class FpdHeader extends IInternalFrame { private JTextField getJTextFieldCopyright() { if (jTextFieldCopyright == null) { jTextFieldCopyright = new JTextField(); - jTextFieldCopyright.setBounds(new java.awt.Rectangle(160,330,320, 20)); + jTextFieldCopyright.setBounds(new java.awt.Rectangle(160,85,320,20)); jTextFieldCopyright.setPreferredSize(new java.awt.Dimension(320,20)); jTextFieldCopyright.addFocusListener(new FocusAdapter(){ public void focusLost(FocusEvent e) { + if (!DataValidation.isCopyright(jTextFieldCopyright.getText())) { + JOptionPane.showMessageDialog(frame, "Copyright must be entered."); + return; + } + if (jTextFieldCopyright.getText().equals(ffc.getFpdHdrCopyright())) { + return; + } + docConsole.setSaved(false); ffc.setFpdHdrCopyright(jTextFieldCopyright.getText()); } }); @@ -373,19 +433,26 @@ public class FpdHeader extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField() { - if (jTextField == null) { - jTextField = new JTextField(); - jTextField.setBounds(new java.awt.Rectangle(160,170,320,20)); - jTextField.setPreferredSize(new Dimension(320, 20)); - jTextField.addFocusListener(new FocusAdapter(){ + private JTextField getJTextFieldUrl() { + if (jTextFieldUrl == null) { + jTextFieldUrl = new JTextField(); + jTextFieldUrl.setBounds(new java.awt.Rectangle(160,193,320,20)); + jTextFieldUrl.setPreferredSize(new Dimension(320, 20)); + jTextFieldUrl.addFocusListener(new FocusAdapter(){ public void focusLost(FocusEvent e){ + if (jTextFieldUrl.getText().length() == 0 && ffc.getFpdHdrUrl() == null) { + return; + } + if (jTextFieldUrl.getText().equals(ffc.getFpdHdrUrl())) { + return; + } ffc.setFpdHdrLicense(jTextAreaLicense.getText()); - ffc.setFpdHdrUrl(jTextField.getText()); + ffc.setFpdHdrUrl(jTextFieldUrl.getText()); + docConsole.setSaved(false); } }); } - return jTextField; + return jTextFieldUrl; } public static void main(String[] args) { @@ -414,6 +481,11 @@ public class FpdHeader extends IInternalFrame { init(ffc); } + + public FpdHeader(OpeningPlatformType opt) { + this(opt.getXmlFpd()); + docConsole = opt; + } /** This method initializes this @@ -422,7 +494,7 @@ public class FpdHeader extends IInternalFrame { private void init() { //this.setSize(500, 515); this.setContentPane(getJContentPane()); - this.setTitle("Package Surface Area Header"); + this.setTitle("Platform Surface Area Header"); initFrame(); } @@ -452,7 +524,7 @@ public class FpdHeader extends IInternalFrame { jTextFieldAbstract.setText(ffc.getFpdHdrAbs()); } if (ffc.getFpdHdrUrl() != null) { - jTextField.setText(ffc.getFpdHdrUrl()); + jTextFieldUrl.setText(ffc.getFpdHdrUrl()); } if (ffc.getFpdHdrCopyright() != null) { jTextFieldCopyright.setText(ffc.getFpdHdrCopyright()); @@ -463,7 +535,24 @@ public class FpdHeader extends IInternalFrame { if (ffc.getFpdHdrSpec() != null) { jTextFieldSpecification.setText(ffc.getFpdHdrSpec()); } - + ffc.setFpdHdrSpec(jTextFieldSpecification.getText()); + + ffc.genPlatformDefsSkuInfo("0", "DEFAULT"); + Vector v = new Vector(); + ffc.getPlatformDefsSupportedArchs(v); + if (v.size() == 0) { + v.add("IA32"); + ffc.setPlatformDefsSupportedArchs(v); + } + v.removeAllElements(); + ffc.getPlatformDefsBuildTargets(v); + if (v.size() == 0) { + v.add("DEBUG"); + ffc.setPlatformDefsBuildTargets(v); + } + if (ffc.getPlatformDefsInterDir() == null) { + ffc.setPlatformDefsInterDir("UNIFIED"); + } } /** @@ -475,27 +564,27 @@ public class FpdHeader extends IInternalFrame { private JPanel getJContentPane() { if (jContentPane == null) { jLabel = new JLabel(); - jLabel.setBounds(new java.awt.Rectangle(15,170,140,20)); + jLabel.setBounds(new java.awt.Rectangle(15,193,140,20)); jLabel.setText("URL"); jContentPane = new JPanel(); jContentPane.setLayout(null); jContentPane.setLocation(new java.awt.Point(0, 0)); jContentPane.setSize(new java.awt.Dimension(500,423)); jLabelAbstract = new JLabel(); - jLabelAbstract.setBounds(new java.awt.Rectangle(15, 195, 140, 20)); + jLabelAbstract.setBounds(new java.awt.Rectangle(15,218,140,20)); jLabelAbstract.setText("Abstract"); jLabelSpecification = new JLabel(); jLabelSpecification.setText("Specification"); - jLabelSpecification.setBounds(new java.awt.Rectangle(15, 305, 140, 20)); + jLabelSpecification.setBounds(new java.awt.Rectangle(15,328,140,20)); jLabelDescription = new JLabel(); jLabelDescription.setText("Description"); - jLabelDescription.setBounds(new java.awt.Rectangle(15, 220, 140, 20)); + jLabelDescription.setBounds(new java.awt.Rectangle(15,243,140,20)); jLabelCopyright = new JLabel(); jLabelCopyright.setText("Copyright"); - jLabelCopyright.setBounds(new java.awt.Rectangle(15, 330, 140, 20)); + jLabelCopyright.setBounds(new java.awt.Rectangle(15,85,140,20)); jLabelLicense = new JLabel(); jLabelLicense.setText("License"); - jLabelLicense.setBounds(new java.awt.Rectangle(15, 85, 140, 20)); + jLabelLicense.setBounds(new java.awt.Rectangle(15,108,140,20)); jLabelVersion = new JLabel(); jLabelVersion.setText("Version"); jLabelVersion.setBounds(new java.awt.Rectangle(15, 60, 140, 20)); @@ -531,18 +620,18 @@ public class FpdHeader extends IInternalFrame { jStarLabel3 = new StarLabel(); jStarLabel3.setLocation(new java.awt.Point(0, 60)); jStarLabel4 = new StarLabel(); - jStarLabel4.setLocation(new java.awt.Point(0, 85)); + jStarLabel4.setLocation(new java.awt.Point(0,108)); jStarLabel5 = new StarLabel(); - jStarLabel5.setLocation(new java.awt.Point(0, 330)); + jStarLabel5.setLocation(new java.awt.Point(0,85)); jStarLabel6 = new StarLabel(); - jStarLabel6.setLocation(new java.awt.Point(0, 195)); + jStarLabel6.setLocation(new java.awt.Point(0,218)); jStarLabel7 = new StarLabel(); - jStarLabel7.setLocation(new java.awt.Point(0, 305)); + jStarLabel7.setLocation(new java.awt.Point(0,328)); jStarLabel7.setEnabled(false); jStarLabel8 = new StarLabel(); - jStarLabel8.setLocation(new java.awt.Point(0, 220)); + jStarLabel8.setLocation(new java.awt.Point(0,243)); jStarLabel9 = new StarLabel(); - jStarLabel9.setLocation(new java.awt.Point(0, 280)); + jStarLabel9.setLocation(new java.awt.Point(0,303)); jStarLabel9.setVisible(false); jContentPane.add(jStarLabel1, null); jContentPane.add(jStarLabel2, null); @@ -556,7 +645,7 @@ public class FpdHeader extends IInternalFrame { jContentPane.add(getJTextFieldCopyright(), null); jContentPane.add(jLabel, null); - jContentPane.add(getJTextField(), null); + jContentPane.add(getJTextFieldUrl(), null); } return jContentPane; } @@ -568,92 +657,15 @@ public class FpdHeader extends IInternalFrame { * */ public void actionPerformed(ActionEvent arg0) { - if (arg0.getSource() == jButtonOk) { - this.save(); - this.setEdited(true); - } - if (arg0.getSource() == jButtonCancel) { - this.setEdited(false); - } + if (arg0.getSource() == jButtonGenerateGuid) { - //ToDo: invoke GuidValueEditor + docConsole.setSaved(false); jTextFieldGuid.setText(Tools.generateUuidString()); ffc.setFpdHdrGuidValue(jTextFieldGuid.getText()); } } - /** - Data validation for all fields - - @retval true - All datas are valid - @retval false - At least one data is invalid - - **/ - public boolean check() { - // - // Check if all required fields are not empty - // - if (isEmpty(this.jTextFieldBaseName.getText())) { - Log.err("Base Name couldn't be empty"); - return false; - } - if (isEmpty(this.jTextFieldGuid.getText())) { - Log.err("Guid couldn't be empty"); - return false; - } - if (isEmpty(this.jTextFieldVersion.getText())) { - Log.err("Version couldn't be empty"); - return false; - } - if (isEmpty(this.jTextAreaLicense.getText())) { - Log.err("License couldn't be empty"); - return false; - } - if (isEmpty(this.jTextFieldCopyright.getText())) { - Log.err("Copyright couldn't be empty"); - return false; - } - if (isEmpty(this.jTextAreaDescription.getText())) { - Log.err("Description couldn't be empty"); - return false; - } - if (isEmpty(this.jTextFieldAbstract.getText())) { - Log.err("Abstract couldn't be empty"); - return false; - } - - // - // Check if all fields have correct data types - // - if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) { - Log.err("Incorrect data type for Base Name"); - return false; - } - if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) { - Log.err("Incorrect data type for Guid"); - return false; - } - if (!DataValidation.isAbstract(this.jTextFieldAbstract.getText())) { - Log.err("Incorrect data type for Abstract"); - return false; - } - if (!DataValidation.isCopyright(this.jTextFieldCopyright.getText())) { - Log.err("Incorrect data type for Copyright"); - return false; - } - return true; - } - - /** - Save all components of Fpd Header - if exists FpdHeader, set the value directly - if not exists FpdHeader, new an instance first - - **/ - public void save() { - - } - + /** This method initializes Package type and Compontent type @@ -671,16 +683,16 @@ public class FpdHeader extends IInternalFrame { public void componentResized(ComponentEvent arg0) { int intPreferredWidth = 500; - resizeComponentWidth(this.jTextFieldBaseName, this.getWidth(), intPreferredWidth); - resizeComponentWidth(this.jTextFieldGuid, this.getWidth(), intPreferredWidth); - resizeComponentWidth(this.jTextFieldVersion, this.getWidth(), intPreferredWidth); - resizeComponentWidth(this.jTextField, this.getWidth(), intPreferredWidth); - resizeComponentWidth(this.jScrollPaneLicense, this.getWidth(), intPreferredWidth); - resizeComponentWidth(this.jTextFieldCopyright, this.getWidth(), intPreferredWidth); - resizeComponentWidth(this.jScrollPaneDescription, this.getWidth(), intPreferredWidth); - resizeComponentWidth(this.jTextFieldSpecification, this.getWidth(), intPreferredWidth); - resizeComponentWidth(this.jTextFieldAbstract, this.getWidth(), intPreferredWidth); + Tools.resizeComponentWidth(this.jTextFieldBaseName, this.getWidth(), intPreferredWidth); + Tools.resizeComponentWidth(this.jTextFieldGuid, this.getWidth(), intPreferredWidth); + Tools.resizeComponentWidth(this.jTextFieldVersion, this.getWidth(), intPreferredWidth); + Tools.resizeComponentWidth(this.jTextFieldUrl, this.getWidth(), intPreferredWidth); + Tools.resizeComponentWidth(this.jScrollPaneLicense, this.getWidth(), intPreferredWidth); + Tools.resizeComponentWidth(this.jTextFieldCopyright, this.getWidth(), intPreferredWidth); + Tools.resizeComponentWidth(this.jScrollPaneDescription, this.getWidth(), intPreferredWidth); + Tools.resizeComponentWidth(this.jTextFieldSpecification, this.getWidth(), intPreferredWidth); + Tools.resizeComponentWidth(this.jTextFieldAbstract, this.getWidth(), intPreferredWidth); - relocateComponentX(this.jButtonGenerateGuid, this.getWidth(), jButtonGenerateGuid.getWidth(), 25); + Tools.relocateComponentX(this.jButtonGenerateGuid, this.getWidth(), jButtonGenerateGuid.getWidth(), 25); } }