X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2FToolChainConfig.java;h=ddfb479cc40ce1ae56694bf2b85d7ec275fa3058;hb=af25df1662fe283b6215086799b3915131575ce2;hp=8d0055a4033f5c3f2c8358dfad9473d9be42cfb6;hpb=8f9acbd7afefaeb33a15f00cf4998e94fffeebd0;p=mirror_edk2.git

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfig.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfig.java
index 8d0055a403..ddfb479cc4 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfig.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfig.java
@@ -15,6 +15,7 @@
 package org.tianocore.frameworkwizard;
 
 import java.awt.event.ActionEvent;
+import java.awt.event.WindowEvent;
 import java.io.File;
 import java.io.IOException;
 
@@ -38,11 +39,10 @@ import org.tianocore.frameworkwizard.common.Log;
 import org.tianocore.frameworkwizard.common.Tools;
 import org.tianocore.frameworkwizard.common.Identifications.ToolChainConfigId;
 import org.tianocore.frameworkwizard.common.Identifications.ToolChainConfigVector;
-import org.tianocore.frameworkwizard.common.ui.IDialog;
 import org.tianocore.frameworkwizard.common.ui.IFrame;
 import org.tianocore.frameworkwizard.workspace.Workspace;
 
-public class ToolChainConfig extends IDialog implements ListSelectionListener, TableModelListener{
+public class ToolChainConfig extends IFrame implements ListSelectionListener, TableModelListener{
 
     ///
     /// Define Class Members
@@ -86,6 +86,10 @@ public class ToolChainConfig extends IDialog implements ListSelectionListener, T
 
     private JButton jButtonHelp = null;
     
+    private static ToolChainConfig tcc = null;
+    
+    private ToolChainConfigHelp tcch = null;
+    
     /**
      This method initializes jScrollPane	
      
@@ -109,12 +113,7 @@ public class ToolChainConfig extends IDialog implements ListSelectionListener, T
      **/
     private JTable getJTable() {
         if (jTable == null) {
-//            Vector<String> vTableHeader = new Vector<String>();
-//            vTableHeader.addElement("Name");
-//            vTableHeader.addElement("Value");
-//            
             model = new DefaultTableModel();
-            //model = new DefaultTableModel(vTableHeader);
             jTable = new JTable(model);
             jTable.setRowHeight(20);
 
@@ -260,12 +259,19 @@ public class ToolChainConfig extends IDialog implements ListSelectionListener, T
         // TODO Auto-generated method stub
 
     }
+    
+    public static ToolChainConfig getInstance() {
+        if (tcc == null) {
+            tcc = new ToolChainConfig();
+        }
+        return tcc;
+    }
 
     /**
      * This is the default constructor
      */
-    public ToolChainConfig(IFrame parentFrame, boolean modal) {
-        super(parentFrame, modal);
+    public ToolChainConfig() {
+        super();
         init();
     }
 
@@ -337,8 +343,7 @@ public class ToolChainConfig extends IDialog implements ListSelectionListener, T
      */
     public void actionPerformed(ActionEvent arg0) {
         if (arg0.getSource() == jButtonClose) {
-            this.setVisible(false);
-            this.returnType = DataType.RETURN_TYPE_CANCEL;
+            this.exit();
         }
 
         if (arg0.getSource() == jButtonOpen) {
@@ -400,7 +405,7 @@ public class ToolChainConfig extends IDialog implements ListSelectionListener, T
         }
         
         if (arg0.getSource() == jButtonHelp) {
-            ToolChainConfigHelp tcch = new ToolChainConfigHelp();
+            tcch = ToolChainConfigHelp.getInstance();
             tcch.setVisible(true);
         }
     }
@@ -477,4 +482,21 @@ public class ToolChainConfig extends IDialog implements ListSelectionListener, T
             this.vtcc.getToolChainConfigs(row).setValue(m.getValueAt(row, 1).toString());
         }
     }
+    
+    /* (non-Javadoc)
+     * @see java.awt.event.WindowListener#windowClosing(java.awt.event.WindowEvent)
+     *
+     * Override windowClosing to popup warning message to confirm quit
+     * 
+     */
+    public void windowClosing(WindowEvent arg0) {
+        this.exit();
+    }
+    
+    private void exit() {
+        this.setVisible(false);
+        if (tcch != null) {
+            tcch.dispose();
+        }
+    }
 }