1. Fix EDKT336: Back to focused dialog window when shift to wizard

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2148 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
hche10x 2006-12-28 08:03:37 +00:00
parent 5d07408433
commit a9e882c96d
17 changed files with 96 additions and 48 deletions

View File

@ -2831,67 +2831,67 @@ public class FrameworkWizardUI extends IFrame implements KeyListener, MouseListe
getJDesktopPaneModule().add(frmMsaHeader, 1);
break;
case IDefaultMutableTreeNode.MSA_LIBRARYCLASSDEFINITIONS:
ModuleLibraryClassDefinitions frmMlcd = new ModuleLibraryClassDefinitions(msa);
ModuleLibraryClassDefinitions frmMlcd = new ModuleLibraryClassDefinitions(msa, this);
getJDesktopPaneModule().add(frmMlcd, 1);
break;
case IDefaultMutableTreeNode.MSA_PACKAGEDEPENDENCIES:
ModulePackageDependencies frmMpd = new ModulePackageDependencies(msa);
ModulePackageDependencies frmMpd = new ModulePackageDependencies(msa, this);
getJDesktopPaneModule().add(frmMpd, 1);
break;
case IDefaultMutableTreeNode.MSA_SOURCEFILES:
ModuleSourceFiles frmMsf = new ModuleSourceFiles(msa);
ModuleSourceFiles frmMsf = new ModuleSourceFiles(msa, this);
getJDesktopPaneModule().add(frmMsf, 1);
break;
case IDefaultMutableTreeNode.MSA_PROTOCOLS:
ModuleProtocols frmMp = new ModuleProtocols(msa);
ModuleProtocols frmMp = new ModuleProtocols(msa, this);
getJDesktopPaneModule().add(frmMp, 1);
break;
case IDefaultMutableTreeNode.MSA_EVENTS:
ModuleEvents frmMe = new ModuleEvents(msa);
ModuleEvents frmMe = new ModuleEvents(msa, this);
getJDesktopPaneModule().add(frmMe, 1);
break;
case IDefaultMutableTreeNode.MSA_HOBS:
ModuleHobs frmMh = new ModuleHobs(msa);
ModuleHobs frmMh = new ModuleHobs(msa, this);
getJDesktopPaneModule().add(frmMh, 1);
break;
case IDefaultMutableTreeNode.MSA_PPIS:
ModulePpis frmMpp = new ModulePpis(msa);
ModulePpis frmMpp = new ModulePpis(msa, this);
getJDesktopPaneModule().add(frmMpp, 1);
break;
case IDefaultMutableTreeNode.MSA_VARIABLES:
ModuleVariables frmMv = new ModuleVariables(msa);
ModuleVariables frmMv = new ModuleVariables(msa, this);
getJDesktopPaneModule().add(frmMv, 1);
break;
case IDefaultMutableTreeNode.MSA_BOOTMODES:
ModuleBootModes frmMbm = new ModuleBootModes(msa);
ModuleBootModes frmMbm = new ModuleBootModes(msa, this);
getJDesktopPaneModule().add(frmMbm, 1);
break;
case IDefaultMutableTreeNode.MSA_SYSTEMTABLES:
ModuleSystemTables frmMst = new ModuleSystemTables(msa);
ModuleSystemTables frmMst = new ModuleSystemTables(msa, this);
getJDesktopPaneModule().add(frmMst, 1);
break;
case IDefaultMutableTreeNode.MSA_DATAHUBS:
ModuleDataHubs frmMdh = new ModuleDataHubs(msa);
ModuleDataHubs frmMdh = new ModuleDataHubs(msa, this);
getJDesktopPaneModule().add(frmMdh, 1);
break;
case IDefaultMutableTreeNode.MSA_HIIPACKAGES:
ModuleHiiPackages frmMf = new ModuleHiiPackages(msa);
ModuleHiiPackages frmMf = new ModuleHiiPackages(msa, this);
getJDesktopPaneModule().add(frmMf, 1);
break;
case IDefaultMutableTreeNode.MSA_GUIDS:
ModuleGuids frmGuid = new ModuleGuids(msa);
ModuleGuids frmGuid = new ModuleGuids(msa, this);
getJDesktopPaneModule().add(frmGuid, 1);
break;
case IDefaultMutableTreeNode.MSA_EXTERNS:
ModuleExterns frmMex = new ModuleExterns(msa);
ModuleExterns frmMex = new ModuleExterns(msa, this);
getJDesktopPaneModule().add(frmMex, 1);
break;
case IDefaultMutableTreeNode.MSA_PCDS:
ModulePCDs frmPcd = new ModulePCDs(msa);
ModulePCDs frmPcd = new ModulePCDs(msa, this);
getJDesktopPaneModule().add(frmPcd, 1);
break;
case IDefaultMutableTreeNode.MSA_BUILDOPTIONS:
ModuleBuildOptions frmMbo = new ModuleBuildOptions(msa);
ModuleBuildOptions frmMbo = new ModuleBuildOptions(msa, this);
getJDesktopPaneModule().add(frmMbo, 1);
break;
}

