Fix EDKT337,Double click on modules in "Framework Modules" of Platforms should be...

[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 e82ed2df8bfca8e662dabd0c9cafa92aef4af879..dea31877f586cac2b3d6c7cd0de4b09f636a97e7 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
@@ -123,7 +123,8 @@ public class FpdModuleSA extends JDialog implements ActionListener {
     private OpeningPlatformType docConsole = null;\r
     private JPanel jPanelCustomToolChain = null;\r
     private JPanel jPanelToolchainS = null;\r
-    private JPanel jPanelToolchainC = null;\r
+    private JPanel jPanelLibraryCenterN = null;\r
+    private JPanel jPanelLibraryCenterC = null;  //  @jve:decl-index=0:visual-constraint="20,224"\r
     /**\r
      * This is the default constructor\r
      */\r
@@ -420,19 +421,14 @@ public class FpdModuleSA extends JDialog implements ActionListener {
         libInstanceTableModel.setRowCount(0);\r
     }\r
     \r
-    private void addLibInstance (ModuleIdentification libMi) {\r
+    private void addLibInstance (ModuleIdentification libMi) throws Exception{\r
         \r
-        ffc.genLibraryInstance(libMi, moduleKey);\r
         //\r
         // Add pcd information of selected instance to current moduleSA\r
         //\r
-        try{\r
-            ffc.addFrameworkModulesPcdBuildDefs(libMi, null, ffc.getModuleSA(moduleKey));\r
-        }\r
-        catch (Exception exception) {\r
-            JOptionPane.showMessageDialog(frame, "Adding Instance" + libMi.getName() + ": "+ exception.getMessage());\r
-        }\r
+        ffc.addFrameworkModulesPcdBuildDefs(libMi, null, ffc.getModuleSA(moduleKey));\r
         \r
+        ffc.genLibraryInstance(libMi, moduleKey);\r
     }\r
     /**\r
      * This method initializes this\r
@@ -440,7 +436,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
      * @return void\r
      */\r
     private void initialize() {\r
-        this.setSize(664, 515);\r
+        this.setSize(877, 555);\r
         this.setResizable(false);\r
         this.centerWindow();\r
         this.setModal(true);\r
@@ -488,7 +484,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
     private JPanel getJPanelPcd() {\r
         if (jPanelPcd == null) {\r
             jLabelPcdData = new JLabel();\r
-            jLabelPcdData.setText("PcdData");\r
+            jLabelPcdData.setText(" PCD Data");\r
             jPanelPcd = new JPanel();\r
             jPanelPcd.setLayout(new BorderLayout());\r
             jPanelPcd.add(jLabelPcdData, java.awt.BorderLayout.NORTH);\r
@@ -548,7 +544,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             model = new IDefaultTableModel();\r
             jTablePcd = new JTable(model);\r
             jTablePcd.setRowHeight(20);\r
-            jTablePcd.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
+            jTablePcd.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_ALL_COLUMNS);\r
             model.addColumn("CName");\r
             model.addColumn("TokenSpaceGUID");\r
             model.addColumn("ItemType");\r
@@ -783,7 +779,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
     private JScrollPane getJScrollPaneSelectedInstances() {\r
         if (jScrollPaneSelectedInstances == null) {\r
             jScrollPaneSelectedInstances = new JScrollPane();\r
-            jScrollPaneSelectedInstances.setPreferredSize(new java.awt.Dimension(453,150));\r
+            jScrollPaneSelectedInstances.setPreferredSize(new java.awt.Dimension(600,150));\r
             jScrollPaneSelectedInstances.setViewportView(getJTableSelectedInstances());\r
         }\r
         return jScrollPaneSelectedInstances;\r
@@ -888,7 +884,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
     private JScrollPane getJScrollPaneQualifiedInstance() {\r
         if (jScrollPaneQualifiedInstance == null) {\r
             jScrollPaneQualifiedInstance = new JScrollPane();\r
-            jScrollPaneQualifiedInstance.setPreferredSize(new java.awt.Dimension(430,170));\r
+            jScrollPaneQualifiedInstance.setPreferredSize(new java.awt.Dimension(600,170));\r
             jScrollPaneQualifiedInstance.setViewportView(getJTableLibInstances());\r
         }\r
         return jScrollPaneQualifiedInstance;\r
@@ -940,12 +936,11 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             jLabelSelectedInstances = new JLabel();\r
             jLabelSelectedInstances.setText("Selected Instances");\r
             jPanelLibraryCenter = new JPanel();\r
-            jPanelLibraryCenter.add(jLabelInstanceHelp, null);\r
-            jPanelLibraryCenter.add(getJScrollPaneInstanceHelp(), null);\r
-            jPanelLibraryCenter.add(getJButtonAdd(), null);\r
-            jPanelLibraryCenter.add(getJButtonDeleteInstance(), null);\r
-            jPanelLibraryCenter.add(jLabelSelectedInstances, null);\r
-            jPanelLibraryCenter.add(getJScrollPaneSelectedInstances(), null);\r
+            jPanelLibraryCenter.setLayout(new BorderLayout());\r
+\r
+            jPanelLibraryCenter.add(getJPanelLibraryCenterC(), java.awt.BorderLayout.CENTER);\r
+            jPanelLibraryCenter.add(getJPanelLibraryCenterN(), java.awt.BorderLayout.NORTH);\r
+\r
         }\r
         return jPanelLibraryCenter;\r
     }\r
@@ -958,7 +953,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
     private JScrollPane getJScrollPaneInstanceHelp() {\r
         if (jScrollPaneInstanceHelp == null) {\r
             jScrollPaneInstanceHelp = new JScrollPane();\r
-            jScrollPaneInstanceHelp.setPreferredSize(new java.awt.Dimension(300,50));\r
+            jScrollPaneInstanceHelp.setPreferredSize(new java.awt.Dimension(400,50));\r
             jScrollPaneInstanceHelp.setViewportView(getJTextAreaInstanceHelp());\r
         }\r
         return jScrollPaneInstanceHelp;\r
@@ -993,17 +988,24 @@ public class FpdModuleSA extends JDialog implements ActionListener {
                     if (row < 0) {\r
                         return;\r
                     }\r
-                    docConsole.setSaved(false);\r
-                    Object[] s = {libInstanceTableModel.getValueAt(row, 0), libInstanceTableModel.getValueAt(row, 1),\r
-                                  libInstanceTableModel.getValueAt(row, 2), libInstanceTableModel.getValueAt(row, 3),\r
-                                  libInstanceTableModel.getValueAt(row, 4)};\r
-                    selectedInstancesTableModel.addRow(s);\r
+                    \r
                     String instanceValue = libInstanceTableModel.getValueAt(row, 1) + " " +\r
                     libInstanceTableModel.getValueAt(row, 2) + " " +\r
                     libInstanceTableModel.getValueAt(row, 3) + " " +\r
                     libInstanceTableModel.getValueAt(row, 4);\r
                     ModuleIdentification libMi = WorkspaceProfile.getModuleId(instanceValue);\r
-                    addLibInstance (libMi);\r
+                    try {\r
+                        addLibInstance (libMi);\r
+                    }\r
+                    catch (Exception exception) {\r
+                        JOptionPane.showMessageDialog(frame, "Adding Instance" + libMi.getName() + ": "+ exception.getMessage());\r
+                        return;\r
+                    }\r
+                    docConsole.setSaved(false);\r
+                    Object[] s = {libInstanceTableModel.getValueAt(row, 0), libInstanceTableModel.getValueAt(row, 1),\r
+                                  libInstanceTableModel.getValueAt(row, 2), libInstanceTableModel.getValueAt(row, 3),\r
+                                  libInstanceTableModel.getValueAt(row, 4)};\r
+                    selectedInstancesTableModel.addRow(s);\r
                     resolveLibraryInstances(instanceValue);\r
                     showClassToResolved();\r
                 }\r
@@ -1123,7 +1125,8 @@ public class FpdModuleSA extends JDialog implements ActionListener {
     private JTextField getJTextFieldFvBinding() {\r
         if (jTextFieldFvBinding == null) {\r
             jTextFieldFvBinding = new JTextField();\r
-            jTextFieldFvBinding.setPreferredSize(new java.awt.Dimension(150,20));\r
+            jTextFieldFvBinding.setPreferredSize(new java.awt.Dimension(400,20));\r
+            jTextFieldFvBinding.setEditable(false);\r
             jTextFieldFvBinding.addFocusListener(new java.awt.event.FocusAdapter() {\r
                 public void focusLost(java.awt.event.FocusEvent e) {\r
                     String originalFvBinding = ffc.getFvBinding(moduleKey);\r
@@ -1600,7 +1603,7 @@ private JPanel getJPanelCustomToolChain() {
         jPanelCustomToolChain = new JPanel();\r
         jPanelCustomToolChain.setLayout(new BorderLayout());\r
         jPanelCustomToolChain.add(getJPanelToolchainS(), java.awt.BorderLayout.SOUTH);\r
-        jPanelCustomToolChain.add(getJPanelToolchainC(), java.awt.BorderLayout.CENTER);\r
+        jPanelCustomToolChain.add(getJScrollPaneModuleSaOptions(), java.awt.BorderLayout.CENTER);\r
         jPanelCustomToolChain.addComponentListener(new java.awt.event.ComponentAdapter() {\r
             public void componentShown(java.awt.event.ComponentEvent e) {\r
                 initToolChainOptions(moduleKey);\r
@@ -1622,17 +1625,38 @@ private JPanel getJPanelToolchainS() {
     }\r
     return jPanelToolchainS;\r
 }\r
+\r
+/**\r
+ * This method initializes jPanelLibraryCenterN        \r
+ *     \r
+ * @return javax.swing.JPanel  \r
+ */\r
+private JPanel getJPanelLibraryCenterN() {\r
+    if (jPanelLibraryCenterN == null) {\r
+        FlowLayout flowLayout5 = new FlowLayout();\r
+        flowLayout5.setAlignment(java.awt.FlowLayout.CENTER);\r
+        flowLayout5.setHgap(10);\r
+        jPanelLibraryCenterN = new JPanel();\r
+        jPanelLibraryCenterN.setLayout(flowLayout5);\r
+        jPanelLibraryCenterN.add(jLabelInstanceHelp, null);\r
+        jPanelLibraryCenterN.add(getJScrollPaneInstanceHelp(), null);\r
+        jPanelLibraryCenterN.add(getJButtonAdd(), null);\r
+        jPanelLibraryCenterN.add(getJButtonDeleteInstance(), null);\r
+    }\r
+    return jPanelLibraryCenterN;\r
+}\r
 /**\r
- * This method initializes jPanelToolchainC    \r
+ * This method initializes jPanelLibraryCenterC        \r
  *     \r
  * @return javax.swing.JPanel  \r
  */\r
-private JPanel getJPanelToolchainC() {\r
-    if (jPanelToolchainC == null) {\r
-        jPanelToolchainC = new JPanel();\r
-        jPanelToolchainC.add(getJScrollPaneModuleSaOptions(), null);\r
+private JPanel getJPanelLibraryCenterC() {\r
+    if (jPanelLibraryCenterC == null) {\r
+        jPanelLibraryCenterC = new JPanel();\r
+        jPanelLibraryCenterC.add(jLabelSelectedInstances, null);\r
+        jPanelLibraryCenterC.add(getJScrollPaneSelectedInstances(), null);\r
     }\r
-    return jPanelToolchainC;\r
+    return jPanelLibraryCenterC;\r
 }\r
 \r
 \r