some bug fixing for FpdFrameworkModules

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / platform / ui / FpdModuleSA.java

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
index 58c181dcd38fe4a2d710d719e4d142382061146c..daca39c657a03ef1c1c2edecd865e43fb9fd8bfb 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
@@ -1,6 +1,8 @@
 package org.tianocore.frameworkwizard.platform.ui;\r
 \r
 import java.awt.BorderLayout;\r
+import java.awt.Dimension;\r
+import java.awt.Toolkit;\r
 \r
 import javax.swing.JFrame;\r
 import javax.swing.JOptionPane;\r
@@ -398,6 +400,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
      */\r
     private void initialize() {\r
         this.setSize(664, 515);\r
+        this.centerWindow();\r
         this.setModal(true);\r
         this.setTitle("Module Settings");\r
         this.setContentPane(getJContentPane());\r
@@ -499,6 +502,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
         if (jTable == null) {\r
             model = new PartialEditableTableModel();\r
             jTable = new JTable(model);\r
+            jTable.setRowHeight(20);\r
             model.addColumn("CName");\r
             model.addColumn("TokenSpaceGUID");\r
             model.addColumn("ItemType");\r
@@ -682,7 +686,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             model1.addColumn("PackageGUID");\r
             model1.addColumn("PackageVersion");\r
             jTable1 = new JTable(model1);\r
-            \r
+            jTable1.setRowHeight(20);\r
             jTable1.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
             jTable1.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
                 public void valueChanged(ListSelectionEvent e) {\r
@@ -731,7 +735,8 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             model2 = new LibraryTableModel();\r
             model2.addColumn("LibraryClass");\r
             jTable2 = new JTable(model2);\r
-            \r
+            jTable2.setRowHeight(20);\r
+            jTable2.setShowGrid(false);\r
             jTable2.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
             jTable2.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
                 public void valueChanged(ListSelectionEvent e) {\r
@@ -803,7 +808,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             model3.addColumn("PackageGUID");\r
             model3.addColumn("PackageVersion");\r
             jTable3 = new JTable(model3);\r
-            \r
+            jTable3.setRowHeight(20);\r
             jTable3.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
             jTable3.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
                 public void valueChanged(ListSelectionEvent e) {\r
@@ -1099,6 +1104,15 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             optionsTableModel.addColumn("SupportedArchs");\r
             optionsTableModel.addColumn("Contents");\r
             jTable4 = new JTable(optionsTableModel);\r
+            jTable4.setRowHeight(20);\r
+            Vector<String> vArch = new Vector<String>();\r
+            vArch.add("IA32");\r
+            vArch.add("X64");\r
+            vArch.add("IPF");\r
+            vArch.add("EBC");\r
+            vArch.add("ARM");\r
+            vArch.add("PPC");\r
+            jTable4.getColumnModel().getColumn(4).setCellEditor(new ListEditor(vArch));\r
             jTable4.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
             jTable4.getModel().addTableModelListener(new TableModelListener() {\r
                 public void tableChanged(TableModelEvent arg0) {\r
@@ -1109,23 +1123,28 @@ public class FpdModuleSA extends JDialog implements ActionListener {
                     if (arg0.getType() == TableModelEvent.UPDATE){\r
                         //ToDo Data Validition check.\r
                         String targets = m.getValueAt(row, 0) + "";\r
-                        Vector<Object> targetName = new Vector<Object>();\r
-                        String[] sArray = targets.split(" ");\r
-                        for (int i = 0; i < sArray.length; ++i) {\r
-                            targetName.add(sArray[i]);\r
+                        Vector<Object> targetName = null;\r
+                        if (targets.length() > 0) {\r
+                            targetName = new Vector<Object>();\r
+                            String[] sArray = targets.split(" ");\r
+                            for (int i = 0; i < sArray.length; ++i) {\r
+                                targetName.add(sArray[i]);\r
+                            }\r
                         }\r
+                        \r
                         String toolChain = m.getValueAt(row, 1) + "";\r
                         String tagName = m.getValueAt(row, 2) + "";\r
                         String toolCode = m.getValueAt(row, 3) + "";\r
                         String archs = m.getValueAt(row, 4) + "";\r
-                        Vector<Object> supArch = new Vector<Object>();\r
-                        String[] sArray1 = archs.split(" ");\r
-                        for (int i = 0; i < sArray1.length; ++i) {\r
-                            supArch.add(sArray1[i]);\r
-                        }\r
-                        if (supArch.size() == 0) {\r
-                            supArch.add("IA32");\r
+                        Vector<Object> supArch = null;\r
+                        if (archs.length() > 0) {\r
+                            supArch = new Vector<Object>();\r
+                            String[] sArray1 = archs.split(" ");\r
+                            for (int i = 0; i < sArray1.length; ++i) {\r
+                                supArch.add(sArray1[i]);\r
+                            }\r
                         }\r
+                        \r
                         String contents = m.getValueAt(row, 5) + "";\r
                         \r
                         ffc.updateModuleSAOptionsOpt(moduleKey, row, targetName, toolChain, tagName, toolCode, supArch, contents);\r
@@ -1181,6 +1200,24 @@ public class FpdModuleSA extends JDialog implements ActionListener {
         }\r
         return jButton5;\r
     }\r
+    \r
+    /**\r
+    Start the window at the center of screen\r
+    \r
+    **/\r
+   protected void centerWindow(int intWidth, int intHeight) {\r
+       Dimension d = Toolkit.getDefaultToolkit().getScreenSize();\r
+       this.setLocation((d.width - intWidth) / 2, (d.height - intHeight) / 2);\r
+   }\r
+\r
+   /**\r
+    Start the window at the center of screen\r
+    \r
+    **/\r
+   protected void centerWindow() {\r
+       centerWindow(this.getSize().width, this.getSize().height);\r
+   }\r
+\r
 \r
 }  //  @jve:decl-index=0:visual-constraint="10,10"\r
 \r