import org.tianocore.frameworkwizard.common.Identifications.OpeningModuleType;\r
import org.tianocore.frameworkwizard.common.Identifications.OpeningPackageType;\r
import org.tianocore.frameworkwizard.common.Identifications.OpeningPlatformType;\r
-import org.tianocore.frameworkwizard.common.find.FindPPIsResult;\r
+import org.tianocore.frameworkwizard.common.find.FindResult;\r
import org.tianocore.frameworkwizard.common.ui.IDefaultMutableTreeNode;\r
import org.tianocore.frameworkwizard.common.ui.IDesktopManager;\r
import org.tianocore.frameworkwizard.common.ui.IFrame;\r
import org.tianocore.frameworkwizard.workspace.Workspace;\r
import org.tianocore.frameworkwizard.workspace.WorkspaceTools;\r
import org.tianocore.frameworkwizard.workspace.ui.SwitchWorkspace;\r
+import org.tianocore.frameworkwizard.toolchain.Preferences;\r
\r
/**\r
The class is used to show main GUI of FrameworkWizard\r
\r
private JMenuItem jMenuItemProjectChangeWorkspace = null;\r
\r
- private JMenu jMenuProjectBuildTargets = null;\r
+ private JMenuItem jMenuItemToolsBuildPreferences = null;\r
\r
- private JCheckBoxMenuItem jCheckBoxMenuItemProjectBuildTargetsDebug = null;\r
+ // private JCheckBoxMenuItem jCheckBoxMenuItemProjectBuildTargetsDebug = null;\r
\r
- private JCheckBoxMenuItem jCheckBoxMenuItemProjectBuildTargetsRelease = null;\r
+ // private JCheckBoxMenuItem jCheckBoxMenuItemProjectBuildTargetsRelease = null;\r
\r
private JMenuItem jMenuItemToolsToolChainConfiguration = null;\r
\r
jMenuEdit = new JMenu();\r
jMenuEdit.setText("Edit");\r
jMenuEdit.setMnemonic('E');\r
- jMenuEdit.setVisible(false);\r
+ jMenuEdit.setVisible(true);\r
\r
//\r
// Add sub menu items\r
//\r
// Add sub menu items\r
//\r
- jMenuTools.add(getJMenuItemToolsToolChainConfiguration());\r
- jMenuTools.addSeparator();\r
\r
jMenuTools.add(getJMenuItemToolsClone());\r
jMenuTools.add(getJMenuItemToolsCodeScan());\r
+ jMenuTools.addSeparator();\r
+\r
+ jMenuTools.add(getJMenuItemToolsToolChainConfiguration());\r
+ jMenuTools.add(getJMenuItemToolsBuildPreferences());\r
}\r
return jMenuTools;\r
}\r
jMenuProject.add(getJMenuItemProjectUpdateFar());\r
jMenuProject.add(getJMenuItemProjectRemoveFar());\r
\r
- jMenuProject.add(getJMenuProjectBuildTargets());\r
}\r
return jMenuProject;\r
}\r
}\r
\r
/**\r
- This method initializes jMenuProjectBuildTargets \r
+ This method initializes jMenuProjectBuildPreferences \r
\r
@return javax.swing.JMenu \r
\r
**/\r
- private JMenu getJMenuProjectBuildTargets() {\r
- if (jMenuProjectBuildTargets == null) {\r
- jMenuProjectBuildTargets = new JMenu();\r
- jMenuProjectBuildTargets.setText("Build Targets");\r
- jMenuProjectBuildTargets.setMnemonic('T');\r
- jMenuProjectBuildTargets.setVisible(false);\r
-\r
- jMenuProjectBuildTargets.add(getJCheckBoxMenuItemProjectBuildTargetsDebug());\r
- jMenuProjectBuildTargets.add(getJCheckBoxMenuItemProjectBuildTargetsRelease());\r
- }\r
- return jMenuProjectBuildTargets;\r
- }\r
-\r
- /**\r
- This method initializes jCheckBoxMenuItemProjectBuildTargetsDebug \r
- \r
- @return javax.swing.JCheckBoxMenuItem \r
- \r
- **/\r
- private JCheckBoxMenuItem getJCheckBoxMenuItemProjectBuildTargetsDebug() {\r
- if (jCheckBoxMenuItemProjectBuildTargetsDebug == null) {\r
- jCheckBoxMenuItemProjectBuildTargetsDebug = new JCheckBoxMenuItem();\r
- jCheckBoxMenuItemProjectBuildTargetsDebug.setText("Debug");\r
- jCheckBoxMenuItemProjectBuildTargetsDebug.setEnabled(false);\r
- }\r
- return jCheckBoxMenuItemProjectBuildTargetsDebug;\r
- }\r
-\r
- /**\r
- This method initializes jCheckBoxMenuItemProjectBuildTargetsRelease \r
- \r
- @return javax.swing.JCheckBoxMenuItem \r
- \r
- **/\r
- private JCheckBoxMenuItem getJCheckBoxMenuItemProjectBuildTargetsRelease() {\r
- if (jCheckBoxMenuItemProjectBuildTargetsRelease == null) {\r
- jCheckBoxMenuItemProjectBuildTargetsRelease = new JCheckBoxMenuItem();\r
- jCheckBoxMenuItemProjectBuildTargetsRelease.setText("Release");\r
- jCheckBoxMenuItemProjectBuildTargetsRelease.setEnabled(false);\r
+ private JMenuItem getJMenuItemToolsBuildPreferences() {\r
+ if (jMenuItemToolsBuildPreferences == null) {\r
+ jMenuItemToolsBuildPreferences = new JMenuItem();\r
+ jMenuItemToolsBuildPreferences.setText("Build Preferences");\r
+ jMenuItemToolsBuildPreferences.setMnemonic('P');\r
+ jMenuItemToolsBuildPreferences.setEnabled(true);\r
+ jMenuItemToolsBuildPreferences.addActionListener(this);\r
}\r
- return jCheckBoxMenuItemProjectBuildTargetsRelease;\r
+ return jMenuItemToolsBuildPreferences;\r
}\r
\r
/**\r
jMenuEditFind.add(getJMenuItemEditFindProtocol());\r
jMenuEditFind.add(getJMenuItemEditFindGuid());\r
jMenuEditFind.add(getJMenuItemEditFindPcd());\r
- jMenuEditFind.addSeparator();\r
-\r
jMenuEditFind.add(getJMenuItemEditFindLibraryClass());\r
jMenuEditFind.add(getJMenuItemEditFindLibraryInstance());\r
}\r
jMenuItemEditFindLibraryInstance.setText("All Library Instances");\r
jMenuItemEditFindLibraryInstance.setMnemonic('n');\r
jMenuItemEditFindLibraryInstance.addActionListener(this);\r
+ jMenuItemEditFindLibraryInstance.setVisible(false);\r
}\r
return jMenuItemEditFindLibraryInstance;\r
}\r
\r
if (arg0.getSource() == this.jMenuItemFileCloseAll) {\r
this.closeAll();\r
+ this.makeEmptyTree();\r
}\r
\r
if (arg0.getSource() == this.jMenuItemFileSave) {\r
this.findPpi();\r
}\r
\r
+ if (arg0.getSource() == this.jMenuItemEditFindProtocol) {\r
+ this.findProtocol();\r
+ }\r
+\r
+ if (arg0.getSource() == this.jMenuItemEditFindGuid) {\r
+ this.findGuid();\r
+ }\r
+\r
+ if (arg0.getSource() == this.jMenuItemEditFindPcd) {\r
+ this.findPcd();\r
+ }\r
+\r
+ if (arg0.getSource() == this.jMenuItemEditFindLibraryClass) {\r
+ this.findLibraryClass();\r
+ }\r
+\r
+ if (arg0.getSource() == this.jMenuItemEditFindLibraryInstance) {\r
+ this.findLibraryInstance();\r
+ }\r
+\r
+ if (arg0.getSource() == jMenuItemToolsBuildPreferences) {\r
+ configBuildPreferences();\r
+ }\r
+\r
if (arg0.getSource() == this.jMenuItemProjectChangeWorkspace) {\r
this.changeWorkspace();\r
}\r
//\r
// Make Module Description\r
//\r
- dmtnModuleDescription = new IDefaultMutableTreeNode("ModuleDescription", IDefaultMutableTreeNode.MODULE, -1);\r
+ dmtnModuleDescription = new IDefaultMutableTreeNode("Modules", IDefaultMutableTreeNode.MODULE, -1);\r
\r
//\r
// First add package\r
//\r
// Make Package Description\r
//\r
- dmtnPackageDescription = new IDefaultMutableTreeNode("PackageDescription", IDefaultMutableTreeNode.PACKAGE, -1);\r
+ dmtnPackageDescription = new IDefaultMutableTreeNode("Packages", IDefaultMutableTreeNode.PACKAGE, -1);\r
if (GlobalData.vPackageList.size() > 0) {\r
for (int index = 0; index < GlobalData.vPackageList.size(); index++) {\r
dmtnPackageDescription.add(new IDefaultMutableTreeNode(GlobalData.vPackageList.elementAt(index)\r
//\r
// Make Platform Description\r
//\r
- dmtnPlatformDescription = new IDefaultMutableTreeNode("PlatformDescription", IDefaultMutableTreeNode.PLATFORM,\r
- -1);\r
+ dmtnPlatformDescription = new IDefaultMutableTreeNode("Platforms", IDefaultMutableTreeNode.PLATFORM, -1);\r
if (GlobalData.vPlatformList.size() > 0) {\r
for (int index = 0; index < GlobalData.vPlatformList.size(); index++) {\r
dmtnPlatformDescription.add(new IDefaultMutableTreeNode(GlobalData.vPlatformList.elementAt(index)\r
//\r
// The module is not in existing packages\r
//\r
- Log.wrn("Open Module", "The module hasn't been added to any package of current workspace!");\r
+ Log.wrn("Open Module", "The module does not belong to any package in the current workspace!");\r
return;\r
}\r
\r
//\r
// The package is not in current workspace\r
//\r
- Log.wrn("Open Package", "The package hasn't been added to current workspace!");\r
+ Log.wrn("Open Package", "The package has not been installed in the current workspace!");\r
return;\r
}\r
\r
//\r
// The platform is not in current workspace\r
//\r
- Log.wrn("Open Platform", "The platform hasn't been added to current workspace!");\r
+ Log.wrn("Open Platform", "The platform has not been installed in the current workspace!");\r
return;\r
}\r
\r
iTree.addNode(new IDefaultMutableTreeNode("Data Hubs", IDefaultMutableTreeNode.MSA_DATAHUBS, true, id));\r
iTree.addNode(new IDefaultMutableTreeNode("Hii Packages", IDefaultMutableTreeNode.MSA_HIIPACKAGES, true, id));\r
iTree.addNode(new IDefaultMutableTreeNode("Guids", IDefaultMutableTreeNode.MSA_GUIDS, true, id));\r
- iTree.addNode(new IDefaultMutableTreeNode("Externs", IDefaultMutableTreeNode.MSA_EXTERNS, true, id));\r
- iTree.addNode(new IDefaultMutableTreeNode("PcdCoded", IDefaultMutableTreeNode.MSA_PCDS, true, id));\r
+ iTree\r
+ .addNode(new IDefaultMutableTreeNode("External Defintions", IDefaultMutableTreeNode.MSA_EXTERNS, true, id));\r
+ iTree.addNode(new IDefaultMutableTreeNode("Pcd Coded", IDefaultMutableTreeNode.MSA_PCDS, true, id));\r
}\r
\r
private void insertPackageTreeNode(Identification id) {\r
id));\r
iTree.addNode(new IDefaultMutableTreeNode("Platform Definitions",\r
IDefaultMutableTreeNode.FPD_PLATFORMDEFINITIONS, true, id));\r
- iTree.addNode(new IDefaultMutableTreeNode("Flash", IDefaultMutableTreeNode.FPD_FLASH, true, id));\r
+ iTree.addNode(new IDefaultMutableTreeNode("Flash Information", IDefaultMutableTreeNode.FPD_FLASH, true, id));\r
iTree.addNode(new IDefaultMutableTreeNode("Framework Modules", IDefaultMutableTreeNode.FPD_FRAMEWORKMODULES,\r
true, id));\r
- iTree.addNode(new IDefaultMutableTreeNode("Pcd Dynamic Build Declarations",\r
+ iTree.addNode(new IDefaultMutableTreeNode("Dynamic PCD Build Declarations",\r
IDefaultMutableTreeNode.FPD_PCDDYNAMICBUILDDECLARATIONS, true, id));\r
iTree.addNode(new IDefaultMutableTreeNode("Build Options", IDefaultMutableTreeNode.FPD_BUILDOPTIONS, true, id));\r
}\r
Identification id = null;\r
int intCategory = -1;\r
String path = null;\r
- boolean isOpen = false;\r
+\r
try {\r
id = iTree.getSelectNode().getId();\r
intCategory = iTree.getSelectCategory();\r
- isOpen = iTree.getSelectNode().isOpening();\r
\r
- if (!isOpen) {\r
- // \r
- // If the node is not opened yet\r
- // Insert top level elements first\r
- //\r
- if (intCategory == IDefaultMutableTreeNode.MODULE) {\r
+ // \r
+ // If the node is not opened yet\r
+ // Insert top level elements first\r
+ //\r
+ if (intCategory == IDefaultMutableTreeNode.MODULE) {\r
\r
- if (intCategory == IDefaultMutableTreeNode.MODULE) {\r
- path = iTree.getSelectNode().getId().getPath();\r
- }\r
- if (intCategory == IDefaultMutableTreeNode.PACKAGE) {\r
- path = iTree.getSelectNode().getId().getPath();\r
- }\r
- openModule(path);\r
- return;\r
- }\r
- if (intCategory == IDefaultMutableTreeNode.PACKAGE) {\r
+ if (intCategory == IDefaultMutableTreeNode.MODULE) {\r
path = iTree.getSelectNode().getId().getPath();\r
- openPackage(path);\r
- return;\r
}\r
- if (intCategory == IDefaultMutableTreeNode.PLATFORM) {\r
+ if (intCategory == IDefaultMutableTreeNode.PACKAGE) {\r
path = iTree.getSelectNode().getId().getPath();\r
- openPlatform(path);\r
- return;\r
}\r
+ openModule(path);\r
+ return;\r
+ }\r
+ if (intCategory == IDefaultMutableTreeNode.PACKAGE) {\r
+ path = iTree.getSelectNode().getId().getPath();\r
+ openPackage(path);\r
+ return;\r
+ }\r
+ if (intCategory == IDefaultMutableTreeNode.PLATFORM) {\r
+ path = iTree.getSelectNode().getId().getPath();\r
+ openPlatform(path);\r
+ return;\r
}\r
\r
//\r
try {\r
wt.addModuleToPackage(mid, psa);\r
} catch (IOException e) {\r
- Log.wrn("Upddate MsaFiles of Package", e.getMessage());\r
- Log.err("Upddate MsaFiles of Package", e.getMessage());\r
+ Log.wrn("Update MsaFiles in Package", e.getMessage());\r
+ Log.err("Update MsaFiles in Package", e.getMessage());\r
return;\r
} catch (XmlException e) {\r
- Log.wrn("Upddate MsaFiles of Package", e.getMessage());\r
- Log.err("Upddate MsaFiles of Package", e.getMessage());\r
+ Log.wrn("Update MsaFiles in Package", e.getMessage());\r
+ Log.err("Update MsaFiles in Package", e.getMessage());\r
return;\r
} catch (Exception e) {\r
- Log.wrn("Upddate MsaFiles of Package", e.getMessage());\r
- Log.err("Upddate MsaFiles of Package", e.getMessage());\r
+ Log.wrn("Update MsaFiles in Package", e.getMessage());\r
+ Log.err("Update MsaFiles in Package", e.getMessage());\r
return;\r
}\r
\r
GlobalData.openingModuleList.closeAll();\r
GlobalData.openingPackageList.closeAll();\r
GlobalData.openingPlatformList.closeAll();\r
- this.makeEmptyTree();\r
+ }\r
+\r
+ /**\r
+ Refresh all global data from disk to memory\r
+ \r
+ **/\r
+ private void refresh() {\r
+ GlobalData.init();\r
}\r
\r
/**\r
\r
**/\r
private void findPpi() {\r
- FindPPIsResult fpr = FindPPIsResult.getInstance();\r
- fpr.setVisible(true);\r
+ FindResult fr = FindResult.getInstance("PPI");\r
+ fr.setVisible(true);\r
+ }\r
+\r
+ /**\r
+ To find all defined PROTOCOLs in workspace\r
+ \r
+ **/\r
+ private void findProtocol() {\r
+ FindResult fr = FindResult.getInstance("PROTOCOL");\r
+ fr.setVisible(true);\r
+ }\r
+\r
+ /**\r
+ To find all defined PROTOCOLs in workspace\r
+ \r
+ **/\r
+ private void findGuid() {\r
+ FindResult fr = FindResult.getInstance("GUID");\r
+ fr.setVisible(true);\r
+ }\r
+\r
+ /**\r
+ To find all defined PROTOCOLs in workspace\r
+ \r
+ **/\r
+ private void findPcd() {\r
+ FindResult fr = FindResult.getInstance("PCD");\r
+ fr.setVisible(true);\r
+ }\r
+\r
+ /**\r
+ To find all defined Library Classes in workspace\r
+ \r
+ **/\r
+ private void findLibraryClass() {\r
+ FindResult fr = FindResult.getInstance("LIBRARY_CLASS");\r
+ fr.setVisible(true);\r
+ }\r
+\r
+ /**\r
+ To find all defined Library Instances in workspace\r
+ \r
+ **/\r
+ private void findLibraryInstance() {\r
+ FindResult fr = FindResult.getInstance("LIBRARY_INSTANCE");\r
+ fr.setVisible(true);\r
}\r
\r
/**\r
CreateStepOne cso = new CreateStepOne(this, true);\r
int result = cso.showDialog();\r
if (result == DataType.RETURN_TYPE_OK) {\r
- String strReturn = "Create Far Done!";\r
+ String strReturn = "Far Creation Completed!";\r
JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,\r
JOptionPane.INFORMATION_MESSAGE);\r
}\r
InstallStepOne iso = new InstallStepOne(this, true);\r
int result = iso.showDialog();\r
if (result == DataType.RETURN_TYPE_OK) {\r
- String strReturn = "<html>Install Far Done! <br>The WORKSPACE will be refreshed!</html>";\r
+ String strReturn = "<html>Far Installalation completed!<br>Refreshing the WORKSPACE!</html>";\r
JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,\r
JOptionPane.INFORMATION_MESSAGE);\r
this.closeAll();\r
+ this.refresh();\r
+ this.makeEmptyTree();\r
}\r
iso.dispose();\r
}\r
DeleteStepOne dso = new DeleteStepOne(this, true);\r
int result = dso.showDialog();\r
if (result == DataType.RETURN_TYPE_OK) {\r
- String strReturn = "<html>Delete Far Done! <br>The WORKSPACE will be refreshed!</html>";\r
+ String strReturn = "<html>Far Deletion completed!<br>Refreshing the WORKSPACE!</html>";\r
JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,\r
JOptionPane.INFORMATION_MESSAGE);\r
this.closeAll();\r
+ this.refresh();\r
+ this.makeEmptyTree();\r
}\r
dso.dispose();\r
}\r
UpdateStepOne uso = new UpdateStepOne(this, true);\r
int result = uso.showDialog();\r
if (result == DataType.RETURN_TYPE_OK) {\r
- String strReturn = "<html>Update Far Done! <br>The WORKSPACE will be refreshed!</html>";\r
+ String strReturn = "<html>Far Update completed!<br>Refreshing the WORKSPACE!</html>";\r
JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,\r
JOptionPane.INFORMATION_MESSAGE);\r
this.closeAll();\r
+ this.refresh();\r
+ this.makeEmptyTree();\r
}\r
uso.dispose();\r
}\r
tcc.showDialog();\r
}\r
\r
+ private void configBuildPreferences() {\r
+ Preferences bt = Preferences.getInstance();\r
+ bt.showDialog();\r
+ }\r
+\r
/**\r
Clone selected item\r
\r
c.dispose();\r
}\r
if (result == DataType.RETURN_TYPE_WORKSPACE) {\r
- Tools.showInformationMessage("Workspace Clone Finished");\r
+ Tools.showInformationMessage("Workspace Clone Completed!");\r
}\r
if (result == DataType.RETURN_TYPE_MODULE_SURFACE_AREA) {\r
- Tools.showInformationMessage("Module Surface Area Clone Finished");\r
+ Tools.showInformationMessage("Module Clone Completed!");\r
GlobalData.vModuleList.addElement(c.getMid());\r
addModuleToTree(c.getMid());\r
}\r
if (result == DataType.RETURN_TYPE_PACKAGE_SURFACE_AREA) {\r
- Tools.showInformationMessage("Package Surface Area Clone Finished");\r
+ Tools.showInformationMessage("Package Clone Completed!");\r
GlobalData.vPackageList.addElement(c.getPid());\r
//\r
// Add new SpdHeader node to the tree\r
projects / mirror_edk2.git / blobdiff