X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fpackaging%2Fui%2FSpdHeader.java;h=83679ea0bcf785293226ad5c11baddbb794e3f14;hp=7aff45aba38c396a72b30ddde6fe42002e05a2b6;hb=11eb278ae57cfc9ba415fcf91e61dea56d6082c0;hpb=410e0e9f02d5cba8a9eccb7da0b6ea75e4f462a4 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 7aff45aba3..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 @@ -29,9 +29,9 @@ 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; @@ -124,7 +124,7 @@ public class SpdHeader extends IInternalFrame { private JLabel jLabel = null; - private JTextField jTextField = null; + private JTextField jTextFieldUrl = null; /** This method initializes jTextFieldBaseName @@ -143,6 +143,9 @@ public class SpdHeader extends IInternalFrame { JOptionPane.showMessageDialog(frame, "Package Name is NOT UiNameType."); return; } + if (jTextFieldBaseName.getText().equals(sfc.getSpdHdrPkgName())) { + return; + } docConsole.setSaved(false); sfc.setSpdHdrPkgName(jTextFieldBaseName.getText()); } @@ -168,6 +171,9 @@ public class SpdHeader extends IInternalFrame { JOptionPane.showMessageDialog(frame, "Guid is NOT GuidType."); return; } + if (jTextFieldGuid.getText().equals(sfc.getSpdHdrGuidValue())) { + return; + } docConsole.setSaved(false); sfc.setSpdHdrGuidValue(jTextFieldGuid.getText()); } @@ -193,6 +199,9 @@ public class SpdHeader extends IInternalFrame { JOptionPane.showMessageDialog(frame, "Version is NOT version type."); return; } + if (jTextFieldVersion.getText().equals(sfc.getSpdHdrVer())){ + return; + } docConsole.setSaved(false); sfc.setSpdHdrVer(jTextFieldVersion.getText()); } @@ -227,7 +236,6 @@ 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){ @@ -235,6 +243,9 @@ public class SpdHeader extends IInternalFrame { JOptionPane.showMessageDialog(frame, "License contents could NOT be empty."); return; } + if (jTextAreaLicense.getText().equals(sfc.getSpdHdrLicense())) { + return; + } docConsole.setSaved(false); sfc.setSpdHdrLicense(jTextAreaLicense.getText()); } @@ -253,13 +264,15 @@ 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()); } @@ -373,6 +386,9 @@ public class SpdHeader extends IInternalFrame { JOptionPane.showMessageDialog(frame, "Abstract could NOT be empty."); return; } + if (jTextFieldAbstract.getText().equals(sfc.getSpdHdrAbs())) { + return; + } docConsole.setSaved(false); sfc.setSpdHdrAbs(jTextFieldAbstract.getText()); } @@ -398,6 +414,9 @@ public class SpdHeader extends IInternalFrame { JOptionPane.showMessageDialog(frame, "Copyright contents could not be empty."); return; } + if (jTextFieldCopyright.getText().equals(sfc.getSpdHdrCopyright())) { + return; + } docConsole.setSaved(false); sfc.setSpdHdrCopyright(jTextFieldCopyright.getText()); } @@ -411,20 +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(161,195,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) { @@ -488,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()); @@ -503,6 +528,14 @@ public class SpdHeader extends IInternalFrame { jTextFieldSpecification.setText(sfc.getSpdHdrSpec()); } sfc.setSpdHdrSpec(jTextFieldSpecification.getText()); + + if (!sfc.getSpdPkgDefsRdOnly().equals("true")) { + sfc.setSpdPkgDefsRdOnly("false"); + } + if (!sfc.getSpdPkgDefsRePkg().equals("true")) { + sfc.setSpdPkgDefsRePkg("false"); + } + } /** @@ -591,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; } @@ -603,97 +636,15 @@ public class SpdHeader extends IInternalFrame { * */ public void actionPerformed(ActionEvent arg0) { - docConsole.setSaved(false); - 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 @@ -714,7 +665,7 @@ public class SpdHeader extends IInternalFrame { resizeComponentWidth(this.jTextFieldBaseName, intCurrentWidth,intPreferredWidth); resizeComponentWidth(this.jTextFieldGuid, intCurrentWidth,intPreferredWidth); resizeComponentWidth(this.jTextFieldVersion, intCurrentWidth,intPreferredWidth); - resizeComponentWidth(this.jTextField, intCurrentWidth,intPreferredWidth); + resizeComponentWidth(this.jTextFieldUrl, intCurrentWidth,intPreferredWidth); resizeComponentWidth(this.jScrollPaneLicense, intCurrentWidth,intPreferredWidth); resizeComponentWidth(this.jTextFieldCopyright, intCurrentWidth,intPreferredWidth); resizeComponentWidth(this.jScrollPaneDescription, intCurrentWidth,intPreferredWidth);