X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;ds=sidebyside;f=Tools%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fpackaging%2Fui%2FSpdPackageHeaders.java;h=1deccad78b02c5ac73e12947f7c0f3f8d2bc3f53;hb=214b0d1914b48d651b25e58f321ddb77a46903b8;hp=84eee46b16e450dace534d6dca5eda84b1edf3e2;hpb=af25df1662fe283b6215086799b3915131575ce2;p=mirror_edk2.git

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 84eee46b16..1deccad78b 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
@@ -21,7 +21,6 @@ import javax.swing.DefaultCellEditor;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JRadioButton;
 import javax.swing.JTable;
 import javax.swing.JTextField;
 import javax.swing.JComboBox;
@@ -68,7 +67,7 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
 
     private JPanel jContentPane = null;
 
-    private JRadioButton jRadioButtonSelect = null;
+    private JLabel jLabelSelect = null;
 
     private JComboBox jComboBoxSelect = null;
 
@@ -94,7 +93,7 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
 
     private JScrollPane jScrollPane = null;
 
-    private JScrollPane jScrollPane1 = null;
+    private JScrollPane jScrollPanePkgHdr = null;
 
     private int selectedRow = -1;
 
@@ -117,15 +116,14 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
       	
       @return javax.swing.JRadioButton	
      **/
-    private JRadioButton getJRadioButtonSelect() {
-        if (jRadioButtonSelect == null) {
-            jRadioButtonSelect = new JRadioButton();
-            jRadioButtonSelect.setBounds(new java.awt.Rectangle(9,10,198,20));
-            jRadioButtonSelect.setText("Select Existing ModuleType");
-            jRadioButtonSelect.addActionListener(this);
-            jRadioButtonSelect.setSelected(true);
+    private JLabel getJLabelSelect() {
+        if (jLabelSelect == null) {
+            jLabelSelect = new JLabel();
+            jLabelSelect.setBounds(new java.awt.Rectangle(14,10,198,20));
+            jLabelSelect.setText("Select ModuleType");
+
         }
-        return jRadioButtonSelect;
+        return jLabelSelect;
     }
 
     /**
@@ -267,7 +265,7 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
     private void init() {
         
         this.setContentPane(getJScrollPane());
-        this.setTitle("Library Class Declarations");
+        this.setTitle("Package Headers");
         this.setBounds(new java.awt.Rectangle(0, 0, 500, 370));
         this.setVisible(true);
         this.addInternalFrameListener(new InternalFrameAdapter(){
@@ -321,7 +319,7 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
             jContentPane.add(jLabel, null);
             jContentPane.add(jStarLabel1, null);
             jContentPane.add(jStarLabel2, null);
-            jContentPane.add(getJRadioButtonSelect(), null);
+            jContentPane.add(getJLabelSelect(), null);
             jContentPane.add(getJComboBoxSelect(), null);
             jContentPane.add(getJButtonAdd(), null);
             jContentPane.add(getJButtonRemove(), null);
@@ -331,7 +329,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;
     }
@@ -349,7 +347,7 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
         jComboBoxSelect.addItem("DXE_RUNTIME_DRIVER");
         jComboBoxSelect.addItem("DXE_SAL_DRIVER");
         jComboBoxSelect.addItem("DXE_SMM_DRIVER");
-        jComboBoxSelect.addItem("TOOLS");
+        jComboBoxSelect.addItem("TOOL");
         jComboBoxSelect.addItem("UEFI_DRIVER");
         jComboBoxSelect.addItem("UEFI_APPLICATION");
         jComboBoxSelect.addItem("USER_DEFINED");
@@ -374,9 +372,7 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
         if (arg0.getSource() == jButtonAdd) {
             String strLibClass = "";
             
-            if (jRadioButtonSelect.isSelected()) {
-                strLibClass = jComboBoxSelect.getSelectedItem().toString();
-            }
+            strLibClass = jComboBoxSelect.getSelectedItem().toString();
             //ToDo: check before add
             String[] row = {"", ""};
             row[0] = strLibClass;
@@ -502,13 +498,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;
     }
 
     /**
@@ -534,7 +530,7 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
             jComboBoxSelect.addItem("DXE_RUNTIME_DRIVER");
             jComboBoxSelect.addItem("DXE_SAL_DRIVER");
             jComboBoxSelect.addItem("DXE_SMM_DRIVER");
-            jComboBoxSelect.addItem("TOOLS");
+            jComboBoxSelect.addItem("TOOL");
             jComboBoxSelect.addItem("UEFI_DRIVER");
             jComboBoxSelect.addItem("UEFI_APPLICATION");
             jComboBoxSelect.addItem("USER_DEFINED");
@@ -564,8 +560,21 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
     public void tableChanged(TableModelEvent arg0) {
         // TODO Auto-generated method stub
         int row = arg0.getFirstRow();
+        int column = arg0.getColumn();
         TableModel m = (TableModel)arg0.getSource();
         if (arg0.getType() == TableModelEvent.UPDATE){
+            String[] sa = new String[2];
+            sfc.getSpdModuleHeader(sa, row);
+            Object cellData = m.getValueAt(row, column);
+            if (cellData == null) {
+                cellData = "";
+            }
+            if (cellData.equals(sa[column])) {
+                return;
+            }
+            if (cellData.toString().length() == 0 && sa[column] == null) {
+                return;
+            }
             String pkg = m.getValueAt(row, 0) + "";
             String hdr = m.getValueAt(row, 1) + "";
             String[] rowData = {pkg, hdr};
@@ -580,10 +589,10 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
     public void componentResized(ComponentEvent arg0) {
         int intPreferredWidth = 500;
         
-        resizeComponentWidth(this.jComboBoxSelect, this.getWidth(), intPreferredWidth);
-        resizeComponentWidth(this.jTextField, this.getWidth(), intPreferredWidth);
-        resizeComponentWidth(this.jScrollPane, this.getWidth(), intPreferredWidth);
-        relocateComponentX(this.jButtonBrowse, this.getWidth(), this.getPreferredSize().width, 30);
+        Tools.resizeComponentWidth(this.jComboBoxSelect, this.getWidth(), intPreferredWidth);
+        Tools.resizeComponentWidth(this.jTextField, this.getWidth(), intPreferredWidth);
+        Tools.resizeComponentWidth(this.jScrollPanePkgHdr, this.getWidth(), intPreferredWidth);
+        Tools.relocateComponentX(this.jButtonBrowse, this.getWidth(), this.getPreferredSize().width, 30);
     }
     
     public static void main(String[] args){