From: jlin16 Date: Mon, 31 Jul 2006 11:20:16 +0000 (+0000) Subject: Coding style changes X-Git-Tag: edk2-stable201903~24716 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=4da2e625971af7431a8f4266482b0770accb9fc6 Coding style changes git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1156 6f19259b-4bc3-4df7-8a09-765794883524 --- diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GenGuidDialog.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GenGuidDialog.java index dfa1922ea1..9c0674ee07 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GenGuidDialog.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GenGuidDialog.java @@ -53,26 +53,23 @@ public class GenGuidDialog extends JDialog implements ActionListener{ static private JFrame frame; private JPanel jContentPane = null; - private JPanel jPanel = null; - private JPanel jPanel1 = null; - private JPanel jPanel2 = null; - private JPanel jPanel3 = null; - private JPanel jPanel4 = null; + private JPanel jPanelEast = null; + private JPanel jPanelCenter = null; private JTextField jTextField = null; private JLabel jLabel = null; private JRadioButton jRadioButton = null; - private JRadioButton jRadioButton1 = null; - private JButton jButton = null; - private JButton jButton1 = null; - private JButton jButton2 = null; + private JRadioButton jRadioButtonReg = null; + private JButton jButtonCancel = null; + private JButton jButtonNew = null; + private JButton jButtonOk = null; // private String guid = null; public void actionPerformed(ActionEvent arg0) { // TODO Auto-generated method stub - if (arg0.getSource() == jButton1){ + if (arg0.getSource() == jButtonNew){ String uuid = Tools.generateUuidString(); - if (jRadioButton1.isSelected()) { + if (jRadioButtonReg.isSelected()) { jTextField.setText(uuid); } else { @@ -86,7 +83,7 @@ public class GenGuidDialog extends JDialog implements ActionListener{ } } - if (arg0.getSource() == jRadioButton1){ + if (arg0.getSource() == jRadioButtonReg){ //ToDo: check text field value against RegExp and transform if needed if (jTextField.getText().matches(GenGuidDialog.guidRegistryPat)){ @@ -116,7 +113,7 @@ public class GenGuidDialog extends JDialog implements ActionListener{ } - if (arg0.getSource() == jButton2){ + if (arg0.getSource() == jButtonOk){ // if (jTextField.getText().matches(Tools.guidArrayPat) // || jTextField.getText().matches(Tools.guidRegistryPat)){ // this.setVisible(false); @@ -127,7 +124,7 @@ public class GenGuidDialog extends JDialog implements ActionListener{ this.dispose(); } - if (arg0.getSource() == jButton){ + if (arg0.getSource() == jButtonCancel){ this.dispose(); } } @@ -137,54 +134,18 @@ public class GenGuidDialog extends JDialog implements ActionListener{ * * @return javax.swing.JPanel */ - private JPanel getJPanel() { - if (jPanel == null) { + private JPanel getJPanelEast() { + if (jPanelEast == null) { FlowLayout flowLayout = new FlowLayout(); flowLayout.setVgap(10); - jPanel = new JPanel(); - jPanel.setLayout(flowLayout); - jPanel.setPreferredSize(new java.awt.Dimension(100,30)); - jPanel.add(getJButton1(), null); - jPanel.add(getJButton2(), null); - jPanel.add(getJButton(), null); + jPanelEast = new JPanel(); + jPanelEast.setLayout(flowLayout); + jPanelEast.setPreferredSize(new java.awt.Dimension(100,30)); + jPanelEast.add(getJButtonNew(), null); + jPanelEast.add(getJButtonOk(), null); + jPanelEast.add(getJButtonCancel(), null); } - return jPanel; - } - - /** - * This method initializes jPanel1 - * - * @return javax.swing.JPanel - */ - private JPanel getJPanel1() { - if (jPanel1 == null) { - jPanel1 = new JPanel(); - } - return jPanel1; - } - - /** - * This method initializes jPanel2 - * - * @return javax.swing.JPanel - */ - private JPanel getJPanel2() { - if (jPanel2 == null) { - jPanel2 = new JPanel(); - } - return jPanel2; - } - - /** - * This method initializes jPanel3 - * - * @return javax.swing.JPanel - */ - private JPanel getJPanel3() { - if (jPanel3 == null) { - jPanel3 = new JPanel(); - } - return jPanel3; + return jPanelEast; } /** @@ -192,23 +153,23 @@ public class GenGuidDialog extends JDialog implements ActionListener{ * * @return javax.swing.JPanel */ - private JPanel getJPanel4() { - if (jPanel4 == null) { + private JPanel getJPanelCenter() { + if (jPanelCenter == null) { jLabel = new JLabel(); jLabel.setText("GUID Value"); GridLayout gridLayout = new GridLayout(); gridLayout.setRows(4); - jPanel4 = new JPanel(); - jPanel4.setLayout(gridLayout); - jPanel4.add(getJRadioButton1(), null); - jPanel4.add(getJRadioButton(), null); - jPanel4.add(jLabel, null); - jPanel4.add(getJTextField(), null); + jPanelCenter = new JPanel(); + jPanelCenter.setLayout(gridLayout); + jPanelCenter.add(getJRadioButtonReg(), null); + jPanelCenter.add(getJRadioButton(), null); + jPanelCenter.add(jLabel, null); + jPanelCenter.add(getJTextField(), null); ButtonGroup bg = new ButtonGroup(); - bg.add(jRadioButton1); + bg.add(jRadioButtonReg); bg.add(jRadioButton); } - return jPanel4; + return jPanelCenter; } /** @@ -245,14 +206,14 @@ public class GenGuidDialog extends JDialog implements ActionListener{ * * @return javax.swing.JRadioButton */ - private JRadioButton getJRadioButton1() { - if (jRadioButton1 == null) { - jRadioButton1 = new JRadioButton(); - jRadioButton1.setText("Registry Format"); - jRadioButton1.setSelected(true); - jRadioButton1.addActionListener(this); + private JRadioButton getJRadioButtonReg() { + if (jRadioButtonReg == null) { + jRadioButtonReg = new JRadioButton(); + jRadioButtonReg.setText("Registry Format"); + jRadioButtonReg.setSelected(true); + jRadioButtonReg.addActionListener(this); } - return jRadioButton1; + return jRadioButtonReg; } /** @@ -260,14 +221,14 @@ public class GenGuidDialog extends JDialog implements ActionListener{ * * @return javax.swing.JButton */ - private JButton getJButton() { - if (jButton == null) { - jButton = new JButton(); - jButton.setPreferredSize(new java.awt.Dimension(80,20)); - jButton.setText("Cancel"); - jButton.addActionListener(this); + private JButton getJButtonCancel() { + if (jButtonCancel == null) { + jButtonCancel = new JButton(); + jButtonCancel.setPreferredSize(new java.awt.Dimension(80,20)); + jButtonCancel.setText("Cancel"); + jButtonCancel.addActionListener(this); } - return jButton; + return jButtonCancel; } /** @@ -275,15 +236,15 @@ public class GenGuidDialog extends JDialog implements ActionListener{ * * @return javax.swing.JButton */ - private JButton getJButton1() { - if (jButton1 == null) { - jButton1 = new JButton(); - jButton1.setPreferredSize(new java.awt.Dimension(80,20)); - jButton1.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); - jButton1.setText("New"); - jButton1.addActionListener(this); + private JButton getJButtonNew() { + if (jButtonNew == null) { + jButtonNew = new JButton(); + jButtonNew.setPreferredSize(new java.awt.Dimension(80,20)); + jButtonNew.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); + jButtonNew.setText("New"); + jButtonNew.addActionListener(this); } - return jButton1; + return jButtonNew; } /** @@ -291,15 +252,15 @@ public class GenGuidDialog extends JDialog implements ActionListener{ * * @return javax.swing.JButton */ - private JButton getJButton2() { - if (jButton2 == null) { - jButton2 = new JButton(); - jButton2.setPreferredSize(new java.awt.Dimension(80,20)); - jButton2.setText("Ok"); - jButton2.setActionCommand("GenGuidValue"); - jButton2.addActionListener(this); + private JButton getJButtonOk() { + if (jButtonOk == null) { + jButtonOk = new JButton(); + jButtonOk.setPreferredSize(new java.awt.Dimension(80,20)); + jButtonOk.setText("Ok"); + jButtonOk.setActionCommand("GenGuidValue"); + jButtonOk.addActionListener(this); } - return jButton2; + return jButtonOk; } /** @@ -329,14 +290,14 @@ public class GenGuidDialog extends JDialog implements ActionListener{ public GenGuidDialog(ActionListener i){ super(); initialize(); - jButton2.addActionListener(i); + jButtonOk.addActionListener(i); this.addWindowListener(new WindowAdapter(){ @Override public void windowActivated(WindowEvent arg0) { // TODO Auto-generated method stub super.windowActivated(arg0); - if ((jRadioButton1.isSelected() && jTextField.getText().matches(GenGuidDialog.guidArrayPat)) + if ((jRadioButtonReg.isSelected() && jTextField.getText().matches(GenGuidDialog.guidArrayPat)) || (jRadioButton.isSelected() && jTextField.getText().matches(GenGuidDialog.guidRegistryPat))) { jTextField.setText(GenGuidDialog.formatGuidString(jTextField.getText())); } @@ -373,11 +334,8 @@ public class GenGuidDialog extends JDialog implements ActionListener{ if (jContentPane == null) { jContentPane = new JPanel(); jContentPane.setLayout(new BorderLayout()); - jContentPane.add(getJPanel(), java.awt.BorderLayout.EAST); - jContentPane.add(getJPanel1(), java.awt.BorderLayout.WEST); - jContentPane.add(getJPanel2(), java.awt.BorderLayout.NORTH); - jContentPane.add(getJPanel3(), java.awt.BorderLayout.SOUTH); - jContentPane.add(getJPanel4(), java.awt.BorderLayout.CENTER); + jContentPane.add(getJPanelEast(), java.awt.BorderLayout.EAST); + jContentPane.add(getJPanelCenter(), java.awt.BorderLayout.CENTER); } return jContentPane; } diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java index 120c52845b..9ffefec4a4 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java @@ -113,21 +113,21 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{ private JTextField jTextFieldVersion = null; - private JLabel jLabel = null; + private JLabel jLabelHelp = null; - private JTextField jTextField = null; + private JTextField jTextFieldHelp = null; - private JLabel jLabel1 = null; + private JLabel jLabelSupMod = null; - private JLabel jLabel2 = null; + private JLabel jLabelSupArch = null; - private ICheckBoxList iCheckBoxList = null; + private ICheckBoxList iCheckBoxListArch = null; - private ICheckBoxList iCheckBoxList1 = null; + private ICheckBoxList iCheckBoxListGuid = null; - private ICheckBoxList iCheckBoxList2 = null; + private ICheckBoxList iCheckBoxListMod = null; - private JLabel jLabel3 = null; + private JLabel jLabelGuidType = null; protected String[][] saa = null; @@ -450,22 +450,22 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{ **/ protected JPanel getJContentPane1() { if (jContentPane == null) { - jLabel3 = new JLabel(); - jLabel3.setBounds(new java.awt.Rectangle(400,122,103,16)); - jLabel3.setText("GUID Type List"); - jLabel3.setEnabled(true); - jLabel2 = new JLabel(); - jLabel2.setBounds(new java.awt.Rectangle(197,122,108,16)); - jLabel2.setText("Supported Arch"); - jLabel2.setEnabled(true); - jLabel1 = new JLabel(); - jLabel1.setBounds(new java.awt.Rectangle(14,120,110,16)); - jLabel1.setText("Supported Module"); - jLabel1.setEnabled(true); - jLabel = new JLabel(); - jLabel.setText("HelpText"); - jLabel.setSize(new java.awt.Dimension(109,20)); - jLabel.setLocation(new java.awt.Point(14,85)); + jLabelGuidType = new JLabel(); + jLabelGuidType.setBounds(new java.awt.Rectangle(400,122,103,16)); + jLabelGuidType.setText("GUID Type List"); + jLabelGuidType.setEnabled(true); + jLabelSupArch = new JLabel(); + jLabelSupArch.setBounds(new java.awt.Rectangle(197,122,108,16)); + jLabelSupArch.setText("Supported Arch"); + jLabelSupArch.setEnabled(true); + jLabelSupMod = new JLabel(); + jLabelSupMod.setBounds(new java.awt.Rectangle(14,120,110,16)); + jLabelSupMod.setText("Supported Module"); + jLabelSupMod.setEnabled(true); + jLabelHelp = new JLabel(); + jLabelHelp.setText("HelpText"); + jLabelHelp.setSize(new java.awt.Dimension(109,20)); + jLabelHelp.setLocation(new java.awt.Point(14,85)); jLabelVer = new JLabel(); jLabelVer.setBounds(new java.awt.Rectangle(14,60,111,20)); jLabelVer.setText("C_Name"); @@ -505,14 +505,14 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{ jContentPane.add(jLabelName, null); jContentPane.add(getJTextFieldName(), null); jContentPane.add(jLabelGuid, null); - jContentPane.add(jLabel, null); - jContentPane.add(getJTextField(), null); - jContentPane.add(jLabel1, null); - jContentPane.add(jLabel2, null); + jContentPane.add(jLabelHelp, null); + jContentPane.add(getJTextFieldHelp(), null); + jContentPane.add(jLabelSupMod, null); + jContentPane.add(jLabelSupArch, null); jContentPane.add(getJScrollPaneArch(), null); jContentPane.add(getJScrollPaneGuid(), null); jContentPane.add(getJScrollPaneModule(), null); - jContentPane.add(jLabel3, null); + jContentPane.add(jLabelGuidType, null); } return jContentPane; } @@ -544,19 +544,19 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{ //ToDo: check before add String[] row = {"", "", "", "", "", "", ""}; - row[3] = jTextField.getText(); + row[3] = jTextFieldHelp.getText(); row[2] = jTextFieldAdd.getText(); row[1] = jTextFieldVersion.getText(); row[0] = jTextFieldName.getText(); - row[4] = vectorToString(iCheckBoxList.getAllCheckedItemsString()); + row[4] = vectorToString(iCheckBoxListArch.getAllCheckedItemsString()); if (row[4].length() == 0) { row[4] = null; } - row[5] = vectorToString(iCheckBoxList2.getAllCheckedItemsString()); + row[5] = vectorToString(iCheckBoxListMod.getAllCheckedItemsString()); if (row[5].length() == 0) { row[5] = null; } - row[6] = vectorToString(iCheckBoxList1.getAllCheckedItemsString()); + row[6] = vectorToString(iCheckBoxListGuid.getAllCheckedItemsString()); if (row[6].length() == 0) { row[6] = null; } @@ -622,15 +622,15 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{ } protected void addRow(String[] row) { - Vector vArch = iCheckBoxList.getAllCheckedItemsString(); + Vector vArch = iCheckBoxListArch.getAllCheckedItemsString(); if (vArch.size() == 0) { vArch = null; } - Vector vModType = iCheckBoxList2.getAllCheckedItemsString(); + Vector vModType = iCheckBoxListMod.getAllCheckedItemsString(); if (vModType.size() == 0) { vModType = null; } - Vector vguidType = iCheckBoxList1.getAllCheckedItemsString(); + Vector vguidType = iCheckBoxListGuid.getAllCheckedItemsString(); if (vguidType.size() == 0) { vguidType = null; } @@ -711,7 +711,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{ resizeComponentWidth(this.jTextFieldName, this.getWidth(), intPreferredWidth); resizeComponentWidth(this.jTextFieldAdd, this.getWidth(), intPreferredWidth); resizeComponentWidth(this.jTextFieldVersion, this.getWidth(), intPreferredWidth); - resizeComponentWidth(this.jTextField, this.getWidth(), intPreferredWidth); + resizeComponentWidth(this.jTextFieldHelp, this.getWidth(), intPreferredWidth); resizeComponentWidth(this.jScrollPane, this.getWidth(), intPreferredWidth); relocateComponentX(this.jButtonGen, this.getWidth(), this.getPreferredSize().width, 40); @@ -722,13 +722,13 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{ * * @return javax.swing.JTextField */ - private JTextField getJTextField() { - if (jTextField == null) { - jTextField = new JTextField(); - jTextField.setBounds(new java.awt.Rectangle(136,85,337,20)); - jTextField.setPreferredSize(new Dimension(335, 20)); + private JTextField getJTextFieldHelp() { + if (jTextFieldHelp == null) { + jTextFieldHelp = new JTextField(); + jTextFieldHelp.setBounds(new java.awt.Rectangle(136,85,337,20)); + jTextFieldHelp.setPreferredSize(new Dimension(335, 20)); } - return jTextField; + return jTextFieldHelp; } private JScrollPane getJScrollPaneArch() { @@ -736,7 +736,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{ jScrollPaneArch = new JScrollPane(); jScrollPaneArch.setBounds(new java.awt.Rectangle(197,142,188,74)); jScrollPaneArch.setPreferredSize(new java.awt.Dimension(188, 74)); - jScrollPaneArch.setViewportView(getICheckBoxList()); + jScrollPaneArch.setViewportView(getICheckBoxListArch()); } return jScrollPaneArch; } @@ -745,10 +745,10 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{ * * @return org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList */ - private ICheckBoxList getICheckBoxList() { - if (iCheckBoxList == null) { - iCheckBoxList = new ICheckBoxList(); - iCheckBoxList.setBounds(new java.awt.Rectangle(197,142,188,74)); + private ICheckBoxList getICheckBoxListArch() { + if (iCheckBoxListArch == null) { + iCheckBoxListArch = new ICheckBoxList(); + iCheckBoxListArch.setBounds(new java.awt.Rectangle(197,142,188,74)); Vector v = new Vector(); v.add("IA32"); v.add("X64"); @@ -756,9 +756,9 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{ v.add("EBC"); v.add("ARM"); v.add("PPC"); - iCheckBoxList.setAllItems(v); + iCheckBoxListArch.setAllItems(v); } - return iCheckBoxList; + return iCheckBoxListArch; } protected JScrollPane getJScrollPaneGuid() { @@ -767,7 +767,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{ jScrollPaneGuid.setPreferredSize(new java.awt.Dimension(190,74)); jScrollPaneGuid.setLocation(new java.awt.Point(400,142)); jScrollPaneGuid.setSize(new java.awt.Dimension(260,74)); - jScrollPaneGuid.setViewportView(getICheckBoxList1()); + jScrollPaneGuid.setViewportView(getICheckBoxListGuid()); } return jScrollPaneGuid; } @@ -776,10 +776,10 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{ * * @return org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList */ - private ICheckBoxList getICheckBoxList1() { - if (iCheckBoxList1 == null) { - iCheckBoxList1 = new ICheckBoxList(); - iCheckBoxList1.setBounds(new java.awt.Rectangle(400,142,177,74)); + private ICheckBoxList getICheckBoxListGuid() { + if (iCheckBoxListGuid == null) { + iCheckBoxListGuid = new ICheckBoxList(); + iCheckBoxListGuid.setBounds(new java.awt.Rectangle(400,142,177,74)); Vector v = new Vector(); v.add("DATA_HUB_RECORD"); v.add("EFI_EVENT"); @@ -790,9 +790,9 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{ v.add("HOB"); v.add("TOKEN_SPACE_GUID"); - iCheckBoxList1.setAllItems(v); + iCheckBoxListGuid.setAllItems(v); } - return iCheckBoxList1; + return iCheckBoxListGuid; } private JScrollPane getJScrollPaneModule() { @@ -800,7 +800,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{ jScrollPaneModule = new JScrollPane(); jScrollPaneModule.setBounds(new java.awt.Rectangle(14,142,170,74)); jScrollPaneModule.setPreferredSize(new java.awt.Dimension(170, 74)); - jScrollPaneModule.setViewportView(getICheckBoxList2()); + jScrollPaneModule.setViewportView(getICheckBoxListMod()); } return jScrollPaneModule; } @@ -809,10 +809,10 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{ * * @return org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList */ - private ICheckBoxList getICheckBoxList2() { - if (iCheckBoxList2 == null) { - iCheckBoxList2 = new ICheckBoxList(); - iCheckBoxList2.setBounds(new java.awt.Rectangle(14,142,170,74)); + private ICheckBoxList getICheckBoxListMod() { + if (iCheckBoxListMod == null) { + iCheckBoxListMod = new ICheckBoxList(); + iCheckBoxListMod.setBounds(new java.awt.Rectangle(14,142,170,74)); Vector v = new Vector(); v.add("BASE"); v.add("SEC"); @@ -826,9 +826,9 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{ v.add("UEFI_DRIVER"); v.add("UEFI_APPLICATION"); v.add("USER_DEFINED"); - iCheckBoxList2.setAllItems(v); + iCheckBoxListMod.setAllItems(v); } - return iCheckBoxList2; + return iCheckBoxListMod; } public static void main(String[] args){ @@ -864,8 +864,8 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{ return v; } - protected JLabel getJLabel3() { - return jLabel3; + protected JLabel getJLabelGuidType() { + return jLabelGuidType; } } 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 5399dceab3..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 @@ -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 @@ -430,26 +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 (jTextField.getText().length() == 0 && sfc.getSpdHdrUrl() == null) { + if (jTextFieldUrl.getText().length() == 0 && sfc.getSpdHdrUrl() == null) { return; } - if (jTextField.getText().equals(sfc.getSpdHdrUrl())) { + 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) { @@ -513,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()); @@ -624,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; } @@ -665,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); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java index 33c78899d7..5c3260d54d 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java @@ -77,7 +77,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen private JPanel jContentPane = null; - private JTextField jTextFieldAdd = null; + private JTextField jTextFieldClass = null; private JComboBox jComboBoxSelect = null; @@ -133,7 +133,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen private ICheckBoxList iCheckBoxListModules = null; - private ICheckBoxList iCheckBoxList = null; + private ICheckBoxList iCheckBoxListArch = null; private JComboBox jComboBox = null; @@ -163,14 +163,14 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen @return javax.swing.JTextField **/ - private JTextField getJTextFieldAdd() { - if (jTextFieldAdd == null) { - jTextFieldAdd = new JTextField(); - jTextFieldAdd.setBounds(new java.awt.Rectangle(122,6,390,20)); - jTextFieldAdd.setPreferredSize(new java.awt.Dimension(260,20)); - jTextFieldAdd.setEnabled(true); + private JTextField getJTextFieldClass() { + if (jTextFieldClass == null) { + jTextFieldClass = new JTextField(); + jTextFieldClass.setBounds(new java.awt.Rectangle(122,6,390,20)); + jTextFieldClass.setPreferredSize(new java.awt.Dimension(260,20)); + jTextFieldClass.setEnabled(true); } - return jTextFieldAdd; + return jTextFieldClass; } /** @@ -512,7 +512,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen jContentPane.add(jLabelHdr, null); jContentPane.add(jStarLabel1, null); jContentPane.add(jStarLabel2, null); - jContentPane.add(getJTextFieldAdd(), null); + jContentPane.add(getJTextFieldClass(), null); jContentPane.add(getJComboBoxSelect(), null); jContentPane.add(getJScrollPane(), null); jContentPane.add(getJButtonAdd(), null); @@ -597,12 +597,12 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen //ToDo: check before add // LAH WAS String[] row = {null, null, null, jComboBox.getSelectedItem()+"", jTextField2RecInstVer.getText(), null, null}; String[] row = {null, null, null, null, null, null, null}; - row[cnClassName] = jTextFieldAdd.getText(); + row[cnClassName] = jTextFieldClass.getText(); row[cnHdrFile] = jTextFieldHdr.getText().replace('\\', '/'); row[cnHelpText] = jTextFieldHelp.getText(); row[cnRecInstName] = jComboBox.getSelectedItem()+""; row[cnRecInstVer] = jTextField2RecInstVer.getText(); - row[cnSupArch] = vectorToString(iCheckBoxList.getAllCheckedItemsString()); + row[cnSupArch] = vectorToString(iCheckBoxListArch.getAllCheckedItemsString()); if (row[cnSupArch].length() == 0) { row[cnSupArch] = null; } @@ -755,7 +755,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen public void componentResized(ComponentEvent arg0) { int intPreferredWidth = 500; - resizeComponentWidth(this.jTextFieldAdd, this.getWidth(), intPreferredWidth); + resizeComponentWidth(this.jTextFieldClass, this.getWidth(), intPreferredWidth); resizeComponentWidth(this.jTextFieldHelp, this.getWidth(), intPreferredWidth); resizeComponentWidth(this.jScrollPane, this.getWidth(), intPreferredWidth-10); @@ -849,7 +849,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen jScrollPane1Arch = new JScrollPane(); jScrollPane1Arch.setBounds(new java.awt.Rectangle(218,170,293,73)); jScrollPane1Arch.setPreferredSize(new java.awt.Dimension(320, 80)); - jScrollPane1Arch.setViewportView(getICheckBoxList()); + jScrollPane1Arch.setViewportView(getICheckBoxListArch()); } return jScrollPane1Arch; } @@ -858,10 +858,10 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen * * @return org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList */ - private ICheckBoxList getICheckBoxList() { - if (iCheckBoxList == null) { - iCheckBoxList = new ICheckBoxList(); - iCheckBoxList.setBounds(new java.awt.Rectangle(218,171,292,66)); + private ICheckBoxList getICheckBoxListArch() { + if (iCheckBoxListArch == null) { + iCheckBoxListArch = new ICheckBoxList(); + iCheckBoxListArch.setBounds(new java.awt.Rectangle(218,171,292,66)); Vector v = new Vector(); v.add("IA32"); v.add("X64"); @@ -869,9 +869,9 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen v.add("EBC"); v.add("ARM"); v.add("PPC"); - iCheckBoxList.setAllItems(v); + iCheckBoxListArch.setAllItems(v); } - return iCheckBoxList; + return iCheckBoxListArch; } /** @@ -887,11 +887,11 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen jComboBox.setLocation(new java.awt.Point(218,111)); jComboBox.addFocusListener(new java.awt.event.FocusAdapter() { public void focusGained(java.awt.event.FocusEvent e) { - if (jTextFieldAdd.getText().length() == 0) { + if (jTextFieldClass.getText().length() == 0) { return; } jComboBox.removeAllItems(); - getLibInstances(jTextFieldAdd.getText()); + getLibInstances(jTextFieldClass.getText()); Set libNames = libNameGuidMap.keySet(); Iterator si = libNames.iterator(); while(si.hasNext()) { diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdMsaFiles.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdMsaFiles.java index a7465835a4..9e25465ca1 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdMsaFiles.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdMsaFiles.java @@ -64,7 +64,7 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{ private JPanel jContentPane = null; - private JScrollPane jScrollPane1 = null; + private JScrollPane jScrollPaneMsa = null; private JButton jButtonAdd = null; @@ -105,13 +105,13 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{ @return javax.swing.JScrollPane **/ - private JScrollPane getJScrollPane1() { - if (jScrollPane1 == null) { - jScrollPane1 = new JScrollPane(); - jScrollPane1.setBounds(new java.awt.Rectangle(13,177,461,421)); - jScrollPane1.setViewportView(getJTable()); + private JScrollPane getJScrollPaneMsa() { + if (jScrollPaneMsa == null) { + jScrollPaneMsa = new JScrollPane(); + jScrollPaneMsa.setBounds(new java.awt.Rectangle(13,177,461,421)); + jScrollPaneMsa.setViewportView(getJTable()); } - return jScrollPane1; + return jScrollPaneMsa; } /** @@ -308,7 +308,7 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{ jContentPane.setLayout(null); jContentPane.add(jLabel, null); jContentPane.add(jStarLabel2, null); - jContentPane.add(getJScrollPane1(), null); + jContentPane.add(getJScrollPaneMsa(), null); jContentPane.add(getJButtonAdd(), null); jContentPane.add(getJButtonRemove(), null); jContentPane.add(getJButtonClearAll(), null); @@ -485,7 +485,7 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{ public void componentResized(ComponentEvent arg0) { int intPreferredWidth = 500; - resizeComponentWidth(this.jScrollPane1, this.getWidth(), intPreferredWidth); + resizeComponentWidth(this.jScrollPaneMsa, this.getWidth(), intPreferredWidth); resizeComponentWidth(this.jTextField, this.getWidth(), intPreferredWidth); relocateComponentX(this.jButtonBrowse, this.getWidth(), this.getPreferredSize().width, 25); } diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageDefinitions.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageDefinitions.java index 56d00ae041..3931381888 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageDefinitions.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageDefinitions.java @@ -31,9 +31,9 @@ public class SpdPackageDefinitions extends IInternalFrame { */ private static final long serialVersionUID = 1L; private JPanel jContentPane = null; - private JLabel jLabel = null; + private JLabel jLabelRdOnly = null; private JComboBox jComboBoxReadOnly = null; - private JLabel jLabel1 = null; + private JLabel jLabelRePkg = null; private JComboBox jComboBoxRePackage = null; private StarLabel starLabel = null; private StarLabel starLabel1 = null; @@ -91,21 +91,21 @@ public class SpdPackageDefinitions extends IInternalFrame { starLabel1.setVisible(true); starLabel = new StarLabel(); starLabel.setBounds(new java.awt.Rectangle(4,22,10,20)); - jLabel1 = new JLabel(); - jLabel1.setPreferredSize(new java.awt.Dimension(65,20)); - jLabel1.setLocation(new java.awt.Point(22,62)); - jLabel1.setSize(new java.awt.Dimension(65,20)); - jLabel1.setText("RePackage"); - jLabel = new JLabel(); - jLabel.setPreferredSize(new java.awt.Dimension(57,20)); - jLabel.setLocation(new java.awt.Point(22,22)); - jLabel.setSize(new java.awt.Dimension(57,20)); - jLabel.setText("Read Only"); + jLabelRePkg = new JLabel(); + jLabelRePkg.setPreferredSize(new java.awt.Dimension(65,20)); + jLabelRePkg.setLocation(new java.awt.Point(22,62)); + jLabelRePkg.setSize(new java.awt.Dimension(65,20)); + jLabelRePkg.setText("RePackage"); + jLabelRdOnly = new JLabel(); + jLabelRdOnly.setPreferredSize(new java.awt.Dimension(57,20)); + jLabelRdOnly.setLocation(new java.awt.Point(22,22)); + jLabelRdOnly.setSize(new java.awt.Dimension(57,20)); + jLabelRdOnly.setText("Read Only"); jContentPane = new JPanel(); jContentPane.setLayout(null); - jContentPane.add(jLabel, null); + jContentPane.add(jLabelRdOnly, null); jContentPane.add(getJComboBox(), null); - jContentPane.add(jLabel1, null); + jContentPane.add(jLabelRePkg, null); jContentPane.add(getJComboBox1(), null); jContentPane.add(starLabel, null); jContentPane.add(starLabel1, null); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageHeaders.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageHeaders.java index e490e28e2d..8b14758f01 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageHeaders.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageHeaders.java @@ -94,7 +94,7 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe private JScrollPane jScrollPane = null; - private JScrollPane jScrollPane1 = null; + private JScrollPane jScrollPanePkgHdr = null; private int selectedRow = -1; @@ -331,7 +331,7 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe jContentPane.add(getJTextField(), null); jContentPane.add(getJButtonBrowse(), null); - jContentPane.add(getJScrollPane1(), null); + jContentPane.add(getJScrollPanePkgHdr(), null); } return jContentPane; } @@ -502,13 +502,13 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe * * @return javax.swing.JScrollPane */ - private JScrollPane getJScrollPane1() { - if (jScrollPane1 == null) { - jScrollPane1 = new JScrollPane(); - jScrollPane1.setBounds(new java.awt.Rectangle(13,149,453,258)); - jScrollPane1.setViewportView(getJTable()); + private JScrollPane getJScrollPanePkgHdr() { + if (jScrollPanePkgHdr == null) { + jScrollPanePkgHdr = new JScrollPane(); + jScrollPanePkgHdr.setBounds(new java.awt.Rectangle(13,149,453,258)); + jScrollPanePkgHdr.setViewportView(getJTable()); } - return jScrollPane1; + return jScrollPanePkgHdr; } /** diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java index 4b9924c32a..c3a71e8d87 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java @@ -105,7 +105,7 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{ private JLabel jLabelVarVal = null; - private JTextField jTextField = null; + private JTextField jTextFieldHelp = null; private JLabel jLabelDefVal = null; @@ -129,27 +129,27 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{ private StarLabel starLabel = null; - private JCheckBox jCheckBox = null; + private JCheckBox jCheckBoxFeatureFlag = null; - private JCheckBox jCheckBox1 = null; + private JCheckBox jCheckBoxFixedAtBuild = null; - private JCheckBox jCheckBox2 = null; + private JCheckBox jCheckBoxPatchInMod = null; - private JCheckBox jCheckBox3 = null; + private JCheckBox jCheckBoxDyn = null; - private JCheckBox jCheckBox4 = null; + private JCheckBox jCheckBoxDynEx = null; - private JScrollPane jScrollPane1 = null; + private JScrollPane jScrollPaneArch = null; - private ICheckBoxList iCheckBoxList = null; + private ICheckBoxList iCheckBoxListArch = null; - private JScrollPane jScrollPane2 = null; + private JScrollPane jScrollPaneMod = null; - private ICheckBoxList iCheckBoxList1 = null; + private ICheckBoxList iCheckBoxListMod = null; - private JLabel jLabel = null; + private JLabel jLabelSupMod = null; - private JLabel jLabel1 = null; + private JLabel jLabelSupArch = null; /** This method initializes this @@ -338,14 +338,14 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{ private JPanel getJContentPane1() { if (jContentPane == null) { - jLabel1 = new JLabel(); - jLabel1.setBounds(new java.awt.Rectangle(241,192,89,16)); - jLabel1.setText("Supported Arch"); - jLabel1.setEnabled(true); - jLabel = new JLabel(); - jLabel.setBounds(new java.awt.Rectangle(15,193,103,16)); - jLabel.setText("Supported Module"); - jLabel.setEnabled(true); + jLabelSupArch = new JLabel(); + jLabelSupArch.setBounds(new java.awt.Rectangle(241,192,89,16)); + jLabelSupArch.setText("Supported Arch"); + jLabelSupArch.setEnabled(true); + jLabelSupMod = new JLabel(); + jLabelSupMod.setBounds(new java.awt.Rectangle(15,193,103,16)); + jLabelSupMod.setText("Supported Module"); + jLabelSupMod.setEnabled(true); starLabel = new StarLabel(); starLabel.setBounds(new java.awt.Rectangle(2,134,10,20)); jLabelDefVal = new JLabel(); @@ -404,7 +404,7 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{ jContentPane.add(jStarLabel, null); jContentPane.add(jStarLabel1, null); jContentPane.add(jStarLabel4, null); - jContentPane.add(getJTextField(), null); + jContentPane.add(getJTextFieldHelp(), null); jContentPane.add(jLabelDefVal, null); jContentPane.add(getJTextFieldDefaultValue(), null); jContentPane.add(getJButtonAdd(), null); @@ -412,15 +412,15 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{ jContentPane.add(getJButtonClearAll(), null); jContentPane.add(getJScrollPane(), null); jContentPane.add(starLabel, null); - jContentPane.add(getJCheckBox(), null); - jContentPane.add(getJCheckBox1(), null); - jContentPane.add(getJCheckBox2(), null); - jContentPane.add(getJCheckBox3(), null); - jContentPane.add(getJCheckBox4(), null); - jContentPane.add(getJScrollPane1(), null); - jContentPane.add(getJScrollPane2(), null); - jContentPane.add(jLabel, null); - jContentPane.add(jLabel1, null); + jContentPane.add(getJCheckBoxFeatureFlag(), null); + jContentPane.add(getJCheckBoxFixedAtBuild(), null); + jContentPane.add(getJCheckBoxPatchInMod(), null); + jContentPane.add(getJCheckBoxDyn(), null); + jContentPane.add(getJCheckBoxDynEx(), null); + jContentPane.add(getJScrollPaneArch(), null); + jContentPane.add(getJScrollPaneMod(), null); + jContentPane.add(jLabelSupMod, null); + jContentPane.add(jLabelSupArch, null); } return jContentPane; } @@ -454,30 +454,30 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{ if (arg0.getSource() == jButtonAdd) { //ToDo: check before add - boolean[] b = {jCheckBox.isSelected(), jCheckBox1.isSelected(), jCheckBox2.isSelected(), jCheckBox3.isSelected(), jCheckBox4.isSelected()}; + boolean[] b = {jCheckBoxFeatureFlag.isSelected(), jCheckBoxFixedAtBuild.isSelected(), jCheckBoxPatchInMod.isSelected(), jCheckBoxDyn.isSelected(), jCheckBoxDynEx.isSelected()}; if (!checkValidUsage(b)) { return; } - String archList = vectorToString(iCheckBoxList.getAllCheckedItemsString()); + String archList = vectorToString(iCheckBoxListArch.getAllCheckedItemsString()); if (archList.length() == 0) { archList = null; } - String modTypeList = vectorToString(iCheckBoxList1.getAllCheckedItemsString()); + String modTypeList = vectorToString(iCheckBoxListMod.getAllCheckedItemsString()); if (modTypeList.length() == 0) { modTypeList = null; } Object[] row = {jTextFieldC_Name.getText(), jTextFieldToken.getText(), jTextFieldTsGuid.getText(), jComboBoxDataType.getSelectedItem(), - jTextFieldDefaultValue.getText(), jTextField.getText(), - jCheckBox.isSelected(), jCheckBox1.isSelected(), - jCheckBox2.isSelected(), jCheckBox3.isSelected(), jCheckBox4.isSelected(), + jTextFieldDefaultValue.getText(), jTextFieldHelp.getText(), + jCheckBoxFeatureFlag.isSelected(), jCheckBoxFixedAtBuild.isSelected(), + jCheckBoxPatchInMod.isSelected(), jCheckBoxDyn.isSelected(), jCheckBoxDynEx.isSelected(), archList, modTypeList}; if (!dataValidation(row)) { return; } model.addRow(row); jTable.changeSelection(model.getRowCount()-1, 0, false, false); - String usage = getValidUsage(jCheckBox.isSelected(), jCheckBox1.isSelected(), jCheckBox2.isSelected(), jCheckBox3.isSelected(), jCheckBox4.isSelected()); + String usage = getValidUsage(jCheckBoxFeatureFlag.isSelected(), jCheckBoxFixedAtBuild.isSelected(), jCheckBoxPatchInMod.isSelected(), jCheckBoxDyn.isSelected(), jCheckBoxDynEx.isSelected()); if (usage.length() == 0) { usage = null; } @@ -531,13 +531,13 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{ * * @return javax.swing.JTextField */ - private JTextField getJTextField() { - if (jTextField == null) { - jTextField = new JTextField(); - jTextField.setBounds(new java.awt.Rectangle(156,108,317,20)); - jTextField.setPreferredSize(new java.awt.Dimension(315,20)); + private JTextField getJTextFieldHelp() { + if (jTextFieldHelp == null) { + jTextFieldHelp = new JTextField(); + jTextFieldHelp.setBounds(new java.awt.Rectangle(156,108,317,20)); + jTextFieldHelp.setPreferredSize(new java.awt.Dimension(315,20)); } - return jTextField; + return jTextFieldHelp; } /** @@ -610,7 +610,7 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{ resizeComponentWidth(this.jTextFieldToken, this.getWidth(), intPreferredWidth); resizeComponentWidth(this.jTextFieldTsGuid, this.getWidth(), intPreferredWidth); resizeComponentWidth(this.jTextFieldDefaultValue, this.getWidth(), intPreferredWidth); - resizeComponentWidth(this.jTextField, this.getWidth(), intPreferredWidth); + resizeComponentWidth(this.jTextFieldHelp, this.getWidth(), intPreferredWidth); resizeComponentWidth(this.jScrollPane, this.getWidth(), intPreferredWidth); resizeComponentWidth(this.jTextFieldDefaultValue, this.getWidth(), intPreferredWidth); @@ -805,14 +805,14 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{ * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox() { - if (jCheckBox == null) { - jCheckBox = new JCheckBox(); - jCheckBox.setBounds(new java.awt.Rectangle(156,161,100,21)); - jCheckBox.setText("Feature Flag"); - jCheckBox.setPreferredSize(new java.awt.Dimension(21,20)); + private JCheckBox getJCheckBoxFeatureFlag() { + if (jCheckBoxFeatureFlag == null) { + jCheckBoxFeatureFlag = new JCheckBox(); + jCheckBoxFeatureFlag.setBounds(new java.awt.Rectangle(156,161,100,21)); + jCheckBoxFeatureFlag.setText("Feature Flag"); + jCheckBoxFeatureFlag.setPreferredSize(new java.awt.Dimension(21,20)); } - return jCheckBox; + return jCheckBoxFeatureFlag; } /** @@ -820,14 +820,14 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{ * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox1() { - if (jCheckBox1 == null) { - jCheckBox1 = new JCheckBox(); - jCheckBox1.setBounds(new java.awt.Rectangle(312,133,108,20)); - jCheckBox1.setText("Fixed at Build"); - jCheckBox1.setPreferredSize(new java.awt.Dimension(21,20)); + private JCheckBox getJCheckBoxFixedAtBuild() { + if (jCheckBoxFixedAtBuild == null) { + jCheckBoxFixedAtBuild = new JCheckBox(); + jCheckBoxFixedAtBuild.setBounds(new java.awt.Rectangle(312,133,108,20)); + jCheckBoxFixedAtBuild.setText("Fixed at Build"); + jCheckBoxFixedAtBuild.setPreferredSize(new java.awt.Dimension(21,20)); } - return jCheckBox1; + return jCheckBoxFixedAtBuild; } /** @@ -835,14 +835,14 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{ * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox2() { - if (jCheckBox2 == null) { - jCheckBox2 = new JCheckBox(); - jCheckBox2.setBounds(new java.awt.Rectangle(156,133,154,20)); - jCheckBox2.setText("Patchable in Module"); - jCheckBox2.setPreferredSize(new java.awt.Dimension(21,20)); + private JCheckBox getJCheckBoxPatchInMod() { + if (jCheckBoxPatchInMod == null) { + jCheckBoxPatchInMod = new JCheckBox(); + jCheckBoxPatchInMod.setBounds(new java.awt.Rectangle(156,133,154,20)); + jCheckBoxPatchInMod.setText("Patchable in Module"); + jCheckBoxPatchInMod.setPreferredSize(new java.awt.Dimension(21,20)); } - return jCheckBox2; + return jCheckBoxPatchInMod; } /** @@ -850,14 +850,14 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{ * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox3() { - if (jCheckBox3 == null) { - jCheckBox3 = new JCheckBox(); - jCheckBox3.setBounds(new java.awt.Rectangle(278,161,80,20)); - jCheckBox3.setText("Dynamic"); - jCheckBox3.setPreferredSize(new java.awt.Dimension(21,20)); + private JCheckBox getJCheckBoxDyn() { + if (jCheckBoxDyn == null) { + jCheckBoxDyn = new JCheckBox(); + jCheckBoxDyn.setBounds(new java.awt.Rectangle(278,161,80,20)); + jCheckBoxDyn.setText("Dynamic"); + jCheckBoxDyn.setPreferredSize(new java.awt.Dimension(21,20)); } - return jCheckBox3; + return jCheckBoxDyn; } /** @@ -865,14 +865,14 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{ * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox4() { - if (jCheckBox4 == null) { - jCheckBox4 = new JCheckBox(); - jCheckBox4.setBounds(new java.awt.Rectangle(371,161,99,20)); - jCheckBox4.setText("DynamicEx"); - jCheckBox4.setPreferredSize(new java.awt.Dimension(21,20)); + private JCheckBox getJCheckBoxDynEx() { + if (jCheckBoxDynEx == null) { + jCheckBoxDynEx = new JCheckBox(); + jCheckBoxDynEx.setBounds(new java.awt.Rectangle(371,161,99,20)); + jCheckBoxDynEx.setText("DynamicEx"); + jCheckBoxDynEx.setPreferredSize(new java.awt.Dimension(21,20)); } - return jCheckBox4; + return jCheckBoxDynEx; } private String getValidUsage(boolean ff, boolean fab, boolean pim, boolean d, boolean de) { @@ -930,14 +930,14 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{ * * @return javax.swing.JScrollPane */ - private JScrollPane getJScrollPane1() { - if (jScrollPane1 == null) { - jScrollPane1 = new JScrollPane(); - jScrollPane1.setBounds(new java.awt.Rectangle(242,213,188,54)); - jScrollPane1.setViewportView(getICheckBoxList()); - jScrollPane1.setPreferredSize(new Dimension(188, 74)); + private JScrollPane getJScrollPaneArch() { + if (jScrollPaneArch == null) { + jScrollPaneArch = new JScrollPane(); + jScrollPaneArch.setBounds(new java.awt.Rectangle(242,213,188,54)); + jScrollPaneArch.setViewportView(getICheckBoxListArch()); + jScrollPaneArch.setPreferredSize(new Dimension(188, 74)); } - return jScrollPane1; + return jScrollPaneArch; } /** @@ -945,10 +945,10 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{ * * @return org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList */ - private ICheckBoxList getICheckBoxList() { - if (iCheckBoxList == null) { - iCheckBoxList = new ICheckBoxList(); - iCheckBoxList.setBounds(new Rectangle(197, 142, 188, 74)); + private ICheckBoxList getICheckBoxListArch() { + if (iCheckBoxListArch == null) { + iCheckBoxListArch = new ICheckBoxList(); + iCheckBoxListArch.setBounds(new Rectangle(197, 142, 188, 74)); Vector v = new Vector(); v.add("IA32"); v.add("X64"); @@ -956,9 +956,9 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{ v.add("EBC"); v.add("ARM"); v.add("PPC"); - iCheckBoxList.setAllItems(v); + iCheckBoxListArch.setAllItems(v); } - return iCheckBoxList; + return iCheckBoxListArch; } /** @@ -966,14 +966,14 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{ * * @return javax.swing.JScrollPane */ - private JScrollPane getJScrollPane2() { - if (jScrollPane2 == null) { - jScrollPane2 = new JScrollPane(); - jScrollPane2.setBounds(new java.awt.Rectangle(15,213,199,55)); - jScrollPane2.setViewportView(getICheckBoxList1()); - jScrollPane2.setPreferredSize(new Dimension(170, 74)); + private JScrollPane getJScrollPaneMod() { + if (jScrollPaneMod == null) { + jScrollPaneMod = new JScrollPane(); + jScrollPaneMod.setBounds(new java.awt.Rectangle(15,213,199,55)); + jScrollPaneMod.setViewportView(getICheckBoxListMod()); + jScrollPaneMod.setPreferredSize(new Dimension(170, 74)); } - return jScrollPane2; + return jScrollPaneMod; } /** @@ -981,10 +981,10 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{ * * @return org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList */ - private ICheckBoxList getICheckBoxList1() { - if (iCheckBoxList1 == null) { - iCheckBoxList1 = new ICheckBoxList(); - iCheckBoxList1.setBounds(new Rectangle(14, 142, 170, 74)); + private ICheckBoxList getICheckBoxListMod() { + if (iCheckBoxListMod == null) { + iCheckBoxListMod = new ICheckBoxList(); + iCheckBoxListMod.setBounds(new Rectangle(14, 142, 170, 74)); Vector v = new Vector(); v.add("BASE"); v.add("SEC"); @@ -998,9 +998,9 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{ v.add("UEFI_DRIVER"); v.add("UEFI_APPLICATION"); v.add("USER_DEFINED"); - iCheckBoxList1.setAllItems(v); + iCheckBoxListMod.setAllItems(v); } - return iCheckBoxList1; + return iCheckBoxListMod; } protected String vectorToString(Vector v) { diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java index f273d8db66..5e24dcd17d 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java @@ -62,23 +62,22 @@ public class FpdBuildOptions extends IInternalFrame { private static final long serialVersionUID = 1L; static JFrame frame; private JPanel jContentPane = null; - private JPanel jPanel = null; - private JPanel jPanel1 = null; - private JPanel jPanel2 = null; - private JPanel jPanel3 = null; + private JPanel jPanelContentSouth = null; + private JPanel jPanelContentNorth = null; + private JPanel jPanelContentWest = null; + private JPanel jPanelContentEast = null; private JTabbedPane jTabbedPane = null; - private JPanel jPanel8 = null; - private JPanel jPanel9 = null; - private JPanel jPanel10 = null; - private JPanel jPanel11 = null; - private JTextField jTextField2 = null; - private JLabel jLabel3 = null; - private JTextField jTextField3 = null; - private JButton jButton4 = null; - private JButton jButton5 = null; - private JTextField jTextField4 = null; - private JScrollPane jScrollPane2 = null; - private JTable jTable2 = null; + private JPanel jPanelUserDef = null; + private JPanel jPanelUserDefNorth = null; + private JPanel jPanelUserDefCenter = null; + private JTextField jTextFieldAntTaskFile = null; + private JLabel jLabelAntTaskId = null; + private JTextField jTextFieldAntTaskId = null; + private JButton jButtonAntTaskAdd = null; + private JButton jButtonAntTaskDel = null; + private JTextField jTextFieldAntCmdOpts = null; + private JScrollPane jScrollPaneAntTasks = null; + private JTable jTableAntTasks = null; private DefaultTableModel ffsTableModel = null; private DefaultTableModel sectionsTableModel = null; private DefaultTableModel sectionTableModel = null; @@ -86,80 +85,79 @@ public class FpdBuildOptions extends IInternalFrame { private DefaultTableModel antTaskTableModel = null; private DefaultTableModel ffsAttributesTableModel = null; private DefaultTableModel optionsTableModel = null; - private JPanel jPanel13 = null; - private JPanel jPanel18 = null; - private JPanel jPanel15 = null; - private JPanel jPanel16 = null; - private JPanel jPanel17 = null; - private JLabel jLabel7 = null; - private JTextField jTextField6 = null; - private JButton jButton8 = null; - private JButton jButton9 = null; - private JScrollPane jScrollPane5 = null; - private JTable jTable4 = null; - private JPanel jPanel19 = null; - private JPanel jPanel20 = null; - private JLabel jLabel9 = null; - private JTextField jTextField7 = null; - private JLabel jLabel10 = null; - private JComboBox jComboBox2 = null; - private JLabel jLabel11 = null; - private JLabel jLabel12 = null; - private JTextField jTextField8 = null; - private JScrollPane jScrollPane6 = null; - private JTable jTable5 = null; - private JButton jButton10 = null; - private JButton jButton11 = null; - private JButton jButton17 = null; - private JButton jButton18 = null; + private JPanel jPanelFfsTab = null; + private JPanel jPanelFfsTabCenter = null; + private JPanel jPanelFfsTabCenterN = null; + private JPanel jPanelFfsTabCenterS = null; + private JPanel jPanelFfsTabCenterE = null; + private JLabel jLabelFfsKey = null; + private JTextField jTextFieldFfsKey = null; + private JButton jButtonFfsAdd = null; + private JButton jButtonFfsDel = null; + private JScrollPane jScrollPaneFfsAttribs = null; + private JTable jTableFfsAttribs = null; + private JPanel jPanelFfsTabCenterC = null; + private JPanel jPanelOptionsTab = null; + private JLabel jLabelOptionContents = null; + private JTextField jTextFieldOptionContents = null; + private JLabel jLabelToolChainFamily = null; + private JLabel jLabelSupArch = null; + private JLabel jLabelToolCmd = null; + private JTextField jTextFieldToolCmd = null; + private JScrollPane jScrollPaneOptions = null; + private JTable jTableOptions = null; + private JButton jButtonOptionsAdd = null; + private JButton jButtonOptionsDel = null; + private JButton jButtonFfsAttribNew = null; + private JButton jButtonFfsAttribRemove = null; private FpdFileContents ffc = null; private OpeningPlatformType docConsole = null; - private JCheckBox jCheckBox9 = null; - private JCheckBox jCheckBox10 = null; - private JCheckBox jCheckBox11 = null; - private JCheckBox jCheckBox12 = null; - private JCheckBox jCheckBox13 = null; - private JCheckBox jCheckBox14 = null; - private JLabel jLabel14 = null; - private JTextField jTextField12 = null; - private JTextField jTextField13 = null; - private JLabel jLabel15 = null; + private JCheckBox jCheckBoxIA32 = null; + private JCheckBox jCheckBoxIpf = null; + private JCheckBox jCheckBoxX64 = null; + private JCheckBox jCheckBoxEBC = null; + private JCheckBox jCheckBoxARM = null; + private JCheckBox jCheckBoxPPC = null; + private JLabel jLabelBuildTargets = null; + private JTextField jTextFieldBuildTargets = null; + private JTextField jTextFieldTagName = null; + private JLabel jLabelTagName = null; private int selectedRow = -1; - private JLabel jLabel = null; - private JLabel jLabel1 = null; - private JScrollPane jScrollPane = null; - private JTable jTable = null; - private JLabel jLabel2 = null; - private JScrollPane jScrollPane1 = null; - private JTable jTable1 = null; - private JLabel jLabel4 = null; - private JScrollPane jScrollPane3 = null; - private JTable jTable3 = null; - private JLabel jLabel5 = null; - private JTextField jTextField = null; - private JPanel jPanel4 = null; - private JLabel jLabel6 = null; - private JButton jButton = null; - private JButton jButton1 = null; - private JButton jButton2 = null; - private JButton jButton3 = null; - private JLabel jLabel8 = null; - private JButton jButton6 = null; - private JButton jButton7 = null; - private JScrollPane jScrollPane4 = null; - private JTable jTable6 = null; - private JButton jButton12 = null; - private JTextField jTextField1 = null; + private JLabel jLabelAntTaskFile = null; + private JLabel jLabelAntCmdOpts = null; + private JScrollPane jScrollPaneFfs = null; + private JTable jTableFfs = null; + private JLabel jLabelFfsSection = null; + private JScrollPane jScrollPaneFfsSection = null; + private JTable jTableFfsSection = null; + private JLabel jLabelFfsSubSections = null; + private JScrollPane jScrollPaneFfsSubSection = null; + private JTable jTableFfsSubSection = null; + private JLabel jLabelEncapType = null; + private JTextField jTextFieldEncapType = null; + private JPanel jPanelFfsAttribButtonGroup = null; + private JLabel jLabelFfsAttribs = null; + private JButton jButtonFfsSectionNew = null; + private JButton jButtonFfsSectionRemove = null; + private JButton jButtonFfsSubSectionNew = null; + private JButton jButtonFfsSubSectionRemove = null; + private JLabel jLabelFfsSections = null; + private JButton jButtonFfsSectionsNew = null; + private JButton jButtonFfsSectionsRemove = null; + private JScrollPane jScrollPaneFfsSections = null; + private JTable jTableFfsSections = null; + private JButton jButtonAntTaskFileBrowse = null; + private JTextField jTextFieldToolChainFamily = null; /** * This method initializes jPanel * * @return javax.swing.JPanel */ - private JPanel getJPanel() { - if (jPanel == null) { - jPanel = new JPanel(); + private JPanel getJPanelContentSouth() { + if (jPanelContentSouth == null) { + jPanelContentSouth = new JPanel(); } - return jPanel; + return jPanelContentSouth; } /** @@ -167,11 +165,11 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel1() { - if (jPanel1 == null) { - jPanel1 = new JPanel(); + private JPanel getJPanelContentNorth() { + if (jPanelContentNorth == null) { + jPanelContentNorth = new JPanel(); } - return jPanel1; + return jPanelContentNorth; } /** @@ -179,11 +177,11 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel2() { - if (jPanel2 == null) { - jPanel2 = new JPanel(); + private JPanel getJPanelContentWest() { + if (jPanelContentWest == null) { + jPanelContentWest = new JPanel(); } - return jPanel2; + return jPanelContentWest; } /** @@ -191,11 +189,11 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel3() { - if (jPanel3 == null) { - jPanel3 = new JPanel(); + private JPanel getJPanelContentEast() { + if (jPanelContentEast == null) { + jPanelContentEast = new JPanel(); } - return jPanel3; + return jPanelContentEast; } /** @@ -206,9 +204,9 @@ public class FpdBuildOptions extends IInternalFrame { private JTabbedPane getJTabbedPane() { if (jTabbedPane == null) { jTabbedPane = new JTabbedPane(); - jTabbedPane.addTab("FFS", null, getJPanel13(), null); - jTabbedPane.addTab("Options", null, getJPanel20(), null); - jTabbedPane.addTab("User Defined ANT Tasks", null, getJPanel8(), null); + jTabbedPane.addTab("FFS", null, getJPanelFfsTab(), null); + jTabbedPane.addTab("Options", null, getJPanelOptionsTab(), null); + jTabbedPane.addTab("User Defined ANT Tasks", null, getJPanelUserDef(), null); } return jTabbedPane; } @@ -219,16 +217,15 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel8() { - if (jPanel8 == null) { - jPanel8 = new JPanel(); - jPanel8.setLayout(new BorderLayout()); - jPanel8.add(getJPanel9(), java.awt.BorderLayout.NORTH); - jPanel8.add(getJPanel10(), java.awt.BorderLayout.SOUTH); - jPanel8.add(getJPanel11(), java.awt.BorderLayout.CENTER); + private JPanel getJPanelUserDef() { + if (jPanelUserDef == null) { + jPanelUserDef = new JPanel(); + jPanelUserDef.setLayout(new BorderLayout()); + jPanelUserDef.add(getJPanelUserDefNorth(), java.awt.BorderLayout.NORTH); + jPanelUserDef.add(getJPanelUserDefCenter(), java.awt.BorderLayout.CENTER); } - return jPanel8; + return jPanelUserDef; } /** @@ -236,36 +233,24 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel9() { - if (jPanel9 == null) { - jLabel = new JLabel(); - jLabel.setText("ANT Task File"); - jLabel.setPreferredSize(new java.awt.Dimension(80,20)); + private JPanel getJPanelUserDefNorth() { + if (jPanelUserDefNorth == null) { + jLabelAntTaskFile = new JLabel(); + jLabelAntTaskFile.setText("ANT Task File"); + jLabelAntTaskFile.setPreferredSize(new java.awt.Dimension(80,20)); FlowLayout flowLayout8 = new FlowLayout(); flowLayout8.setAlignment(java.awt.FlowLayout.LEFT); - jLabel3 = new JLabel(); - jLabel3.setText("ID"); - jPanel9 = new JPanel(); - jPanel9.setLayout(flowLayout8); - jPanel9.add(jLabel, null); - jPanel9.add(getJTextField2(), null); - jPanel9.add(getJButton12(), null); - jPanel9.add(jLabel3, null); - jPanel9.add(getJTextField3(), null); + jLabelAntTaskId = new JLabel(); + jLabelAntTaskId.setText("ID"); + jPanelUserDefNorth = new JPanel(); + jPanelUserDefNorth.setLayout(flowLayout8); + jPanelUserDefNorth.add(jLabelAntTaskFile, null); + jPanelUserDefNorth.add(getJTextFieldAntTaskFile(), null); + jPanelUserDefNorth.add(getJButtonAntTaskFileBrowse(), null); + jPanelUserDefNorth.add(jLabelAntTaskId, null); + jPanelUserDefNorth.add(getJTextFieldAntTaskId(), null); } - return jPanel9; - } - - /** - * This method initializes jPanel10 - * - * @return javax.swing.JPanel - */ - private JPanel getJPanel10() { - if (jPanel10 == null) { - jPanel10 = new JPanel(); - } - return jPanel10; + return jPanelUserDefNorth; } /** @@ -273,23 +258,23 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel11() { - if (jPanel11 == null) { - jLabel1 = new JLabel(); - jLabel1.setText("ANT Command Options"); - jLabel1.setPreferredSize(new java.awt.Dimension(131,20)); + private JPanel getJPanelUserDefCenter() { + if (jPanelUserDefCenter == null) { + jLabelAntCmdOpts = new JLabel(); + jLabelAntCmdOpts.setText("ANT Command Options"); + jLabelAntCmdOpts.setPreferredSize(new java.awt.Dimension(131,20)); FlowLayout flowLayout3 = new FlowLayout(); flowLayout3.setHgap(5); flowLayout3.setAlignment(java.awt.FlowLayout.LEFT); - jPanel11 = new JPanel(); - jPanel11.setLayout(flowLayout3); - jPanel11.add(jLabel1, null); - jPanel11.add(getJTextField4(), null); - jPanel11.add(getJButton4(), null); - jPanel11.add(getJButton5(), null); - jPanel11.add(getJScrollPane2(), null); + jPanelUserDefCenter = new JPanel(); + jPanelUserDefCenter.setLayout(flowLayout3); + jPanelUserDefCenter.add(jLabelAntCmdOpts, null); + jPanelUserDefCenter.add(getJTextField4(), null); + jPanelUserDefCenter.add(getJButtonAntTaskAdd(), null); + jPanelUserDefCenter.add(getJButtonAntTaskDel(), null); + jPanelUserDefCenter.add(getJScrollPaneAntTasks(), null); } - return jPanel11; + return jPanelUserDefCenter; } /** @@ -297,12 +282,12 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField2() { - if (jTextField2 == null) { - jTextField2 = new JTextField(); - jTextField2.setPreferredSize(new java.awt.Dimension(200,20)); + private JTextField getJTextFieldAntTaskFile() { + if (jTextFieldAntTaskFile == null) { + jTextFieldAntTaskFile = new JTextField(); + jTextFieldAntTaskFile.setPreferredSize(new java.awt.Dimension(200,20)); } - return jTextField2; + return jTextFieldAntTaskFile; } /** @@ -310,12 +295,12 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField3() { - if (jTextField3 == null) { - jTextField3 = new JTextField(); - jTextField3.setPreferredSize(new java.awt.Dimension(100,20)); + private JTextField getJTextFieldAntTaskId() { + if (jTextFieldAntTaskId == null) { + jTextFieldAntTaskId = new JTextField(); + jTextFieldAntTaskId.setPreferredSize(new java.awt.Dimension(100,20)); } - return jTextField3; + return jTextFieldAntTaskId; } /** @@ -323,27 +308,27 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton4() { - if (jButton4 == null) { - jButton4 = new JButton(); - jButton4.setPreferredSize(new java.awt.Dimension(90,20)); - jButton4.setText("Add"); - jButton4.addActionListener(new ActionListener() { + private JButton getJButtonAntTaskAdd() { + if (jButtonAntTaskAdd == null) { + jButtonAntTaskAdd = new JButton(); + jButtonAntTaskAdd.setPreferredSize(new java.awt.Dimension(90,20)); + jButtonAntTaskAdd.setText("Add"); + jButtonAntTaskAdd.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - if (!DataValidation.isInt(jTextField3.getText()) || jTextField3.getText().length() != 8) { + if (!DataValidation.isInt(jTextFieldAntTaskId.getText()) || jTextFieldAntTaskId.getText().length() != 8) { JOptionPane.showMessageDialog(frame, "ID must be an 8-digit integer."); return; } - Object[] o = {jTextField3.getText(), null, null}; - o[1] = jTextField2.getText(); - o[2] = jTextField4.getText(); + Object[] o = {jTextFieldAntTaskId.getText(), null, null}; + o[1] = jTextFieldAntTaskFile.getText(); + o[2] = jTextFieldAntCmdOpts.getText(); ffc.genBuildOptionsUserDefAntTask(o[0]+"", o[1]+"", o[2]+""); antTaskTableModel.addRow(o); docConsole.setSaved(false); } }); } - return jButton4; + return jButtonAntTaskAdd; } /** @@ -351,12 +336,12 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton5() { - if (jButton5 == null) { - jButton5 = new JButton(); - jButton5.setPreferredSize(new java.awt.Dimension(90,20)); - jButton5.setText("Delete"); - jButton5.addActionListener(new ActionListener() { + private JButton getJButtonAntTaskDel() { + if (jButtonAntTaskDel == null) { + jButtonAntTaskDel = new JButton(); + jButtonAntTaskDel.setPreferredSize(new java.awt.Dimension(90,20)); + jButtonAntTaskDel.setText("Delete"); + jButtonAntTaskDel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if (selectedRow >= 0) { docConsole.setSaved(false); @@ -366,7 +351,7 @@ public class FpdBuildOptions extends IInternalFrame { } }); } - return jButton5; + return jButtonAntTaskDel; } /** @@ -375,12 +360,12 @@ public class FpdBuildOptions extends IInternalFrame { * @return javax.swing.JTextField */ private JTextField getJTextField4() { - if (jTextField4 == null) { - jTextField4 = new JTextField(); - jTextField4.setPreferredSize(new java.awt.Dimension(270,20)); - jTextField4.setEnabled(true); + if (jTextFieldAntCmdOpts == null) { + jTextFieldAntCmdOpts = new JTextField(); + jTextFieldAntCmdOpts.setPreferredSize(new java.awt.Dimension(270,20)); + jTextFieldAntCmdOpts.setEnabled(true); } - return jTextField4; + return jTextFieldAntCmdOpts; } /** @@ -388,13 +373,13 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JScrollPane */ - private JScrollPane getJScrollPane2() { - if (jScrollPane2 == null) { - jScrollPane2 = new JScrollPane(); - jScrollPane2.setPreferredSize(new java.awt.Dimension(600,100)); - jScrollPane2.setViewportView(getJTable2()); + private JScrollPane getJScrollPaneAntTasks() { + if (jScrollPaneAntTasks == null) { + jScrollPaneAntTasks = new JScrollPane(); + jScrollPaneAntTasks.setPreferredSize(new java.awt.Dimension(600,100)); + jScrollPaneAntTasks.setViewportView(getJTableAntTasks()); } - return jScrollPane2; + return jScrollPaneAntTasks; } /** @@ -402,17 +387,17 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JTable */ - private JTable getJTable2() { - if (jTable2 == null) { + private JTable getJTableAntTasks() { + if (jTableAntTasks == null) { antTaskTableModel = new DefaultTableModel(); - jTable2 = new JTable(antTaskTableModel); - jTable2.setRowHeight(20); + jTableAntTasks = new JTable(antTaskTableModel); + jTableAntTasks.setRowHeight(20); antTaskTableModel.addColumn("ID"); antTaskTableModel.addColumn("Filename"); antTaskTableModel.addColumn("ANT Command Options"); - jTable2.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - jTable2.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ + jTableAntTasks.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + jTableAntTasks.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ public void valueChanged(ListSelectionEvent e) { selectedRow = -1; if (e.getValueIsAdjusting()){ @@ -428,7 +413,7 @@ public class FpdBuildOptions extends IInternalFrame { } }); - jTable2.getModel().addTableModelListener(new TableModelListener() { + jTableAntTasks.getModel().addTableModelListener(new TableModelListener() { public void tableChanged(TableModelEvent arg0) { // TODO Auto-generated method stub int row = arg0.getFirstRow(); @@ -456,7 +441,7 @@ public class FpdBuildOptions extends IInternalFrame { } }); } - return jTable2; + return jTableAntTasks; } /** @@ -464,14 +449,14 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel13() { - if (jPanel13 == null) { - jPanel13 = new JPanel(); - jPanel13.setLayout(new BorderLayout()); - jPanel13.add(getJPanel18(), java.awt.BorderLayout.CENTER); - jPanel13.add(getJScrollPane(), java.awt.BorderLayout.WEST); + private JPanel getJPanelFfsTab() { + if (jPanelFfsTab == null) { + jPanelFfsTab = new JPanel(); + jPanelFfsTab.setLayout(new BorderLayout()); + jPanelFfsTab.add(getJPanelFfsTabCenter(), java.awt.BorderLayout.CENTER); + jPanelFfsTab.add(getJScrollPaneFfs(), java.awt.BorderLayout.WEST); } - return jPanel13; + return jPanelFfsTab; } /** @@ -479,16 +464,16 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel18() { - if (jPanel18 == null) { - jPanel18 = new JPanel(); - jPanel18.setLayout(new BorderLayout()); - jPanel18.add(getJPanel15(), java.awt.BorderLayout.NORTH); - jPanel18.add(getJPanel16(), java.awt.BorderLayout.SOUTH); - jPanel18.add(getJPanel17(), java.awt.BorderLayout.EAST); - jPanel18.add(getJPanel19(), java.awt.BorderLayout.CENTER); + private JPanel getJPanelFfsTabCenter() { + if (jPanelFfsTabCenter == null) { + jPanelFfsTabCenter = new JPanel(); + jPanelFfsTabCenter.setLayout(new BorderLayout()); + jPanelFfsTabCenter.add(getJPanelFfsTabCenterN(), java.awt.BorderLayout.NORTH); + jPanelFfsTabCenter.add(getJPanelFfsTabCenterS(), java.awt.BorderLayout.SOUTH); + jPanelFfsTabCenter.add(getJPanelFfsTabCenterE(), java.awt.BorderLayout.EAST); + jPanelFfsTabCenter.add(getJPanelFfsTabCenterC(), java.awt.BorderLayout.CENTER); } - return jPanel18; + return jPanelFfsTabCenter; } /** @@ -496,24 +481,24 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel15() { - if (jPanel15 == null) { - jLabel5 = new JLabel(); - jLabel5.setText("Encapsulation Type"); + private JPanel getJPanelFfsTabCenterN() { + if (jPanelFfsTabCenterN == null) { + jLabelEncapType = new JLabel(); + jLabelEncapType.setText("Encapsulation Type"); FlowLayout flowLayout5 = new FlowLayout(); flowLayout5.setAlignment(java.awt.FlowLayout.RIGHT); - jLabel7 = new JLabel(); - jLabel7.setText("FFS Key"); - jPanel15 = new JPanel(); - jPanel15.setLayout(flowLayout5); - jPanel15.add(jLabel7, null); - jPanel15.add(getJTextField6(), null); - jPanel15.add(jLabel5, null); - jPanel15.add(getJTextField(), null); - jPanel15.add(getJButton8(), null); - jPanel15.add(getJButton9(), null); + jLabelFfsKey = new JLabel(); + jLabelFfsKey.setText("FFS Key"); + jPanelFfsTabCenterN = new JPanel(); + jPanelFfsTabCenterN.setLayout(flowLayout5); + jPanelFfsTabCenterN.add(jLabelFfsKey, null); + jPanelFfsTabCenterN.add(getJTextFieldFfsKey(), null); + jPanelFfsTabCenterN.add(jLabelEncapType, null); + jPanelFfsTabCenterN.add(getJTextFieldEncapType(), null); + jPanelFfsTabCenterN.add(getJButtonFfsAdd(), null); + jPanelFfsTabCenterN.add(getJButtonFfsDel(), null); } - return jPanel15; + return jPanelFfsTabCenterN; } /** @@ -521,22 +506,22 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel16() { - if (jPanel16 == null) { - jLabel6 = new JLabel(); - jLabel6.setText("Attributes"); + private JPanel getJPanelFfsTabCenterS() { + if (jPanelFfsTabCenterS == null) { + jLabelFfsAttribs = new JLabel(); + jLabelFfsAttribs.setText("Attributes"); FlowLayout flowLayout6 = new FlowLayout(); flowLayout6.setHgap(5); flowLayout6.setVgap(20); flowLayout6.setAlignment(java.awt.FlowLayout.CENTER); - jPanel16 = new JPanel(); - jPanel16.setPreferredSize(new java.awt.Dimension(491,130)); - jPanel16.setLayout(flowLayout6); - jPanel16.add(jLabel6, null); - jPanel16.add(getJScrollPane5(), null); - jPanel16.add(getJPanel4(), null); + jPanelFfsTabCenterS = new JPanel(); + jPanelFfsTabCenterS.setPreferredSize(new java.awt.Dimension(491,130)); + jPanelFfsTabCenterS.setLayout(flowLayout6); + jPanelFfsTabCenterS.add(jLabelFfsAttribs, null); + jPanelFfsTabCenterS.add(getJScrollPaneFfsAttribs(), null); + jPanelFfsTabCenterS.add(getJPanelFfsAttribButtonGroup(), null); } - return jPanel16; + return jPanelFfsTabCenterS; } /** @@ -544,11 +529,11 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel17() { - if (jPanel17 == null) { - jPanel17 = new JPanel(); + private JPanel getJPanelFfsTabCenterE() { + if (jPanelFfsTabCenterE == null) { + jPanelFfsTabCenterE = new JPanel(); } - return jPanel17; + return jPanelFfsTabCenterE; } /** @@ -556,21 +541,21 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField6() { - if (jTextField6 == null) { - jTextField6 = new JTextField(); - jTextField6.setPreferredSize(new java.awt.Dimension(100,20)); - jTextField6.setEditable(true); - jTextField6.addFocusListener(new java.awt.event.FocusAdapter() { + private JTextField getJTextFieldFfsKey() { + if (jTextFieldFfsKey == null) { + jTextFieldFfsKey = new JTextField(); + jTextFieldFfsKey.setPreferredSize(new java.awt.Dimension(100,20)); + jTextFieldFfsKey.setEditable(true); + jTextFieldFfsKey.addFocusListener(new java.awt.event.FocusAdapter() { public void focusLost(java.awt.event.FocusEvent e) { - if (jTable.getSelectedRow() < 0) { + if (jTableFfs.getSelectedRow() < 0) { return; } // ffc.updateBuildOptionsFfsKey(jTable.getSelectedRow(), jTextField6.getText()); } }); } - return jTextField6; + return jTextFieldFfsKey; } /** @@ -578,28 +563,28 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton8() { - if (jButton8 == null) { - jButton8 = new JButton(); - jButton8.setPreferredSize(new java.awt.Dimension(70,20)); - jButton8.setText("Add"); - jButton8.addActionListener(new AbstractAction() { + private JButton getJButtonFfsAdd() { + if (jButtonFfsAdd == null) { + jButtonFfsAdd = new JButton(); + jButtonFfsAdd.setPreferredSize(new java.awt.Dimension(70,20)); + jButtonFfsAdd.setText("Add"); + jButtonFfsAdd.addActionListener(new AbstractAction() { /** * */ private static final long serialVersionUID = -2923720717273384221L; public void actionPerformed(java.awt.event.ActionEvent e) { - if (jTextField6.getText().length() > 0) { - String[] row = {jTextField6.getText()}; + if (jTextFieldFfsKey.getText().length() > 0) { + String[] row = {jTextFieldFfsKey.getText()}; ffsTableModel.addRow(row); docConsole.setSaved(false); - ffc.genBuildOptionsFfs(jTextField6.getText(), jTextField.getText()); + ffc.genBuildOptionsFfs(jTextFieldFfsKey.getText(), jTextFieldEncapType.getText()); } } }); } - return jButton8; + return jButtonFfsAdd; } /** @@ -607,27 +592,27 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton9() { - if (jButton9 == null) { - jButton9 = new JButton(); - jButton9.setPreferredSize(new java.awt.Dimension(70,20)); - jButton9.setText("Delete"); - jButton9.addActionListener(new AbstractAction() { + private JButton getJButtonFfsDel() { + if (jButtonFfsDel == null) { + jButtonFfsDel = new JButton(); + jButtonFfsDel.setPreferredSize(new java.awt.Dimension(70,20)); + jButtonFfsDel.setText("Delete"); + jButtonFfsDel.addActionListener(new AbstractAction() { /** * */ private static final long serialVersionUID = -4002678939178194476L; public void actionPerformed(ActionEvent arg0){ - if (jTable.getSelectedRow() < 0) { + if (jTableFfs.getSelectedRow() < 0) { return; } docConsole.setSaved(false); - ffc.removeBuildOptionsFfs(jTable.getSelectedRow()); + ffc.removeBuildOptionsFfs(jTableFfs.getSelectedRow()); } }); } - return jButton9; + return jButtonFfsDel; } /** @@ -635,13 +620,13 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JScrollPane */ - private JScrollPane getJScrollPane5() { - if (jScrollPane5 == null) { - jScrollPane5 = new JScrollPane(); - jScrollPane5.setPreferredSize(new java.awt.Dimension(350,100)); - jScrollPane5.setViewportView(getJTable4()); + private JScrollPane getJScrollPaneFfsAttribs() { + if (jScrollPaneFfsAttribs == null) { + jScrollPaneFfsAttribs = new JScrollPane(); + jScrollPaneFfsAttribs.setPreferredSize(new java.awt.Dimension(350,100)); + jScrollPaneFfsAttribs.setViewportView(getJTableFfsAttribs()); } - return jScrollPane5; + return jScrollPaneFfsAttribs; } /** @@ -649,17 +634,17 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JTable */ - private JTable getJTable4() { - if (jTable4 == null) { + private JTable getJTableFfsAttribs() { + if (jTableFfsAttribs == null) { ffsAttributesTableModel = new DefaultTableModel(); - jTable4 = new JTable(ffsAttributesTableModel); - jTable4.setPreferredSize(new java.awt.Dimension(400,80)); - jTable4.setRowHeight(20); + jTableFfsAttribs = new JTable(ffsAttributesTableModel); + jTableFfsAttribs.setPreferredSize(new java.awt.Dimension(400,80)); + jTableFfsAttribs.setRowHeight(20); ffsAttributesTableModel.addColumn("Name"); ffsAttributesTableModel.addColumn("Value"); - jTable4.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - jTable4.getModel().addTableModelListener(new TableModelListener() { + jTableFfsAttribs.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + jTableFfsAttribs.getModel().addTableModelListener(new TableModelListener() { public void tableChanged(TableModelEvent arg0) { // TODO Auto-generated method stub int row = arg0.getFirstRow(); @@ -676,12 +661,12 @@ public class FpdBuildOptions extends IInternalFrame { return; } docConsole.setSaved(false); - ffc.updateBuildOptionsFfsAttribute(jTable.getSelectedRow(), row, name, value); + ffc.updateBuildOptionsFfsAttribute(jTableFfs.getSelectedRow(), row, name, value); } } }); } - return jTable4; + return jTableFfsAttribs; } /** @@ -689,30 +674,30 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel19() { - if (jPanel19 == null) { - jLabel8 = new JLabel(); - jLabel8.setText("Sections"); - jLabel4 = new JLabel(); - jLabel4.setText("Sub-Sections"); - jLabel2 = new JLabel(); - jLabel2.setText("Section"); - jPanel19 = new JPanel(); - jPanel19.setLayout(new FlowLayout()); - jPanel19.add(jLabel2, null); - jPanel19.add(getJButton(), null); - jPanel19.add(getJButton1(), null); - jPanel19.add(getJScrollPane1(), null); - jPanel19.add(jLabel8, null); - jPanel19.add(getJButton6(), null); - jPanel19.add(getJButton7(), null); - jPanel19.add(getJScrollPane4(), null); - jPanel19.add(jLabel4, null); - jPanel19.add(getJButton2(), null); - jPanel19.add(getJButton3(), null); - jPanel19.add(getJScrollPane3(), null); - } - return jPanel19; + private JPanel getJPanelFfsTabCenterC() { + if (jPanelFfsTabCenterC == null) { + jLabelFfsSections = new JLabel(); + jLabelFfsSections.setText("Sections"); + jLabelFfsSubSections = new JLabel(); + jLabelFfsSubSections.setText("Sub-Sections"); + jLabelFfsSection = new JLabel(); + jLabelFfsSection.setText("Section"); + jPanelFfsTabCenterC = new JPanel(); + jPanelFfsTabCenterC.setLayout(new FlowLayout()); + jPanelFfsTabCenterC.add(jLabelFfsSection, null); + jPanelFfsTabCenterC.add(getJButtonFfsSectionNew(), null); + jPanelFfsTabCenterC.add(getJButtonFfsSectionRemove(), null); + jPanelFfsTabCenterC.add(getJScrollPaneFfsSection(), null); + jPanelFfsTabCenterC.add(jLabelFfsSections, null); + jPanelFfsTabCenterC.add(getJButtonFfsSectionsNew(), null); + jPanelFfsTabCenterC.add(getJButtonFfsSectionsRemove(), null); + jPanelFfsTabCenterC.add(getJScrollPaneFfsSections(), null); + jPanelFfsTabCenterC.add(jLabelFfsSubSections, null); + jPanelFfsTabCenterC.add(getJButtonFfsSubSectionNew(), null); + jPanelFfsTabCenterC.add(getJButtonFfsSubSectionRemove(), null); + jPanelFfsTabCenterC.add(getJScrollPaneFfsSubSection(), null); + } + return jPanelFfsTabCenterC; } /** @@ -720,47 +705,46 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel20() { - if (jPanel20 == null) { - jLabel15 = new JLabel(); - jLabel15.setText("Tag Name"); + private JPanel getJPanelOptionsTab() { + if (jPanelOptionsTab == null) { + jLabelTagName = new JLabel(); + jLabelTagName.setText("Tag Name"); FlowLayout flowLayout9 = new FlowLayout(); flowLayout9.setAlignment(java.awt.FlowLayout.LEFT); - jLabel14 = new JLabel(); - jLabel14.setText("Build Targets"); - jLabel12 = new JLabel(); - jLabel12.setText("Tool Command"); - jLabel11 = new JLabel(); - jLabel11.setText("Supported Arch"); - jLabel10 = new JLabel(); - jLabel10.setText("Tool Chain Family"); - jLabel9 = new JLabel(); - jLabel9.setText("Option Contents"); - jPanel20 = new JPanel(); - jPanel20.setLayout(flowLayout9); - jPanel20.add(jLabel14, null); - jPanel20.add(getJTextField12(), null); - jPanel20.add(jLabel10, null); - jPanel20.add(getJTextField1(), null); - jPanel20.add(getJComboBox2(), null); - jPanel20.add(jLabel12, null); - jPanel20.add(getJTextField8(), null); - jPanel20.add(jLabel11, null); - jPanel20.add(getJCheckBox9(), null); - jPanel20.add(getJCheckBox10(), null); - jPanel20.add(getJCheckBox11(), null); - jPanel20.add(getJCheckBox12(), null); - jPanel20.add(getJCheckBox13(), null); - jPanel20.add(getJCheckBox14(), null); - jPanel20.add(jLabel15, null); - jPanel20.add(getJTextField13(), null); - jPanel20.add(jLabel9, null); - jPanel20.add(getJTextField7(), null); - jPanel20.add(getJButton10(), null); - jPanel20.add(getJButton11(), null); - jPanel20.add(getJScrollPane6(), null); - } - return jPanel20; + jLabelBuildTargets = new JLabel(); + jLabelBuildTargets.setText("Build Targets"); + jLabelToolCmd = new JLabel(); + jLabelToolCmd.setText("Tool Command"); + jLabelSupArch = new JLabel(); + jLabelSupArch.setText("Supported Arch"); + jLabelToolChainFamily = new JLabel(); + jLabelToolChainFamily.setText("Tool Chain Family"); + jLabelOptionContents = new JLabel(); + jLabelOptionContents.setText("Option Contents"); + jPanelOptionsTab = new JPanel(); + jPanelOptionsTab.setLayout(flowLayout9); + jPanelOptionsTab.add(jLabelBuildTargets, null); + jPanelOptionsTab.add(getJTextFieldBuildTargets(), null); + jPanelOptionsTab.add(jLabelToolChainFamily, null); + jPanelOptionsTab.add(getJTextFieldToolChainFamily(), null); + jPanelOptionsTab.add(jLabelToolCmd, null); + jPanelOptionsTab.add(getJTextFieldToolCmd(), null); + jPanelOptionsTab.add(jLabelSupArch, null); + jPanelOptionsTab.add(getJCheckBoxIA32(), null); + jPanelOptionsTab.add(getJCheckBoxIpf(), null); + jPanelOptionsTab.add(getJCheckBoxX64(), null); + jPanelOptionsTab.add(getJCheckBoxEBC(), null); + jPanelOptionsTab.add(getJCheckBoxARM(), null); + jPanelOptionsTab.add(getJCheckBoxPPC(), null); + jPanelOptionsTab.add(jLabelTagName, null); + jPanelOptionsTab.add(getJTextFieldTagName(), null); + jPanelOptionsTab.add(jLabelOptionContents, null); + jPanelOptionsTab.add(getJTextFieldOptionContents(), null); + jPanelOptionsTab.add(getJButtonOptionsAdd(), null); + jPanelOptionsTab.add(getJButtonOptionsDel(), null); + jPanelOptionsTab.add(getJScrollPaneOptions(), null); + } + return jPanelOptionsTab; } /** @@ -768,31 +752,12 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField7() { - if (jTextField7 == null) { - jTextField7 = new JTextField(); - jTextField7.setPreferredSize(new java.awt.Dimension(300,20)); - } - return jTextField7; - } - - /** - * This method initializes jComboBox2 - * - * @return javax.swing.JComboBox - */ - private JComboBox getJComboBox2() { - if (jComboBox2 == null) { - jComboBox2 = new JComboBox(); - jComboBox2.setPreferredSize(new java.awt.Dimension(80,20)); - jComboBox2.addItem("MSFT"); - jComboBox2.addItem("GCC"); - jComboBox2.addItem("CYGWIN"); - jComboBox2.addItem("INTEL"); - jComboBox2.setSelectedIndex(0); - jComboBox2.setVisible(false); + private JTextField getJTextFieldOptionContents() { + if (jTextFieldOptionContents == null) { + jTextFieldOptionContents = new JTextField(); + jTextFieldOptionContents.setPreferredSize(new java.awt.Dimension(300,20)); } - return jComboBox2; + return jTextFieldOptionContents; } /** @@ -800,12 +765,12 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField8() { - if (jTextField8 == null) { - jTextField8 = new JTextField(); - jTextField8.setPreferredSize(new java.awt.Dimension(110,20)); + private JTextField getJTextFieldToolCmd() { + if (jTextFieldToolCmd == null) { + jTextFieldToolCmd = new JTextField(); + jTextFieldToolCmd.setPreferredSize(new java.awt.Dimension(110,20)); } - return jTextField8; + return jTextFieldToolCmd; } /** @@ -813,13 +778,13 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JScrollPane */ - private JScrollPane getJScrollPane6() { - if (jScrollPane6 == null) { - jScrollPane6 = new JScrollPane(); - jScrollPane6.setPreferredSize(new java.awt.Dimension(630,200)); - jScrollPane6.setViewportView(getJTable5()); + private JScrollPane getJScrollPaneOptions() { + if (jScrollPaneOptions == null) { + jScrollPaneOptions = new JScrollPane(); + jScrollPaneOptions.setPreferredSize(new java.awt.Dimension(630,200)); + jScrollPaneOptions.setViewportView(getJTableOptions()); } - return jScrollPane6; + return jScrollPaneOptions; } /** @@ -827,11 +792,11 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JTable */ - private JTable getJTable5() { - if (jTable5 == null) { + private JTable getJTableOptions() { + if (jTableOptions == null) { optionsTableModel = new DefaultTableModel(); - jTable5 = new JTable(optionsTableModel); - jTable5.setRowHeight(20); + jTableOptions = new JTable(optionsTableModel); + jTableOptions.setRowHeight(20); optionsTableModel.addColumn("BuildTargets"); optionsTableModel.addColumn("ToolChainFamily"); optionsTableModel.addColumn("SupportedArch"); @@ -853,9 +818,9 @@ public class FpdBuildOptions extends IInternalFrame { vArch.add("EBC"); vArch.add("ARM"); vArch.add("PPC"); - jTable5.getColumnModel().getColumn(2).setCellEditor(new ListEditor(vArch)); - jTable5.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - jTable5.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ + jTableOptions.getColumnModel().getColumn(2).setCellEditor(new ListEditor(vArch)); + jTableOptions.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + jTableOptions.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ public void valueChanged(ListSelectionEvent e) { selectedRow = -1; if (e.getValueIsAdjusting()){ @@ -871,7 +836,7 @@ public class FpdBuildOptions extends IInternalFrame { } }); - jTable5.getModel().addTableModelListener(new TableModelListener() { + jTableOptions.getModel().addTableModelListener(new TableModelListener() { public void tableChanged(TableModelEvent arg0) { // TODO Auto-generated method stub int row = arg0.getFirstRow(); @@ -904,7 +869,7 @@ public class FpdBuildOptions extends IInternalFrame { } }); } - return jTable5; + return jTableOptions; } /** @@ -912,30 +877,30 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton10() { - if (jButton10 == null) { - jButton10 = new JButton(); - jButton10.setText("Add"); - jButton10.setPreferredSize(new java.awt.Dimension(90,20)); - jButton10.addActionListener(new AbstractAction() { + private JButton getJButtonOptionsAdd() { + if (jButtonOptionsAdd == null) { + jButtonOptionsAdd = new JButton(); + jButtonOptionsAdd.setText("Add"); + jButtonOptionsAdd.setPreferredSize(new java.awt.Dimension(90,20)); + jButtonOptionsAdd.addActionListener(new AbstractAction() { /** * */ private static final long serialVersionUID = 1L; public void actionPerformed(java.awt.event.ActionEvent e) { - boolean[] boolArray = {jCheckBox9.isSelected(),jCheckBox10.isSelected(),jCheckBox11.isSelected(), - jCheckBox12.isSelected(),jCheckBox13.isSelected(),jCheckBox14.isSelected()}; + boolean[] boolArray = {jCheckBoxIA32.isSelected(),jCheckBoxIpf.isSelected(),jCheckBoxX64.isSelected(), + jCheckBoxEBC.isSelected(),jCheckBoxARM.isSelected(),jCheckBoxPPC.isSelected()}; String s = boolToList(boolArray); - Object[] o = {jTextField12.getText(), jTextField1.getText(), s, - jTextField8.getText(), jTextField13.getText(), jTextField7.getText()}; + Object[] o = {jTextFieldBuildTargets.getText(), jTextFieldToolChainFamily.getText(), s, + jTextFieldToolCmd.getText(), jTextFieldTagName.getText(), jTextFieldOptionContents.getText()}; optionsTableModel.addRow(o); docConsole.setSaved(false); - ffc.genBuildOptionsOpt(stringToVector(jTextField12.getText()), jTextField1.getText(), jTextField13.getText(), jTextField8.getText(), stringToVector(s), jTextField7.getText()); + ffc.genBuildOptionsOpt(stringToVector(jTextFieldBuildTargets.getText()), jTextFieldToolChainFamily.getText(), jTextFieldTagName.getText(), jTextFieldToolCmd.getText(), stringToVector(s), jTextFieldOptionContents.getText()); } }); } - return jButton10; + return jButtonOptionsAdd; } private Vector stringToVector(String s) { @@ -981,12 +946,12 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton11() { - if (jButton11 == null) { - jButton11 = new JButton(); - jButton11.setText("Delete"); - jButton11.setPreferredSize(new java.awt.Dimension(90,20)); - jButton11.addActionListener(new AbstractAction() { + private JButton getJButtonOptionsDel() { + if (jButtonOptionsDel == null) { + jButtonOptionsDel = new JButton(); + jButtonOptionsDel.setText("Delete"); + jButtonOptionsDel.setPreferredSize(new java.awt.Dimension(90,20)); + jButtonOptionsDel.addActionListener(new AbstractAction() { /** * */ @@ -1001,7 +966,7 @@ public class FpdBuildOptions extends IInternalFrame { } }); } - return jButton11; + return jButtonOptionsDel; } /** @@ -1009,29 +974,29 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton17() { - if (jButton17 == null) { - jButton17 = new JButton(); - jButton17.setPreferredSize(new java.awt.Dimension(80,20)); - jButton17.setText("New"); - jButton17.addActionListener(new AbstractAction() { + private JButton getJButtonFfsAttribNew() { + if (jButtonFfsAttribNew == null) { + jButtonFfsAttribNew = new JButton(); + jButtonFfsAttribNew.setPreferredSize(new java.awt.Dimension(80,20)); + jButtonFfsAttribNew.setText("New"); + jButtonFfsAttribNew.addActionListener(new AbstractAction() { /** * */ private static final long serialVersionUID = 1L; public void actionPerformed(ActionEvent arg0){ - if (jTable.getSelectedRow() < 0) { + if (jTableFfs.getSelectedRow() < 0) { return; } Object[] o = {"", ""}; ffsAttributesTableModel.addRow(o); docConsole.setSaved(false); - ffc.genBuildOptionsFfsAttribute(jTable.getSelectedRow(), "", ""); + ffc.genBuildOptionsFfsAttribute(jTableFfs.getSelectedRow(), "", ""); } }); } - return jButton17; + return jButtonFfsAttribNew; } /** @@ -1039,30 +1004,30 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton18() { - if (jButton18 == null) { - jButton18 = new JButton(); - jButton18.setPreferredSize(new java.awt.Dimension(80,20)); - jButton18.setText("Remove"); - jButton18.addActionListener(new AbstractAction(){ + private JButton getJButtonFfsAttribRemove() { + if (jButtonFfsAttribRemove == null) { + jButtonFfsAttribRemove = new JButton(); + jButtonFfsAttribRemove.setPreferredSize(new java.awt.Dimension(80,20)); + jButtonFfsAttribRemove.setText("Remove"); + jButtonFfsAttribRemove.addActionListener(new AbstractAction(){ /** * */ private static final long serialVersionUID = 1L; public void actionPerformed(ActionEvent arg0){ - if (jTable.getSelectedRow() < 0) { + if (jTableFfs.getSelectedRow() < 0) { return; } - if (jTable4.getSelectedRow() >= 0){ + if (jTableFfsAttribs.getSelectedRow() >= 0){ docConsole.setSaved(false); - ffsAttributesTableModel.removeRow(jTable4.getSelectedRow()); - ffc.removeBuildOptionsFfsAttribute(jTable.getSelectedRow(), jTable4.getSelectedRow()); + ffsAttributesTableModel.removeRow(jTableFfsAttribs.getSelectedRow()); + ffc.removeBuildOptionsFfsAttribute(jTableFfs.getSelectedRow(), jTableFfsAttribs.getSelectedRow()); } } }); } - return jButton18; + return jButtonFfsAttribRemove; } /** @@ -1070,13 +1035,13 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox9() { - if (jCheckBox9 == null) { - jCheckBox9 = new JCheckBox(); - jCheckBox9.setPreferredSize(new java.awt.Dimension(50,20)); - jCheckBox9.setText("IA32"); + private JCheckBox getJCheckBoxIA32() { + if (jCheckBoxIA32 == null) { + jCheckBoxIA32 = new JCheckBox(); + jCheckBoxIA32.setPreferredSize(new java.awt.Dimension(50,20)); + jCheckBoxIA32.setText("IA32"); } - return jCheckBox9; + return jCheckBoxIA32; } /** @@ -1084,13 +1049,13 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox10() { - if (jCheckBox10 == null) { - jCheckBox10 = new JCheckBox(); - jCheckBox10.setPreferredSize(new java.awt.Dimension(50,20)); - jCheckBox10.setText("IPF"); + private JCheckBox getJCheckBoxIpf() { + if (jCheckBoxIpf == null) { + jCheckBoxIpf = new JCheckBox(); + jCheckBoxIpf.setPreferredSize(new java.awt.Dimension(50,20)); + jCheckBoxIpf.setText("IPF"); } - return jCheckBox10; + return jCheckBoxIpf; } /** @@ -1098,13 +1063,13 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox11() { - if (jCheckBox11 == null) { - jCheckBox11 = new JCheckBox(); - jCheckBox11.setText("X64"); - jCheckBox11.setPreferredSize(new java.awt.Dimension(47,20)); + private JCheckBox getJCheckBoxX64() { + if (jCheckBoxX64 == null) { + jCheckBoxX64 = new JCheckBox(); + jCheckBoxX64.setText("X64"); + jCheckBoxX64.setPreferredSize(new java.awt.Dimension(47,20)); } - return jCheckBox11; + return jCheckBoxX64; } /** @@ -1112,13 +1077,13 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox12() { - if (jCheckBox12 == null) { - jCheckBox12 = new JCheckBox(); - jCheckBox12.setPreferredSize(new java.awt.Dimension(50,20)); - jCheckBox12.setText("EBC"); + private JCheckBox getJCheckBoxEBC() { + if (jCheckBoxEBC == null) { + jCheckBoxEBC = new JCheckBox(); + jCheckBoxEBC.setPreferredSize(new java.awt.Dimension(50,20)); + jCheckBoxEBC.setText("EBC"); } - return jCheckBox12; + return jCheckBoxEBC; } /** @@ -1126,13 +1091,13 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox13() { - if (jCheckBox13 == null) { - jCheckBox13 = new JCheckBox(); - jCheckBox13.setPreferredSize(new java.awt.Dimension(55,20)); - jCheckBox13.setText("ARM"); + private JCheckBox getJCheckBoxARM() { + if (jCheckBoxARM == null) { + jCheckBoxARM = new JCheckBox(); + jCheckBoxARM.setPreferredSize(new java.awt.Dimension(55,20)); + jCheckBoxARM.setText("ARM"); } - return jCheckBox13; + return jCheckBoxARM; } /** @@ -1140,13 +1105,13 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox14() { - if (jCheckBox14 == null) { - jCheckBox14 = new JCheckBox(); - jCheckBox14.setPreferredSize(new java.awt.Dimension(50,20)); - jCheckBox14.setText("PPC"); + private JCheckBox getJCheckBoxPPC() { + if (jCheckBoxPPC == null) { + jCheckBoxPPC = new JCheckBox(); + jCheckBoxPPC.setPreferredSize(new java.awt.Dimension(50,20)); + jCheckBoxPPC.setText("PPC"); } - return jCheckBox14; + return jCheckBoxPPC; } /** @@ -1154,12 +1119,12 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField12() { - if (jTextField12 == null) { - jTextField12 = new JTextField(); - jTextField12.setPreferredSize(new java.awt.Dimension(150,20)); + private JTextField getJTextFieldBuildTargets() { + if (jTextFieldBuildTargets == null) { + jTextFieldBuildTargets = new JTextField(); + jTextFieldBuildTargets.setPreferredSize(new java.awt.Dimension(150,20)); } - return jTextField12; + return jTextFieldBuildTargets; } /** @@ -1167,12 +1132,12 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField13() { - if (jTextField13 == null) { - jTextField13 = new JTextField(); - jTextField13.setPreferredSize(new java.awt.Dimension(140,20)); + private JTextField getJTextFieldTagName() { + if (jTextFieldTagName == null) { + jTextFieldTagName = new JTextField(); + jTextFieldTagName.setPreferredSize(new java.awt.Dimension(140,20)); } - return jTextField13; + return jTextFieldTagName; } /** @@ -1180,13 +1145,13 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JScrollPane */ - private JScrollPane getJScrollPane() { - if (jScrollPane == null) { - jScrollPane = new JScrollPane(); - jScrollPane.setPreferredSize(new java.awt.Dimension(150,419)); - jScrollPane.setViewportView(getJTable()); + private JScrollPane getJScrollPaneFfs() { + if (jScrollPaneFfs == null) { + jScrollPaneFfs = new JScrollPane(); + jScrollPaneFfs.setPreferredSize(new java.awt.Dimension(150,419)); + jScrollPaneFfs.setViewportView(getJTableFfs()); } - return jScrollPane; + return jScrollPaneFfs; } /** @@ -1194,16 +1159,16 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JTable */ - private JTable getJTable() { - if (jTable == null) { + private JTable getJTableFfs() { + if (jTableFfs == null) { ffsTableModel = new DefaultTableModel(); ffsTableModel.addColumn("FFS Type"); - jTable = new JTable(ffsTableModel); - jTable.setShowGrid(false); - jTable.setRowHeight(20); + jTableFfs = new JTable(ffsTableModel); + jTableFfs.setShowGrid(false); + jTableFfs.setRowHeight(20); - jTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - jTable.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ + jTableFfs.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + jTableFfs.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ public void valueChanged(ListSelectionEvent e) { if (e.getValueIsAdjusting()){ @@ -1224,8 +1189,8 @@ public class FpdBuildOptions extends IInternalFrame { ArrayList alSections = new ArrayList(); ArrayList alSection = new ArrayList(); ffc.getBuildOptionsFfs(row, sArray, lhm, alSections, alSection); - jTextField6.setText(sArray[0]); - jTextField.setText(sArray[1]); + jTextFieldFfsKey.setText(sArray[0]); + jTextFieldEncapType.setText(sArray[1]); for (int i = 0; i < alSection.size(); ++i) { String[] sectionRow = {alSection.get(i)}; sectionTableModel.addRow(sectionRow); @@ -1248,7 +1213,7 @@ public class FpdBuildOptions extends IInternalFrame { } }); - jTable.getModel().addTableModelListener(new TableModelListener() { + jTableFfs.getModel().addTableModelListener(new TableModelListener() { public void tableChanged(TableModelEvent arg0) { // TODO Auto-generated method stub int row = arg0.getFirstRow(); @@ -1266,7 +1231,7 @@ public class FpdBuildOptions extends IInternalFrame { } }); } - return jTable; + return jTableFfs; } /** @@ -1274,13 +1239,13 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JScrollPane */ - private JScrollPane getJScrollPane1() { - if (jScrollPane1 == null) { - jScrollPane1 = new JScrollPane(); - jScrollPane1.setPreferredSize(new java.awt.Dimension(500,80)); - jScrollPane1.setViewportView(getJTable1()); + private JScrollPane getJScrollPaneFfsSection() { + if (jScrollPaneFfsSection == null) { + jScrollPaneFfsSection = new JScrollPane(); + jScrollPaneFfsSection.setPreferredSize(new java.awt.Dimension(500,80)); + jScrollPaneFfsSection.setViewportView(getJTableFfsSection()); } - return jScrollPane1; + return jScrollPaneFfsSection; } /** @@ -1288,13 +1253,13 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JTable */ - private JTable getJTable1() { - if (jTable1 == null) { + private JTable getJTableFfsSection() { + if (jTableFfsSection == null) { sectionTableModel = new DefaultTableModel(); sectionTableModel.addColumn("SectionType"); - jTable1 = new JTable(sectionTableModel); - jTable1.setRowHeight(20); + jTableFfsSection = new JTable(sectionTableModel); + jTableFfsSection.setRowHeight(20); JComboBox cb = new JComboBox(); cb.addItem("EFI_SECTION_FREEFORM_SUBTYPE_GUID"); cb.addItem("EFI_SECTION_VERSION"); @@ -1309,14 +1274,14 @@ public class FpdBuildOptions extends IInternalFrame { cb.addItem("EFI_SECTION_GUID_DEFINED"); cb.addItem("EFI_SECTION_COMPATIBILITY16"); cb.addItem("EFI_SECTION_FIRMWARE_VOLUME_IMAGE"); - jTable1.getColumnModel().getColumn(0).setCellEditor(new DefaultCellEditor(cb)); + jTableFfsSection.getColumnModel().getColumn(0).setCellEditor(new DefaultCellEditor(cb)); - jTable1.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + jTableFfsSection.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - jTable1.getModel().addTableModelListener(new TableModelListener() { + jTableFfsSection.getModel().addTableModelListener(new TableModelListener() { public void tableChanged(TableModelEvent arg0) { // TODO Auto-generated method stub - if (jTable.getSelectedRow() < 0) { + if (jTableFfs.getSelectedRow() < 0) { return; } int row = arg0.getFirstRow(); @@ -1325,12 +1290,12 @@ public class FpdBuildOptions extends IInternalFrame { //ToDo Data Validition check. String type = m.getValueAt(row, 0) + ""; docConsole.setSaved(false); - ffc.updateBuildOptionsFfsSectionsSection(jTable.getSelectedRow(), row, type); + ffc.updateBuildOptionsFfsSectionsSection(jTableFfs.getSelectedRow(), row, type); } } }); } - return jTable1; + return jTableFfsSection; } /** @@ -1338,13 +1303,13 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JScrollPane */ - private JScrollPane getJScrollPane3() { - if (jScrollPane3 == null) { - jScrollPane3 = new JScrollPane(); - jScrollPane3.setPreferredSize(new java.awt.Dimension(500,90)); - jScrollPane3.setViewportView(getJTable3()); + private JScrollPane getJScrollPaneFfsSubSection() { + if (jScrollPaneFfsSubSection == null) { + jScrollPaneFfsSubSection = new JScrollPane(); + jScrollPaneFfsSubSection.setPreferredSize(new java.awt.Dimension(500,90)); + jScrollPaneFfsSubSection.setViewportView(getJTableFfsSubSection()); } - return jScrollPane3; + return jScrollPaneFfsSubSection; } /** @@ -1352,12 +1317,12 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JTable */ - private JTable getJTable3() { - if (jTable3 == null) { + private JTable getJTableFfsSubSection() { + if (jTableFfsSubSection == null) { subsectionsTableModel = new DefaultTableModel(); subsectionsTableModel.addColumn("SectionType"); - jTable3 = new JTable(subsectionsTableModel); - jTable3.setRowHeight(20); + jTableFfsSubSection = new JTable(subsectionsTableModel); + jTableFfsSubSection.setRowHeight(20); JComboBox cb = new JComboBox(); cb.addItem("EFI_SECTION_FREEFORM_SUBTYPE_GUID"); cb.addItem("EFI_SECTION_VERSION"); @@ -1372,13 +1337,13 @@ public class FpdBuildOptions extends IInternalFrame { cb.addItem("EFI_SECTION_GUID_DEFINED"); cb.addItem("EFI_SECTION_COMPATIBILITY16"); cb.addItem("EFI_SECTION_FIRMWARE_VOLUME_IMAGE"); - jTable3.getColumnModel().getColumn(0).setCellEditor(new DefaultCellEditor(cb)); - jTable3.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + jTableFfsSubSection.getColumnModel().getColumn(0).setCellEditor(new DefaultCellEditor(cb)); + jTableFfsSubSection.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - jTable3.getModel().addTableModelListener(new TableModelListener() { + jTableFfsSubSection.getModel().addTableModelListener(new TableModelListener() { public void tableChanged(TableModelEvent arg0) { // TODO Auto-generated method stub - if (jTable.getSelectedRow() < 0 || jTable6.getSelectedRow() < 0) { + if (jTableFfs.getSelectedRow() < 0 || jTableFfsSections.getSelectedRow() < 0) { return; } int row = arg0.getFirstRow(); @@ -1387,12 +1352,12 @@ public class FpdBuildOptions extends IInternalFrame { //ToDo Data Validition check. String type = m.getValueAt(row, 0) + ""; docConsole.setSaved(false); - ffc.updateBuildOptionsFfsSectionsSectionsSection(jTable.getSelectedRow(), jTable6.getSelectedRow(), row, type); + ffc.updateBuildOptionsFfsSectionsSectionsSection(jTableFfs.getSelectedRow(), jTableFfsSections.getSelectedRow(), row, type); } } }); } - return jTable3; + return jTableFfsSubSection; } /** @@ -1400,20 +1365,20 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField() { - if (jTextField == null) { - jTextField = new JTextField(); - jTextField.setPreferredSize(new java.awt.Dimension(100,20)); - jTextField.addFocusListener(new java.awt.event.FocusAdapter() { + private JTextField getJTextFieldEncapType() { + if (jTextFieldEncapType == null) { + jTextFieldEncapType = new JTextField(); + jTextFieldEncapType.setPreferredSize(new java.awt.Dimension(100,20)); + jTextFieldEncapType.addFocusListener(new java.awt.event.FocusAdapter() { public void focusLost(java.awt.event.FocusEvent e) { - if (jTable.getSelectedRow() < 0) { + if (jTableFfs.getSelectedRow() < 0) { return; } - ffc.updateBuildOptionsFfsSectionsType(jTable.getSelectedRow(), jTextField.getText()); + ffc.updateBuildOptionsFfsSectionsType(jTableFfs.getSelectedRow(), jTextFieldEncapType.getText()); } }); } - return jTextField; + return jTextFieldEncapType; } /** @@ -1421,14 +1386,14 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel4() { - if (jPanel4 == null) { - jPanel4 = new JPanel(); - jPanel4.setPreferredSize(new java.awt.Dimension(100,100)); - jPanel4.add(getJButton17(), null); - jPanel4.add(getJButton18(), null); + private JPanel getJPanelFfsAttribButtonGroup() { + if (jPanelFfsAttribButtonGroup == null) { + jPanelFfsAttribButtonGroup = new JPanel(); + jPanelFfsAttribButtonGroup.setPreferredSize(new java.awt.Dimension(100,100)); + jPanelFfsAttribButtonGroup.add(getJButtonFfsAttribNew(), null); + jPanelFfsAttribButtonGroup.add(getJButtonFfsAttribRemove(), null); } - return jPanel4; + return jPanelFfsAttribButtonGroup; } /** @@ -1436,24 +1401,24 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton() { - if (jButton == null) { - jButton = new JButton(); - jButton.setPreferredSize(new java.awt.Dimension(80,20)); - jButton.setText("New"); - jButton.addActionListener(new java.awt.event.ActionListener() { + private JButton getJButtonFfsSectionNew() { + if (jButtonFfsSectionNew == null) { + jButtonFfsSectionNew = new JButton(); + jButtonFfsSectionNew.setPreferredSize(new java.awt.Dimension(80,20)); + jButtonFfsSectionNew.setText("New"); + jButtonFfsSectionNew.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { - if (jTable.getSelectedRow() < 0) { + if (jTableFfs.getSelectedRow() < 0) { return; } docConsole.setSaved(false); String[] row = {"EFI_SECTION_RAW"}; sectionTableModel.addRow(row); - ffc.genBuildOptionsFfsSectionsSection(jTable.getSelectedRow(), row[0]); + ffc.genBuildOptionsFfsSectionsSection(jTableFfs.getSelectedRow(), row[0]); } }); } - return jButton; + return jButtonFfsSectionNew; } /** @@ -1461,24 +1426,24 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton1() { - if (jButton1 == null) { - jButton1 = new JButton(); - jButton1.setPreferredSize(new java.awt.Dimension(80,20)); - jButton1.setText("Remove"); + private JButton getJButtonFfsSectionRemove() { + if (jButtonFfsSectionRemove == null) { + jButtonFfsSectionRemove = new JButton(); + jButtonFfsSectionRemove.setPreferredSize(new java.awt.Dimension(80,20)); + jButtonFfsSectionRemove.setText("Remove"); - jButton1.addActionListener(new java.awt.event.ActionListener() { + jButtonFfsSectionRemove.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { - if (jTable.getSelectedRow() < 0 || jTable1.getSelectedRow() < 0) { + if (jTableFfs.getSelectedRow() < 0 || jTableFfsSection.getSelectedRow() < 0) { return; } docConsole.setSaved(false); - sectionTableModel.removeRow(jTable1.getSelectedRow()); - ffc.removeBuildOptionsFfsSectionsSection(jTable.getSelectedRow(), jTable1.getSelectedRow()); + sectionTableModel.removeRow(jTableFfsSection.getSelectedRow()); + ffc.removeBuildOptionsFfsSectionsSection(jTableFfs.getSelectedRow(), jTableFfsSection.getSelectedRow()); } }); } - return jButton1; + return jButtonFfsSectionRemove; } /** @@ -1486,25 +1451,25 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton2() { - if (jButton2 == null) { - jButton2 = new JButton(); - jButton2.setPreferredSize(new java.awt.Dimension(80,20)); - jButton2.setText("New"); - jButton2.addActionListener(new java.awt.event.ActionListener() { + private JButton getJButtonFfsSubSectionNew() { + if (jButtonFfsSubSectionNew == null) { + jButtonFfsSubSectionNew = new JButton(); + jButtonFfsSubSectionNew.setPreferredSize(new java.awt.Dimension(80,20)); + jButtonFfsSubSectionNew.setText("New"); + jButtonFfsSubSectionNew.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { - if (jTable.getSelectedRow() < 0 || jTable6.getSelectedRow() < 0) { + if (jTableFfs.getSelectedRow() < 0 || jTableFfsSections.getSelectedRow() < 0) { return; } docConsole.setSaved(false); String[] row = {"EFI_SECTION_RAW"}; subsectionsTableModel.addRow(row); - ffc.genBuildOptionsFfsSectionsSectionsSection(jTable.getSelectedRow(), jTable6.getSelectedRow(), row[0]); + ffc.genBuildOptionsFfsSectionsSectionsSection(jTableFfs.getSelectedRow(), jTableFfsSections.getSelectedRow(), row[0]); } }); } - return jButton2; + return jButtonFfsSubSectionNew; } /** @@ -1512,23 +1477,23 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton3() { - if (jButton3 == null) { - jButton3 = new JButton(); - jButton3.setPreferredSize(new java.awt.Dimension(80,20)); - jButton3.setText("Remove"); - jButton3.addActionListener(new java.awt.event.ActionListener() { + private JButton getJButtonFfsSubSectionRemove() { + if (jButtonFfsSubSectionRemove == null) { + jButtonFfsSubSectionRemove = new JButton(); + jButtonFfsSubSectionRemove.setPreferredSize(new java.awt.Dimension(80,20)); + jButtonFfsSubSectionRemove.setText("Remove"); + jButtonFfsSubSectionRemove.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { - if (jTable.getSelectedRow() < 0 || jTable6.getSelectedRow() < 0 || jTable3.getSelectedRow() < 0) { + if (jTableFfs.getSelectedRow() < 0 || jTableFfsSections.getSelectedRow() < 0 || jTableFfsSubSection.getSelectedRow() < 0) { return; } docConsole.setSaved(false); - subsectionsTableModel.removeRow(jTable3.getSelectedRow()); - ffc.removeBuildOptionsFfsSectionsSectionsSection(jTable.getSelectedRow(), jTable6.getSelectedRow(), jTable3.getSelectedRow()); + subsectionsTableModel.removeRow(jTableFfsSubSection.getSelectedRow()); + ffc.removeBuildOptionsFfsSectionsSectionsSection(jTableFfs.getSelectedRow(), jTableFfsSections.getSelectedRow(), jTableFfsSubSection.getSelectedRow()); } }); } - return jButton3; + return jButtonFfsSubSectionRemove; } /** @@ -1536,24 +1501,24 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton6() { - if (jButton6 == null) { - jButton6 = new JButton(); - jButton6.setPreferredSize(new java.awt.Dimension(80,20)); - jButton6.setText("New"); - jButton6.addActionListener(new java.awt.event.ActionListener() { + private JButton getJButtonFfsSectionsNew() { + if (jButtonFfsSectionsNew == null) { + jButtonFfsSectionsNew = new JButton(); + jButtonFfsSectionsNew.setPreferredSize(new java.awt.Dimension(80,20)); + jButtonFfsSectionsNew.setText("New"); + jButtonFfsSectionsNew.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { - if (jTable.getSelectedRow() < 0) { + if (jTableFfs.getSelectedRow() < 0) { return; } docConsole.setSaved(false); String[] row = {""}; sectionsTableModel.addRow(row); - ffc.genBuildOptionsFfsSectionsSections(jTable.getSelectedRow(), ""); + ffc.genBuildOptionsFfsSectionsSections(jTableFfs.getSelectedRow(), ""); } }); } - return jButton6; + return jButtonFfsSectionsNew; } /** @@ -1561,23 +1526,23 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton7() { - if (jButton7 == null) { - jButton7 = new JButton(); - jButton7.setPreferredSize(new java.awt.Dimension(80,20)); - jButton7.setText("Remove"); - jButton7.addActionListener(new java.awt.event.ActionListener() { + private JButton getJButtonFfsSectionsRemove() { + if (jButtonFfsSectionsRemove == null) { + jButtonFfsSectionsRemove = new JButton(); + jButtonFfsSectionsRemove.setPreferredSize(new java.awt.Dimension(80,20)); + jButtonFfsSectionsRemove.setText("Remove"); + jButtonFfsSectionsRemove.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { - if (jTable.getSelectedRow() < 0 || jTable6.getSelectedRow() < 0) { + if (jTableFfs.getSelectedRow() < 0 || jTableFfsSections.getSelectedRow() < 0) { return; } docConsole.setSaved(false); - sectionsTableModel.removeRow(jTable6.getSelectedRow()); - ffc.removeBuildOptionsFfsSectionsSections(jTable.getSelectedRow(), jTable6.getSelectedRow()); + sectionsTableModel.removeRow(jTableFfsSections.getSelectedRow()); + ffc.removeBuildOptionsFfsSectionsSections(jTableFfs.getSelectedRow(), jTableFfsSections.getSelectedRow()); } }); } - return jButton7; + return jButtonFfsSectionsRemove; } /** @@ -1585,13 +1550,13 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JScrollPane */ - private JScrollPane getJScrollPane4() { - if (jScrollPane4 == null) { - jScrollPane4 = new JScrollPane(); - jScrollPane4.setPreferredSize(new java.awt.Dimension(500,80)); - jScrollPane4.setViewportView(getJTable6()); + private JScrollPane getJScrollPaneFfsSections() { + if (jScrollPaneFfsSections == null) { + jScrollPaneFfsSections = new JScrollPane(); + jScrollPaneFfsSections.setPreferredSize(new java.awt.Dimension(500,80)); + jScrollPaneFfsSections.setViewportView(getJTableFfsSections()); } - return jScrollPane4; + return jScrollPaneFfsSections; } /** @@ -1599,14 +1564,14 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JTable */ - private JTable getJTable6() { - if (jTable6 == null) { + private JTable getJTableFfsSections() { + if (jTableFfsSections == null) { sectionsTableModel = new DefaultTableModel(); sectionsTableModel.addColumn("EncapsulationType"); - jTable6 = new JTable(sectionsTableModel); - jTable6.setRowHeight(20); - jTable6.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - jTable6.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ + jTableFfsSections = new JTable(sectionsTableModel); + jTableFfsSections.setRowHeight(20); + jTableFfsSections.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + jTableFfsSections.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ public void valueChanged(ListSelectionEvent e) { if (e.getValueIsAdjusting()){ return; @@ -1617,12 +1582,12 @@ public class FpdBuildOptions extends IInternalFrame { } else{ int sectionsRow = lsm.getMinSelectionIndex(); - if (jTable.getSelectedRow() < 0) { + if (jTableFfs.getSelectedRow() < 0) { return; } subsectionsTableModel.setRowCount(0); ArrayList al = new ArrayList(); - ffc.getBuildOptionsFfsSectionsSectionsSection(jTable.getSelectedRow(), sectionsRow, al); + ffc.getBuildOptionsFfsSectionsSectionsSection(jTableFfs.getSelectedRow(), sectionsRow, al); for (int i = 0; i < al.size(); ++i) { String[] subsectionRow = {al.get(i)}; subsectionsTableModel.addRow(subsectionRow); @@ -1631,7 +1596,7 @@ public class FpdBuildOptions extends IInternalFrame { } }); - jTable6.getModel().addTableModelListener(new TableModelListener() { + jTableFfsSections.getModel().addTableModelListener(new TableModelListener() { public void tableChanged(TableModelEvent arg0) { // TODO Auto-generated method stub int row = arg0.getFirstRow(); @@ -1640,12 +1605,12 @@ public class FpdBuildOptions extends IInternalFrame { //ToDo Data Validition check. String encapType = m.getValueAt(row, 0) + ""; docConsole.setSaved(false); - ffc.updateBuildOptionsFfsSectionsSections(jTable.getSelectedRow(), row, encapType); + ffc.updateBuildOptionsFfsSectionsSections(jTableFfs.getSelectedRow(), row, encapType); } } }); } - return jTable6; + return jTableFfsSections; } /** @@ -1653,12 +1618,12 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton12() { - if (jButton12 == null) { - jButton12 = new JButton(); - jButton12.setPreferredSize(new Dimension(90, 20)); - jButton12.setText("Browse"); - jButton12.addActionListener(new AbstractAction() { + private JButton getJButtonAntTaskFileBrowse() { + if (jButtonAntTaskFileBrowse == null) { + jButtonAntTaskFileBrowse = new JButton(); + jButtonAntTaskFileBrowse.setPreferredSize(new Dimension(90, 20)); + jButtonAntTaskFileBrowse.setText("Browse"); + jButtonAntTaskFileBrowse.addActionListener(new AbstractAction() { private static final long serialVersionUID = 1L; public void actionPerformed(ActionEvent arg0) { @@ -1687,13 +1652,13 @@ public class FpdBuildOptions extends IInternalFrame { } headerDest = theFile.getPath(); - jTextField2.setText(headerDest.substring(dirPrefix.length()).replace('\\', '/')); + jTextFieldAntTaskFile.setText(headerDest.substring(dirPrefix.length()).replace('\\', '/')); } }); } - return jButton12; + return jButtonAntTaskFileBrowse; } /** @@ -1701,12 +1666,12 @@ public class FpdBuildOptions extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField1() { - if (jTextField1 == null) { - jTextField1 = new JTextField(); - jTextField1.setPreferredSize(new java.awt.Dimension(85,20)); + private JTextField getJTextFieldToolChainFamily() { + if (jTextFieldToolChainFamily == null) { + jTextFieldToolChainFamily = new JTextField(); + jTextFieldToolChainFamily.setPreferredSize(new java.awt.Dimension(85,20)); } - return jTextField1; + return jTextFieldToolChainFamily; } /** @@ -1743,23 +1708,23 @@ public class FpdBuildOptions extends IInternalFrame { initFfsTable(); this.addInternalFrameListener(new InternalFrameAdapter(){ public void internalFrameDeactivated(InternalFrameEvent e){ - if (jTable.isEditing()) { - jTable.getCellEditor().stopCellEditing(); + if (jTableFfs.isEditing()) { + jTableFfs.getCellEditor().stopCellEditing(); } - if (jTable1.isEditing()) { - jTable1.getCellEditor().stopCellEditing(); + if (jTableFfsSection.isEditing()) { + jTableFfsSection.getCellEditor().stopCellEditing(); } - if (jTable2.isEditing()) { - jTable2.getCellEditor().stopCellEditing(); + if (jTableAntTasks.isEditing()) { + jTableAntTasks.getCellEditor().stopCellEditing(); } - if (jTable3.isEditing()) { - jTable3.getCellEditor().stopCellEditing(); + if (jTableFfsSubSection.isEditing()) { + jTableFfsSubSection.getCellEditor().stopCellEditing(); } - if (jTable4.isEditing()) { - jTable4.getCellEditor().stopCellEditing(); + if (jTableFfsAttribs.isEditing()) { + jTableFfsAttribs.getCellEditor().stopCellEditing(); } - if (jTable5.isEditing()) { - jTable5.getCellEditor().stopCellEditing(); + if (jTableOptions.isEditing()) { + jTableOptions.getCellEditor().stopCellEditing(); } } }); @@ -1819,10 +1784,10 @@ public class FpdBuildOptions extends IInternalFrame { if (jContentPane == null) { jContentPane = new JPanel(); jContentPane.setLayout(new BorderLayout()); - jContentPane.add(getJPanel(), java.awt.BorderLayout.SOUTH); - jContentPane.add(getJPanel1(), java.awt.BorderLayout.NORTH); - jContentPane.add(getJPanel2(), java.awt.BorderLayout.WEST); - jContentPane.add(getJPanel3(), java.awt.BorderLayout.EAST); + jContentPane.add(getJPanelContentSouth(), java.awt.BorderLayout.SOUTH); + jContentPane.add(getJPanelContentNorth(), java.awt.BorderLayout.NORTH); + jContentPane.add(getJPanelContentWest(), java.awt.BorderLayout.WEST); + jContentPane.add(getJPanelContentEast(), java.awt.BorderLayout.EAST); jContentPane.add(getJTabbedPane(), java.awt.BorderLayout.CENTER); } return jContentPane; diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java index 0a96224da3..3fd3f9edb7 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java @@ -28,38 +28,38 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { */ private static final long serialVersionUID = 1L; private JPanel jContentPane = null; - private JPanel jPanel = null; - private JPanel jPanel1 = null; - private JPanel jPanel2 = null; - private JScrollPane jScrollPane = null; - private JTable jTable = null; - private DynPcdTableModel model = null; - private DynPcdTableModel model1 = null; + private JPanel jPanelContentNorth = null; + private JPanel jPanelContentCenter = null; + private JPanel jPanelContentSouth = null; + private JScrollPane jScrollPaneDynPcd = null; + private JTable jTableDynPcd = null; + private DynPcdTableModel modelPcd = null; + private DynPcdTableModel modelSku = null; private FpdFileContents ffc = null; private OpeningPlatformType docConsole = null; - private JPanel jPanel3 = null; - private JCheckBox jCheckBox = null; - private JPanel jPanel4 = null; - private JRadioButton jRadioButton = null; - private JRadioButton jRadioButton1 = null; - private JScrollPane jScrollPane1 = null; - private JTable jTable1 = null; - private JButton jButton = null; - private JLabel jLabel = null; - private JTextField jTextField = null; - private JLabel jLabel1 = null; - private JTextField jTextField1 = null; - private JLabel jLabel2 = null; - private JLabel jLabel3 = null; - private JTextField jTextField2 = null; - private JLabel jLabel4 = null; - private JTextField jTextField3 = null; - private JTextField jTextField4 = null; - private JLabel jLabel5 = null; - private JTextField jTextField5 = null; - private JRadioButton jRadioButton2 = null; + private JPanel jPanelSkuInfo = null; + private JCheckBox jCheckBoxSkuEnable = null; + private JPanel jPanelDynPcdValue = null; + private JRadioButton jRadioButtonHii = null; + private JRadioButton jRadioButtonVpd = null; + private JScrollPane jScrollPaneSkuInfo = null; + private JTable jTableSkuInfo = null; + private JButton jButtonSkuInfoUpdate = null; + private JLabel jLabelVarName = null; + private JTextField jTextFieldVarName = null; + private JLabel jLabelVarGuid = null; + private JTextField jTextFieldVarGuid = null; + private JLabel jLabelPad = null; + private JLabel jLabelVarOffset = null; + private JTextField jTextFieldVarOffset = null; + private JLabel jLabelHiiDefaultValue = null; + private JTextField jTextFieldHiiDefaultValue = null; + private JTextField jTextFieldVpdOffset = null; + private JLabel jLabelVpdOffset = null; + private JTextField jTextFieldDefaultValue = null; + private JRadioButton jRadioButtonDefaultValue = null; private ButtonGroup bg = new ButtonGroup(); - private JLabel jLabel6 = null; + private JLabel jLabelPadd = null; /** * This is the default constructor */ @@ -85,13 +85,13 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { String[][] saa = new String[ffc.getDynamicPcdBuildDataCount()][5]; ffc.getDynamicPcdBuildData(saa); for (int i = 0; i < saa.length; ++i) { - model.addRow(saa[i]); + modelPcd.addRow(saa[i]); } saa = new String[ffc.getPlatformDefsSkuInfoCount()][2]; ffc.getPlatformDefsSkuInfos(saa); for (int i = 0; i < saa.length; ++i) { - model1.addRow(saa[i]); + modelSku.addRow(saa[i]); } } @@ -116,9 +116,9 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { if (jContentPane == null) { jContentPane = new JPanel(); jContentPane.setLayout(new BorderLayout()); - jContentPane.add(getJPanel(), java.awt.BorderLayout.NORTH); - jContentPane.add(getJPanel1(), java.awt.BorderLayout.CENTER); - jContentPane.add(getJPanel2(), java.awt.BorderLayout.SOUTH); + jContentPane.add(getJPanelContentNorth(), java.awt.BorderLayout.NORTH); + jContentPane.add(getJPanelContentCenter(), java.awt.BorderLayout.CENTER); + jContentPane.add(getJPanelContentSouth(), java.awt.BorderLayout.SOUTH); } return jContentPane; } @@ -128,11 +128,11 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel() { - if (jPanel == null) { - jPanel = new JPanel(); + private JPanel getJPanelContentNorth() { + if (jPanelContentNorth == null) { + jPanelContentNorth = new JPanel(); } - return jPanel; + return jPanelContentNorth; } /** @@ -140,14 +140,14 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel1() { - if (jPanel1 == null) { - jPanel1 = new JPanel(); - jPanel1.add(getJScrollPane(), null); - jPanel1.add(getJPanel3(), null); - jPanel1.add(getJPanel4(), null); - } - return jPanel1; + private JPanel getJPanelContentCenter() { + if (jPanelContentCenter == null) { + jPanelContentCenter = new JPanel(); + jPanelContentCenter.add(getJScrollPaneDynPcd(), null); + jPanelContentCenter.add(getJPanelSkuInfo(), null); + jPanelContentCenter.add(getJPanelDynPcdValue(), null); + } + return jPanelContentCenter; } /** @@ -155,11 +155,11 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel2() { - if (jPanel2 == null) { - jPanel2 = new JPanel(); + private JPanel getJPanelContentSouth() { + if (jPanelContentSouth == null) { + jPanelContentSouth = new JPanel(); } - return jPanel2; + return jPanelContentSouth; } /** @@ -167,13 +167,13 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { * * @return javax.swing.JScrollPane */ - private JScrollPane getJScrollPane() { - if (jScrollPane == null) { - jScrollPane = new JScrollPane(); - jScrollPane.setPreferredSize(new java.awt.Dimension(600,200)); - jScrollPane.setViewportView(getJTable()); + private JScrollPane getJScrollPaneDynPcd() { + if (jScrollPaneDynPcd == null) { + jScrollPaneDynPcd = new JScrollPane(); + jScrollPaneDynPcd.setPreferredSize(new java.awt.Dimension(600,200)); + jScrollPaneDynPcd.setViewportView(getJTableDynPcd()); } - return jScrollPane; + return jScrollPaneDynPcd; } /** @@ -181,18 +181,18 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { * * @return javax.swing.JTable */ - private JTable getJTable() { - if (jTable == null) { - model = new DynPcdTableModel(); - model.addColumn("CName"); - model.addColumn("Token"); - model.addColumn("TokenSpaceGuid"); - model.addColumn("MaxDatumSize"); - model.addColumn("DatumType"); - jTable = new JTable(model); - jTable.setRowHeight(20); - jTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - jTable.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ + private JTable getJTableDynPcd() { + if (jTableDynPcd == null) { + modelPcd = new DynPcdTableModel(); + modelPcd.addColumn("CName"); + modelPcd.addColumn("Token"); + modelPcd.addColumn("TokenSpaceGuid"); + modelPcd.addColumn("MaxDatumSize"); + modelPcd.addColumn("DatumType"); + jTableDynPcd = new JTable(modelPcd); + jTableDynPcd.setRowHeight(20); + jTableDynPcd.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + jTableDynPcd.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ public void valueChanged(ListSelectionEvent e) { if (e.getValueIsAdjusting()){ return; @@ -209,57 +209,57 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { } }); } - return jTable; + return jTableDynPcd; } // // should display default sku info here, as no selection event of table1 will be triggered when change selection of rows in table. // private void displayDetails(int i) { - jTable1.changeSelection(0, 1, false, false); + jTableSkuInfo.changeSelection(0, 1, false, false); int skuCount = ffc.getDynamicPcdSkuInfoCount(i); String defaultVal = ffc.getDynamicPcdBuildDataValue(i); if (defaultVal != null) { - jRadioButton2.setSelected(true); - jTextField5.setText(defaultVal); + jRadioButtonDefaultValue.setSelected(true); + jTextFieldDefaultValue.setText(defaultVal); if ( skuCount == 1) { - jCheckBox.setSelected(false); + jCheckBoxSkuEnable.setSelected(false); } else{ - jCheckBox.setSelected(true); + jCheckBoxSkuEnable.setSelected(true); } } else if (ffc.getDynamicPcdBuildDataVpdOffset(i) != null) { - jRadioButton1.setSelected(true); - jTextField4.setText(ffc.getDynamicPcdBuildDataVpdOffset(i)); + jRadioButtonVpd.setSelected(true); + jTextFieldVpdOffset.setText(ffc.getDynamicPcdBuildDataVpdOffset(i)); if (skuCount ==1) { - jCheckBox.setSelected(false); + jCheckBoxSkuEnable.setSelected(false); } else{ - jCheckBox.setSelected(true); + jCheckBoxSkuEnable.setSelected(true); } } else { - jRadioButton.setSelected(true); + jRadioButtonHii.setSelected(true); String[][] saa = new String[ffc.getDynamicPcdSkuInfoCount(i)][7]; ffc.getDynamicPcdSkuInfos(i, saa); - jTextField.setText(saa[0][1]); - jTextField1.setText(saa[0][2]); - jTextField2.setText(saa[0][3]); - jTextField3.setText(saa[0][4]); + jTextFieldVarName.setText(saa[0][1]); + jTextFieldVarGuid.setText(saa[0][2]); + jTextFieldVarOffset.setText(saa[0][3]); + jTextFieldHiiDefaultValue.setText(saa[0][4]); if (skuCount ==1) { - jCheckBox.setSelected(false); + jCheckBoxSkuEnable.setSelected(false); } else{ - jCheckBox.setSelected(true); + jCheckBoxSkuEnable.setSelected(true); } } } private void displaySkuInfoDetails(int i) { - int pcdSelected = jTable.getSelectedRow(); + int pcdSelected = jTableDynPcd.getSelectedRow(); if (pcdSelected < 0) { return; } @@ -268,21 +268,21 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { ffc.getDynamicPcdSkuInfos(pcdSelected, saa); if (saa[i][5] != null){ - jRadioButton1.setSelected(true); - jTextField4.setText(saa[i][5]); + jRadioButtonVpd.setSelected(true); + jTextFieldVpdOffset.setText(saa[i][5]); } else if (saa[i][1] != null) { - jRadioButton.setSelected(true); - jTextField.setText(saa[i][1]); - jTextField1.setText(saa[i][2]); - jTextField2.setText(saa[i][3]); - jTextField3.setText(saa[i][4]); + jRadioButtonHii.setSelected(true); + jTextFieldVarName.setText(saa[i][1]); + jTextFieldVarGuid.setText(saa[i][2]); + jTextFieldVarOffset.setText(saa[i][3]); + jTextFieldHiiDefaultValue.setText(saa[i][4]); } else{ - jRadioButton2.setSelected(true); - jTextField5.setText(saa[i][6]); + jRadioButtonDefaultValue.setSelected(true); + jTextFieldDefaultValue.setText(saa[i][6]); } } @@ -292,19 +292,19 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel3() { - if (jPanel3 == null) { + private JPanel getJPanelSkuInfo() { + if (jPanelSkuInfo == null) { FlowLayout flowLayout = new FlowLayout(); flowLayout.setAlignment(java.awt.FlowLayout.LEFT); - jPanel3 = new JPanel(); - jPanel3.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.RAISED)); - jPanel3.setLayout(flowLayout); - jPanel3.setPreferredSize(new java.awt.Dimension(600,100)); - jPanel3.add(getJCheckBox(), null); - jPanel3.add(getJScrollPane1(), null); - jPanel3.add(getJButton(), null); - } - return jPanel3; + jPanelSkuInfo = new JPanel(); + jPanelSkuInfo.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.RAISED)); + jPanelSkuInfo.setLayout(flowLayout); + jPanelSkuInfo.setPreferredSize(new java.awt.Dimension(600,100)); + jPanelSkuInfo.add(getJCheckBoxSkuEnable(), null); + jPanelSkuInfo.add(getJScrollPaneSkuInfo(), null); + jPanelSkuInfo.add(getJButtonSkuInfoUpdate(), null); + } + return jPanelSkuInfo; } /** @@ -312,17 +312,17 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox() { - if (jCheckBox == null) { - jCheckBox = new JCheckBox(); - jCheckBox.setText("SKU Enable"); - jCheckBox.addItemListener(new java.awt.event.ItemListener() { + private JCheckBox getJCheckBoxSkuEnable() { + if (jCheckBoxSkuEnable == null) { + jCheckBoxSkuEnable = new JCheckBox(); + jCheckBoxSkuEnable.setText("SKU Enable"); + jCheckBoxSkuEnable.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent e) { - jTable1.setEnabled(jCheckBox.isSelected()); + jTableSkuInfo.setEnabled(jCheckBoxSkuEnable.isSelected()); } }); } - return jCheckBox; + return jCheckBoxSkuEnable; } @@ -331,60 +331,60 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel4() { - if (jPanel4 == null) { - jLabel5 = new JLabel(); - jLabel5.setPreferredSize(new java.awt.Dimension(80,20)); - jLabel5.setText("VPD Offset"); - jLabel4 = new JLabel(); - jLabel4.setPreferredSize(new java.awt.Dimension(100,20)); - jLabel4.setText("HII Default Value"); - jLabel3 = new JLabel(); - jLabel3.setText("Variable Offset"); - jLabel3.setPreferredSize(new java.awt.Dimension(90,20)); - jLabel2 = new JLabel(); - jLabel2.setText(" "); - jLabel1 = new JLabel(); - jLabel1.setText("Variable GUID"); - jLabel1.setPreferredSize(new java.awt.Dimension(100,20)); - jLabel = new JLabel(); - jLabel.setText("Variable Name"); - jLabel.setToolTipText(""); - jLabel.setPreferredSize(new java.awt.Dimension(90,20)); + private JPanel getJPanelDynPcdValue() { + if (jPanelDynPcdValue == null) { + jLabelVpdOffset = new JLabel(); + jLabelVpdOffset.setPreferredSize(new java.awt.Dimension(80,20)); + jLabelVpdOffset.setText("VPD Offset"); + jLabelHiiDefaultValue = new JLabel(); + jLabelHiiDefaultValue.setPreferredSize(new java.awt.Dimension(100,20)); + jLabelHiiDefaultValue.setText("HII Default Value"); + jLabelVarOffset = new JLabel(); + jLabelVarOffset.setText("Variable Offset"); + jLabelVarOffset.setPreferredSize(new java.awt.Dimension(90,20)); + jLabelPad = new JLabel(); + jLabelPad.setText(" "); + jLabelVarGuid = new JLabel(); + jLabelVarGuid.setText("Variable GUID"); + jLabelVarGuid.setPreferredSize(new java.awt.Dimension(100,20)); + jLabelVarName = new JLabel(); + jLabelVarName.setText("Variable Name"); + jLabelVarName.setToolTipText(""); + jLabelVarName.setPreferredSize(new java.awt.Dimension(90,20)); FlowLayout flowLayout1 = new FlowLayout(); flowLayout1.setAlignment(java.awt.FlowLayout.LEFT); - jPanel4 = new JPanel(); - jPanel4.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED)); - jPanel4.setLayout(flowLayout1); - jPanel4.setPreferredSize(new java.awt.Dimension(600,120)); - jPanel4.add(getJRadioButton(), null); - jPanel4.add(jLabel, null); - jPanel4.add(getJTextField(), null); - jPanel4.add(jLabel1, null); - jPanel4.add(getJTextField1(), null); - jPanel4.add(jLabel2, null); - jPanel4.add(jLabel3, null); - jPanel4.add(getJTextField2(), null); - jPanel4.add(jLabel4, null); - jPanel4.add(getJTextField3(), null); - jPanel4.add(getJRadioButton1(), null); - jPanel4.add(jLabel5, null); - jPanel4.add(getJTextField4(), null); - jLabel6 = new JLabel(); - jLabel6.setText(" "); - jPanel4.add(jLabel6, null); - jLabel.setEnabled(false); - jLabel1.setEnabled(false); - jLabel4.setEnabled(false); - jLabel3.setEnabled(false); - jLabel5.setEnabled(false); - jPanel4.add(getJRadioButton2(), null); - jPanel4.add(getJTextField5(), null); - bg.add(jRadioButton); - bg.add(jRadioButton1); + jPanelDynPcdValue = new JPanel(); + jPanelDynPcdValue.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED)); + jPanelDynPcdValue.setLayout(flowLayout1); + jPanelDynPcdValue.setPreferredSize(new java.awt.Dimension(600,120)); + jPanelDynPcdValue.add(getJRadioButtonHii(), null); + jPanelDynPcdValue.add(jLabelVarName, null); + jPanelDynPcdValue.add(getJTextFieldVarName(), null); + jPanelDynPcdValue.add(jLabelVarGuid, null); + jPanelDynPcdValue.add(getJTextFieldVarGuid(), null); + jPanelDynPcdValue.add(jLabelPad, null); + jPanelDynPcdValue.add(jLabelVarOffset, null); + jPanelDynPcdValue.add(getJTextFieldVarOffset(), null); + jPanelDynPcdValue.add(jLabelHiiDefaultValue, null); + jPanelDynPcdValue.add(getJTextFieldHiiDefaultValue(), null); + jPanelDynPcdValue.add(getJRadioButtonVpd(), null); + jPanelDynPcdValue.add(jLabelVpdOffset, null); + jPanelDynPcdValue.add(getJTextFieldVpdOffset(), null); + jLabelPadd = new JLabel(); + jLabelPadd.setText(" "); + jPanelDynPcdValue.add(jLabelPadd, null); + jLabelVarName.setEnabled(false); + jLabelVarGuid.setEnabled(false); + jLabelHiiDefaultValue.setEnabled(false); + jLabelVarOffset.setEnabled(false); + jLabelVpdOffset.setEnabled(false); + jPanelDynPcdValue.add(getJRadioButtonDefaultValue(), null); + jPanelDynPcdValue.add(getJTextFieldDefaultValue(), null); + bg.add(jRadioButtonHii); + bg.add(jRadioButtonVpd); } - return jPanel4; + return jPanelDynPcdValue; } /** @@ -392,26 +392,26 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { * * @return javax.swing.JRadioButton */ - private JRadioButton getJRadioButton() { - if (jRadioButton == null) { - jRadioButton = new JRadioButton(); - jRadioButton.setText("HII Enable"); - jRadioButton.addItemListener(new java.awt.event.ItemListener() { + private JRadioButton getJRadioButtonHii() { + if (jRadioButtonHii == null) { + jRadioButtonHii = new JRadioButton(); + jRadioButtonHii.setText("HII Enable"); + jRadioButtonHii.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent e) { - boolean selected = jRadioButton.isSelected(); - jLabel.setEnabled(selected); - jLabel1.setEnabled(selected); - jLabel2.setEnabled(selected); - jLabel3.setEnabled(selected); - jLabel4.setEnabled(selected); - jTextField.setEnabled(selected); - jTextField1.setEnabled(selected); - jTextField2.setEnabled(selected); - jTextField3.setEnabled(selected); + boolean selected = jRadioButtonHii.isSelected(); + jLabelVarName.setEnabled(selected); + jLabelVarGuid.setEnabled(selected); + jLabelPad.setEnabled(selected); + jLabelVarOffset.setEnabled(selected); + jLabelHiiDefaultValue.setEnabled(selected); + jTextFieldVarName.setEnabled(selected); + jTextFieldVarGuid.setEnabled(selected); + jTextFieldVarOffset.setEnabled(selected); + jTextFieldHiiDefaultValue.setEnabled(selected); } }); } - return jRadioButton; + return jRadioButtonHii; } /** @@ -419,19 +419,19 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { * * @return javax.swing.JRadioButton */ - private JRadioButton getJRadioButton1() { - if (jRadioButton1 == null) { - jRadioButton1 = new JRadioButton(); - jRadioButton1.setText("VPD Enable"); - jRadioButton1.addItemListener(new java.awt.event.ItemListener() { + private JRadioButton getJRadioButtonVpd() { + if (jRadioButtonVpd == null) { + jRadioButtonVpd = new JRadioButton(); + jRadioButtonVpd.setText("VPD Enable"); + jRadioButtonVpd.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent e) { - boolean selected = jRadioButton1.isSelected(); - jTextField4.setEnabled(selected); - jLabel5.setEnabled(selected); + boolean selected = jRadioButtonVpd.isSelected(); + jTextFieldVpdOffset.setEnabled(selected); + jLabelVpdOffset.setEnabled(selected); } }); } - return jRadioButton1; + return jRadioButtonVpd; } /** @@ -439,13 +439,13 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { * * @return javax.swing.JScrollPane */ - private JScrollPane getJScrollPane1() { - if (jScrollPane1 == null) { - jScrollPane1 = new JScrollPane(); - jScrollPane1.setPreferredSize(new java.awt.Dimension(300,80)); - jScrollPane1.setViewportView(getJTable1()); + private JScrollPane getJScrollPaneSkuInfo() { + if (jScrollPaneSkuInfo == null) { + jScrollPaneSkuInfo = new JScrollPane(); + jScrollPaneSkuInfo.setPreferredSize(new java.awt.Dimension(300,80)); + jScrollPaneSkuInfo.setViewportView(getJTableSkuInfo()); } - return jScrollPane1; + return jScrollPaneSkuInfo; } /** @@ -453,17 +453,17 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { * * @return javax.swing.JTable */ - private JTable getJTable1() { - if (jTable1 == null) { - model1 = new DynPcdTableModel(); - jTable1 = new JTable(model1); - model1.addColumn("SKU ID"); - model1.addColumn("SKU Name"); + private JTable getJTableSkuInfo() { + if (jTableSkuInfo == null) { + modelSku = new DynPcdTableModel(); + jTableSkuInfo = new JTable(modelSku); + modelSku.addColumn("SKU ID"); + modelSku.addColumn("SKU Name"); - jTable1.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - jTable1.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ + jTableSkuInfo.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + jTableSkuInfo.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ public void valueChanged(ListSelectionEvent e) { - if (jTable.getSelectedRow() < 0) { + if (jTableDynPcd.getSelectedRow() < 0) { return; } if (e.getValueIsAdjusting()){ @@ -480,7 +480,7 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { } }); } - return jTable1; + return jTableSkuInfo; } /** @@ -488,14 +488,14 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton() { - if (jButton == null) { - jButton = new JButton(); - jButton.setPreferredSize(new java.awt.Dimension(180,20)); - jButton.setText(" Update SKU Information"); - jButton.addActionListener(new java.awt.event.ActionListener() { + private JButton getJButtonSkuInfoUpdate() { + if (jButtonSkuInfoUpdate == null) { + jButtonSkuInfoUpdate = new JButton(); + jButtonSkuInfoUpdate.setPreferredSize(new java.awt.Dimension(180,20)); + jButtonSkuInfoUpdate.setText(" Update SKU Information"); + jButtonSkuInfoUpdate.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { - int pcdSelected = jTable.getSelectedRow(); + int pcdSelected = jTableDynPcd.getSelectedRow(); if (pcdSelected < 0) { return; } @@ -505,7 +505,7 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { } }); } - return jButton; + return jButtonSkuInfoUpdate; } private void updateSkuInfo (int pcdSelected) { @@ -517,28 +517,28 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { String hiiDefault = null; String value = null; String vpdOffset = null; - if (jRadioButton.isSelected()) { - varName = jTextField.getText(); - varGuid = jTextField1.getText(); - varOffset = jTextField2.getText(); - hiiDefault = jTextField3.getText(); + if (jRadioButtonHii.isSelected()) { + varName = jTextFieldVarName.getText(); + varGuid = jTextFieldVarGuid.getText(); + varOffset = jTextFieldVarOffset.getText(); + hiiDefault = jTextFieldHiiDefaultValue.getText(); } - if (jRadioButton1.isSelected()) { - vpdOffset = jTextField4.getText(); + if (jRadioButtonVpd.isSelected()) { + vpdOffset = jTextFieldVpdOffset.getText(); } - if (jRadioButton2.isSelected()) { - value = jTextField5.getText(); + if (jRadioButtonDefaultValue.isSelected()) { + value = jTextFieldDefaultValue.getText(); } // // SKU disabled. only modify data for default SKU. // - if (!jCheckBox.isSelected()) { + if (!jCheckBoxSkuEnable.isSelected()) { if (true) { ffc.removeDynamicPcdBuildDataSkuInfo(pcdSelected); - if (jRadioButton.isSelected()) { + if (jRadioButtonHii.isSelected()) { ffc.genDynamicPcdBuildDataSkuInfo("0", varName, varGuid, varOffset, hiiDefault, null, null, pcdSelected); } - else if (jRadioButton1.isSelected()){ + else if (jRadioButtonVpd.isSelected()){ ffc.genDynamicPcdBuildDataSkuInfo("0", null, null, null, null, vpdOffset, null, pcdSelected); } else{ @@ -549,19 +549,19 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { // // SKU Enabled, need add data to all SKUs. // - if (jCheckBox.isSelected()) { + if (jCheckBoxSkuEnable.isSelected()) { if (skuCount == 1) { - for (int i = 1; i < jTable1.getRowCount(); ++i) { - ffc.genDynamicPcdBuildDataSkuInfo(jTable1.getValueAt(i, 0)+"", varName, varGuid, varOffset, hiiDefault, vpdOffset, value, pcdSelected); + for (int i = 1; i < jTableSkuInfo.getRowCount(); ++i) { + ffc.genDynamicPcdBuildDataSkuInfo(jTableSkuInfo.getValueAt(i, 0)+"", varName, varGuid, varOffset, hiiDefault, vpdOffset, value, pcdSelected); } } else { - int row = jTable1.getSelectedRow(); + int row = jTableSkuInfo.getSelectedRow(); if (row < 0) { return; } - ffc.updateDynamicPcdBuildDataSkuInfo(jTable1.getValueAt(row, 0)+"", varName, varGuid, varOffset, hiiDefault, vpdOffset, value, pcdSelected); + ffc.updateDynamicPcdBuildDataSkuInfo(jTableSkuInfo.getValueAt(row, 0)+"", varName, varGuid, varOffset, hiiDefault, vpdOffset, value, pcdSelected); } } } @@ -570,13 +570,13 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField() { - if (jTextField == null) { - jTextField = new JTextField(); - jTextField.setPreferredSize(new java.awt.Dimension(150,20)); - jTextField.setEnabled(false); + private JTextField getJTextFieldVarName() { + if (jTextFieldVarName == null) { + jTextFieldVarName = new JTextField(); + jTextFieldVarName.setPreferredSize(new java.awt.Dimension(150,20)); + jTextFieldVarName.setEnabled(false); } - return jTextField; + return jTextFieldVarName; } /** @@ -584,13 +584,13 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField1() { - if (jTextField1 == null) { - jTextField1 = new JTextField(); - jTextField1.setPreferredSize(new java.awt.Dimension(150,20)); - jTextField1.setEnabled(false); + private JTextField getJTextFieldVarGuid() { + if (jTextFieldVarGuid == null) { + jTextFieldVarGuid = new JTextField(); + jTextFieldVarGuid.setPreferredSize(new java.awt.Dimension(150,20)); + jTextFieldVarGuid.setEnabled(false); } - return jTextField1; + return jTextFieldVarGuid; } /** @@ -598,13 +598,13 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField2() { - if (jTextField2 == null) { - jTextField2 = new JTextField(); - jTextField2.setPreferredSize(new java.awt.Dimension(150,20)); - jTextField2.setEnabled(false); + private JTextField getJTextFieldVarOffset() { + if (jTextFieldVarOffset == null) { + jTextFieldVarOffset = new JTextField(); + jTextFieldVarOffset.setPreferredSize(new java.awt.Dimension(150,20)); + jTextFieldVarOffset.setEnabled(false); } - return jTextField2; + return jTextFieldVarOffset; } /** @@ -612,13 +612,13 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField3() { - if (jTextField3 == null) { - jTextField3 = new JTextField(); - jTextField3.setPreferredSize(new java.awt.Dimension(150,20)); - jTextField3.setEnabled(false); + private JTextField getJTextFieldHiiDefaultValue() { + if (jTextFieldHiiDefaultValue == null) { + jTextFieldHiiDefaultValue = new JTextField(); + jTextFieldHiiDefaultValue.setPreferredSize(new java.awt.Dimension(150,20)); + jTextFieldHiiDefaultValue.setEnabled(false); } - return jTextField3; + return jTextFieldHiiDefaultValue; } /** @@ -626,13 +626,13 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField4() { - if (jTextField4 == null) { - jTextField4 = new JTextField(); - jTextField4.setPreferredSize(new java.awt.Dimension(150,20)); - jTextField4.setEnabled(false); + private JTextField getJTextFieldVpdOffset() { + if (jTextFieldVpdOffset == null) { + jTextFieldVpdOffset = new JTextField(); + jTextFieldVpdOffset.setPreferredSize(new java.awt.Dimension(150,20)); + jTextFieldVpdOffset.setEnabled(false); } - return jTextField4; + return jTextFieldVpdOffset; } /** @@ -640,12 +640,12 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField5() { - if (jTextField5 == null) { - jTextField5 = new JTextField(); - jTextField5.setPreferredSize(new java.awt.Dimension(150,20)); + private JTextField getJTextFieldDefaultValue() { + if (jTextFieldDefaultValue == null) { + jTextFieldDefaultValue = new JTextField(); + jTextFieldDefaultValue.setPreferredSize(new java.awt.Dimension(150,20)); } - return jTextField5; + return jTextFieldDefaultValue; } /** @@ -653,20 +653,20 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame { * * @return javax.swing.JRadioButton */ - private JRadioButton getJRadioButton2() { - if (jRadioButton2 == null) { - jRadioButton2 = new JRadioButton(); - jRadioButton2.setText("Default PCD Value"); - jRadioButton2.setSelected(true); - jRadioButton2.setPreferredSize(new java.awt.Dimension(175,20)); - jRadioButton2.addItemListener(new java.awt.event.ItemListener() { + private JRadioButton getJRadioButtonDefaultValue() { + if (jRadioButtonDefaultValue == null) { + jRadioButtonDefaultValue = new JRadioButton(); + jRadioButtonDefaultValue.setText("Default PCD Value"); + jRadioButtonDefaultValue.setSelected(true); + jRadioButtonDefaultValue.setPreferredSize(new java.awt.Dimension(175,20)); + jRadioButtonDefaultValue.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent e) { - jTextField5.setEnabled(jRadioButton2.isSelected()); + jTextFieldDefaultValue.setEnabled(jRadioButtonDefaultValue.isSelected()); } }); - bg.add(jRadioButton2); + bg.add(jRadioButtonDefaultValue); } - return jRadioButton2; + return jRadioButtonDefaultValue; } } // @jve:decl-index=0:visual-constraint="10,10" diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java index ce9682e2d4..bcc1938928 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java @@ -2465,7 +2465,7 @@ class PcdItemTypeConflictException extends Exception { private String details = null; PcdItemTypeConflictException(String info){ - details = info; + details = "ItemTypeConflict: " + info; } public String getMessage() { @@ -2482,7 +2482,7 @@ class PcdDeclNotFound extends Exception { private String details = null; PcdDeclNotFound(String info) { - details = info; + details = "PcdDeclNotFound: " + info; } public String getMessage() { @@ -2499,7 +2499,7 @@ class PcdValueMalFormed extends Exception { private String details = null; PcdValueMalFormed(String info) { - details = info; + details = "PcdValueMalFormed: " + info; } public String getMessage() { diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java index 19849d0277..690291bd50 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java @@ -68,64 +68,62 @@ public class FpdFlash extends IInternalFrame { private static final long serialVersionUID = 1L; static JFrame frame; private JPanel jContentPane = null; - private JPanel jPanel = null; - private JPanel jPanel1 = null; - private JPanel jPanel2 = null; - private JPanel jPanel3 = null; + private JPanel jPanelContentEast = null; + private JPanel jPanelContentSouth = null; + private JPanel jPanelContentWest = null; + private JPanel jPanelContentNorth = null; private JTabbedPane jTabbedPane = null; private JPanel jPanelFvImages = null; - private JButton jButtonOk = null; - private JButton jButtonCancel = null; private JPanel jPanelFvImageN = null; private JPanel jPanelFvImageS = null; - private JCheckBox jCheckBox1 = null; - private JLabel jLabel = null; - private JTextField jTextField = null; - private JLabel jLabel1 = null; - private JTextField jTextField1 = null; - private JButton jButton = null; - private JScrollPane jScrollPane1 = null; - private JTable jTable = null; - private JPanel jPanel4 = null; - private JButton jButton1 = null; + private JCheckBox jCheckBoxFvProperty = null; + private JLabel jLabelFvPropName = null; + private JTextField jTextFieldFvPropName = null; + private JLabel jLabelFvPropValue = null; + private JTextField jTextFieldFvPropValue = null; + private JButton jButtonFvPropAdd = null; + private JScrollPane jScrollPaneFvProp = null; + private JTable jTableFvProp = null; + private JPanel jPanelFvPropButtonGroup = null; + private JButton jButtonFvPropDel = null; private DefaultTableModel fvPropertyTableModel = null; private DefaultTableModel fvImageNameTableModel = null; private ImageParaTableModel fvImageParaTableModel = null; private DefaultTableModel fvOptionTableModel = null; private JPanel jPanelFvImageC = null; - private JCheckBox jCheckBox2 = null; - private JLabel jLabel2 = null; - private JComboBox jComboBox = null; - private JLabel jLabel3 = null; - private JLabel jLabel4 = null; - private JTextField jTextField2 = null; - private JButton jButton2 = null; - private JScrollPane jScrollPane2 = null; - private JTable jTable1 = null; - private JButton jButton3 = null; - private JPanel jPanel5 = null; - private JButton jButton4 = null; - private JScrollPane jScrollPane3 = null; - private JTable jTable2 = null; - private JButton jButton6 = null; - private JCheckBox jCheckBox3 = null; - private JPanel jPanel6 = null; + private JCheckBox jCheckBoxFvImagePara = null; + private JLabel jLabelFvParaType = null; + private JComboBox jComboBoxFvParaType = null; + private JLabel jLabelFvImageNames = null; + private JLabel jLabelFvParaName = null; + private JTextField jTextFieldFvParaName = null; + private JButton jButtonFvParaAdd = null; + private JScrollPane jScrollPaneFvImageNames = null; + private JTable jTableFvImageNames = null; + private JButton jButtonFvParaDel = null; + private JPanel jPanelFvImageOpts = null; + private JButton jButtonAddFvImage = null; + private JScrollPane jScrollPaneFvInfo = null; + private JTable jTableFvInfo = null; + private JButton jButtonDelFvImage = null; + private JCheckBox jCheckBoxFvImageOpts = null; + private JPanel jPanelFvImagePara = null; private OpeningPlatformType docConsole = null; private FpdFileContents ffc = null; - private JPanel jPanel7 = null; - private JCheckBox jCheckBox = null; - private JTextField jTextField3 = null; - private JButton jButton5 = null; - private JLabel jLabel5 = null; - private JTextField jTextField4 = null; - private JLabel jLabel6 = null; - private JTextField jTextField5 = null; - private JPanel jPanel8 = null; - private JButton jButton7 = null; - private JButton jButton8 = null; + private JPanel jPanelFdf = null; + private JCheckBox jCheckBoxFdf = null; + private JTextField jTextFieldFdf = null; + private JButton jButtonFdfBrowse = null; + private JLabel jLabelFvImageOptName = null; + private JTextField jTextFieldFvImageOptName = null; + private JLabel jLabelFvImageOptValue = null; + private JTextField jTextFieldFvImageOptValue = null; + private JPanel jPanelFvImageOptsButtonGroup = null; + private JButton jButtonFvImageOptAdd = null; + private JButton jButtonFvImageOptDel = null; private JScrollPane jScrollPane = null; - private JTable jTable3 = null; - private JButton jButton9 = null; + private JTable jTableFvImageOpts = null; + private JButton jButtonUpdateFvImage = null; public FpdFlash() { super(); // TODO Auto-generated constructor stub @@ -151,11 +149,11 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel() { - if (jPanel == null) { - jPanel = new JPanel(); + private JPanel getJPanelContentEast() { + if (jPanelContentEast == null) { + jPanelContentEast = new JPanel(); } - return jPanel; + return jPanelContentEast; } /** @@ -163,18 +161,16 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel1() { - if (jPanel1 == null) { + private JPanel getJPanelContentSouth() { + if (jPanelContentSouth == null) { FlowLayout flowLayout = new FlowLayout(); flowLayout.setAlignment(java.awt.FlowLayout.RIGHT); flowLayout.setHgap(15); - jPanel1 = new JPanel(); - jPanel1.setLayout(flowLayout); - jPanel1.setComponentOrientation(java.awt.ComponentOrientation.LEFT_TO_RIGHT); - jPanel1.add(getJButtonCancel(), null); - jPanel1.add(getJButtonOk(), null); + jPanelContentSouth = new JPanel(); + jPanelContentSouth.setLayout(flowLayout); + jPanelContentSouth.setComponentOrientation(java.awt.ComponentOrientation.LEFT_TO_RIGHT); } - return jPanel1; + return jPanelContentSouth; } /** @@ -182,11 +178,11 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel2() { - if (jPanel2 == null) { - jPanel2 = new JPanel(); + private JPanel getJPanelContentWest() { + if (jPanelContentWest == null) { + jPanelContentWest = new JPanel(); } - return jPanel2; + return jPanelContentWest; } /** @@ -194,11 +190,11 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel3() { - if (jPanel3 == null) { - jPanel3 = new JPanel(); + private JPanel getJPanelContentNorth() { + if (jPanelContentNorth == null) { + jPanelContentNorth = new JPanel(); } - return jPanel3; + return jPanelContentNorth; } /** @@ -210,7 +206,7 @@ public class FpdFlash extends IInternalFrame { if (jTabbedPane == null) { jTabbedPane = new JTabbedPane(); jTabbedPane.addTab("FV Images", null, getJPanelFvImages(), null); - jTabbedPane.addTab("Flash Definition File", null, getJPanel7(), null); + jTabbedPane.addTab("Flash Definition File", null, getJPanelFdf(), null); } return jTabbedPane; @@ -234,36 +230,6 @@ public class FpdFlash extends IInternalFrame { return jPanelFvImages; } - /** - * This method initializes jButtonOk - * - * @return javax.swing.JButton - */ - private JButton getJButtonOk() { - if (jButtonOk == null) { - jButtonOk = new JButton(); - jButtonOk.setPreferredSize(new java.awt.Dimension(80,20)); - jButtonOk.setText("Cancel"); - jButtonOk.setVisible(false); - } - return jButtonOk; - } - - /** - * This method initializes jButtonCancel - * - * @return javax.swing.JButton - */ - private JButton getJButtonCancel() { - if (jButtonCancel == null) { - jButtonCancel = new JButton(); - jButtonCancel.setPreferredSize(new java.awt.Dimension(80,20)); - jButtonCancel.setText("Ok"); - jButtonCancel.setVisible(false); - } - return jButtonCancel; - } - /** * This method initializes jPanelFvImageN * @@ -271,14 +237,14 @@ public class FpdFlash extends IInternalFrame { */ private JPanel getJPanelFvImageN() { if (jPanelFvImageN == null) { - jLabel1 = new JLabel(); - jLabel1.setText("Value"); - jLabel1.setEnabled(false); - jLabel1.setPreferredSize(new java.awt.Dimension(38,20)); - jLabel = new JLabel(); - jLabel.setText("Name"); - jLabel.setEnabled(false); - jLabel.setPreferredSize(new java.awt.Dimension(38,20)); + jLabelFvPropValue = new JLabel(); + jLabelFvPropValue.setText("Value"); + jLabelFvPropValue.setEnabled(false); + jLabelFvPropValue.setPreferredSize(new java.awt.Dimension(38,20)); + jLabelFvPropName = new JLabel(); + jLabelFvPropName.setText("Name"); + jLabelFvPropName.setEnabled(false); + jLabelFvPropName.setPreferredSize(new java.awt.Dimension(38,20)); FlowLayout flowLayout2 = new FlowLayout(); flowLayout2.setAlignment(java.awt.FlowLayout.CENTER); flowLayout2.setHgap(15); @@ -286,13 +252,13 @@ public class FpdFlash extends IInternalFrame { jPanelFvImageN.setPreferredSize(new java.awt.Dimension(576,100)); jPanelFvImageN.setBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED)); jPanelFvImageN.setLayout(flowLayout2); - jPanelFvImageN.add(getJCheckBox1(), null); - jPanelFvImageN.add(jLabel, null); - jPanelFvImageN.add(getJTextField(), null); - jPanelFvImageN.add(jLabel1, null); - jPanelFvImageN.add(getJTextField1(), null); - jPanelFvImageN.add(getJScrollPane1(), null); - jPanelFvImageN.add(getJPanel4(), null); + jPanelFvImageN.add(getJCheckBoxFvProperty(), null); + jPanelFvImageN.add(jLabelFvPropName, null); + jPanelFvImageN.add(getJTextFieldFvPropName(), null); + jPanelFvImageN.add(jLabelFvPropValue, null); + jPanelFvImageN.add(getJTextFieldFvPropValue(), null); + jPanelFvImageN.add(getJScrollPaneFvProp(), null); + jPanelFvImageN.add(getJPanelFvPropButtonGroup(), null); } return jPanelFvImageN; } @@ -309,7 +275,7 @@ public class FpdFlash extends IInternalFrame { jPanelFvImageS = new JPanel(); jPanelFvImageS.setPreferredSize(new java.awt.Dimension(480,190)); jPanelFvImageS.setLayout(gridLayout2); - jPanelFvImageS.add(getJScrollPane3(), null); + jPanelFvImageS.add(getJScrollPaneFvInfo(), null); } return jPanelFvImageS; } @@ -320,30 +286,30 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox1() { - if (jCheckBox1 == null) { - jCheckBox1 = new JCheckBox(); - jCheckBox1.setText("FV Properties"); - jCheckBox1.addItemListener(new ItemListener(){ + private JCheckBox getJCheckBoxFvProperty() { + if (jCheckBoxFvProperty == null) { + jCheckBoxFvProperty = new JCheckBox(); + jCheckBoxFvProperty.setText("FV Properties"); + jCheckBoxFvProperty.addItemListener(new ItemListener(){ public void itemStateChanged(ItemEvent arg0) { // TODO Auto-generated method stub - boolean seleted = jCheckBox1.isSelected(); + boolean seleted = jCheckBoxFvProperty.isSelected(); - jLabel.setEnabled(seleted); - jTextField.setEnabled(seleted); - jLabel1.setEnabled(seleted); - jTextField1.setEnabled(seleted); - jTable.setEnabled(seleted); - jButton.setEnabled(seleted); - jButton1.setEnabled(seleted); + jLabelFvPropName.setEnabled(seleted); + jTextFieldFvPropName.setEnabled(seleted); + jLabelFvPropValue.setEnabled(seleted); + jTextFieldFvPropValue.setEnabled(seleted); + jTableFvProp.setEnabled(seleted); + jButtonFvPropAdd.setEnabled(seleted); + jButtonFvPropDel.setEnabled(seleted); } }); } - return jCheckBox1; + return jCheckBoxFvProperty; } @@ -352,13 +318,13 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField() { - if (jTextField == null) { - jTextField = new JTextField(); - jTextField.setPreferredSize(new java.awt.Dimension(100,20)); - jTextField.setEnabled(false); + private JTextField getJTextFieldFvPropName() { + if (jTextFieldFvPropName == null) { + jTextFieldFvPropName = new JTextField(); + jTextFieldFvPropName.setPreferredSize(new java.awt.Dimension(100,20)); + jTextFieldFvPropName.setEnabled(false); } - return jTextField; + return jTextFieldFvPropName; } @@ -367,13 +333,13 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField1() { - if (jTextField1 == null) { - jTextField1 = new JTextField(); - jTextField1.setPreferredSize(new java.awt.Dimension(100,20)); - jTextField1.setEnabled(false); + private JTextField getJTextFieldFvPropValue() { + if (jTextFieldFvPropValue == null) { + jTextFieldFvPropValue = new JTextField(); + jTextFieldFvPropValue.setPreferredSize(new java.awt.Dimension(100,20)); + jTextFieldFvPropValue.setEnabled(false); } - return jTextField1; + return jTextFieldFvPropValue; } @@ -382,21 +348,21 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton() { - if (jButton == null) { - jButton = new JButton(); - jButton.setPreferredSize(new java.awt.Dimension(80,20)); - jButton.setEnabled(false); - jButton.setText("Add"); - jButton.addActionListener(new AbstractAction() { + private JButton getJButtonFvPropAdd() { + if (jButtonFvPropAdd == null) { + jButtonFvPropAdd = new JButton(); + jButtonFvPropAdd.setPreferredSize(new java.awt.Dimension(80,20)); + jButtonFvPropAdd.setEnabled(false); + jButtonFvPropAdd.setText("Add"); + jButtonFvPropAdd.addActionListener(new AbstractAction() { /** * */ private static final long serialVersionUID = 1L; public void actionPerformed(ActionEvent e) { - if (jTextField.getText().length() > 0 && jTextField1.getText().length() > 0){ - String[] row = {jTextField.getText(), jTextField1.getText()}; + if (jTextFieldFvPropName.getText().length() > 0 && jTextFieldFvPropValue.getText().length() > 0){ + String[] row = {jTextFieldFvPropName.getText(), jTextFieldFvPropValue.getText()}; fvPropertyTableModel.addRow(row); docConsole.setSaved(false); ffc.genFvImagesNameValue(row[0], row[1]); @@ -404,7 +370,7 @@ public class FpdFlash extends IInternalFrame { } }); } - return jButton; + return jButtonFvPropAdd; } @@ -413,13 +379,13 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JScrollPane */ - private JScrollPane getJScrollPane1() { - if (jScrollPane1 == null) { - jScrollPane1 = new JScrollPane(); - jScrollPane1.setPreferredSize(new java.awt.Dimension(350,55)); - jScrollPane1.setViewportView(getJTable()); + private JScrollPane getJScrollPaneFvProp() { + if (jScrollPaneFvProp == null) { + jScrollPaneFvProp = new JScrollPane(); + jScrollPaneFvProp.setPreferredSize(new java.awt.Dimension(350,55)); + jScrollPaneFvProp.setViewportView(getJTableFvProp()); } - return jScrollPane1; + return jScrollPaneFvProp; } @@ -428,17 +394,17 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JTable */ - private JTable getJTable() { - if (jTable == null) { + private JTable getJTableFvProp() { + if (jTableFvProp == null) { fvPropertyTableModel = new DefaultTableModel(); - jTable = new JTable(fvPropertyTableModel); + jTableFvProp = new JTable(fvPropertyTableModel); fvPropertyTableModel.addColumn("Name"); fvPropertyTableModel.addColumn("Value"); - jTable.setRowHeight(20); - jTable.setEnabled(false); + jTableFvProp.setRowHeight(20); + jTableFvProp.setEnabled(false); - jTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - jTable.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ + jTableFvProp.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + jTableFvProp.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ public void valueChanged(ListSelectionEvent e) { if (e.getValueIsAdjusting()){ return; @@ -453,7 +419,7 @@ public class FpdFlash extends IInternalFrame { } }); - jTable.getModel().addTableModelListener(new TableModelListener(){ + jTableFvProp.getModel().addTableModelListener(new TableModelListener(){ public void tableChanged(TableModelEvent arg0) { // TODO Auto-generated method stub int row = arg0.getFirstRow(); @@ -468,7 +434,7 @@ public class FpdFlash extends IInternalFrame { } }); } - return jTable; + return jTableFvProp; } @@ -477,15 +443,15 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel4() { - if (jPanel4 == null) { - jPanel4 = new JPanel(); - jPanel4.setPreferredSize(new java.awt.Dimension(80,55)); + private JPanel getJPanelFvPropButtonGroup() { + if (jPanelFvPropButtonGroup == null) { + jPanelFvPropButtonGroup = new JPanel(); + jPanelFvPropButtonGroup.setPreferredSize(new java.awt.Dimension(80,55)); - jPanel4.add(getJButton(), null); - jPanel4.add(getJButton1(), null); + jPanelFvPropButtonGroup.add(getJButtonFvPropAdd(), null); + jPanelFvPropButtonGroup.add(getJButtonFvPropDel(), null); } - return jPanel4; + return jPanelFvPropButtonGroup; } @@ -494,28 +460,28 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton1() { - if (jButton1 == null) { - jButton1 = new JButton(); - jButton1.setPreferredSize(new java.awt.Dimension(80,20)); - jButton1.setEnabled(false); - jButton1.setText("Delete"); - jButton1.addActionListener(new AbstractAction() { + private JButton getJButtonFvPropDel() { + if (jButtonFvPropDel == null) { + jButtonFvPropDel = new JButton(); + jButtonFvPropDel.setPreferredSize(new java.awt.Dimension(80,20)); + jButtonFvPropDel.setEnabled(false); + jButtonFvPropDel.setText("Delete"); + jButtonFvPropDel.addActionListener(new AbstractAction() { /** * */ private static final long serialVersionUID = 1L; public void actionPerformed(ActionEvent e) { - if (jTable.getSelectedRow() >= 0){ - fvPropertyTableModel.removeRow(jTable.getSelectedRow()); + if (jTableFvProp.getSelectedRow() >= 0){ + fvPropertyTableModel.removeRow(jTableFvProp.getSelectedRow()); docConsole.setSaved(false); - ffc.removeFvImagesNameValue(jTable.getSelectedRow()); + ffc.removeFvImagesNameValue(jTableFvProp.getSelectedRow()); } } }); } - return jButton1; + return jButtonFvPropDel; } @@ -526,26 +492,26 @@ public class FpdFlash extends IInternalFrame { */ private JPanel getJPanelFvImageC() { if (jPanelFvImageC == null) { - jLabel4 = new JLabel(); - jLabel4.setPreferredSize(new Dimension(38, 20)); - jLabel4.setEnabled(false); - jLabel4.setText("Name"); - jLabel3 = new JLabel(); - jLabel3.setText("FV Image Names"); - jLabel3.setEnabled(false); - jLabel3.setPreferredSize(new java.awt.Dimension(150,20)); - jLabel2 = new JLabel(); - jLabel2.setText("Type"); - jLabel2.setEnabled(false); - jLabel2.setPreferredSize(new java.awt.Dimension(70,20)); + jLabelFvParaName = new JLabel(); + jLabelFvParaName.setPreferredSize(new Dimension(38, 20)); + jLabelFvParaName.setEnabled(false); + jLabelFvParaName.setText("Name"); + jLabelFvImageNames = new JLabel(); + jLabelFvImageNames.setText("FV Image Names"); + jLabelFvImageNames.setEnabled(false); + jLabelFvImageNames.setPreferredSize(new java.awt.Dimension(150,20)); + jLabelFvParaType = new JLabel(); + jLabelFvParaType.setText("Type"); + jLabelFvParaType.setEnabled(false); + jLabelFvParaType.setPreferredSize(new java.awt.Dimension(70,20)); FlowLayout flowLayout3 = new FlowLayout(); flowLayout3.setAlignment(java.awt.FlowLayout.LEFT); flowLayout3.setHgap(5); jPanelFvImageC = new JPanel(); jPanelFvImageC.setLayout(flowLayout3); - jPanelFvImageC.add(getJPanel6(), null); + jPanelFvImageC.add(getJPanelFvImagePara(), null); - jPanelFvImageC.add(getJPanel5(), null); + jPanelFvImageC.add(getJPanelFvImageOpts(), null); } return jPanelFvImageC; @@ -557,33 +523,33 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox2() { - if (jCheckBox2 == null) { - jCheckBox2 = new JCheckBox(); - jCheckBox2.setText("FV Image Parameters"); - jCheckBox2.setPreferredSize(new java.awt.Dimension(200,20)); - jCheckBox2.addItemListener(new ItemListener(){ + private JCheckBox getJCheckBoxFvImagePara() { + if (jCheckBoxFvImagePara == null) { + jCheckBoxFvImagePara = new JCheckBox(); + jCheckBoxFvImagePara.setText("FV Image Parameters"); + jCheckBoxFvImagePara.setPreferredSize(new java.awt.Dimension(200,20)); + jCheckBoxFvImagePara.addItemListener(new ItemListener(){ public void itemStateChanged(ItemEvent arg0) { // TODO Auto-generated method stub - boolean seleted = jCheckBox2.isSelected(); + boolean seleted = jCheckBoxFvImagePara.isSelected(); - jLabel2.setEnabled(seleted); - jLabel3.setEnabled(seleted); - jLabel4.setEnabled(seleted); - jComboBox.setEnabled(seleted); - jTextField2.setEnabled(seleted); + jLabelFvParaType.setEnabled(seleted); + jLabelFvImageNames.setEnabled(seleted); + jLabelFvParaName.setEnabled(seleted); + jComboBoxFvParaType.setEnabled(seleted); + jTextFieldFvParaName.setEnabled(seleted); - jTable1.setEnabled(seleted); - jButton2.setEnabled(seleted); - jButton3.setEnabled(seleted); + jTableFvImageNames.setEnabled(seleted); + jButtonFvParaAdd.setEnabled(seleted); + jButtonFvParaDel.setEnabled(seleted); } }); } - return jCheckBox2; + return jCheckBoxFvImagePara; } @@ -592,16 +558,16 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JComboBox */ - private JComboBox getJComboBox() { - if (jComboBox == null) { - jComboBox = new JComboBox(); - jComboBox.addItem("ImageName"); - jComboBox.addItem("Attributes"); - jComboBox.addItem("Options"); - jComboBox.addItem("Components"); - jComboBox.setPreferredSize(new java.awt.Dimension(180,20)); - jComboBox.setEnabled(false); - jComboBox.addItemListener(new ItemListener() { + private JComboBox getJComboBoxFvParaType() { + if (jComboBoxFvParaType == null) { + jComboBoxFvParaType = new JComboBox(); + jComboBoxFvParaType.addItem("ImageName"); + jComboBoxFvParaType.addItem("Attributes"); + jComboBoxFvParaType.addItem("Options"); + jComboBoxFvParaType.addItem("Components"); + jComboBoxFvParaType.setPreferredSize(new java.awt.Dimension(180,20)); + jComboBoxFvParaType.setEnabled(false); + jComboBoxFvParaType.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent arg0) { // TODO disable attribute settings when ValidImageNames selected. @@ -610,7 +576,7 @@ public class FpdFlash extends IInternalFrame { }); } - return jComboBox; + return jComboBoxFvParaType; } @@ -619,13 +585,13 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField2() { - if (jTextField2 == null) { - jTextField2 = new JTextField(); - jTextField2.setPreferredSize(new java.awt.Dimension(140,20)); - jTextField2.setEnabled(false); + private JTextField getJTextFieldFvParaName() { + if (jTextFieldFvParaName == null) { + jTextFieldFvParaName = new JTextField(); + jTextFieldFvParaName.setPreferredSize(new java.awt.Dimension(140,20)); + jTextFieldFvParaName.setEnabled(false); } - return jTextField2; + return jTextFieldFvParaName; } @@ -634,27 +600,27 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton2() { - if (jButton2 == null) { - jButton2 = new JButton(); - jButton2.setPreferredSize(new Dimension(80, 20)); - jButton2.setEnabled(false); - jButton2.setText("Add"); - jButton2.addActionListener(new AbstractAction() { + private JButton getJButtonFvParaAdd() { + if (jButtonFvParaAdd == null) { + jButtonFvParaAdd = new JButton(); + jButtonFvParaAdd.setPreferredSize(new Dimension(80, 20)); + jButtonFvParaAdd.setEnabled(false); + jButtonFvParaAdd.setText("Add"); + jButtonFvParaAdd.addActionListener(new AbstractAction() { /** * */ private static final long serialVersionUID = 1L; public void actionPerformed(java.awt.event.ActionEvent e) { - if (jTextField2.getText().length() > 0){ - String[] row = {jTextField2.getText()}; + if (jTextFieldFvParaName.getText().length() > 0){ + String[] row = {jTextFieldFvParaName.getText()}; fvImageNameTableModel.addRow(row); } } }); } - return jButton2; + return jButtonFvParaAdd; } @@ -663,13 +629,13 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JScrollPane */ - private JScrollPane getJScrollPane2() { - if (jScrollPane2 == null) { - jScrollPane2 = new JScrollPane(); - jScrollPane2.setPreferredSize(new java.awt.Dimension(350,50)); - jScrollPane2.setViewportView(getJTable1()); + private JScrollPane getJScrollPaneFvImageNames() { + if (jScrollPaneFvImageNames == null) { + jScrollPaneFvImageNames = new JScrollPane(); + jScrollPaneFvImageNames.setPreferredSize(new java.awt.Dimension(350,50)); + jScrollPaneFvImageNames.setViewportView(getJTableFvImageNames()); } - return jScrollPane2; + return jScrollPaneFvImageNames; } @@ -678,14 +644,14 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JTable */ - private JTable getJTable1() { - if (jTable1 == null) { + private JTable getJTableFvImageNames() { + if (jTableFvImageNames == null) { fvImageNameTableModel = new DefaultTableModel(); - jTable1 = new JTable(fvImageNameTableModel); - jTable1.setEnabled(false); + jTableFvImageNames = new JTable(fvImageNameTableModel); + jTableFvImageNames.setEnabled(false); fvImageNameTableModel.addColumn("FV Image Name"); } - return jTable1; + return jTableFvImageNames; } @@ -694,68 +660,68 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton3() { - if (jButton3 == null) { - jButton3 = new JButton(); - jButton3.setPreferredSize(new Dimension(80, 20)); - jButton3.setEnabled(false); - jButton3.setText("Delete"); - jButton3.addActionListener(new AbstractAction() { + private JButton getJButtonFvParaDel() { + if (jButtonFvParaDel == null) { + jButtonFvParaDel = new JButton(); + jButtonFvParaDel.setPreferredSize(new Dimension(80, 20)); + jButtonFvParaDel.setEnabled(false); + jButtonFvParaDel.setText("Delete"); + jButtonFvParaDel.addActionListener(new AbstractAction() { /** * */ private static final long serialVersionUID = 1L; public void actionPerformed(java.awt.event.ActionEvent e) { - if (jTable1.getSelectedRow() >= 0){ + if (jTableFvImageNames.getSelectedRow() >= 0){ - fvImageNameTableModel.removeRow(jTable1.getSelectedRow()); + fvImageNameTableModel.removeRow(jTableFvImageNames.getSelectedRow()); } } }); } - return jButton3; + return jButtonFvParaDel; } - private JPanel getJPanel5() { + private JPanel getJPanelFvImageOpts() { - if (jPanel5 == null) { + if (jPanelFvImageOpts == null) { //ToDo add ButtonGroup for RadioButtons - jLabel6 = new JLabel(); - jLabel6.setEnabled(true); - jLabel6.setText("Value"); - jLabel6.setPreferredSize(new Dimension(38, 20)); - jLabel5 = new JLabel(); - jLabel5.setEnabled(true); - jLabel5.setText("Name"); - jLabel5.setPreferredSize(new Dimension(38, 20)); - jPanel5 = new JPanel(); - jPanel5.setPreferredSize(new java.awt.Dimension(480,150)); + jLabelFvImageOptValue = new JLabel(); + jLabelFvImageOptValue.setEnabled(true); + jLabelFvImageOptValue.setText("Value"); + jLabelFvImageOptValue.setPreferredSize(new Dimension(38, 20)); + jLabelFvImageOptName = new JLabel(); + jLabelFvImageOptName.setEnabled(true); + jLabelFvImageOptName.setText("Name"); + jLabelFvImageOptName.setPreferredSize(new Dimension(38, 20)); + jPanelFvImageOpts = new JPanel(); + jPanelFvImageOpts.setPreferredSize(new java.awt.Dimension(480,150)); - jPanel5.setLayout(new FlowLayout()); + jPanelFvImageOpts.setLayout(new FlowLayout()); - jPanel5.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED)); - jPanel5.add(getJCheckBox3(), null); - jPanel5.add(jLabel5, null); - jPanel5.add(getJTextField4(), null); - jPanel5.add(jLabel6, null); - jPanel5.add(getJTextField5(), null); - jPanel5.add(getJScrollPane(), null); - jPanel5.add(getJPanel8(), null); - jPanel5.add(getJButton4(), null); - jPanel5.add(getJButton6(), null); - jPanel5.add(getJButton9(), null); + jPanelFvImageOpts.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED)); + jPanelFvImageOpts.add(getJCheckBoxFvImageOpts(), null); + jPanelFvImageOpts.add(jLabelFvImageOptName, null); + jPanelFvImageOpts.add(getJTextFieldFvImageOptName(), null); + jPanelFvImageOpts.add(jLabelFvImageOptValue, null); + jPanelFvImageOpts.add(getJTextFieldFvImageOptValue(), null); + jPanelFvImageOpts.add(getJScrollPane(), null); + jPanelFvImageOpts.add(getJPanelFvImageOptsButtonGroup(), null); + jPanelFvImageOpts.add(getJButtonAddFvImage(), null); + jPanelFvImageOpts.add(getJButtonDelFvImage(), null); + jPanelFvImageOpts.add(getJButtonUpdateFvImage(), null); } - return jPanel5; + return jPanelFvImageOpts; } @@ -764,53 +730,53 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton4() { - if (jButton4 == null) { - jButton4 = new JButton(); - jButton4.setPreferredSize(new java.awt.Dimension(120,20)); + private JButton getJButtonAddFvImage() { + if (jButtonAddFvImage == null) { + jButtonAddFvImage = new JButton(); + jButtonAddFvImage.setPreferredSize(new java.awt.Dimension(120,20)); // jButton4.setEnabled(false); - jButton4.setText("Add FV Image"); - jButton4.addActionListener(new AbstractAction() { + jButtonAddFvImage.setText("Add FV Image"); + jButtonAddFvImage.addActionListener(new AbstractAction() { /** * */ private static final long serialVersionUID = 1L; public void actionPerformed(java.awt.event.ActionEvent e) { - if (jTable2.isEditing()) { - jTable2.getCellEditor().stopCellEditing(); + if (jTableFvInfo.isEditing()) { + jTableFvInfo.getCellEditor().stopCellEditing(); } - if (jTable3.isEditing()) { - jTable3.getCellEditor().stopCellEditing(); + if (jTableFvImageOpts.isEditing()) { + jTableFvImageOpts.getCellEditor().stopCellEditing(); } - if (jTable1.getRowCount()== 0){ + if (jTableFvImageNames.getRowCount()== 0){ return; } String imageName = " "; - for (int i = 0; i < jTable1.getRowCount(); ++i){ - imageName += (String)jTable1.getValueAt(i, 0); + for (int i = 0; i < jTableFvImageNames.getRowCount(); ++i){ + imageName += (String)jTableFvImageNames.getValueAt(i, 0); imageName += " "; } imageName = imageName.trim(); - if (!jCheckBox3.isSelected() && jComboBox.getSelectedIndex() != 0){ + if (!jCheckBoxFvImageOpts.isSelected() && jComboBoxFvParaType.getSelectedIndex() != 0){ return; } LinkedHashMap m = null; - if (jCheckBox3.isSelected()) { + if (jCheckBoxFvImageOpts.isSelected()) { m = new LinkedHashMap(); getOptionNameValue(m); } - ffc.genFvImagesFvImage(imageName.split(" "), jComboBox.getSelectedItem()+"", m); + ffc.genFvImagesFvImage(imageName.split(" "), jComboBoxFvParaType.getSelectedItem()+"", m); docConsole.setSaved(false); - Object[] row = {imageName, jComboBox.getSelectedItem()}; + Object[] row = {imageName, jComboBoxFvParaType.getSelectedItem()}; fvImageParaTableModel.addRow(row); } }); } - return jButton4; + return jButtonAddFvImage; } @@ -819,13 +785,13 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JScrollPane */ - private JScrollPane getJScrollPane3() { - if (jScrollPane3 == null) { - jScrollPane3 = new JScrollPane(); - jScrollPane3.setPreferredSize(new java.awt.Dimension(480,150)); - jScrollPane3.setViewportView(getJTable2()); + private JScrollPane getJScrollPaneFvInfo() { + if (jScrollPaneFvInfo == null) { + jScrollPaneFvInfo = new JScrollPane(); + jScrollPaneFvInfo.setPreferredSize(new java.awt.Dimension(480,150)); + jScrollPaneFvInfo.setViewportView(getJTableFvInfo()); } - return jScrollPane3; + return jScrollPaneFvInfo; } @@ -834,15 +800,15 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JTable */ - private JTable getJTable2() { - if (jTable2 == null) { + private JTable getJTableFvInfo() { + if (jTableFvInfo == null) { fvImageParaTableModel = new ImageParaTableModel(); - jTable2 = new JTable(fvImageParaTableModel); + jTableFvInfo = new JTable(fvImageParaTableModel); fvImageParaTableModel.addColumn("FvImageNames"); fvImageParaTableModel.addColumn("Type"); - TableColumn typeCol = jTable2.getColumnModel().getColumn(1); + TableColumn typeCol = jTableFvInfo.getColumnModel().getColumn(1); JComboBox cb = new JComboBox(); cb.addItem("ValidImageNames"); cb.addItem("Attributes"); @@ -850,8 +816,8 @@ public class FpdFlash extends IInternalFrame { cb.addItem("Components"); typeCol.setCellEditor(new DefaultCellEditor(cb)); - jTable2.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - jTable2.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ + jTableFvInfo.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + jTableFvInfo.getSelectionModel().addListSelectionListener(new ListSelectionListener(){ public void valueChanged(ListSelectionEvent e) { if (e.getValueIsAdjusting()){ return; @@ -883,7 +849,7 @@ public class FpdFlash extends IInternalFrame { } - return jTable2; + return jTableFvInfo; } @@ -892,13 +858,13 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton6() { - if (jButton6 == null) { - jButton6 = new JButton(); - jButton6.setPreferredSize(new java.awt.Dimension(120,20)); + private JButton getJButtonDelFvImage() { + if (jButtonDelFvImage == null) { + jButtonDelFvImage = new JButton(); + jButtonDelFvImage.setPreferredSize(new java.awt.Dimension(120,20)); // jButton6.setEnabled(false); - jButton6.setText("Delete Row"); - jButton6.addActionListener(new AbstractAction() { + jButtonDelFvImage.setText("Delete Row"); + jButtonDelFvImage.addActionListener(new AbstractAction() { /** * */ @@ -906,16 +872,16 @@ public class FpdFlash extends IInternalFrame { public void actionPerformed(ActionEvent arg0) { // TODO Auto-generated method stub - if (jTable2.getSelectedRow() >= 0 ) { - ffc.removeFvImagesFvImage(jTable2.getSelectedRow()); - fvImageParaTableModel.removeRow(jTable2.getSelectedRow()); + if (jTableFvInfo.getSelectedRow() >= 0 ) { + ffc.removeFvImagesFvImage(jTableFvInfo.getSelectedRow()); + fvImageParaTableModel.removeRow(jTableFvInfo.getSelectedRow()); docConsole.setSaved(false); } } }); } - return jButton6; + return jButtonDelFvImage; } @@ -924,17 +890,17 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox3() { - if (jCheckBox3 == null) { - jCheckBox3 = new JCheckBox(); - jCheckBox3.setText("FV Image Options"); - jCheckBox3.addItemListener(new ItemListener(){ + private JCheckBox getJCheckBoxFvImageOpts() { + if (jCheckBoxFvImageOpts == null) { + jCheckBoxFvImageOpts = new JCheckBox(); + jCheckBoxFvImageOpts.setText("FV Image Options"); + jCheckBoxFvImageOpts.addItemListener(new ItemListener(){ public void itemStateChanged(ItemEvent arg0) { // TODO Auto-generated method stub // boolean selected = jCheckBox3.isSelected(); - if (!jCheckBox2.isSelected() || jComboBox.getSelectedIndex() == 0) { + if (!jCheckBoxFvImagePara.isSelected() || jComboBoxFvParaType.getSelectedIndex() == 0) { return; } @@ -949,7 +915,7 @@ public class FpdFlash extends IInternalFrame { }); } - return jCheckBox3; + return jCheckBoxFvImageOpts; } @@ -958,25 +924,25 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel6() { - if (jPanel6 == null) { + private JPanel getJPanelFvImagePara() { + if (jPanelFvImagePara == null) { StarLabel starLabel = new StarLabel(); starLabel.setVisible(false); - jPanel6 = new JPanel(); - jPanel6.setPreferredSize(new java.awt.Dimension(480,120)); - jPanel6.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.RAISED)); - jPanel6.add(getJCheckBox2(), null); - jPanel6.add(jLabel2, null); - jPanel6.add(getJComboBox(), null); - jPanel6.add(new StarLabel(), null); - jPanel6.add(jLabel3, null); - jPanel6.add(jLabel4, null); - jPanel6.add(getJTextField2(), null); - jPanel6.add(getJButton2(), null); - jPanel6.add(getJScrollPane2(), null); - jPanel6.add(getJButton3(), null); + jPanelFvImagePara = new JPanel(); + jPanelFvImagePara.setPreferredSize(new java.awt.Dimension(480,120)); + jPanelFvImagePara.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.RAISED)); + jPanelFvImagePara.add(getJCheckBoxFvImagePara(), null); + jPanelFvImagePara.add(jLabelFvParaType, null); + jPanelFvImagePara.add(getJComboBoxFvParaType(), null); + jPanelFvImagePara.add(new StarLabel(), null); + jPanelFvImagePara.add(jLabelFvImageNames, null); + jPanelFvImagePara.add(jLabelFvParaName, null); + jPanelFvImagePara.add(getJTextFieldFvParaName(), null); + jPanelFvImagePara.add(getJButtonFvParaAdd(), null); + jPanelFvImagePara.add(getJScrollPaneFvImageNames(), null); + jPanelFvImagePara.add(getJButtonFvParaDel(), null); } - return jPanel6; + return jPanelFvImagePara; } /** @@ -984,29 +950,29 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel7() { - if (jPanel7 == null) { + private JPanel getJPanelFdf() { + if (jPanelFdf == null) { FlowLayout flowLayout1 = new FlowLayout(); flowLayout1.setAlignment(FlowLayout.LEFT); - jPanel7 = new JPanel(); - jPanel7.setLayout(flowLayout1); - jPanel7.add(getJCheckBox(), null); - jPanel7.add(getJTextField3(), null); - jPanel7.add(getJButton5(), null); - jPanel7.addComponentListener(new ComponentAdapter(){ + jPanelFdf = new JPanel(); + jPanelFdf.setLayout(flowLayout1); + jPanelFdf.add(getJCheckBoxFdf(), null); + jPanelFdf.add(getJTextFieldFdf(), null); + jPanelFdf.add(getJButtonFdfBrowse(), null); + jPanelFdf.addComponentListener(new ComponentAdapter(){ public void componentShown(ComponentEvent e) { if (ffc.getFlashDefinitionFile() != null) { - jTextField3.setText(ffc.getFlashDefinitionFile()); + jTextFieldFdf.setText(ffc.getFlashDefinitionFile()); } } public void componentHidden(ComponentEvent e) { - if (jCheckBox.isSelected()) { - ffc.genFlashDefinitionFile(jTextField3.getText()); + if (jCheckBoxFdf.isSelected()) { + ffc.genFlashDefinitionFile(jTextFieldFdf.getText()); } } }); } - return jPanel7; + return jPanelFdf; } /** @@ -1014,27 +980,27 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox() { - if (jCheckBox == null) { - jCheckBox = new JCheckBox(); - jCheckBox.setText("Flash Definition File"); - jCheckBox.addItemListener(new ItemListener() { + private JCheckBox getJCheckBoxFdf() { + if (jCheckBoxFdf == null) { + jCheckBoxFdf = new JCheckBox(); + jCheckBoxFdf.setText("Flash Definition File"); + jCheckBoxFdf.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent arg0) { // TODO Auto-generated method stub - if (jCheckBox.isSelected()){ - jTextField3.setEnabled(true); - jButton5.setEnabled(true); + if (jCheckBoxFdf.isSelected()){ + jTextFieldFdf.setEnabled(true); + jButtonFdfBrowse.setEnabled(true); } else { - jTextField3.setEnabled(false); - jButton5.setEnabled(false); + jTextFieldFdf.setEnabled(false); + jButtonFdfBrowse.setEnabled(false); } } }); } - return jCheckBox; + return jCheckBoxFdf; } /** @@ -1042,18 +1008,18 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField3() { - if (jTextField3 == null) { - jTextField3 = new JTextField(); - jTextField3.setEnabled(false); - jTextField3.setPreferredSize(new Dimension(300, 20)); - jTextField3.addFocusListener(new java.awt.event.FocusAdapter() { + private JTextField getJTextFieldFdf() { + if (jTextFieldFdf == null) { + jTextFieldFdf = new JTextField(); + jTextFieldFdf.setEnabled(false); + jTextFieldFdf.setPreferredSize(new Dimension(300, 20)); + jTextFieldFdf.addFocusListener(new java.awt.event.FocusAdapter() { public void focusLost(java.awt.event.FocusEvent e) { - ffc.genFlashDefinitionFile(jTextField3.getText()); + ffc.genFlashDefinitionFile(jTextFieldFdf.getText()); } }); } - return jTextField3; + return jTextFieldFdf; } /** @@ -1061,13 +1027,13 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton5() { - if (jButton5 == null) { - jButton5 = new JButton(); - jButton5.setEnabled(false); - jButton5.setText("Browse"); - jButton5.setPreferredSize(new Dimension(78, 20)); - jButton5.addActionListener(new AbstractAction(){ + private JButton getJButtonFdfBrowse() { + if (jButtonFdfBrowse == null) { + jButtonFdfBrowse = new JButton(); + jButtonFdfBrowse.setEnabled(false); + jButtonFdfBrowse.setText("Browse"); + jButtonFdfBrowse.setPreferredSize(new Dimension(78, 20)); + jButtonFdfBrowse.addActionListener(new AbstractAction(){ /** * */ @@ -1088,13 +1054,13 @@ public class FpdFlash extends IInternalFrame { JOptionPane.showMessageDialog(frame, "You can only select files in current WORKSPACE."); return; } - jTextField3.setText(filePath.substring(wsDir.length() + 1).replace('\\', '/')); + jTextFieldFdf.setText(filePath.substring(wsDir.length() + 1).replace('\\', '/')); } } }); } - return jButton5; + return jButtonFdfBrowse; } /** @@ -1102,13 +1068,13 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField4() { - if (jTextField4 == null) { - jTextField4 = new JTextField(); - jTextField4.setEnabled(true); - jTextField4.setPreferredSize(new Dimension(100, 20)); + private JTextField getJTextFieldFvImageOptName() { + if (jTextFieldFvImageOptName == null) { + jTextFieldFvImageOptName = new JTextField(); + jTextFieldFvImageOptName.setEnabled(true); + jTextFieldFvImageOptName.setPreferredSize(new Dimension(100, 20)); } - return jTextField4; + return jTextFieldFvImageOptName; } /** @@ -1116,13 +1082,13 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField5() { - if (jTextField5 == null) { - jTextField5 = new JTextField(); - jTextField5.setEnabled(true); - jTextField5.setPreferredSize(new Dimension(100, 20)); + private JTextField getJTextFieldFvImageOptValue() { + if (jTextFieldFvImageOptValue == null) { + jTextFieldFvImageOptValue = new JTextField(); + jTextFieldFvImageOptValue.setEnabled(true); + jTextFieldFvImageOptValue.setPreferredSize(new Dimension(100, 20)); } - return jTextField5; + return jTextFieldFvImageOptValue; } /** @@ -1130,14 +1096,14 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel8() { - if (jPanel8 == null) { - jPanel8 = new JPanel(); - jPanel8.setPreferredSize(new Dimension(80, 55)); - jPanel8.add(getJButton7(), null); - jPanel8.add(getJButton8(), null); + private JPanel getJPanelFvImageOptsButtonGroup() { + if (jPanelFvImageOptsButtonGroup == null) { + jPanelFvImageOptsButtonGroup = new JPanel(); + jPanelFvImageOptsButtonGroup.setPreferredSize(new Dimension(80, 55)); + jPanelFvImageOptsButtonGroup.add(getJButtonFvImageOptAdd(), null); + jPanelFvImageOptsButtonGroup.add(getJButtonFvImageOptDel(), null); } - return jPanel8; + return jPanelFvImageOptsButtonGroup; } /** @@ -1145,27 +1111,27 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton7() { - if (jButton7 == null) { - jButton7 = new JButton(); - jButton7.setEnabled(true); - jButton7.setText("Add"); - jButton7.setPreferredSize(new Dimension(80, 20)); - jButton7.addActionListener(new AbstractAction() { + private JButton getJButtonFvImageOptAdd() { + if (jButtonFvImageOptAdd == null) { + jButtonFvImageOptAdd = new JButton(); + jButtonFvImageOptAdd.setEnabled(true); + jButtonFvImageOptAdd.setText("Add"); + jButtonFvImageOptAdd.setPreferredSize(new Dimension(80, 20)); + jButtonFvImageOptAdd.addActionListener(new AbstractAction() { /** * */ private static final long serialVersionUID = 1L; public void actionPerformed(ActionEvent e) { - if (jTextField4.getText().length() > 0 && jTextField5.getText().length() > 0){ - String[] row = {jTextField4.getText(), jTextField5.getText()}; + if (jTextFieldFvImageOptName.getText().length() > 0 && jTextFieldFvImageOptValue.getText().length() > 0){ + String[] row = {jTextFieldFvImageOptName.getText(), jTextFieldFvImageOptValue.getText()}; fvOptionTableModel.addRow(row); } } }); } - return jButton7; + return jButtonFvImageOptAdd; } /** @@ -1173,26 +1139,26 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton8() { - if (jButton8 == null) { - jButton8 = new JButton(); - jButton8.setEnabled(true); - jButton8.setText("Delete"); - jButton8.setPreferredSize(new Dimension(80, 20)); - jButton8.addActionListener(new AbstractAction() { + private JButton getJButtonFvImageOptDel() { + if (jButtonFvImageOptDel == null) { + jButtonFvImageOptDel = new JButton(); + jButtonFvImageOptDel.setEnabled(true); + jButtonFvImageOptDel.setText("Delete"); + jButtonFvImageOptDel.setPreferredSize(new Dimension(80, 20)); + jButtonFvImageOptDel.addActionListener(new AbstractAction() { /** * */ private static final long serialVersionUID = 1L; public void actionPerformed(ActionEvent e) { - if (jTable3.getSelectedRow() >= 0){ - fvOptionTableModel.removeRow(jTable.getSelectedRow()); + if (jTableFvImageOpts.getSelectedRow() >= 0){ + fvOptionTableModel.removeRow(jTableFvProp.getSelectedRow()); } } }); } - return jButton8; + return jButtonFvImageOptDel; } /** @@ -1204,7 +1170,7 @@ public class FpdFlash extends IInternalFrame { if (jScrollPane == null) { jScrollPane = new JScrollPane(); jScrollPane.setPreferredSize(new java.awt.Dimension(350,80)); - jScrollPane.setViewportView(getJTable3()); + jScrollPane.setViewportView(getJTableFvImageOpts()); } return jScrollPane; } @@ -1214,18 +1180,18 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JTable */ - private JTable getJTable3() { - if (jTable3 == null) { + private JTable getJTableFvImageOpts() { + if (jTableFvImageOpts == null) { fvOptionTableModel = new DefaultTableModel(); fvOptionTableModel.addColumn("Name"); fvOptionTableModel.addColumn("Value"); - jTable3 = new JTable(fvOptionTableModel); + jTableFvImageOpts = new JTable(fvOptionTableModel); - jTable3.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - jTable3.setRowHeight(20); + jTableFvImageOpts.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + jTableFvImageOpts.setRowHeight(20); } - return jTable3; + return jTableFvImageOpts; } /** @@ -1233,20 +1199,20 @@ public class FpdFlash extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton9() { - if (jButton9 == null) { - jButton9 = new JButton(); - jButton9.setPreferredSize(new Dimension(120, 20)); - jButton9.setActionCommand("Update"); - jButton9.setText("Update FV"); - jButton9.addActionListener(new java.awt.event.ActionListener() { + private JButton getJButtonUpdateFvImage() { + if (jButtonUpdateFvImage == null) { + jButtonUpdateFvImage = new JButton(); + jButtonUpdateFvImage.setPreferredSize(new Dimension(120, 20)); + jButtonUpdateFvImage.setActionCommand("Update"); + jButtonUpdateFvImage.setText("Update FV"); + jButtonUpdateFvImage.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { - int row = jTable2.getSelectedRow(); - if (jTable2.isEditing()) { - jTable2.getCellEditor().stopCellEditing(); + int row = jTableFvInfo.getSelectedRow(); + if (jTableFvInfo.isEditing()) { + jTableFvInfo.getCellEditor().stopCellEditing(); } - if (jTable3.isEditing()) { - jTable3.getCellEditor().stopCellEditing(); + if (jTableFvImageOpts.isEditing()) { + jTableFvImageOpts.getCellEditor().stopCellEditing(); } //ToDo Check data validity before update @@ -1262,7 +1228,7 @@ public class FpdFlash extends IInternalFrame { } }); } - return jButton9; + return jButtonUpdateFvImage; } /** @@ -1285,14 +1251,14 @@ public class FpdFlash extends IInternalFrame { this.setTitle("FPD Flash Definitions"); this.addInternalFrameListener(new InternalFrameAdapter(){ public void internalFrameDeactivated(InternalFrameEvent e){ - if (jTable.isEditing()) { - jTable.getCellEditor().stopCellEditing(); + if (jTableFvProp.isEditing()) { + jTableFvProp.getCellEditor().stopCellEditing(); } - if (jTable1.isEditing()) { - jTable1.getCellEditor().stopCellEditing(); + if (jTableFvImageNames.isEditing()) { + jTableFvImageNames.getCellEditor().stopCellEditing(); } - if (jTable2.isEditing()) { - jTable2.getCellEditor().stopCellEditing(); + if (jTableFvInfo.isEditing()) { + jTableFvInfo.getCellEditor().stopCellEditing(); } } }); @@ -1325,7 +1291,7 @@ public class FpdFlash extends IInternalFrame { } private void getOptionNameValue(Map m){ - for (int i = 0; i < jTable3.getRowCount(); ++i) { + for (int i = 0; i < jTableFvImageOpts.getRowCount(); ++i) { m.put(fvOptionTableModel.getValueAt(i, 0)+"", fvOptionTableModel.getValueAt(i, 1)+""); } } @@ -1338,10 +1304,10 @@ public class FpdFlash extends IInternalFrame { if (jContentPane == null) { jContentPane = new JPanel(); jContentPane.setLayout(new BorderLayout()); - jContentPane.add(getJPanel(), java.awt.BorderLayout.EAST); - jContentPane.add(getJPanel1(), java.awt.BorderLayout.SOUTH); - jContentPane.add(getJPanel2(), java.awt.BorderLayout.WEST); - jContentPane.add(getJPanel3(), java.awt.BorderLayout.NORTH); + jContentPane.add(getJPanelContentEast(), java.awt.BorderLayout.EAST); + jContentPane.add(getJPanelContentSouth(), java.awt.BorderLayout.SOUTH); + jContentPane.add(getJPanelContentWest(), java.awt.BorderLayout.WEST); + jContentPane.add(getJPanelContentNorth(), java.awt.BorderLayout.NORTH); jContentPane.add(getJTabbedPane(), java.awt.BorderLayout.CENTER); } return jContentPane; diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java index c37be625ac..25a39c0a62 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java @@ -37,21 +37,21 @@ public class FpdFrameworkModules extends IInternalFrame { private static final long serialVersionUID = 1L; static JFrame frame; private JSplitPane jSplitPane = null; - private JPanel jPanel = null; - private JPanel jPanel1 = null; + private JPanel jPanelTop = null; + private JPanel jPanelBottom = null; private JLabel jLabel = null; - private JScrollPane jScrollPane = null; - private JTable jTable = null; - private JPanel jPanel2 = null; - private JButton jButton = null; - private JLabel jLabel1 = null; - private JPanel jPanel3 = null; - private JScrollPane jScrollPane1 = null; - private JTable jTable1 = null; - private JButton jButton1 = null; - private JButton jButton2 = null; - private NonEditableTableModel model = null; - private NonEditableTableModel model1 = null; + private JScrollPane jScrollPaneAllModules = null; + private JTable jTableAllModules = null; + private JPanel jPanelTopSouth = null; + private JButton jButtonAddModule = null; + private JLabel jLabelModulesAdded = null; + private JPanel jPanelBottomSouth = null; + private JScrollPane jScrollPaneFpdModules = null; + private JTable jTableFpdModules = null; + private JButton jButtonSettings = null; + private JButton jButtonRemoveModule = null; + private NonEditableTableModel modelAllModules = null; + private NonEditableTableModel modelFpdModules = null; private FpdModuleSA settingDlg = null; @@ -71,8 +71,8 @@ public class FpdFrameworkModules extends IInternalFrame { jSplitPane = new JSplitPane(); jSplitPane.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT); jSplitPane.setDividerLocation(250); - jSplitPane.setBottomComponent(getJPanel1()); - jSplitPane.setTopComponent(getJPanel()); + jSplitPane.setBottomComponent(getJPanelBottom()); + jSplitPane.setTopComponent(getJPanelTop()); } return jSplitPane; } @@ -82,17 +82,17 @@ public class FpdFrameworkModules extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel() { - if (jPanel == null) { + private JPanel getJPanelTop() { + if (jPanelTop == null) { jLabel = new JLabel(); jLabel.setText("Modules in Workspace"); - jPanel = new JPanel(); - jPanel.setLayout(new BorderLayout()); - jPanel.add(jLabel, java.awt.BorderLayout.NORTH); - jPanel.add(getJScrollPane(), java.awt.BorderLayout.CENTER); - jPanel.add(getJPanel2(), java.awt.BorderLayout.SOUTH); + jPanelTop = new JPanel(); + jPanelTop.setLayout(new BorderLayout()); + jPanelTop.add(jLabel, java.awt.BorderLayout.NORTH); + jPanelTop.add(getJScrollPaneAllModules(), java.awt.BorderLayout.CENTER); + jPanelTop.add(getJPanelTopSouth(), java.awt.BorderLayout.SOUTH); } - return jPanel; + return jPanelTop; } /** @@ -100,17 +100,17 @@ public class FpdFrameworkModules extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel1() { - if (jPanel1 == null) { - jLabel1 = new JLabel(); - jLabel1.setText("Modules Added"); - jPanel1 = new JPanel(); - jPanel1.setLayout(new BorderLayout()); - jPanel1.add(jLabel1, java.awt.BorderLayout.NORTH); - jPanel1.add(getJPanel3(), java.awt.BorderLayout.SOUTH); - jPanel1.add(getJScrollPane1(), java.awt.BorderLayout.CENTER); + private JPanel getJPanelBottom() { + if (jPanelBottom == null) { + jLabelModulesAdded = new JLabel(); + jLabelModulesAdded.setText("Modules Added"); + jPanelBottom = new JPanel(); + jPanelBottom.setLayout(new BorderLayout()); + jPanelBottom.add(jLabelModulesAdded, java.awt.BorderLayout.NORTH); + jPanelBottom.add(getJPanelBottomSouth(), java.awt.BorderLayout.SOUTH); + jPanelBottom.add(getJScrollPaneFpdModules(), java.awt.BorderLayout.CENTER); } - return jPanel1; + return jPanelBottom; } /** @@ -118,13 +118,13 @@ public class FpdFrameworkModules extends IInternalFrame { * * @return javax.swing.JScrollPane */ - private JScrollPane getJScrollPane() { - if (jScrollPane == null) { - jScrollPane = new JScrollPane(); - jScrollPane.setPreferredSize(new java.awt.Dimension(600,200)); - jScrollPane.setViewportView(getJTable()); + private JScrollPane getJScrollPaneAllModules() { + if (jScrollPaneAllModules == null) { + jScrollPaneAllModules = new JScrollPane(); + jScrollPaneAllModules.setPreferredSize(new java.awt.Dimension(600,200)); + jScrollPaneAllModules.setViewportView(getJTableAllModules()); } - return jScrollPane; + return jScrollPaneAllModules; } /** @@ -132,20 +132,20 @@ public class FpdFrameworkModules extends IInternalFrame { * * @return javax.swing.JTable */ - private JTable getJTable() { - if (jTable == null) { - model = new NonEditableTableModel(); - jTable = new JTable(model); - jTable.setRowHeight(20); - model.addColumn("ModuleName"); - model.addColumn("ModuleVersion"); - model.addColumn("PackageName"); - model.addColumn("PackageVersion"); - model.addColumn("Path"); + private JTable getJTableAllModules() { + if (jTableAllModules == null) { + modelAllModules = new NonEditableTableModel(); + jTableAllModules = new JTable(modelAllModules); + jTableAllModules.setRowHeight(20); + modelAllModules.addColumn("ModuleName"); + modelAllModules.addColumn("ModuleVersion"); + modelAllModules.addColumn("PackageName"); + modelAllModules.addColumn("PackageVersion"); + modelAllModules.addColumn("Path"); - jTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + jTableAllModules.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); } - return jTable; + return jTableAllModules; } /** @@ -153,15 +153,15 @@ public class FpdFrameworkModules extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel2() { - if (jPanel2 == null) { + private JPanel getJPanelTopSouth() { + if (jPanelTopSouth == null) { FlowLayout flowLayout = new FlowLayout(); flowLayout.setAlignment(java.awt.FlowLayout.RIGHT); - jPanel2 = new JPanel(); - jPanel2.setLayout(flowLayout); - jPanel2.add(getJButton(), null); + jPanelTopSouth = new JPanel(); + jPanelTopSouth.setLayout(flowLayout); + jPanelTopSouth.add(getJButtonAddModule(), null); } - return jPanel2; + return jPanelTopSouth; } /** @@ -169,19 +169,19 @@ public class FpdFrameworkModules extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton() { - if (jButton == null) { - jButton = new JButton(); - jButton.setPreferredSize(new java.awt.Dimension(130,20)); - jButton.setText("Add a Module"); - jButton.addActionListener(new java.awt.event.ActionListener() { + private JButton getJButtonAddModule() { + if (jButtonAddModule == null) { + jButtonAddModule = new JButton(); + jButtonAddModule.setPreferredSize(new java.awt.Dimension(130,20)); + jButtonAddModule.setText("Add a Module"); + jButtonAddModule.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { - int selectedRow = jTable.getSelectedRow(); + int selectedRow = jTableAllModules.getSelectedRow(); if (selectedRow < 0){ return; } - String path = model.getValueAt(selectedRow, 4)+""; + String path = modelAllModules.getValueAt(selectedRow, 4)+""; ModuleIdentification mi = miList.get(selectedRow); Vector vArchs = null; try { @@ -229,7 +229,7 @@ public class FpdFrameworkModules extends IInternalFrame { row[2] = mi.getPackage().getName(); } - model1.addRow(row); + modelFpdModules.addRow(row); docConsole.setSaved(false); try{ @@ -243,11 +243,11 @@ public class FpdFrameworkModules extends IInternalFrame { JOptionPane.showMessageDialog(frame, "This Module with Arch "+ archsAdded +" Added Successfully."); - jTable1.changeSelection(model1.getRowCount()-1, 0, false, false); + jTableFpdModules.changeSelection(modelFpdModules.getRowCount()-1, 0, false, false); } }); } - return jButton; + return jButtonAddModule; } /** @@ -255,16 +255,16 @@ public class FpdFrameworkModules extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel3() { - if (jPanel3 == null) { + private JPanel getJPanelBottomSouth() { + if (jPanelBottomSouth == null) { FlowLayout flowLayout1 = new FlowLayout(); flowLayout1.setAlignment(java.awt.FlowLayout.RIGHT); - jPanel3 = new JPanel(); - jPanel3.setLayout(flowLayout1); - jPanel3.add(getJButton1(), null); - jPanel3.add(getJButton2(), null); + jPanelBottomSouth = new JPanel(); + jPanelBottomSouth.setLayout(flowLayout1); + jPanelBottomSouth.add(getJButtonSettings(), null); + jPanelBottomSouth.add(getJButtonRemoveModule(), null); } - return jPanel3; + return jPanelBottomSouth; } /** @@ -272,13 +272,13 @@ public class FpdFrameworkModules extends IInternalFrame { * * @return javax.swing.JScrollPane */ - private JScrollPane getJScrollPane1() { - if (jScrollPane1 == null) { - jScrollPane1 = new JScrollPane(); - jScrollPane1.setPreferredSize(new java.awt.Dimension(453,200)); - jScrollPane1.setViewportView(getJTable1()); + private JScrollPane getJScrollPaneFpdModules() { + if (jScrollPaneFpdModules == null) { + jScrollPaneFpdModules = new JScrollPane(); + jScrollPaneFpdModules.setPreferredSize(new java.awt.Dimension(453,200)); + jScrollPaneFpdModules.setViewportView(getJTableFpdModules()); } - return jScrollPane1; + return jScrollPaneFpdModules; } /** @@ -286,21 +286,21 @@ public class FpdFrameworkModules extends IInternalFrame { * * @return javax.swing.JTable */ - private JTable getJTable1() { - if (jTable1 == null) { - model1 = new NonEditableTableModel(); - jTable1 = new JTable(model1); - jTable1.setRowHeight(20); - model1.addColumn("ModuleName"); - model1.addColumn("ModuleVersion"); - model1.addColumn("PackageName"); - model1.addColumn("PackageVersion"); - model1.addColumn("SupportedArch"); - model1.addColumn("Path"); + private JTable getJTableFpdModules() { + if (jTableFpdModules == null) { + modelFpdModules = new NonEditableTableModel(); + jTableFpdModules = new JTable(modelFpdModules); + jTableFpdModules.setRowHeight(20); + modelFpdModules.addColumn("ModuleName"); + modelFpdModules.addColumn("ModuleVersion"); + modelFpdModules.addColumn("PackageName"); + modelFpdModules.addColumn("PackageVersion"); + modelFpdModules.addColumn("SupportedArch"); + modelFpdModules.addColumn("Path"); - jTable1.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + jTableFpdModules.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); } - return jTable1; + return jTableFpdModules; } /** @@ -308,14 +308,14 @@ public class FpdFrameworkModules extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton1() { - if (jButton1 == null) { - jButton1 = new JButton(); - jButton1.setPreferredSize(new java.awt.Dimension(130,20)); - jButton1.setText("Settings"); - jButton1.addActionListener(new java.awt.event.ActionListener() { + private JButton getJButtonSettings() { + if (jButtonSettings == null) { + jButtonSettings = new JButton(); + jButtonSettings.setPreferredSize(new java.awt.Dimension(130,20)); + jButtonSettings.setText("Settings"); + jButtonSettings.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { - int selectedRow = jTable1.getSelectedRow(); + int selectedRow = jTableFpdModules.getSelectedRow(); if (selectedRow < 0){ return; } @@ -335,7 +335,7 @@ public class FpdFrameworkModules extends IInternalFrame { } }); } - return jButton1; + return jButtonSettings; } /** @@ -343,14 +343,14 @@ public class FpdFrameworkModules extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton2() { - if (jButton2 == null) { - jButton2 = new JButton(); - jButton2.setPreferredSize(new java.awt.Dimension(130,20)); - jButton2.setText("Remove Module"); - jButton2.addActionListener(new java.awt.event.ActionListener() { + private JButton getJButtonRemoveModule() { + if (jButtonRemoveModule == null) { + jButtonRemoveModule = new JButton(); + jButtonRemoveModule.setPreferredSize(new java.awt.Dimension(130,20)); + jButtonRemoveModule.setText("Remove Module"); + jButtonRemoveModule.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { - int selectedRow = jTable1.getSelectedRow(); + int selectedRow = jTableFpdModules.getSelectedRow(); if (selectedRow < 0){ return; } @@ -364,7 +364,7 @@ public class FpdFrameworkModules extends IInternalFrame { ModuleIdentification mi = getModuleId(sa[0] + " " + sa[1] + " " + sa[2] + " " + sa[3] + " " + sa[4]); mv = mi.getVersion(); pv = mi.getPackage().getVersion(); - model1.removeRow(selectedRow); + modelFpdModules.removeRow(selectedRow); if (arch == null) { // if no arch specified in ModuleSA fpdMsa.remove(mg+mv+pg+pv); @@ -383,7 +383,7 @@ public class FpdFrameworkModules extends IInternalFrame { } }); } - return jButton2; + return jButtonRemoveModule; } /** @@ -449,7 +449,7 @@ public class FpdFrameworkModules extends IInternalFrame { JOptionPane.showMessageDialog(frame, "ShowFPDModules:" + e.getMessage()); } } - model1.addRow(row); + modelFpdModules.addRow(row); ArrayList al = fpdMsa.get(saa[i][0]+row[1]+saa[i][2]+row[3]); if (al == null) { al = new ArrayList(); @@ -490,7 +490,7 @@ public class FpdFrameworkModules extends IInternalFrame { catch (Exception e) { JOptionPane.showMessageDialog(frame, "ShowAllModules:" + e.getMessage()); } - model.addRow(s); + modelAllModules.addRow(s); miList.add(mi); } } 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 d101250d15..4ca854c927 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 @@ -122,7 +122,7 @@ public class FpdHeader extends IInternalFrame { private JLabel jLabel = null; - private JTextField jTextField = null; + private JTextField jTextFieldUrl = null; private FpdFileContents ffc = null; @@ -432,26 +432,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,193,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 (jTextField.getText().length() == 0 && ffc.getFpdHdrUrl() == null) { + if (jTextFieldUrl.getText().length() == 0 && ffc.getFpdHdrUrl() == null) { return; } - if (jTextField.getText().equals(ffc.getFpdHdrUrl())) { + 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) { @@ -523,7 +523,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()); @@ -627,7 +627,7 @@ public class FpdHeader extends IInternalFrame { jContentPane.add(getJTextFieldCopyright(), null); jContentPane.add(jLabel, null); - jContentPane.add(getJTextField(), null); + jContentPane.add(getJTextFieldUrl(), null); } return jContentPane; } @@ -668,7 +668,7 @@ public class FpdHeader extends IInternalFrame { 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.jTextFieldUrl, this.getWidth(), intPreferredWidth); resizeComponentWidth(this.jScrollPaneLicense, this.getWidth(), intPreferredWidth); resizeComponentWidth(this.jTextFieldCopyright, this.getWidth(), intPreferredWidth); resizeComponentWidth(this.jScrollPaneDescription, this.getWidth(), intPreferredWidth); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java index e6f18d17f3..cda63d0bd4 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java @@ -52,52 +52,49 @@ public class FpdPlatformDefs extends IInternalFrame { private static final long serialVersionUID = 1L; static JFrame frame; private JPanel jContentPane = null; - private JPanel jPanel = null; - private JPanel jPanel1 = null; - private JPanel jPanel2 = null; - private JPanel jPanel3 = null; + private JPanel jPanelContentEast = null; + private JPanel jPanelContentWest = null; + private JPanel jPanelContentNorth = null; private JTabbedPane jTabbedPane = null; - private JButton jButtonOk = null; - private JButton jButtonCancel = null; - private TargetTableModel imageEntryPointTableModel = null; + private TargetTableModel buildTargetTableModel = null; private SkuInfoTableModel skuInfoTableModel = null; private OpeningPlatformType docConsole = null; private FpdFileContents ffc = null; - private JPanel jPanel4 = null; - private JPanel jPanel5 = null; + private JPanel jPanelGeneralTab = null; + private JPanel jPanelGeneralTabNorth = null; private JLabel jLabel = null; - private JCheckBox jCheckBox1 = null; - private JCheckBox jCheckBox2 = null; - private JCheckBox jCheckBox3 = null; - private JPanel jPanel6 = null; - private JCheckBox jCheckBox4 = null; - private JComboBox jComboBox = null; - private JTable jTable = null; - private JPanel jPanel7 = null; - private JLabel jLabel2 = null; - private JTextField jTextField1 = null; - private JButton jButton2 = null; - private JButton jButton3 = null; - private JScrollPane jScrollPane2 = null; - private JScrollPane jScrollPane3 = null; - private JTable jTable2 = null; - private JCheckBox jCheckBox = null; - private JCheckBox jCheckBox5 = null; - private JCheckBox jCheckBox6 = null; - private JPanel jPanel8 = null; - private JLabel jLabel7 = null; - private JLabel jLabel1 = null; - private JTextField jTextField = null; - private JPanel jPanel9 = null; - private JLabel jLabel3 = null; - private JLabel jLabel4 = null; - private JTextField jTextField2 = null; - private JLabel jLabel5 = null; - private JTextField jTextField3 = null; - private JButton jButton = null; - private JButton jButton1 = null; - private JLabel jLabel6 = null; + private JCheckBox jCheckBoxIa32 = null; + private JCheckBox jCheckBoxX64 = null; + private JCheckBox jCheckBoxIpf = null; + private JPanel jPanelGeneralTabSouth = null; + private JCheckBox jCheckBoxInterDir = null; + private JComboBox jComboBoxInterDir = null; + private JTable jTableBuildTargets = null; + private JPanel jPanelGeneralTabCenter = null; + private JLabel jLabelBuildTargets = null; + private JTextField jTextFieldBuildTarget = null; + private JButton jButtonAddBuildTarget = null; + private JButton jButtonDelBuildTarget = null; + private JScrollPane jScrollPaneBuildTargets = null; + private JScrollPane jScrollPaneSkuInfo = null; + private JTable jTableSkuInfo = null; + private JCheckBox jCheckBoxEbc = null; + private JCheckBox jCheckBoxArm = null; + private JCheckBox jCheckBoxPpc = null; + private JPanel jPanelDir = null; + private JLabel jLabelPad = null; + private JLabel jLabelOutputDir = null; + private JTextField jTextFieldOutputDir = null; + private JPanel jPanelSkuInfo = null; + private JLabel jLabelSkuInfo = null; + private JLabel jLabelSkuId = null; + private JTextField jTextFieldSkuId = null; + private JLabel jLabelSkuName = null; + private JTextField jTextFieldSkuName = null; + private JButton jButtonSkuAdd = null; + private JButton jButtonSkuDel = null; + private JLabel jLabelPadd = null; public FpdPlatformDefs() { super(); // TODO Auto-generated constructor stub @@ -123,30 +120,11 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel() { - if (jPanel == null) { - jPanel = new JPanel(); + private JPanel getJPanelContentEast() { + if (jPanelContentEast == null) { + jPanelContentEast = new JPanel(); } - return jPanel; - } - - /** - * This method initializes jPanel1 - * - * @return javax.swing.JPanel - */ - private JPanel getJPanel1() { - if (jPanel1 == null) { - FlowLayout flowLayout = new FlowLayout(); - flowLayout.setAlignment(java.awt.FlowLayout.RIGHT); - flowLayout.setHgap(15); - jPanel1 = new JPanel(); - jPanel1.setLayout(flowLayout); - jPanel1.setComponentOrientation(java.awt.ComponentOrientation.LEFT_TO_RIGHT); - jPanel1.add(getJButtonCancel(), null); - jPanel1.add(getJButtonOk(), null); - } - return jPanel1; + return jPanelContentEast; } /** @@ -154,11 +132,11 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel2() { - if (jPanel2 == null) { - jPanel2 = new JPanel(); + private JPanel getJPanelContentWest() { + if (jPanelContentWest == null) { + jPanelContentWest = new JPanel(); } - return jPanel2; + return jPanelContentWest; } /** @@ -166,11 +144,11 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel3() { - if (jPanel3 == null) { - jPanel3 = new JPanel(); + private JPanel getJPanelContentNorth() { + if (jPanelContentNorth == null) { + jPanelContentNorth = new JPanel(); } - return jPanel3; + return jPanelContentNorth; } /** @@ -182,43 +160,13 @@ public class FpdPlatformDefs extends IInternalFrame { if (jTabbedPane == null) { jTabbedPane = new JTabbedPane(); - jTabbedPane.addTab("General", null, getJPanel4(), null); + jTabbedPane.addTab("General", null, getJPanelGeneralTab(), null); } return jTabbedPane; } /** - * This method initializes jButtonOk - * - * @return javax.swing.JButton - */ - private JButton getJButtonOk() { - if (jButtonOk == null) { - jButtonOk = new JButton(); - jButtonOk.setPreferredSize(new java.awt.Dimension(80,20)); - jButtonOk.setText("Cancel"); - jButtonOk.setVisible(false); - } - return jButtonOk; - } - - /** - * This method initializes jButtonCancel - * - * @return javax.swing.JButton - */ - private JButton getJButtonCancel() { - if (jButtonCancel == null) { - jButtonCancel = new JButton(); - jButtonCancel.setPreferredSize(new java.awt.Dimension(80,20)); - jButtonCancel.setText("Ok"); - jButtonCancel.setVisible(false); - } - return jButtonCancel; - } - - /** * This method initializes this * * @return void @@ -230,11 +178,11 @@ public class FpdPlatformDefs extends IInternalFrame { this.setTitle("FPD Platform Definitions"); this.addInternalFrameListener(new InternalFrameAdapter(){ public void internalFrameDeactivated(InternalFrameEvent e){ - if (jTable.isEditing()) { - jTable.getCellEditor().stopCellEditing(); + if (jTableBuildTargets.isEditing()) { + jTableBuildTargets.getCellEditor().stopCellEditing(); } - if (jTable2.isEditing()) { - jTable2.getCellEditor().stopCellEditing(); + if (jTableSkuInfo.isEditing()) { + jTableSkuInfo.getCellEditor().stopCellEditing(); } } @@ -246,12 +194,12 @@ public class FpdPlatformDefs extends IInternalFrame { ffc.getPlatformDefsSupportedArchs(v); showToolChain(v); - imageEntryPointTableModel.setRowCount(0); + buildTargetTableModel.setRowCount(0); v.removeAllElements(); ffc.getPlatformDefsBuildTargets(v); for (int i = 0; i < v.size(); ++i){ Object[] row = {v.get(i)}; - imageEntryPointTableModel.addRow(row); + buildTargetTableModel.addRow(row); } String[][] saa = new String[ffc.getPlatformDefsSkuInfoCount()][2]; @@ -262,51 +210,51 @@ public class FpdPlatformDefs extends IInternalFrame { String interDir = ffc.getPlatformDefsInterDir(); if (interDir != null) { - jComboBox.setSelectedItem(interDir); + jComboBoxInterDir.setSelectedItem(interDir); } String outputDir = ffc.getPlatformDefsOutputDir(); if (outputDir != null) { - jTextField.setText(outputDir); + jTextFieldOutputDir.setText(outputDir); } } private void showToolChain(Vector v) { if (v.contains("IA32")) { - jCheckBox1.setSelected(true); + jCheckBoxIa32.setSelected(true); } else{ - jCheckBox1.setSelected(false); + jCheckBoxIa32.setSelected(false); } if (v.contains("X64")) { - jCheckBox2.setSelected(true); + jCheckBoxX64.setSelected(true); } else{ - jCheckBox2.setSelected(false); + jCheckBoxX64.setSelected(false); } if (v.contains("IPF")) { - jCheckBox3.setSelected(true); + jCheckBoxIpf.setSelected(true); } else{ - jCheckBox3.setSelected(false); + jCheckBoxIpf.setSelected(false); } if (v.contains("EBC")) { - jCheckBox.setSelected(true); + jCheckBoxEbc.setSelected(true); } else{ - jCheckBox.setSelected(false); + jCheckBoxEbc.setSelected(false); } if (v.contains("ARM")) { - jCheckBox5.setSelected(true); + jCheckBoxArm.setSelected(true); } else{ - jCheckBox5.setSelected(false); + jCheckBoxArm.setSelected(false); } if (v.contains("PPC")) { - jCheckBox6.setSelected(true); + jCheckBoxPpc.setSelected(true); } else{ - jCheckBox6.setSelected(false); + jCheckBoxPpc.setSelected(false); } } @@ -315,22 +263,22 @@ public class FpdPlatformDefs extends IInternalFrame { docConsole.setSaved(false); } v.removeAllElements(); - if (jCheckBox1.isSelected()) { + if (jCheckBoxIa32.isSelected()) { v.add("IA32"); } - if (jCheckBox2.isSelected()) { + if (jCheckBoxX64.isSelected()) { v.add("X64"); } - if (jCheckBox3.isSelected()) { + if (jCheckBoxIpf.isSelected()) { v.add("IPF"); } - if (jCheckBox.isSelected()) { + if (jCheckBoxEbc.isSelected()) { v.add("EBC"); } - if (jCheckBox5.isSelected()) { + if (jCheckBoxArm.isSelected()) { v.add("ARM"); } - if (jCheckBox6.isSelected()) { + if (jCheckBoxPpc.isSelected()) { v.add("PPC"); } @@ -345,10 +293,9 @@ public class FpdPlatformDefs extends IInternalFrame { if (jContentPane == null) { jContentPane = new JPanel(); jContentPane.setLayout(new BorderLayout()); - jContentPane.add(getJPanel(), java.awt.BorderLayout.EAST); - jContentPane.add(getJPanel1(), java.awt.BorderLayout.SOUTH); - jContentPane.add(getJPanel2(), java.awt.BorderLayout.WEST); - jContentPane.add(getJPanel3(), java.awt.BorderLayout.NORTH); + jContentPane.add(getJPanelContentEast(), java.awt.BorderLayout.EAST); + jContentPane.add(getJPanelContentWest(), java.awt.BorderLayout.WEST); + jContentPane.add(getJPanelContentNorth(), java.awt.BorderLayout.NORTH); jContentPane.add(getJTabbedPane(), java.awt.BorderLayout.CENTER); } return jContentPane; @@ -359,15 +306,15 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel4() { - if (jPanel4 == null) { - jPanel4 = new JPanel(); - jPanel4.setLayout(new BorderLayout()); - jPanel4.add(getJPanel5(), java.awt.BorderLayout.NORTH); - jPanel4.add(getJPanel6(), java.awt.BorderLayout.SOUTH); - jPanel4.add(getJPanel7(), java.awt.BorderLayout.CENTER); + private JPanel getJPanelGeneralTab() { + if (jPanelGeneralTab == null) { + jPanelGeneralTab = new JPanel(); + jPanelGeneralTab.setLayout(new BorderLayout()); + jPanelGeneralTab.add(getJPanelGeneralTabNorth(), java.awt.BorderLayout.NORTH); + jPanelGeneralTab.add(getJPanelGeneralTabSouth(), java.awt.BorderLayout.SOUTH); + jPanelGeneralTab.add(getJPanelGeneralTabCenter(), java.awt.BorderLayout.CENTER); } - return jPanel4; + return jPanelGeneralTab; } /** @@ -375,24 +322,24 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel5() { - if (jPanel5 == null) { + private JPanel getJPanelGeneralTabNorth() { + if (jPanelGeneralTabNorth == null) { jLabel = new JLabel(); jLabel.setText("Supported Archs"); FlowLayout flowLayout2 = new FlowLayout(); flowLayout2.setAlignment(FlowLayout.LEFT); flowLayout2.setHgap(12); - jPanel5 = new JPanel(); - jPanel5.setLayout(flowLayout2); - jPanel5.add(jLabel, null); - jPanel5.add(getJCheckBox1(), null); - jPanel5.add(getJCheckBox2(), null); - jPanel5.add(getJCheckBox3(), null); - jPanel5.add(getJCheckBox(), null); - jPanel5.add(getJCheckBox5(), null); - jPanel5.add(getJCheckBox6(), null); + jPanelGeneralTabNorth = new JPanel(); + jPanelGeneralTabNorth.setLayout(flowLayout2); + jPanelGeneralTabNorth.add(jLabel, null); + jPanelGeneralTabNorth.add(getJCheckBoxIa32(), null); + jPanelGeneralTabNorth.add(getJCheckBoxX64(), null); + jPanelGeneralTabNorth.add(getJCheckBoxIpf(), null); + jPanelGeneralTabNorth.add(getJCheckBoxEbc(), null); + jPanelGeneralTabNorth.add(getJCheckBoxArm(), null); + jPanelGeneralTabNorth.add(getJCheckBoxPpc(), null); } - return jPanel5; + return jPanelGeneralTabNorth; } /** @@ -400,11 +347,11 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox1() { - if (jCheckBox1 == null) { - jCheckBox1 = new JCheckBox(); - jCheckBox1.setText("IA32"); - jCheckBox1.addItemListener(new java.awt.event.ItemListener() { + private JCheckBox getJCheckBoxIa32() { + if (jCheckBoxIa32 == null) { + jCheckBoxIa32 = new JCheckBox(); + jCheckBoxIa32.setText("IA32"); + jCheckBoxIa32.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent e) { Vector v = new Vector(); getToolChain(v); @@ -416,7 +363,7 @@ public class FpdPlatformDefs extends IInternalFrame { } }); } - return jCheckBox1; + return jCheckBoxIa32; } /** @@ -424,11 +371,11 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox2() { - if (jCheckBox2 == null) { - jCheckBox2 = new JCheckBox(); - jCheckBox2.setText("X64"); - jCheckBox2.addItemListener(new java.awt.event.ItemListener() { + private JCheckBox getJCheckBoxX64() { + if (jCheckBoxX64 == null) { + jCheckBoxX64 = new JCheckBox(); + jCheckBoxX64.setText("X64"); + jCheckBoxX64.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent e) { Vector v = new Vector(); getToolChain(v); @@ -440,7 +387,7 @@ public class FpdPlatformDefs extends IInternalFrame { } }); } - return jCheckBox2; + return jCheckBoxX64; } /** @@ -448,11 +395,11 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox3() { - if (jCheckBox3 == null) { - jCheckBox3 = new JCheckBox(); - jCheckBox3.setText("IPF"); - jCheckBox3.addItemListener(new java.awt.event.ItemListener() { + private JCheckBox getJCheckBoxIpf() { + if (jCheckBoxIpf == null) { + jCheckBoxIpf = new JCheckBox(); + jCheckBoxIpf.setText("IPF"); + jCheckBoxIpf.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent e) { Vector v = new Vector(); getToolChain(v); @@ -464,7 +411,7 @@ public class FpdPlatformDefs extends IInternalFrame { } }); } - return jCheckBox3; + return jCheckBoxIpf; } /** @@ -472,24 +419,24 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JTable */ - private JTable getJTable() { - if (jTable == null) { - imageEntryPointTableModel = new TargetTableModel(); - imageEntryPointTableModel.addColumn("Build Target"); - jTable = new JTable(imageEntryPointTableModel); - jTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + private JTable getJTableBuildTargets() { + if (jTableBuildTargets == null) { + buildTargetTableModel = new TargetTableModel(); + buildTargetTableModel.addColumn("Build Target"); + jTableBuildTargets = new JTable(buildTargetTableModel); + jTableBuildTargets.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - jTable.getModel().addTableModelListener(new TableModelListener() { + jTableBuildTargets.getModel().addTableModelListener(new TableModelListener() { public void tableChanged(TableModelEvent arg0) { // TODO Auto-generated method stub - if (jTable.getSelectedRow() < 0) { + if (jTableBuildTargets.getSelectedRow() < 0) { return; } TableModel m = (TableModel)arg0.getSource(); if (arg0.getType() == TableModelEvent.UPDATE){ //ToDo Data Validition check. Vector v = new Vector(); - for (int i = 0; i < jTable.getRowCount(); ++i) { + for (int i = 0; i < jTableBuildTargets.getRowCount(); ++i) { v.add(m.getValueAt(i, 0)); } docConsole.setSaved(false); @@ -498,7 +445,7 @@ public class FpdPlatformDefs extends IInternalFrame { } }); } - return jTable; + return jTableBuildTargets; } /** @@ -506,17 +453,17 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel6() { - if (jPanel6 == null) { + private JPanel getJPanelGeneralTabSouth() { + if (jPanelGeneralTabSouth == null) { FlowLayout flowLayout3 = new FlowLayout(); flowLayout3.setAlignment(FlowLayout.LEFT); flowLayout3.setHgap(20); - jPanel6 = new JPanel(); - jPanel6.setPreferredSize(new java.awt.Dimension(10,200)); - jPanel6.setLayout(flowLayout3); - jPanel6.add(getJPanel8(), null); + jPanelGeneralTabSouth = new JPanel(); + jPanelGeneralTabSouth.setPreferredSize(new java.awt.Dimension(10,200)); + jPanelGeneralTabSouth.setLayout(flowLayout3); + jPanelGeneralTabSouth.add(getJPanelDir(), null); } - return jPanel6; + return jPanelGeneralTabSouth; } /** @@ -524,12 +471,12 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox4() { - if (jCheckBox4 == null) { - jCheckBox4 = new JCheckBox(); - jCheckBox4.setText("Intermediate Directories"); + private JCheckBox getJCheckBoxInterDir() { + if (jCheckBoxInterDir == null) { + jCheckBoxInterDir = new JCheckBox(); + jCheckBoxInterDir.setText("Intermediate Directories"); } - return jCheckBox4; + return jCheckBoxInterDir; } /** @@ -537,24 +484,24 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JComboBox */ - private JComboBox getJComboBox() { - if (jComboBox == null) { - jComboBox = new JComboBox(); - jComboBox.setPreferredSize(new Dimension(100, 20)); - jComboBox.addItem("UNIFIED"); - jComboBox.addItem("MODULE"); + private JComboBox getJComboBoxInterDir() { + if (jComboBoxInterDir == null) { + jComboBoxInterDir = new JComboBox(); + jComboBoxInterDir.setPreferredSize(new Dimension(100, 20)); + jComboBoxInterDir.addItem("UNIFIED"); + jComboBoxInterDir.addItem("MODULE"); - jComboBox.setSelectedIndex(0); - jComboBox.addItemListener(new java.awt.event.ItemListener() { + jComboBoxInterDir.setSelectedIndex(0); + jComboBoxInterDir.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent e) { if (docConsole != null){ docConsole.setSaved(false); } - ffc.setPlatformDefsInterDir(jComboBox.getSelectedItem()+""); + ffc.setPlatformDefsInterDir(jComboBoxInterDir.getSelectedItem()+""); } }); } - return jComboBox; + return jComboBoxInterDir; } /** @@ -562,26 +509,26 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel7() { - if (jPanel7 == null) { - jLabel2 = new JLabel(); - jLabel2.setPreferredSize(new Dimension(109, 16)); - jLabel2.setText("Build Targets"); + private JPanel getJPanelGeneralTabCenter() { + if (jPanelGeneralTabCenter == null) { + jLabelBuildTargets = new JLabel(); + jLabelBuildTargets.setPreferredSize(new Dimension(109, 16)); + jLabelBuildTargets.setText("Build Targets"); FlowLayout flowLayout4 = new FlowLayout(); flowLayout4.setAlignment(FlowLayout.LEFT); flowLayout4.setHgap(20); - jPanel7 = new JPanel(); - jPanel7.setPreferredSize(new Dimension(972, 100)); - jPanel7.setLayout(flowLayout4); - jPanel7.add(jLabel2, null); - jPanel7.add(getJTextField1(), null); - jPanel7.add(getJButton2(), null); - jPanel7.add(getJButton3(), null); - jPanel7.add(getJScrollPane2(), null); - jPanel7.add(getJPanel9(), null); - jPanel7.add(getJScrollPane3(), null); + jPanelGeneralTabCenter = new JPanel(); + jPanelGeneralTabCenter.setPreferredSize(new Dimension(972, 100)); + jPanelGeneralTabCenter.setLayout(flowLayout4); + jPanelGeneralTabCenter.add(jLabelBuildTargets, null); + jPanelGeneralTabCenter.add(getJTextFieldBuildTarget(), null); + jPanelGeneralTabCenter.add(getJButtonAddBuildTarget(), null); + jPanelGeneralTabCenter.add(getJButtonDelBuildTarget(), null); + jPanelGeneralTabCenter.add(getJScrollPaneBuildTargets(), null); + jPanelGeneralTabCenter.add(getJPanelSkuInfo(), null); + jPanelGeneralTabCenter.add(getJScrollPaneSkuInfo(), null); } - return jPanel7; + return jPanelGeneralTabCenter; } /** @@ -589,12 +536,12 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField1() { - if (jTextField1 == null) { - jTextField1 = new JTextField(); - jTextField1.setPreferredSize(new Dimension(150, 20)); + private JTextField getJTextFieldBuildTarget() { + if (jTextFieldBuildTarget == null) { + jTextFieldBuildTarget = new JTextField(); + jTextFieldBuildTarget.setPreferredSize(new Dimension(150, 20)); } - return jTextField1; + return jTextFieldBuildTarget; } /** @@ -602,19 +549,19 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton2() { - if (jButton2 == null) { - jButton2 = new JButton(); - jButton2.setPreferredSize(new Dimension(70, 20)); - jButton2.setText("Add"); - jButton2.addActionListener(new java.awt.event.ActionListener() { + private JButton getJButtonAddBuildTarget() { + if (jButtonAddBuildTarget == null) { + jButtonAddBuildTarget = new JButton(); + jButtonAddBuildTarget.setPreferredSize(new Dimension(70, 20)); + jButtonAddBuildTarget.setText("Add"); + jButtonAddBuildTarget.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { - if (jTextField1.getText().length() > 0) { - String[] row = {jTextField1.getText()}; - imageEntryPointTableModel.addRow(row); + if (jTextFieldBuildTarget.getText().length() > 0) { + String[] row = {jTextFieldBuildTarget.getText()}; + buildTargetTableModel.addRow(row); Vector v = new Vector(); - for (int i = 0; i < jTable.getRowCount(); ++i) { - v.add(imageEntryPointTableModel.getValueAt(i, 0)); + for (int i = 0; i < jTableBuildTargets.getRowCount(); ++i) { + v.add(buildTargetTableModel.getValueAt(i, 0)); } docConsole.setSaved(false); ffc.setPlatformDefsBuildTargets(v); @@ -622,7 +569,7 @@ public class FpdPlatformDefs extends IInternalFrame { } }); } - return jButton2; + return jButtonAddBuildTarget; } /** @@ -630,14 +577,14 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton3() { - if (jButton3 == null) { - jButton3 = new JButton(); - jButton3.setPreferredSize(new Dimension(70, 20)); - jButton3.setText("Delete"); - jButton3.setVisible(false); + private JButton getJButtonDelBuildTarget() { + if (jButtonDelBuildTarget == null) { + jButtonDelBuildTarget = new JButton(); + jButtonDelBuildTarget.setPreferredSize(new Dimension(70, 20)); + jButtonDelBuildTarget.setText("Delete"); + jButtonDelBuildTarget.setVisible(false); } - return jButton3; + return jButtonDelBuildTarget; } /** @@ -645,13 +592,13 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JScrollPane */ - private JScrollPane getJScrollPane2() { - if (jScrollPane2 == null) { - jScrollPane2 = new JScrollPane(); - jScrollPane2.setPreferredSize(new Dimension(453, 100)); - jScrollPane2.setViewportView(getJTable()); + private JScrollPane getJScrollPaneBuildTargets() { + if (jScrollPaneBuildTargets == null) { + jScrollPaneBuildTargets = new JScrollPane(); + jScrollPaneBuildTargets.setPreferredSize(new Dimension(453, 100)); + jScrollPaneBuildTargets.setViewportView(getJTableBuildTargets()); } - return jScrollPane2; + return jScrollPaneBuildTargets; } /** @@ -659,13 +606,13 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JScrollPane */ - private JScrollPane getJScrollPane3() { - if (jScrollPane3 == null) { - jScrollPane3 = new JScrollPane(); - jScrollPane3.setPreferredSize(new java.awt.Dimension(453,100)); - jScrollPane3.setViewportView(getJTable2()); + private JScrollPane getJScrollPaneSkuInfo() { + if (jScrollPaneSkuInfo == null) { + jScrollPaneSkuInfo = new JScrollPane(); + jScrollPaneSkuInfo.setPreferredSize(new java.awt.Dimension(453,100)); + jScrollPaneSkuInfo.setViewportView(getJTableSkuInfo()); } - return jScrollPane3; + return jScrollPaneSkuInfo; } /** @@ -673,16 +620,16 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JTable */ - private JTable getJTable2() { - if (jTable2 == null) { + private JTable getJTableSkuInfo() { + if (jTableSkuInfo == null) { skuInfoTableModel = new SkuInfoTableModel(); skuInfoTableModel.addColumn("SKU ID"); skuInfoTableModel.addColumn("Name"); - jTable2 = new JTable(skuInfoTableModel); + jTableSkuInfo = new JTable(skuInfoTableModel); - jTable2.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + jTableSkuInfo.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - jTable2.getModel().addTableModelListener(new TableModelListener() { + jTableSkuInfo.getModel().addTableModelListener(new TableModelListener() { public void tableChanged(TableModelEvent arg0) { // TODO Auto-generated method stub int row = arg0.getFirstRow(); @@ -697,7 +644,7 @@ public class FpdPlatformDefs extends IInternalFrame { } }); } - return jTable2; + return jTableSkuInfo; } /** @@ -705,12 +652,12 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox() { - if (jCheckBox == null) { - jCheckBox = new JCheckBox(); - jCheckBox.setPreferredSize(new java.awt.Dimension(50,20)); - jCheckBox.setText("EBC"); - jCheckBox.addItemListener(new java.awt.event.ItemListener() { + private JCheckBox getJCheckBoxEbc() { + if (jCheckBoxEbc == null) { + jCheckBoxEbc = new JCheckBox(); + jCheckBoxEbc.setPreferredSize(new java.awt.Dimension(50,20)); + jCheckBoxEbc.setText("EBC"); + jCheckBoxEbc.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent e) { Vector v = new Vector(); getToolChain(v); @@ -722,7 +669,7 @@ public class FpdPlatformDefs extends IInternalFrame { } }); } - return jCheckBox; + return jCheckBoxEbc; } /** @@ -730,13 +677,13 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox5() { - if (jCheckBox5 == null) { - jCheckBox5 = new JCheckBox(); - jCheckBox5.setPreferredSize(new java.awt.Dimension(52,20)); - jCheckBox5.setText("ARM"); - jCheckBox5.setVisible(false); - jCheckBox5.addItemListener(new java.awt.event.ItemListener() { + private JCheckBox getJCheckBoxArm() { + if (jCheckBoxArm == null) { + jCheckBoxArm = new JCheckBox(); + jCheckBoxArm.setPreferredSize(new java.awt.Dimension(52,20)); + jCheckBoxArm.setText("ARM"); + jCheckBoxArm.setVisible(false); + jCheckBoxArm.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent e) { Vector v = new Vector(); getToolChain(v); @@ -748,7 +695,7 @@ public class FpdPlatformDefs extends IInternalFrame { } }); } - return jCheckBox5; + return jCheckBoxArm; } /** @@ -756,13 +703,13 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JCheckBox */ - private JCheckBox getJCheckBox6() { - if (jCheckBox6 == null) { - jCheckBox6 = new JCheckBox(); - jCheckBox6.setPreferredSize(new Dimension(50, 20)); - jCheckBox6.setText("PPC"); - jCheckBox6.setVisible(false); - jCheckBox6.addItemListener(new java.awt.event.ItemListener() { + private JCheckBox getJCheckBoxPpc() { + if (jCheckBoxPpc == null) { + jCheckBoxPpc = new JCheckBox(); + jCheckBoxPpc.setPreferredSize(new Dimension(50, 20)); + jCheckBoxPpc.setText("PPC"); + jCheckBoxPpc.setVisible(false); + jCheckBoxPpc.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent e) { Vector v = new Vector(); getToolChain(v); @@ -774,7 +721,7 @@ public class FpdPlatformDefs extends IInternalFrame { } }); } - return jCheckBox6; + return jCheckBoxPpc; } /** @@ -782,26 +729,26 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel8() { - if (jPanel8 == null) { + private JPanel getJPanelDir() { + if (jPanelDir == null) { FlowLayout flowLayout1 = new FlowLayout(); flowLayout1.setAlignment(java.awt.FlowLayout.LEFT); - jLabel1 = new JLabel(); - jLabel1.setText("Output Directory"); - jLabel7 = new JLabel(); - jLabel7.setPreferredSize(new java.awt.Dimension(150,20)); - jLabel7.setText(""); - jPanel8 = new JPanel(); - jPanel8.setLayout(flowLayout1); - jPanel8.setPreferredSize(new java.awt.Dimension(450,100)); - jPanel8.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.RAISED)); - jPanel8.add(getJCheckBox4(), null); - jPanel8.add(getJComboBox(), null); - jPanel8.add(jLabel7, null); - jPanel8.add(jLabel1, null); - jPanel8.add(getJTextField(), null); + jLabelOutputDir = new JLabel(); + jLabelOutputDir.setText("Output Directory"); + jLabelPad = new JLabel(); + jLabelPad.setPreferredSize(new java.awt.Dimension(150,20)); + jLabelPad.setText(""); + jPanelDir = new JPanel(); + jPanelDir.setLayout(flowLayout1); + jPanelDir.setPreferredSize(new java.awt.Dimension(450,100)); + jPanelDir.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.RAISED)); + jPanelDir.add(getJCheckBoxInterDir(), null); + jPanelDir.add(getJComboBoxInterDir(), null); + jPanelDir.add(jLabelPad, null); + jPanelDir.add(jLabelOutputDir, null); + jPanelDir.add(getJTextFieldOutputDir(), null); } - return jPanel8; + return jPanelDir; } /** @@ -809,18 +756,18 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField() { - if (jTextField == null) { - jTextField = new JTextField(); - jTextField.setPreferredSize(new java.awt.Dimension(300,20)); - jTextField.addFocusListener(new java.awt.event.FocusAdapter() { + private JTextField getJTextFieldOutputDir() { + if (jTextFieldOutputDir == null) { + jTextFieldOutputDir = new JTextField(); + jTextFieldOutputDir.setPreferredSize(new java.awt.Dimension(300,20)); + jTextFieldOutputDir.addFocusListener(new java.awt.event.FocusAdapter() { public void focusLost(java.awt.event.FocusEvent e) { docConsole.setSaved(false); - ffc.setPlatformDefsOutputDir(jTextField.getText()); + ffc.setPlatformDefsOutputDir(jTextFieldOutputDir.getText()); } }); } - return jTextField; + return jTextFieldOutputDir; } /** @@ -828,32 +775,32 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JPanel */ - private JPanel getJPanel9() { - if (jPanel9 == null) { - jLabel6 = new JLabel(); - jLabel6.setPreferredSize(new Dimension(280, 20)); - jLabel6.setText(" "); - jLabel5 = new JLabel(); - jLabel5.setPreferredSize(new Dimension(40, 20)); - jLabel5.setText("Name"); - jLabel4 = new JLabel(); - jLabel4.setPreferredSize(new Dimension(20, 20)); - jLabel4.setText("ID"); - jLabel3 = new JLabel(); - jLabel3.setPreferredSize(new java.awt.Dimension(150,20)); - jLabel3.setText("SKU Information"); - jPanel9 = new JPanel(); - jPanel9.setPreferredSize(new java.awt.Dimension(450,70)); - jPanel9.add(jLabel3, null); - jPanel9.add(jLabel6, null); - jPanel9.add(jLabel4, null); - jPanel9.add(getJTextField2(), null); - jPanel9.add(jLabel5, null); - jPanel9.add(getJTextField3(), null); - jPanel9.add(getJButton(), null); - jPanel9.add(getJButton1(), null); - } - return jPanel9; + private JPanel getJPanelSkuInfo() { + if (jPanelSkuInfo == null) { + jLabelPadd = new JLabel(); + jLabelPadd.setPreferredSize(new Dimension(280, 20)); + jLabelPadd.setText(" "); + jLabelSkuName = new JLabel(); + jLabelSkuName.setPreferredSize(new Dimension(40, 20)); + jLabelSkuName.setText("Name"); + jLabelSkuId = new JLabel(); + jLabelSkuId.setPreferredSize(new Dimension(20, 20)); + jLabelSkuId.setText("ID"); + jLabelSkuInfo = new JLabel(); + jLabelSkuInfo.setPreferredSize(new java.awt.Dimension(150,20)); + jLabelSkuInfo.setText("SKU Information"); + jPanelSkuInfo = new JPanel(); + jPanelSkuInfo.setPreferredSize(new java.awt.Dimension(450,70)); + jPanelSkuInfo.add(jLabelSkuInfo, null); + jPanelSkuInfo.add(jLabelPadd, null); + jPanelSkuInfo.add(jLabelSkuId, null); + jPanelSkuInfo.add(getJTextFieldSkuId(), null); + jPanelSkuInfo.add(jLabelSkuName, null); + jPanelSkuInfo.add(getJTextFieldSkuName(), null); + jPanelSkuInfo.add(getJButtonSkuAdd(), null); + jPanelSkuInfo.add(getJButtonSkuDel(), null); + } + return jPanelSkuInfo; } /** @@ -861,12 +808,12 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField2() { - if (jTextField2 == null) { - jTextField2 = new JTextField(); - jTextField2.setPreferredSize(new Dimension(50, 20)); + private JTextField getJTextFieldSkuId() { + if (jTextFieldSkuId == null) { + jTextFieldSkuId = new JTextField(); + jTextFieldSkuId.setPreferredSize(new Dimension(50, 20)); } - return jTextField2; + return jTextFieldSkuId; } /** @@ -874,12 +821,12 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JTextField */ - private JTextField getJTextField3() { - if (jTextField3 == null) { - jTextField3 = new JTextField(); - jTextField3.setPreferredSize(new Dimension(150, 20)); + private JTextField getJTextFieldSkuName() { + if (jTextFieldSkuName == null) { + jTextFieldSkuName = new JTextField(); + jTextFieldSkuName.setPreferredSize(new Dimension(150, 20)); } - return jTextField3; + return jTextFieldSkuName; } /** @@ -887,15 +834,15 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton() { - if (jButton == null) { - jButton = new JButton(); - jButton.setPreferredSize(new Dimension(70, 20)); - jButton.setText("Add"); - jButton.addActionListener(new java.awt.event.ActionListener() { + private JButton getJButtonSkuAdd() { + if (jButtonSkuAdd == null) { + jButtonSkuAdd = new JButton(); + jButtonSkuAdd.setPreferredSize(new Dimension(70, 20)); + jButtonSkuAdd.setText("Add"); + jButtonSkuAdd.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { - if (jTextField2.getText().length() > 0) { - String[] row = {jTextField2.getText(), jTextField3.getText()}; + if (jTextFieldSkuId.getText().length() > 0) { + String[] row = {jTextFieldSkuId.getText(), jTextFieldSkuName.getText()}; skuInfoTableModel.addRow(row); docConsole.setSaved(false); ffc.genPlatformDefsSkuInfo(row[0], row[1]); @@ -903,7 +850,7 @@ public class FpdPlatformDefs extends IInternalFrame { } }); } - return jButton; + return jButtonSkuAdd; } /** @@ -911,26 +858,26 @@ public class FpdPlatformDefs extends IInternalFrame { * * @return javax.swing.JButton */ - private JButton getJButton1() { - if (jButton1 == null) { - jButton1 = new JButton(); - jButton1.setPreferredSize(new Dimension(70, 20)); - jButton1.setText("Delete"); - jButton1.addActionListener(new java.awt.event.ActionListener() { + private JButton getJButtonSkuDel() { + if (jButtonSkuDel == null) { + jButtonSkuDel = new JButton(); + jButtonSkuDel.setPreferredSize(new Dimension(70, 20)); + jButtonSkuDel.setText("Delete"); + jButtonSkuDel.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent e) { - if (jTable2.isEditing()) { - jTable2.getCellEditor().stopCellEditing(); + if (jTableSkuInfo.isEditing()) { + jTableSkuInfo.getCellEditor().stopCellEditing(); } - if (jTable2.getSelectedRow() < 1) { + if (jTableSkuInfo.getSelectedRow() < 1) { return; } docConsole.setSaved(false); - ffc.removePlatformDefsSkuInfo(jTable2.getSelectedRow()); - skuInfoTableModel.removeRow(jTable2.getSelectedRow()); + ffc.removePlatformDefsSkuInfo(jTableSkuInfo.getSelectedRow()); + skuInfoTableModel.removeRow(jTableSkuInfo.getSelectedRow()); } }); } - return jButton1; + return jButtonSkuDel; } diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/GenListDialog.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/GenListDialog.java index 6ca63c5271..e21ee547e9 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/GenListDialog.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/GenListDialog.java @@ -44,14 +44,10 @@ public class GenListDialog extends JDialog implements ActionListener{ private static final long serialVersionUID = 1L; private JPanel jContentPane = null; - private JPanel jPanel = null; - private JPanel jPanel1 = null; - private JPanel jPanel2 = null; - private JPanel jPanel3 = null; - private JPanel jPanel4 = null; - private JButton jButton = null; - private JButton jButton1 = null; - private JButton jButton2 = null; + private JPanel jPanelContentEast = null; + private JPanel jPanelContentCenter = null; + private JButton jButtonCancel = null; + private JButton jButtonOk = null; private ICheckBoxList checkBoxList = null; @@ -60,17 +56,13 @@ public class GenListDialog extends JDialog implements ActionListener{ public void actionPerformed(ActionEvent arg0) { - // TODO Auto-generated method stub - if (arg0.getSource() == jButton1){ - checkBoxList.setAllItemsUnchecked(); - } - if (arg0.getSource() == jButton2){ + if (arg0.getSource() == jButtonOk){ this.dispose(); } - if (arg0.getSource() == jButton){ + if (arg0.getSource() == jButtonCancel){ this.dispose(); } } @@ -80,54 +72,17 @@ public class GenListDialog extends JDialog implements ActionListener{ * * @return javax.swing.JPanel */ - private JPanel getJPanel() { - if (jPanel == null) { + private JPanel getJPanelContentEast() { + if (jPanelContentEast == null) { FlowLayout flowLayout = new FlowLayout(); flowLayout.setVgap(10); - jPanel = new JPanel(); - jPanel.setLayout(flowLayout); - jPanel.setPreferredSize(new java.awt.Dimension(100,30)); - jPanel.add(getJButton1(), null); - jPanel.add(getJButton2(), null); - jPanel.add(getJButton(), null); - } - return jPanel; - } - - /** - * This method initializes jPanel1 - * - * @return javax.swing.JPanel - */ - private JPanel getJPanel1() { - if (jPanel1 == null) { - jPanel1 = new JPanel(); - } - return jPanel1; - } - - /** - * This method initializes jPanel2 - * - * @return javax.swing.JPanel - */ - private JPanel getJPanel2() { - if (jPanel2 == null) { - jPanel2 = new JPanel(); + jPanelContentEast = new JPanel(); + jPanelContentEast.setLayout(flowLayout); + jPanelContentEast.setPreferredSize(new java.awt.Dimension(100,30)); + jPanelContentEast.add(getJButtonOk(), null); + jPanelContentEast.add(getJButtonCancel(), null); } - return jPanel2; - } - - /** - * This method initializes jPanel3 - * - * @return javax.swing.JPanel - */ - private JPanel getJPanel3() { - if (jPanel3 == null) { - jPanel3 = new JPanel(); - } - return jPanel3; + return jPanelContentEast; } /** @@ -135,14 +90,14 @@ public class GenListDialog extends JDialog implements ActionListener{ * * @return javax.swing.JPanel */ - private JPanel getJPanel4() { - if (jPanel4 == null) { - jPanel4 = new JPanel(); - jPanel4.setLayout(new FlowLayout()); - jPanel4.add(getJScrollPane(), null); + private JPanel getJPanelContentCenter() { + if (jPanelContentCenter == null) { + jPanelContentCenter = new JPanel(); + jPanelContentCenter.setLayout(new FlowLayout()); + jPanelContentCenter.add(getJScrollPane(), null); } - return jPanel4; + return jPanelContentCenter; } /** @@ -150,31 +105,14 @@ public class GenListDialog extends JDialog implements ActionListener{ * * @return javax.swing.JButton */ - private JButton getJButton() { - if (jButton == null) { - jButton = new JButton(); - jButton.setPreferredSize(new java.awt.Dimension(80,20)); - jButton.setText("Cancel"); - jButton.addActionListener(this); + private JButton getJButtonCancel() { + if (jButtonCancel == null) { + jButtonCancel = new JButton(); + jButtonCancel.setPreferredSize(new java.awt.Dimension(80,20)); + jButtonCancel.setText("Cancel"); + jButtonCancel.addActionListener(this); } - return jButton; - } - - /** - * This method initializes jButton1 - * - * @return javax.swing.JButton - */ - private JButton getJButton1() { - if (jButton1 == null) { - jButton1 = new JButton(); - jButton1.setPreferredSize(new java.awt.Dimension(80,20)); - jButton1.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING); - jButton1.setText("Clear"); - jButton1.setVisible(false); - jButton1.addActionListener(this); - } - return jButton1; + return jButtonCancel; } /** @@ -182,15 +120,15 @@ public class GenListDialog extends JDialog implements ActionListener{ * * @return javax.swing.JButton */ - private JButton getJButton2() { - if (jButton2 == null) { - jButton2 = new JButton(); - jButton2.setPreferredSize(new java.awt.Dimension(80,20)); - jButton2.setText("Ok"); - jButton2.setActionCommand("GenGuidValue"); - jButton2.addActionListener(this); + private JButton getJButtonOk() { + if (jButtonOk == null) { + jButtonOk = new JButton(); + jButtonOk.setPreferredSize(new java.awt.Dimension(80,20)); + jButtonOk.setText("Ok"); + jButtonOk.setActionCommand("GenGuidValue"); + jButtonOk.addActionListener(this); } - return jButton2; + return jButtonOk; } /** @@ -211,17 +149,7 @@ public class GenListDialog extends JDialog implements ActionListener{ if (checkBoxList == null) { checkBoxList = new ICheckBoxList(); checkBoxList.setBounds(new java.awt.Rectangle(40,20,177,74)); -// Vector v = new Vector(); -// v.add("DATA_HUB_RECORD"); -// v.add("EFI_EVENT"); -// v.add("EFI_SYSTEM_CONFIGURATION_TABLE"); -// v.add("EFI_VARIABLE"); -// v.add("GUID"); -// v.add("HII_PACKAGE_LIST"); -// v.add("HOB"); -// v.add("TOKEN_SPACE_GUID"); -// -// checkBoxList.setAllItems(v); + } return checkBoxList; } @@ -256,7 +184,7 @@ public class GenListDialog extends JDialog implements ActionListener{ public GenListDialog(ActionListener i){ this(); - jButton2.addActionListener(i); + jButtonOk.addActionListener(i); } @@ -283,11 +211,8 @@ public class GenListDialog extends JDialog implements ActionListener{ if (jContentPane == null) { jContentPane = new JPanel(); jContentPane.setLayout(new BorderLayout()); - jContentPane.add(getJPanel(), java.awt.BorderLayout.EAST); - jContentPane.add(getJPanel1(), java.awt.BorderLayout.WEST); - jContentPane.add(getJPanel2(), java.awt.BorderLayout.NORTH); - jContentPane.add(getJPanel3(), java.awt.BorderLayout.SOUTH); - jContentPane.add(getJPanel4(), java.awt.BorderLayout.CENTER); + jContentPane.add(getJPanelContentEast(), java.awt.BorderLayout.EAST); + jContentPane.add(getJPanelContentCenter(), java.awt.BorderLayout.CENTER); } return jContentPane; }