]> git.proxmox.com Git - mirror_edk2.git/blobdiff - Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
1. Fix EDKT214 "Framework Wizard is not synchronized with FrameworkDatabase.db when...
[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / FrameworkWizardUI.java
index ec826817da5bb652eec8e6cd76e1a5eecde8a2bc..dfc9f6249219f65b3c4c9f8faef44df50e53d0f4 100644 (file)
@@ -54,7 +54,7 @@ import org.tianocore.frameworkwizard.common.Identifications.Identification;
 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
@@ -241,9 +241,9 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
 \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
@@ -482,7 +482,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             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
@@ -751,7 +751,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             jMenuTools.add(getJMenuItemToolsClone());\r
             jMenuTools.add(getJMenuItemToolsCodeScan());\r
             jMenuTools.addSeparator();\r
-            \r
+\r
             jMenuTools.add(getJMenuItemToolsToolChainConfiguration());\r
             jMenuTools.add(getJMenuItemToolsBuildPreferences());\r
         }\r
@@ -1630,8 +1630,6 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             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
@@ -1724,6 +1722,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             jMenuItemEditFindLibraryInstance.setText("All Library Instances");\r
             jMenuItemEditFindLibraryInstance.setMnemonic('n');\r
             jMenuItemEditFindLibraryInstance.addActionListener(this);\r
+            jMenuItemEditFindLibraryInstance.setVisible(false);\r
         }\r
         return jMenuItemEditFindLibraryInstance;\r
     }\r
@@ -1829,6 +1828,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
 \r
         if (arg0.getSource() == this.jMenuItemFileCloseAll) {\r
             this.closeAll();\r
+            this.makeEmptyTree();\r
         }\r
 \r
         if (arg0.getSource() == this.jMenuItemFileSave) {\r
@@ -1848,9 +1848,29 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         }\r
 \r
         if (arg0.getSource() == this.jMenuItemEditFindPpi) {\r
-//            this.findPpi();\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
+\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
@@ -1905,7 +1925,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         //\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
@@ -1954,7 +1974,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         //\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
@@ -1967,8 +1987,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         //\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
@@ -2179,7 +2198,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             //\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
@@ -2225,7 +2244,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             //\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
@@ -2271,7 +2290,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             //\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
@@ -2416,8 +2435,9 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         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
@@ -2442,10 +2462,10 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
                                                   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
@@ -2458,38 +2478,35 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         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
@@ -2735,16 +2752,16 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
                     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
@@ -2986,7 +3003,14 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         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
@@ -3073,10 +3097,55 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      To find all defined PPIs in workspace\r
      \r
      **/\r
-//    private void findPpi() {\r
-//        FindPPIsResult fpr = FindPPIsResult.getInstance();\r
-//        fpr.setVisible(true);\r
-//    }\r
+    private void findPpi() {\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
      Switch current workspace to others\r
@@ -3110,7 +3179,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         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
@@ -3125,10 +3194,12 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         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
@@ -3141,10 +3212,12 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         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
@@ -3157,10 +3230,12 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         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
@@ -3175,9 +3250,10 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
     }\r
 \r
     private void configBuildPreferences() {\r
-       Preferences bt = Preferences.getInstance();\r
-       bt.showDialog();\r
+        Preferences bt = Preferences.getInstance();\r
+        bt.showDialog();\r
     }\r
+\r
     /**\r
      Clone selected item\r
      \r
@@ -3221,15 +3297,15 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             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