View File

@ -75,6 +75,8 @@ public class ModuleBootModes extends IInternalFrame {
private JScrollPane jScrollPaneTable = null;
private JTable jTable = null;
private IFrame parentFrame = null;
//
// Not used by UI
@ -260,10 +262,11 @@ public class ModuleBootModes extends IInternalFrame {
@param inBootModes The input BootModesDocument.BootModes
**/
public ModuleBootModes(OpeningModuleType inOmt) {
public ModuleBootModes(OpeningModuleType inOmt, IFrame iFrame) {
super();
this.omt = inOmt;
this.msa = omt.getXmlMsa();
this.parentFrame = iFrame;
init(msa.getBootModes());
this.setVisible(true);
}
@ -289,7 +292,7 @@ public class ModuleBootModes extends IInternalFrame {
}
private void showEdit(int index) {
BootModesDlg dlg = new BootModesDlg(vid.getBootModes(index), new IFrame(), omt.getId());
BootModesDlg dlg = new BootModesDlg(vid.getBootModes(index), this.parentFrame, omt.getId());
int result = dlg.showDialog();
if (result == DataType.RETURN_TYPE_OK) {
if (index == -1) {

View File

@ -93,6 +93,8 @@ public class ModuleBuildOptions extends IInternalFrame {
private IDefaultTableModel model = null;
private int selectedRow = -1;
private IFrame parentFrame = null;
/**
This method initializes jButtonAdd
@ -265,10 +267,11 @@ public class ModuleBuildOptions extends IInternalFrame {
@param inBuildOptions The input BuildOptionsDocument.BuildOptions
**/
public ModuleBuildOptions(OpeningModuleType inOmt) {
public ModuleBuildOptions(OpeningModuleType inOmt, IFrame iFrame) {
super();
this.omt = inOmt;
this.msa = omt.getXmlMsa();
this.parentFrame = iFrame;
init(msa.getModuleBuildOptions());
this.setVisible(true);
}
@ -294,7 +297,7 @@ public class ModuleBuildOptions extends IInternalFrame {
}
private void showEdit(int index) {
BuildOptionsDlg dlg = new BuildOptionsDlg(vid.getBuildOptions(index), new IFrame(), omt.getId());
BuildOptionsDlg dlg = new BuildOptionsDlg(vid.getBuildOptions(index), this.parentFrame, omt.getId());
int result = dlg.showDialog();
if (result == DataType.RETURN_TYPE_OK) {
if (index == -1) {

View File

@ -91,6 +91,8 @@ public class ModuleDataHubs extends IInternalFrame {
private IDefaultTableModel model = null;
private int selectedRow = -1;
private IFrame parentFrame = null;
/**
This method initializes jButtonAdd
@ -257,10 +259,11 @@ public class ModuleDataHubs extends IInternalFrame {
@param inDataHubs The input DataHubsDocument.DataHubs
**/
public ModuleDataHubs(OpeningModuleType inOmt) {
public ModuleDataHubs(OpeningModuleType inOmt, IFrame iFrame) {
super();
this.omt = inOmt;
this.msa = omt.getXmlMsa();
this.parentFrame = iFrame;
init(msa.getDataHubs());
this.setVisible(true);
}
@ -286,7 +289,7 @@ public class ModuleDataHubs extends IInternalFrame {
}
private void showEdit(int index) {
DataHubsDlg dlg = new DataHubsDlg(vid.getDataHubs(index), new IFrame(), omt.getId());
DataHubsDlg dlg = new DataHubsDlg(vid.getDataHubs(index), this.parentFrame, omt.getId());
int result = dlg.showDialog();
if (result == DataType.RETURN_TYPE_OK) {
if (index == -1) {

View File

@ -96,6 +96,8 @@ public class ModuleEvents extends IInternalFrame {
private IDefaultTableModel model = null;
private int selectedRow = -1;
private IFrame parentFrame = null;
/**
This method initializes jButtonAdd
@ -286,10 +288,11 @@ public class ModuleEvents extends IInternalFrame {
@param inEvents The input EventsDocument.Events
**/
public ModuleEvents(OpeningModuleType inOmt) {
public ModuleEvents(OpeningModuleType inOmt, IFrame iFrame) {
super();
this.omt = inOmt;
this.msa = omt.getXmlMsa();
this.parentFrame = iFrame;
init(msa.getEvents());
this.setVisible(true);
}
@ -315,7 +318,7 @@ public class ModuleEvents extends IInternalFrame {
}
private void showEdit(int index) {
EventsDlg dlg = new EventsDlg(vid.getEvents(index), new IFrame(), omt.getId());
EventsDlg dlg = new EventsDlg(vid.getEvents(index), this.parentFrame, omt.getId());
int result = dlg.showDialog();
if (result == DataType.RETURN_TYPE_OK) {
if (index == -1) {

View File

@ -91,6 +91,8 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
private IDefaultTableModel model = null;
private int selectedRow = -1;
private IFrame parentFrame = null;
/**
This method initializes jButtonAdd
@ -315,10 +317,11 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
@param inExterns The input data of ExternsDocument.Externs
**/
public ModuleExterns(OpeningModuleType inOmt) {
public ModuleExterns(OpeningModuleType inOmt, IFrame iFrame) {
super();
this.omt = inOmt;
this.msa = omt.getXmlMsa();
this.parentFrame = iFrame;
init(msa.getExterns());
this.setVisible(true);
}
@ -344,7 +347,7 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
}
private void showEdit(int index) {
ExternsDlg dlg = new ExternsDlg(vid.getExterns(index), new IFrame(), omt.getId());
ExternsDlg dlg = new ExternsDlg(vid.getExterns(index), this.parentFrame, omt.getId());
int result = dlg.showDialog();
if (result == DataType.RETURN_TYPE_OK) {
if (index == -1) {

View File

@ -88,6 +88,8 @@ public class ModuleGuids extends IInternalFrame {
private IDefaultTableModel model = null;
private int selectedRow = -1;
private IFrame parentFrame = null;
/**
This method initializes jButtonAdd
@ -254,10 +256,11 @@ public class ModuleGuids extends IInternalFrame {
@param inGuids The input data of GuidsDocument.Guids
**/
public ModuleGuids(OpeningModuleType inOmt) {
public ModuleGuids(OpeningModuleType inOmt, IFrame iFrame) {
super();
this.omt = inOmt;
this.msa = omt.getXmlMsa();
this.parentFrame = iFrame;
init(msa.getGuids());
this.setVisible(true);
}
@ -283,7 +286,7 @@ public class ModuleGuids extends IInternalFrame {
}
private void showEdit(int index) {
GuidsDlg dlg = new GuidsDlg(vid.getGuids(index), new IFrame(), omt.getId());
GuidsDlg dlg = new GuidsDlg(vid.getGuids(index), this.parentFrame, omt.getId());
int result = dlg.showDialog();
if (result == DataType.RETURN_TYPE_OK) {
if (index == -1) {

View File

@ -88,6 +88,8 @@ public class ModuleHiiPackages extends IInternalFrame {
private IDefaultTableModel model = null;
private int selectedRow = -1;
private IFrame parentFrame = null;
/**
This method initializes jButtonAdd
@ -257,10 +259,11 @@ public class ModuleHiiPackages extends IInternalFrame {
@param inFormsets The input data of HiiPackagesDocument.HiiPackages
**/
public ModuleHiiPackages(OpeningModuleType inOmt) {
public ModuleHiiPackages(OpeningModuleType inOmt, IFrame iFrame) {
super();
this.omt = inOmt;
this.msa = omt.getXmlMsa();
this.parentFrame = iFrame;
init(msa.getHiiPackages());
this.setVisible(true);
}
@ -286,7 +289,7 @@ public class ModuleHiiPackages extends IInternalFrame {
}
private void showEdit(int index) {
HiiPackagesDlg dlg = new HiiPackagesDlg(vid.getHiiPackages(index), new IFrame(), omt.getId());
HiiPackagesDlg dlg = new HiiPackagesDlg(vid.getHiiPackages(index), this.parentFrame, omt.getId());
int result = dlg.showDialog();
if (result == DataType.RETURN_TYPE_OK) {
if (index == -1) {

View File

@ -90,6 +90,8 @@ public class ModuleHobs extends IInternalFrame {
private IDefaultTableModel model = null;
private int selectedRow = -1;
private IFrame parentFrame = null;
/**
This method initializes jButtonAdd
@ -259,10 +261,11 @@ public class ModuleHobs extends IInternalFrame {
@param inHobs The input data of HobsDocument.Hobs
**/
public ModuleHobs(OpeningModuleType inOmt) {
public ModuleHobs(OpeningModuleType inOmt, IFrame iFrame) {
super();
this.omt = inOmt;
this.msa = omt.getXmlMsa();
this.parentFrame = iFrame;
init(msa.getHobs());
this.setVisible(true);
}
@ -289,7 +292,7 @@ public class ModuleHobs extends IInternalFrame {
}
private void showEdit(int index) {
HobsDlg dlg = new HobsDlg(vid.getHobs(index), new IFrame(), omt.getId());
HobsDlg dlg = new HobsDlg(vid.getHobs(index), this.parentFrame, omt.getId());
int result = dlg.showDialog();
if (result == DataType.RETURN_TYPE_OK) {
if (index == -1) {

View File

@ -86,6 +86,8 @@ public class ModuleLibraryClassDefinitions extends IInternalFrame {
private IDefaultTableModel model = null;
private int selectedRow = -1;
private IFrame parentFrame = null;
/**
This method initializes jButtonAdd
@ -209,10 +211,11 @@ public class ModuleLibraryClassDefinitions extends IInternalFrame {
@param
**/
public ModuleLibraryClassDefinitions(OpeningModuleType inOmt) {
public ModuleLibraryClassDefinitions(OpeningModuleType inOmt, IFrame iFrame) {
super();
this.omt = inOmt;
this.msa = omt.getXmlMsa();
this.parentFrame = iFrame;
init(msa.getLibraryClassDefinitions());
this.setVisible(true);
}
@ -344,7 +347,7 @@ public class ModuleLibraryClassDefinitions extends IInternalFrame {
}
private void showEdit(int index) {
LibraryClassDefsDlg mcdd = new LibraryClassDefsDlg(vLibraryClass.getLibraryClass(index), new IFrame(), omt.getId());
LibraryClassDefsDlg mcdd = new LibraryClassDefsDlg(vLibraryClass.getLibraryClass(index), this.parentFrame, omt.getId());
int result = mcdd.showDialog();
if (result == DataType.RETURN_TYPE_OK) {
if (index == -1) {

View File

@ -91,6 +91,8 @@ public class ModulePCDs extends IInternalFrame {
private IDefaultTableModel model = null;
private int selectedRow = -1;
private IFrame parentFrame = null;
/**
This method initializes jButtonAdd
@ -264,10 +266,11 @@ public class ModulePCDs extends IInternalFrame {
@param inPcds The input data of PCDsDocument.PCDs
**/
public ModulePCDs(OpeningModuleType inOmt) {
public ModulePCDs(OpeningModuleType inOmt, IFrame iFrame) {
super();
this.omt = inOmt;
this.msa = omt.getXmlMsa();
this.parentFrame = iFrame;
init(msa.getPcdCoded());
this.setVisible(true);
}
@ -293,7 +296,7 @@ public class ModulePCDs extends IInternalFrame {
}
private void showEdit(int index) {
PCDsDlg dlg = new PCDsDlg(vid.getPcdCoded(index), new IFrame(), omt.getId());
PCDsDlg dlg = new PCDsDlg(vid.getPcdCoded(index), this.parentFrame, omt.getId());
int result = dlg.showDialog();
if (result == DataType.RETURN_TYPE_OK) {
if (index == -1) {

View File

@ -94,6 +94,8 @@ public class ModulePackageDependencies extends IInternalFrame {
private IDefaultTableModel model = null;
private int selectedRow = -1;
private IFrame parentFrame = null;
/**
This method initializes jButtonAdd
@ -217,10 +219,11 @@ public class ModulePackageDependencies extends IInternalFrame {
@param
**/
public ModulePackageDependencies(OpeningModuleType inOmt) {
public ModulePackageDependencies(OpeningModuleType inOmt, IFrame iFrame) {
super();
this.omt = inOmt;
this.msa = omt.getXmlMsa();
this.parentFrame = iFrame;
init(msa.getPackageDependencies());
this.setVisible(true);
}
@ -294,7 +297,7 @@ public class ModulePackageDependencies extends IInternalFrame {
}
private void showEdit(int index) {
PackageDepDlg pdd = new PackageDepDlg(vid.getPackageDependencies(index), new IFrame(), omt.getId());
PackageDepDlg pdd = new PackageDepDlg(vid.getPackageDependencies(index), this.parentFrame, omt.getId());
int result = pdd.showDialog();
if (result == DataType.RETURN_TYPE_OK) {
if (index == -1) {

View File

@ -94,6 +94,8 @@ public class ModulePpis extends IInternalFrame {
private IDefaultTableModel model = null;
private int selectedRow = -1;
private IFrame parentFrame = null;
/**
This method initializes jButtonAdd
@ -279,10 +281,11 @@ public class ModulePpis extends IInternalFrame {
@param inPpis The input data of PPIsDocument.PPIs
**/
public ModulePpis(OpeningModuleType inOmt) {
public ModulePpis(OpeningModuleType inOmt, IFrame iFrame) {
super();
this.omt = inOmt;
this.msa = omt.getXmlMsa();
this.parentFrame = iFrame;
init(msa.getPPIs());
this.setVisible(true);
}
@ -308,7 +311,7 @@ public class ModulePpis extends IInternalFrame {
}
private void showEdit(int index) {
PpisDlg dlg = new PpisDlg(vid.getPpis(index), new IFrame(), omt.getId());
PpisDlg dlg = new PpisDlg(vid.getPpis(index), this.parentFrame, omt.getId());
int result = dlg.showDialog();
if (result == DataType.RETURN_TYPE_OK) {
if (index == -1) {

View File

@ -96,6 +96,8 @@ public class ModuleProtocols extends IInternalFrame {
private IDefaultTableModel model = null;
private int selectedRow = -1;
private IFrame parentFrame = null;
/**
This method initializes jButtonAdd
@ -280,10 +282,11 @@ public class ModuleProtocols extends IInternalFrame {
@param inProtocol The input data of ProtocolsDocument.Protocols
**/
public ModuleProtocols(OpeningModuleType inOmt) {
public ModuleProtocols(OpeningModuleType inOmt, IFrame iFrame) {
super();
this.omt = inOmt;
this.msa = omt.getXmlMsa();
this.parentFrame = iFrame;
init(msa.getProtocols());
this.setVisible(true);
}
@ -309,7 +312,7 @@ public class ModuleProtocols extends IInternalFrame {
}
private void showEdit(int index) {
ProtocolsDlg dlg = new ProtocolsDlg(vid.getProtocols(index), new IFrame(), omt.getId());
ProtocolsDlg dlg = new ProtocolsDlg(vid.getProtocols(index), this.parentFrame, omt.getId());
int result = dlg.showDialog();
if (result == DataType.RETURN_TYPE_OK) {
if (index == -1) {

View File

@ -88,6 +88,8 @@ public class ModuleSourceFiles extends IInternalFrame {
private IDefaultTableModel model = null;
private int selectedRow = -1;
private IFrame parentFrame = null;
/**
This method initializes jButtonAdd
@ -213,10 +215,11 @@ public class ModuleSourceFiles extends IInternalFrame {
@param
**/
public ModuleSourceFiles(OpeningModuleType inOmt) {
public ModuleSourceFiles(OpeningModuleType inOmt, IFrame iFrame) {
super();
this.omt = inOmt;
this.msa = omt.getXmlMsa();
this.parentFrame = iFrame;
init(msa.getSourceFiles());
this.setVisible(true);
}
@ -348,7 +351,7 @@ public class ModuleSourceFiles extends IInternalFrame {
}
private void showEdit(int index) {
SourceFilesDlg sfd = new SourceFilesDlg(this.vSourceFiles.getSourceFiles(index), new IFrame(), omt.getId());
SourceFilesDlg sfd = new SourceFilesDlg(this.vSourceFiles.getSourceFiles(index), this.parentFrame, omt.getId());
int result = sfd.showDialog();
if (result == DataType.RETURN_TYPE_OK) {
if (index == -1) {

View File

@ -90,6 +90,8 @@ public class ModuleSystemTables extends IInternalFrame {
private IDefaultTableModel model = null;
private int selectedRow = -1;
private IFrame parentFrame = null;
/**
This method initializes jButtonAdd
@ -256,10 +258,11 @@ public class ModuleSystemTables extends IInternalFrame {
@param inSystemTables The input data of SystemTablesDocument.SystemTables
**/
public ModuleSystemTables(OpeningModuleType inOmt) {
public ModuleSystemTables(OpeningModuleType inOmt, IFrame iFrame) {
super();
this.omt = inOmt;
this.msa = omt.getXmlMsa();
this.parentFrame = iFrame;
init(msa.getSystemTables());
this.setVisible(true);
}
@ -286,7 +289,7 @@ public class ModuleSystemTables extends IInternalFrame {
}
private void showEdit(int index) {
SystemTablesDlg dlg = new SystemTablesDlg(vid.getSystemTables(index), new IFrame(), omt.getId());
SystemTablesDlg dlg = new SystemTablesDlg(vid.getSystemTables(index), this.parentFrame, omt.getId());
int result = dlg.showDialog();
if (result == DataType.RETURN_TYPE_OK) {
if (index == -1) {

View File

@ -89,6 +89,8 @@ public class ModuleVariables extends IInternalFrame {
private IDefaultTableModel model = null;
private int selectedRow = -1;
private IFrame parentFrame = null;
/**
This method initializes jButtonAdd
@ -257,10 +259,11 @@ public class ModuleVariables extends IInternalFrame {
@param inVariables The input data of VariablesDocument.Variables
**/
public ModuleVariables(OpeningModuleType inOmt) {
public ModuleVariables(OpeningModuleType inOmt, IFrame iFrame) {
super();
this.omt = inOmt;
this.msa = omt.getXmlMsa();
this.parentFrame = iFrame;
init(msa.getVariables());
this.setVisible(true);
}
@ -286,7 +289,7 @@ public class ModuleVariables extends IInternalFrame {
}
private void showEdit(int index) {
VariablesDlg dlg = new VariablesDlg(vid.getVariables(index), new IFrame(), omt.getId());
VariablesDlg dlg = new VariablesDlg(vid.getVariables(index), this.parentFrame, omt.getId());
int result = dlg.showDialog();
if (result == DataType.RETURN_TYPE_OK) {
if (index == -1) {