X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;ds=sidebyside;f=Tools%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fpackaging%2Fui%2FSpdHeader.java;h=83679ea0bcf785293226ad5c11baddbb794e3f14;hb=4da2e625971af7431a8f4266482b0770accb9fc6;hp=0d482e83e39ecae910935b954cbe23474c672798;hpb=a13899c5acad2f5e125abdae972b4c3d1e522f69;p=mirror_edk2.git diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java index 0d482e83e3..83679ea0bc 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java @@ -15,23 +15,25 @@ package org.tianocore.frameworkwizard.packaging.ui; -import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ComponentEvent; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; 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; import javax.swing.JTextField; + import org.tianocore.PackageSurfaceAreaDocument; import org.tianocore.frameworkwizard.common.DataValidation; -import org.tianocore.frameworkwizard.common.Log; import org.tianocore.frameworkwizard.common.Tools; +import org.tianocore.frameworkwizard.common.Identifications.OpeningPackageType; import org.tianocore.frameworkwizard.common.ui.IInternalFrame; import org.tianocore.frameworkwizard.common.ui.StarLabel; @@ -52,6 +54,8 @@ public class SpdHeader extends IInternalFrame { // //Define class members // + static JFrame frame; + private JPanel jContentPane = null; private JLabel jLabelBaseName = null; @@ -111,6 +115,8 @@ public class SpdHeader extends IInternalFrame { private StarLabel jStarLabel9 = null; private SpdFileContents sfc = null; + + private OpeningPackageType docConsole = null; private JTextField jTextFieldCopyright = null; @@ -118,7 +124,7 @@ public class SpdHeader extends IInternalFrame { private JLabel jLabel = null; - private JTextField jTextField = null; + private JTextField jTextFieldUrl = null; /** This method initializes jTextFieldBaseName @@ -133,6 +139,14 @@ public class SpdHeader 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 is NOT UiNameType."); + return; + } + if (jTextFieldBaseName.getText().equals(sfc.getSpdHdrPkgName())) { + return; + } + docConsole.setSaved(false); sfc.setSpdHdrPkgName(jTextFieldBaseName.getText()); } }); @@ -153,6 +167,14 @@ public class SpdHeader 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 is NOT GuidType."); + return; + } + if (jTextFieldGuid.getText().equals(sfc.getSpdHdrGuidValue())) { + return; + } + docConsole.setSaved(false); sfc.setSpdHdrGuidValue(jTextFieldGuid.getText()); } }); @@ -173,6 +195,14 @@ public class SpdHeader 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 is NOT version type."); + return; + } + if (jTextFieldVersion.getText().equals(sfc.getSpdHdrVer())){ + return; + } + docConsole.setSaved(false); sfc.setSpdHdrVer(jTextFieldVersion.getText()); } }); @@ -206,10 +236,17 @@ public class SpdHeader 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 contents could NOT be empty."); + return; + } + if (jTextAreaLicense.getText().equals(sfc.getSpdHdrLicense())) { + return; + } + docConsole.setSaved(false); sfc.setSpdHdrLicense(jTextAreaLicense.getText()); } }); @@ -227,9 +264,16 @@ public class SpdHeader 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 contents could NOT be empty."); + return; + } + if (jTextAreaDescription.getText().equals(sfc.getSpdHdrDescription())) { + return; + } + docConsole.setSaved(false); sfc.setSpdHdrDescription(jTextAreaDescription.getText()); } }); @@ -246,7 +290,7 @@ public class SpdHeader 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(161,330,320,20)); jTextFieldSpecification.setEditable(false); jTextFieldSpecification.setPreferredSize(new java.awt.Dimension(320,20)); jTextFieldSpecification.addFocusListener(new FocusAdapter(){ @@ -301,7 +345,7 @@ public class SpdHeader 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(161,108,320,80)); jScrollPaneLicense.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); jScrollPaneLicense.setPreferredSize(new java.awt.Dimension(320,80)); jScrollPaneLicense.setViewportView(getJTextAreaLicense()); @@ -318,7 +362,7 @@ public class SpdHeader 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,244,320,80)); jScrollPaneDescription.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); jScrollPaneDescription.setViewportView(getJTextAreaDescription()); } @@ -334,10 +378,18 @@ public class SpdHeader 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(161,220,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 could NOT be empty."); + return; + } + if (jTextFieldAbstract.getText().equals(sfc.getSpdHdrAbs())) { + return; + } + docConsole.setSaved(false); sfc.setSpdHdrAbs(jTextFieldAbstract.getText()); } }); @@ -354,10 +406,18 @@ public class SpdHeader 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,86,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 contents could not be empty."); + return; + } + if (jTextFieldCopyright.getText().equals(sfc.getSpdHdrCopyright())) { + return; + } + docConsole.setSaved(false); sfc.setSpdHdrCopyright(jTextFieldCopyright.getText()); } }); @@ -370,19 +430,26 @@ public class SpdHeader 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 java.awt.Dimension(320, 20)); - jTextField.addFocusListener(new FocusAdapter(){ + private JTextField getJTextFieldUrl() { + if (jTextFieldUrl == null) { + jTextFieldUrl = new JTextField(); + jTextFieldUrl.setBounds(new java.awt.Rectangle(161,195,320,20)); + jTextFieldUrl.setPreferredSize(new java.awt.Dimension(320, 20)); + jTextFieldUrl.addFocusListener(new FocusAdapter(){ public void focusLost(FocusEvent e){ + if (jTextFieldUrl.getText().length() == 0 && sfc.getSpdHdrUrl() == null) { + return; + } + if (jTextFieldUrl.getText().equals(sfc.getSpdHdrUrl())) { + return; + } sfc.setSpdHdrLicense(jTextAreaLicense.getText()); - sfc.setSpdHdrUrl(jTextField.getText()); + sfc.setSpdHdrUrl(jTextFieldUrl.getText()); + docConsole.setSaved(false); } }); } - return jTextField; + return jTextFieldUrl; } public static void main(String[] args) { @@ -410,6 +477,11 @@ public class SpdHeader extends IInternalFrame { sfc = new SpdFileContents(inPsa); init(sfc); } + + public SpdHeader(OpeningPackageType opt){ + this(opt.getXmlSpd()); + docConsole = opt; + } /** This method initializes this @@ -441,7 +513,7 @@ public class SpdHeader extends IInternalFrame { jTextAreaLicense.setText(sfc.getSpdHdrLicense()); } if (sfc.getSpdHdrUrl() != null) { - jTextField.setText(sfc.getSpdHdrUrl()); + jTextFieldUrl.setText(sfc.getSpdHdrUrl()); } if (sfc.getSpdHdrCopyright() != null) { jTextFieldCopyright.setText(sfc.getSpdHdrCopyright()); @@ -455,7 +527,15 @@ public class SpdHeader extends IInternalFrame { if (sfc.getSpdHdrSpec() != null) { jTextFieldSpecification.setText(sfc.getSpdHdrSpec()); } - + sfc.setSpdHdrSpec(jTextFieldSpecification.getText()); + + if (!sfc.getSpdPkgDefsRdOnly().equals("true")) { + sfc.setSpdPkgDefsRdOnly("false"); + } + if (!sfc.getSpdPkgDefsRePkg().equals("true")) { + sfc.setSpdPkgDefsRePkg("false"); + } + } /** @@ -467,27 +547,27 @@ public class SpdHeader 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(16,195,140,20)); jLabel.setText("URL"); jContentPane = new JPanel(); jContentPane.setLayout(null); jContentPane.setLocation(new java.awt.Point(0, 0)); jContentPane.setPreferredSize(new java.awt.Dimension(500, 524)); jLabelAbstract = new JLabel(); - jLabelAbstract.setBounds(new java.awt.Rectangle(15, 220, 140, 20)); + jLabelAbstract.setBounds(new java.awt.Rectangle(16,245,140,20)); jLabelAbstract.setText("Description"); jLabelSpecification = new JLabel(); jLabelSpecification.setText("Specification"); - jLabelSpecification.setBounds(new java.awt.Rectangle(15, 305, 140, 20)); + jLabelSpecification.setBounds(new java.awt.Rectangle(16,330,140,20)); jLabelDescription = new JLabel(); jLabelDescription.setText("Abstract"); - jLabelDescription.setBounds(new java.awt.Rectangle(15, 195, 140, 20)); + jLabelDescription.setBounds(new java.awt.Rectangle(16,220,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,86,140,20)); jLabelLicense = new JLabel(); jLabelLicense.setText("License"); - jLabelLicense.setBounds(new java.awt.Rectangle(15, 85, 140, 20)); + jLabelLicense.setBounds(new java.awt.Rectangle(16,110,140,20)); jLabelVersion = new JLabel(); jLabelVersion.setText("Version"); jLabelVersion.setBounds(new java.awt.Rectangle(15, 60, 140, 20)); @@ -523,16 +603,16 @@ public class SpdHeader 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(1,110)); jStarLabel5 = new StarLabel(); - jStarLabel5.setLocation(new java.awt.Point(0, 330)); + jStarLabel5.setLocation(new java.awt.Point(0,86)); jStarLabel6 = new StarLabel(); - jStarLabel6.setLocation(new java.awt.Point(0, 195)); + jStarLabel6.setLocation(new java.awt.Point(1,220)); jStarLabel7 = new StarLabel(); - jStarLabel7.setLocation(new java.awt.Point(0, 305)); + jStarLabel7.setLocation(new java.awt.Point(1,330)); jStarLabel7.setEnabled(false); jStarLabel9 = new StarLabel(); - jStarLabel9.setLocation(new java.awt.Point(0, 220)); + jStarLabel9.setLocation(new java.awt.Point(1,245)); jContentPane.add(jStarLabel1, null); jContentPane.add(jStarLabel2, null); jContentPane.add(jStarLabel3, null); @@ -544,7 +624,7 @@ public class SpdHeader extends IInternalFrame { jContentPane.add(getJTextFieldCopyright(), null); jContentPane.add(jLabel, null); - jContentPane.add(getJTextField(), null); + jContentPane.add(getJTextFieldUrl(), null); } return jContentPane; } @@ -556,96 +636,15 @@ public class SpdHeader 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 jTextFieldGuid.setText(Tools.generateUuidString()); + docConsole.setSaved(false); sfc.setSpdHdrGuidValue(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 Spd Header - if exists spdHeader, set the value directly - if not exists spdHeader, new an instance first - - **/ - public void save() { - try { - - } catch (Exception e) { - Log.err("Save Package", e.getMessage()); - } - } - + /** This method initializes Package type and Compontent type @@ -666,6 +665,7 @@ public class SpdHeader extends IInternalFrame { resizeComponentWidth(this.jTextFieldBaseName, intCurrentWidth,intPreferredWidth); resizeComponentWidth(this.jTextFieldGuid, intCurrentWidth,intPreferredWidth); resizeComponentWidth(this.jTextFieldVersion, intCurrentWidth,intPreferredWidth); + resizeComponentWidth(this.jTextFieldUrl, intCurrentWidth,intPreferredWidth); resizeComponentWidth(this.jScrollPaneLicense, intCurrentWidth,intPreferredWidth); resizeComponentWidth(this.jTextFieldCopyright, intCurrentWidth,intPreferredWidth); resizeComponentWidth(this.jScrollPaneDescription, intCurrentWidth,intPreferredWidth);