1. Wrap text by word when showing a message box

2. Add "wrn" function in Log.java to save and show warning message. Most of original err messages are replaced by warning messages.
3. Add "try-catch" for double click event in main ui.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1078 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java
index 016bada67873fd70cfc26aa65e39c6d58613ea7d..9253793ca966d137311af29b506413fff59a26a9 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java
@@ -336,7 +336,8 @@ public class Clone extends IDialog {
             this.jTextFieldSource.setText(Tools.convertPathToCurrentOsType(s));\r
             initExistingPackage();\r
             this.jButtonBrowse.setVisible(false);\r
             this.jTextFieldSource.setText(Tools.convertPathToCurrentOsType(s));\r
             initExistingPackage();\r
             this.jButtonBrowse.setVisible(false);\r

-            this.jTextFieldFilePath.setToolTipText("Input module name here. For example, Application\\HelloWorld\\HelloWorld.msa");\r
+            this.jTextFieldFilePath\r
+                                   .setToolTipText("Input module name here. For example, Application\\HelloWorld\\HelloWorld.msa");\r

             this.jTextFieldFilePath.setSize(320, this.jTextFieldFilePath.getSize().height);\r
             this.jLabelDestinationFile.setText("New Module Path and Filename");\r
         }\r
             this.jTextFieldFilePath.setSize(320, this.jTextFieldFilePath.getSize().height);\r
             this.jLabelDestinationFile.setText("New Module Path and Filename");\r
         }\r


@@ -357,7 +358,8 @@ public class Clone extends IDialog {
             this.jTextFieldSource.setText(oldId.getPath());\r
             this.jLabelBelong.setEnabled(false);\r
             this.jComboBoxExistingPackage.setEnabled(false);\r
             this.jTextFieldSource.setText(oldId.getPath());\r
             this.jLabelBelong.setEnabled(false);\r
             this.jComboBoxExistingPackage.setEnabled(false);\r

-            this.jTextFieldFilePath.setToolTipText("Select platform path here. For example, C:\\MyWorkspace\\EdkNt32Pkg\\Nt32.fpd");\r
+            this.jTextFieldFilePath\r
+                                   .setToolTipText("Select platform path here. For example, C:\\MyWorkspace\\EdkNt32Pkg\\Nt32.fpd");\r

             this.jLabelDestinationFile.setText("New Platform Path and Filename");\r
         }\r
         if (mode == DataType.RETURN_TYPE_WORKSPACE) {\r
             this.jLabelDestinationFile.setText("New Platform Path and Filename");\r
         }\r
         if (mode == DataType.RETURN_TYPE_WORKSPACE) {\r


@@ -446,16 +448,16 @@ public class Clone extends IDialog {
                 try {\r
                     this.save();\r
                 } catch (IOException e) {\r
                 try {\r
                     this.save();\r
                 } catch (IOException e) {\r

+                    Log.wrn("Clone", e.getMessage());\r

                     Log.err("Clone", e.getMessage());\r
                     Log.err("Clone", e.getMessage());\r

-                    e.printStackTrace();\r

                     return;\r
                 } catch (XmlException e) {\r
                     return;\r
                 } catch (XmlException e) {\r

+                    Log.wrn("Clone", e.getMessage());\r

                     Log.err("Clone", e.getMessage());\r
                     Log.err("Clone", e.getMessage());\r

-                    e.printStackTrace();\r

                     return;\r
                 } catch (Exception e) {\r
                     return;\r
                 } catch (Exception e) {\r

+                    Log.wrn("Clone", e.getMessage());\r

                     Log.err("Clone", e.getMessage());\r
                     Log.err("Clone", e.getMessage());\r

-                    e.printStackTrace();\r

                     return;\r
                 }\r
             } else {\r
                     return;\r
                 }\r
             } else {\r


@@ -507,11 +509,11 @@ public class Clone extends IDialog {
         // Check Basename\r
         //\r
         if (isEmpty(this.jTextFieldBaseName.getText())) {\r
         // Check Basename\r
         //\r
         if (isEmpty(this.jTextFieldBaseName.getText())) {\r

-            Log.err("Base Name couldn't be empty!");\r
+            Log.wrn("Clone", "Base Name couldn't be empty!");\r

             return false;\r
         }\r
         if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) {\r
             return false;\r
         }\r
         if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) {\r

-            Log.err("Incorrect data type for Base Name");\r
+            Log.wrn("Clone", "Incorrect data type for Base Name");\r

             return false;\r
         }\r
 \r
             return false;\r
         }\r
 \r


@@ -519,11 +521,11 @@ public class Clone extends IDialog {
         // Check Guid\r
         //\r
         if (isEmpty(this.jTextFieldGuid.getText())) {\r
         // Check Guid\r
         //\r
         if (isEmpty(this.jTextFieldGuid.getText())) {\r

-            Log.err("Guid couldn't be empty!");\r
+            Log.wrn("Clone", "Guid couldn't be empty!");\r

             return false;\r
         }\r
         if (!DataValidation.isGuid(this.jTextFieldGuid.getText())) {\r
             return false;\r
         }\r
         if (!DataValidation.isGuid(this.jTextFieldGuid.getText())) {\r

-            Log.err("Incorrect data type for Guid");\r
+            Log.wrn("Clone", "Incorrect data type for Guid");\r

             return false;\r
         }\r
 \r
             return false;\r
         }\r
 \r


@@ -531,11 +533,11 @@ public class Clone extends IDialog {
         // Check Version\r
         //\r
         if (isEmpty(this.jTextFieldVersion.getText())) {\r
         // Check Version\r
         //\r
         if (isEmpty(this.jTextFieldVersion.getText())) {\r

-            Log.err("Version couldn't be empty!");\r
+            Log.wrn("Clone", "Version couldn't be empty!");\r

             return false;\r
         }\r
         if (!DataValidation.isVersion(this.jTextFieldVersion.getText())) {\r
             return false;\r
         }\r
         if (!DataValidation.isVersion(this.jTextFieldVersion.getText())) {\r

-            Log.err("Incorrect data type for Version");\r
+            Log.wrn("Clone", "Incorrect data type for Version");\r

             return false;\r
         }\r
 \r
             return false;\r
         }\r
 \r


@@ -566,19 +568,19 @@ public class Clone extends IDialog {
         // Common Check\r
         //\r
         if (!srcFile.exists()) {\r
         // Common Check\r
         //\r
         if (!srcFile.exists()) {\r

-            Log.err("The source doesn't exist");\r
+            Log.wrn("Clone", "The source doesn't exist");\r

             return false;\r
         }\r
         if (isEmpty(trg)) {\r
             return false;\r
         }\r
         if (isEmpty(trg)) {\r

-            Log.err("The destination file path couldn't be empty");\r
+            Log.wrn("Clone", "The destination file path couldn't be empty");\r

             return false;\r
         }\r
         if (src.equals(trg)) {\r
             return false;\r
         }\r
         if (src.equals(trg)) {\r

-            Log.err("The source and destination couldn't be same");\r
+            Log.wrn("Clone", "The source and destination couldn't be same");\r

             return false;\r
         }\r
         if (trgFile.exists()) {\r
             return false;\r
         }\r
         if (trgFile.exists()) {\r

-            Log.err("The destination already exists");\r
+            Log.wrn("Clone", "The destination already exists");\r

             return false;\r
         }\r
 \r
             return false;\r
         }\r
 \r


@@ -587,7 +589,7 @@ public class Clone extends IDialog {
         //\r
         if (mode == DataType.RETURN_TYPE_WORKSPACE) {\r
             if (trg.indexOf(src + DataType.FILE_SEPARATOR) == 0) {\r
         //\r
         if (mode == DataType.RETURN_TYPE_WORKSPACE) {\r
             if (trg.indexOf(src + DataType.FILE_SEPARATOR) == 0) {\r

-                Log.err("The new workspace couldn't be in current workspace!");\r
+                Log.wrn("Clone", "The new workspace couldn't be in current workspace!");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r


@@ -596,18 +598,18 @@ public class Clone extends IDialog {
         // Check for Module\r
         //\r
         if (mode == DataType.RETURN_TYPE_MODULE_SURFACE_AREA) {\r
         // Check for Module\r
         //\r
         if (mode == DataType.RETURN_TYPE_MODULE_SURFACE_AREA) {\r

-//            if (trg.indexOf(DataType.DOS_FILE_SEPARATOR) == -1 && trg.indexOf(DataType.UNIX_FILE_SEPARATOR) == -1) {\r
-//                Log.err("The module name must include a path");\r
-//                return false;\r
-//            }\r
+            //            if (trg.indexOf(DataType.DOS_FILE_SEPARATOR) == -1 && trg.indexOf(DataType.UNIX_FILE_SEPARATOR) == -1) {\r
+            //                Log.err("The module name must include a path");\r
+            //                return false;\r
+            //            }\r

             trg = this.getModulePath();\r
             if (src.equals(trg)) {\r
             trg = this.getModulePath();\r
             if (src.equals(trg)) {\r

-                Log.err("The source and destination couldn't be same");\r
+                Log.wrn("Clone", "The source and destination couldn't be same");\r

                 return false;\r
             }\r
             trgFile = new File(trg);\r
             if (trgFile.exists()) {\r
                 return false;\r
             }\r
             trgFile = new File(trg);\r
             if (trgFile.exists()) {\r

-                Log.err("The target module already exists");\r
+                Log.wrn("Clone", "The target module already exists");\r

                 return false;\r
             }\r
             return checkId();\r
                 return false;\r
             }\r
             return checkId();\r


@@ -618,17 +620,17 @@ public class Clone extends IDialog {
         //\r
         if (mode == DataType.RETURN_TYPE_PACKAGE_SURFACE_AREA) {\r
             if (trg.indexOf(DataType.DOS_FILE_SEPARATOR) == -1 && trg.indexOf(DataType.UNIX_FILE_SEPARATOR) == -1) {\r
         //\r
         if (mode == DataType.RETURN_TYPE_PACKAGE_SURFACE_AREA) {\r
             if (trg.indexOf(DataType.DOS_FILE_SEPARATOR) == -1 && trg.indexOf(DataType.UNIX_FILE_SEPARATOR) == -1) {\r

-                Log.err("The package name must include a path");\r
+                Log.wrn("Clone", "The package name must include a path");\r

                 return false;\r
             }\r
             trg = this.getPackagePath();\r
             if (Tools.getFilePathOnly(src).equals(Tools.getFilePathOnly(trg))) {\r
                 return false;\r
             }\r
             trg = this.getPackagePath();\r
             if (Tools.getFilePathOnly(src).equals(Tools.getFilePathOnly(trg))) {\r

-                Log.err("The source and destination couldn't be same");\r
+                Log.wrn("Clone", "The source and destination couldn't be same");\r

                 return false;\r
             }\r
             trgFile = new File(trg);\r
             if (trgFile.exists()) {\r
                 return false;\r
             }\r
             trgFile = new File(trg);\r
             if (trgFile.exists()) {\r

-                Log.err("The target package already exists");\r
+                Log.wrn("Clone", "The target package already exists");\r

                 return false;\r
             }\r
             return checkId();\r
                 return false;\r
             }\r
             return checkId();\r


@@ -639,12 +641,12 @@ public class Clone extends IDialog {
         //\r
         if (mode == DataType.RETURN_TYPE_PLATFORM_SURFACE_AREA) {\r
             if (trg.indexOf(Workspace.getCurrentWorkspace()) != 0) {\r
         //\r
         if (mode == DataType.RETURN_TYPE_PLATFORM_SURFACE_AREA) {\r
             if (trg.indexOf(Workspace.getCurrentWorkspace()) != 0) {\r

-                Log.err("The target platform must be in current workspace");\r
+                Log.wrn("Clone", "The target platform must be in current workspace");\r

                 return false;\r
             }\r
             trgFile = new File(trg);\r
             if (trgFile.exists()) {\r
                 return false;\r
             }\r
             trgFile = new File(trg);\r
             if (trgFile.exists()) {\r

-                Log.err("The target platform already exists");\r
+                Log.wrn("Clone", "The target platform already exists");\r

                 return false;\r
             }\r
             return checkId();\r
                 return false;\r
             }\r
             return checkId();\r


@@ -657,18 +659,12 @@ public class Clone extends IDialog {
         String src = this.oldId.getPath();\r
         String trg = this.jTextFieldFilePath.getText();\r
         Vector<String> vFiles = new Vector<String>();\r
         String src = this.oldId.getPath();\r
         String trg = this.jTextFieldFilePath.getText();\r
         Vector<String> vFiles = new Vector<String>();\r

-        \r
+\r

         //\r
         // Clone Workspace\r
         //\r
         if (mode == DataType.RETURN_TYPE_WORKSPACE) {\r
         //\r
         // Clone Workspace\r
         //\r
         if (mode == DataType.RETURN_TYPE_WORKSPACE) {\r

-            try {\r
-                FileOperation.copyFolder(src, trg);\r
-            } catch (Exception e) {\r
-                this.returnType = DataType.RETURN_TYPE_CANCEL;\r
-                Log.err("Clone Workspace", e.getMessage());\r
-                e.printStackTrace();\r
-            }\r
+            FileOperation.copyFolder(src, trg);\r

             this.returnType = DataType.RETURN_TYPE_WORKSPACE;\r
         }\r
 \r
             this.returnType = DataType.RETURN_TYPE_WORKSPACE;\r
         }\r
 \r


@@ -682,7 +678,7 @@ public class Clone extends IDialog {
             trg = getModulePath();\r
             newId.setPath(trg);\r
             vFiles = wt.getAllModuleFilesPath(src);\r
             trg = getModulePath();\r
             newId.setPath(trg);\r
             vFiles = wt.getAllModuleFilesPath(src);\r

-            \r
+\r

             //\r
             // First copy all files to new directory\r
             //\r
             //\r
             // First copy all files to new directory\r
             //\r


@@ -710,7 +706,7 @@ public class Clone extends IDialog {
             // Update Cloned From element\r
             //\r
             updateModuleClonedId(msa, oldId);\r
             // Update Cloned From element\r
             //\r
             updateModuleClonedId(msa, oldId);\r

-            \r
+\r

             //\r
             // Save to file\r
             //\r
             //\r
             // Save to file\r
             //\r


@@ -719,14 +715,15 @@ public class Clone extends IDialog {
             //\r
             // Update to platformId\r
             //\r
             //\r
             // Update to platformId\r
             //\r

-            this.setMid(new ModuleIdentification(newId, packages.elementAt(this.jComboBoxExistingPackage.getSelectedIndex())));\r
+            this.setMid(new ModuleIdentification(newId,\r
+                                                 packages.elementAt(this.jComboBoxExistingPackage.getSelectedIndex())));\r

 \r
             //\r
             // Open belonging package\r
             //\r
             PackageSurfaceArea psa = PackageSurfaceArea.Factory.newInstance();\r
             psa = OpenFile.openSpdFile(mid.getPackageId().getPath());\r
 \r
             //\r
             // Open belonging package\r
             //\r
             PackageSurfaceArea psa = PackageSurfaceArea.Factory.newInstance();\r
             psa = OpenFile.openSpdFile(mid.getPackageId().getPath());\r

-            \r
+\r

             //\r
             // Update the db file\r
             //\r
             //\r
             // Update the db file\r
             //\r


@@ -745,14 +742,14 @@ public class Clone extends IDialog {
             trg = this.getPackagePath();\r
             newId.setPath(trg);\r
             vFiles = wt.getAllPakcageFilesPath(src);\r
             trg = this.getPackagePath();\r
             newId.setPath(trg);\r
             vFiles = wt.getAllPakcageFilesPath(src);\r

-            \r
+\r

             FileOperation.copyFile(src, trg);\r
             for (int index = 1; index < vFiles.size(); index++) {\r
                 String oldFile = vFiles.get(index);\r
                 String newFile = vFiles.get(index).replace(Tools.getFilePathOnly(src), Tools.getFilePathOnly(trg));\r
                 FileOperation.copyFile(oldFile, newFile);\r
             }\r
             FileOperation.copyFile(src, trg);\r
             for (int index = 1; index < vFiles.size(); index++) {\r
                 String oldFile = vFiles.get(index);\r
                 String newFile = vFiles.get(index).replace(Tools.getFilePathOnly(src), Tools.getFilePathOnly(trg));\r
                 FileOperation.copyFile(oldFile, newFile);\r
             }\r

-            \r
+\r

             //\r
             // First copy all files to new directory\r
             //\r
             //\r
             // First copy all files to new directory\r
             //\r


@@ -780,7 +777,7 @@ public class Clone extends IDialog {
             // Update Cloned From element\r
             //\r
             updatePackageClonedId(spd, oldId);\r
             // Update Cloned From element\r
             //\r
             updatePackageClonedId(spd, oldId);\r

-            \r
+\r

             //\r
             // Save to file\r
             //\r
             //\r
             // Save to file\r
             //\r


@@ -837,7 +834,7 @@ public class Clone extends IDialog {
         }\r
         vFiles = null;\r
     }\r
         }\r
         vFiles = null;\r
     }\r

-    \r
+\r

     private String getSelectPackagePath() {\r
         return Tools.getFilePathOnly(packages.elementAt(this.jComboBoxExistingPackage.getSelectedIndex()).getPath());\r
     }\r
     private String getSelectPackagePath() {\r
         return Tools.getFilePathOnly(packages.elementAt(this.jComboBoxExistingPackage.getSelectedIndex()).getPath());\r
     }\r


@@ -849,7 +846,7 @@ public class Clone extends IDialog {
         Tools.convertPathToCurrentOsType(trg);\r
         return trg;\r
     }\r
         Tools.convertPathToCurrentOsType(trg);\r
         return trg;\r
     }\r

-    \r
+\r

     private String getPackagePath() {\r
         String trg = this.jTextFieldFilePath.getText();\r
         trg = Tools.addPathExt(trg, mode);\r
     private String getPackagePath() {\r
         String trg = this.jTextFieldFilePath.getText();\r
         trg = Tools.addPathExt(trg, mode);\r


@@ -857,7 +854,7 @@ public class Clone extends IDialog {
         trg = Tools.convertPathToCurrentOsType(trg);\r
         return trg;\r
     }\r
         trg = Tools.convertPathToCurrentOsType(trg);\r
         return trg;\r
     }\r

-    \r
+\r

     /**\r
      Set target item's Cloned From element\r
 \r
     /**\r
      Set target item's Cloned From element\r
 \r


@@ -906,7 +903,7 @@ public class Clone extends IDialog {
         c.setId(count.add(new BigInteger("1")));\r
         String guid = wt.getModuleFarGuid(oldId);\r
         if (guid != null && !guid.equals("")) {\r
         c.setId(count.add(new BigInteger("1")));\r
         String guid = wt.getModuleFarGuid(oldId);\r
         if (guid != null && !guid.equals("")) {\r

-            c.setFarGuid(guid);    \r
+            c.setFarGuid(guid);\r

         }\r
 \r
         cf.addNewCloned();\r
         }\r
 \r
         cf.addNewCloned();\r


@@ -962,7 +959,7 @@ public class Clone extends IDialog {
         c.setId(count.add(new BigInteger("1")));\r
         String guid = wt.getModuleFarGuid(oldId);\r
         if (guid != null && !guid.equals("")) {\r
         c.setId(count.add(new BigInteger("1")));\r
         String guid = wt.getModuleFarGuid(oldId);\r
         if (guid != null && !guid.equals("")) {\r

-            c.setFarGuid(guid);    \r
+            c.setFarGuid(guid);\r

         }\r
 \r
         cf.addNewCloned();\r
         }\r
 \r
         cf.addNewCloned();\r


@@ -1018,9 +1015,9 @@ public class Clone extends IDialog {
         c.setId(count.add(new BigInteger("1")));\r
         String guid = wt.getModuleFarGuid(oldId);\r
         if (guid != null && !guid.equals("")) {\r
         c.setId(count.add(new BigInteger("1")));\r
         String guid = wt.getModuleFarGuid(oldId);\r
         if (guid != null && !guid.equals("")) {\r

-            c.setFarGuid(guid);    \r
+            c.setFarGuid(guid);\r

         }\r
         }\r

-        \r
+\r

         cf.addNewCloned();\r
         cf.setClonedArray(cf.getClonedList().size() - 1, c);\r
         pd.addNewClonedFrom();\r
         cf.addNewCloned();\r
         cf.setClonedArray(cf.getClonedList().size() - 1, c);\r
         pd.addNewClonedFrom();\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
index 80df4135c336769951c5031d17380f7f41ef3d59..2b6b25f9bef3fc5a163a14690e5bb23d8a034167 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
@@ -2133,12 +2133,15 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         try {\r
             msa = OpenFile.openMsaFile(path);\r
         } catch (IOException e) {\r
         try {\r
             msa = OpenFile.openMsaFile(path);\r
         } catch (IOException e) {\r

+            Log.wrn("Open Module Surface Area " + path, e.getMessage());\r

             Log.err("Open Module Surface Area " + path, e.getMessage());\r
             return;\r
         } catch (XmlException e) {\r
             Log.err("Open Module Surface Area " + path, e.getMessage());\r
             return;\r
         } catch (XmlException e) {\r

+            Log.wrn("Open Module Surface Area " + path, e.getMessage());\r

             Log.err("Open Module Surface Area " + path, e.getMessage());\r
             return;\r
         } catch (Exception e) {\r
             Log.err("Open Module Surface Area " + path, e.getMessage());\r
             return;\r
         } catch (Exception e) {\r

+            Log.wrn("Open Module Surface Area " + path, "Invalid file type");\r

             Log.err("Open Module Surface Area " + path, "Invalid file type");\r
             return;\r
         }\r
             Log.err("Open Module Surface Area " + path, "Invalid file type");\r
             return;\r
         }\r


@@ -2212,12 +2215,15 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         try {\r
             msa = OpenFile.openMsaFile(path);\r
         } catch (IOException e) {\r
         try {\r
             msa = OpenFile.openMsaFile(path);\r
         } catch (IOException e) {\r

+            Log.wrn("Open Module Surface Area " + path, e.getMessage());\r

             Log.err("Open Module Surface Area " + path, e.getMessage());\r
             return;\r
         } catch (XmlException e) {\r
             Log.err("Open Module Surface Area " + path, e.getMessage());\r
             return;\r
         } catch (XmlException e) {\r

+            Log.wrn("Open Module Surface Area " + path, e.getMessage());\r

             Log.err("Open Module Surface Area " + path, e.getMessage());\r
             return;\r
         } catch (Exception e) {\r
             Log.err("Open Module Surface Area " + path, e.getMessage());\r
             return;\r
         } catch (Exception e) {\r

+            Log.wrn("Open Module Surface Area " + path, "Invalid file type");\r

             Log.err("Open Module Surface Area " + path, "Invalid file type");\r
             return;\r
         }\r
             Log.err("Open Module Surface Area " + path, "Invalid file type");\r
             return;\r
         }\r


@@ -2248,7 +2254,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             //\r
             // The module is not in existing packages\r
             //\r
             //\r
             // The module is not in existing packages\r
             //\r

-            Log.err("The module hasn't been added to any package of current workspace!");\r
+            Log.wrn("Open Module", "The module hasn't been added to any package of current workspace!");\r

             return;\r
         }\r
 \r
             return;\r
         }\r
 \r


@@ -2291,12 +2297,15 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         try {\r
             spd = OpenFile.openSpdFile(path);\r
         } catch (IOException e) {\r
         try {\r
             spd = OpenFile.openSpdFile(path);\r
         } catch (IOException e) {\r

+            Log.wrn("Open Package Surface Area " + path, e.getMessage());\r

             Log.err("Open Package Surface Area " + path, e.getMessage());\r
             return;\r
         } catch (XmlException e) {\r
             Log.err("Open Package Surface Area " + path, e.getMessage());\r
             return;\r
         } catch (XmlException e) {\r

+            Log.wrn("Open Package Surface Area " + path, e.getMessage());\r

             Log.err("Open Package Surface Area " + path, e.getMessage());\r
             return;\r
         } catch (Exception e) {\r
             Log.err("Open Package Surface Area " + path, e.getMessage());\r
             return;\r
         } catch (Exception e) {\r

+            Log.wrn("Open Package Surface Area " + path, "Invalid file type");\r

             Log.err("Open Package Surface Area " + path, "Invalid file type");\r
             return;\r
         }\r
             Log.err("Open Package Surface Area " + path, "Invalid file type");\r
             return;\r
         }\r


@@ -2317,7 +2326,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             //\r
             // The module is not in existing packages\r
             //\r
             //\r
             // The module is not in existing packages\r
             //\r

-            Log.err("The package hasn't been added to current workspace!");\r
+            Log.wrn("Open Package", "The package hasn't been added to current workspace!");\r

             return;\r
         }\r
 \r
             return;\r
         }\r
 \r


@@ -2360,12 +2369,15 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         try {\r
             fpd = OpenFile.openFpdFile(path);\r
         } catch (IOException e) {\r
         try {\r
             fpd = OpenFile.openFpdFile(path);\r
         } catch (IOException e) {\r

+            Log.wrn("Open Platform Surface Area " + path, e.getMessage());\r

             Log.err("Open Platform Surface Area " + path, e.getMessage());\r
             return;\r
         } catch (XmlException e) {\r
             Log.err("Open Platform Surface Area " + path, e.getMessage());\r
             return;\r
         } catch (XmlException e) {\r

+            Log.wrn("Open Platform Surface Area " + path, e.getMessage());\r

             Log.err("Open Platform Surface Area " + path, e.getMessage());\r
             return;\r
         } catch (Exception e) {\r
             Log.err("Open Platform Surface Area " + path, e.getMessage());\r
             return;\r
         } catch (Exception e) {\r

+            Log.wrn("Open Platform Surface Area " + path, "Invalid file type");\r

             Log.err("Open Platform Surface Area " + path, "Invalid file type");\r
             return;\r
         }\r
             Log.err("Open Platform Surface Area " + path, "Invalid file type");\r
             return;\r
         }\r


@@ -2387,7 +2399,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             //\r
             // The module is not in existing packages\r
             //\r
             //\r
             // The module is not in existing packages\r
             //\r

-            Log.err("The platform hasn't been added to current workspace!");\r
+            Log.wrn("Open Platform", "The platform hasn't been added to current workspace!");\r

             return;\r
         }\r
 \r
             return;\r
         }\r
 \r


@@ -2435,6 +2447,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             openingModuleList.setNew(omt.getId(), false);\r
             openingModuleList.setModuleSaved(omt.getId(), true);\r
         } catch (Exception e) {\r
             openingModuleList.setNew(omt.getId(), false);\r
             openingModuleList.setModuleSaved(omt.getId(), true);\r
         } catch (Exception e) {\r

+            Log.wrn("Save Module", e.getMessage());\r

             Log.err("Save Module", e.getMessage());\r
         }\r
     }\r
             Log.err("Save Module", e.getMessage());\r
         }\r
     }\r


@@ -2455,6 +2468,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             openingPackageList.setNew(opt.getId(), false);\r
             openingPackageList.setPackageSaved(opt.getId(), true);\r
         } catch (Exception e) {\r
             openingPackageList.setNew(opt.getId(), false);\r
             openingPackageList.setPackageSaved(opt.getId(), true);\r
         } catch (Exception e) {\r

+            Log.wrn("Save Package", e.getMessage());\r

             Log.err("Save Package", e.getMessage());\r
         }\r
     }\r
             Log.err("Save Package", e.getMessage());\r
         }\r
     }\r


@@ -2475,6 +2489,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             openingPlatformList.setNew(opt.getId(), false);\r
             openingPlatformList.setPlatformSaved(opt.getId(), true);\r
         } catch (Exception e) {\r
             openingPlatformList.setNew(opt.getId(), false);\r
             openingPlatformList.setPlatformSaved(opt.getId(), true);\r
         } catch (Exception e) {\r

+            Log.wrn("Save Package", e.getMessage());\r

             Log.err("Save Package", e.getMessage());\r
         }\r
     }\r
             Log.err("Save Package", e.getMessage());\r
         }\r
     }\r


@@ -2587,47 +2602,54 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         Identification id = iTree.getSelectNode().getId();\r
         int intCategory = iTree.getSelectCategory();\r
         String path = null;\r
         Identification id = iTree.getSelectNode().getId();\r
         int intCategory = iTree.getSelectCategory();\r
         String path = null;\r

-        //          \r
-        // If the node is not opened yet\r
-        // Insert top level elements first\r
-        //\r
-        //if (intCategory == IDefaultMutableTreeNode.MSA_HEADER || intCategory == IDefaultMutableTreeNode.SPD_MSAFILES) {\r
-        if (intCategory == IDefaultMutableTreeNode.MSA_HEADER) {\r
-\r
+        try {\r
+            //          \r
+            // If the node is not opened yet\r
+            // Insert top level elements first\r
+            //\r
+            //if (intCategory == IDefaultMutableTreeNode.MSA_HEADER || intCategory == IDefaultMutableTreeNode.SPD_MSAFILES) {\r

             if (intCategory == IDefaultMutableTreeNode.MSA_HEADER) {\r
             if (intCategory == IDefaultMutableTreeNode.MSA_HEADER) {\r

+\r
+                if (intCategory == IDefaultMutableTreeNode.MSA_HEADER) {\r
+                    path = iTree.getSelectNode().getId().getPath();\r
+                }\r
+                if (intCategory == IDefaultMutableTreeNode.SPD_MSAFILES) {\r
+                    path = iTree.getSelectNode().getId().getPath();\r
+                }\r
+                openModule(path);\r
+                return;\r
+            }\r
+            if (intCategory == IDefaultMutableTreeNode.SPD_HEADER) {\r

                 path = iTree.getSelectNode().getId().getPath();\r
                 path = iTree.getSelectNode().getId().getPath();\r

+                openPackage(path);\r
+                return;\r

             }\r
             }\r

-            if (intCategory == IDefaultMutableTreeNode.SPD_MSAFILES) {\r
+            if (intCategory == IDefaultMutableTreeNode.FPD_PLATFORMHEADER) {\r

                 path = iTree.getSelectNode().getId().getPath();\r
                 path = iTree.getSelectNode().getId().getPath();\r

+                openPlatform(path);\r
+                return;\r

             }\r
             }\r

-            openModule(path);\r
-            return;\r
-        }\r
-        if (intCategory == IDefaultMutableTreeNode.SPD_HEADER) {\r
-            path = iTree.getSelectNode().getId().getPath();\r
-            openPackage(path);\r
-            return;\r
-        }\r
-        if (intCategory == IDefaultMutableTreeNode.FPD_PLATFORMHEADER) {\r
-            path = iTree.getSelectNode().getId().getPath();\r
-            openPlatform(path);\r
-            return;\r
-        }\r
-        //\r
-        // Show editor panel\r
-        //\r
-        if (intCategory >= IDefaultMutableTreeNode.MSA_HEADER && intCategory < IDefaultMutableTreeNode.SPD_HEADER) {\r
-            showModuleElement(intCategory, openingModuleList.getOpeningModuleById(id));\r
-            this.currentOpeningModuleIndex = openingModuleList.findIndexOfListById(id);\r
-        }\r
-        if (intCategory >= IDefaultMutableTreeNode.SPD_HEADER\r
-            && intCategory < IDefaultMutableTreeNode.FPD_PLATFORMHEADER) {\r
-            showPackageElement(intCategory, openingPackageList.getOpeningPackageById(id));\r
-            this.currentOpeningPackageIndex = openingPackageList.findIndexOfListById(id);\r
-        }\r
-        if (intCategory >= IDefaultMutableTreeNode.FPD_PLATFORMHEADER) {\r
-            showPlatformElement(intCategory, openingPlatformList.getOpeningPlatformById(id));\r
-            this.currentOpeningPlatformIndex = openingPlatformList.findIndexOfListById(id);\r
+            //\r
+            // Show editor panel\r
+            //\r
+            if (intCategory >= IDefaultMutableTreeNode.MSA_HEADER && intCategory < IDefaultMutableTreeNode.SPD_HEADER) {\r
+                showModuleElement(intCategory, openingModuleList.getOpeningModuleById(id));\r
+                this.currentOpeningModuleIndex = openingModuleList.findIndexOfListById(id);\r
+            }\r
+            if (intCategory >= IDefaultMutableTreeNode.SPD_HEADER\r
+                && intCategory < IDefaultMutableTreeNode.FPD_PLATFORMHEADER) {\r
+                showPackageElement(intCategory, openingPackageList.getOpeningPackageById(id));\r
+                this.currentOpeningPackageIndex = openingPackageList.findIndexOfListById(id);\r
+            }\r
+            if (intCategory >= IDefaultMutableTreeNode.FPD_PLATFORMHEADER) {\r
+                showPlatformElement(intCategory, openingPlatformList.getOpeningPlatformById(id));\r
+                this.currentOpeningPlatformIndex = openingPlatformList.findIndexOfListById(id);\r
+            }\r
+        } catch (RuntimeException e) {\r
+            Log.log("double click category: " + intCategory);\r
+            Log.log("double click id path: " + id.getPath());\r
+            Log.log("double click exception: " + e.getMessage());\r
+            e.printStackTrace();\r

         }\r
     }\r
 \r
         }\r
     }\r
 \r


@@ -2843,16 +2865,16 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
                 try {\r
                     wt.addModuleToPackage(smb.getMid(), psa);\r
                 } catch (IOException e) {\r
                 try {\r
                     wt.addModuleToPackage(smb.getMid(), 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.err("Upddate MsaFiles of Package", e.getMessage());\r

-                    e.printStackTrace();\r

                     return;\r
                 } catch (XmlException e) {\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.err("Upddate MsaFiles of Package", e.getMessage());\r

-                    e.printStackTrace();\r

                     return;\r
                 } catch (Exception e) {\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.err("Upddate MsaFiles of Package", e.getMessage());\r

-                    e.printStackTrace();\r

                     return;\r
                 }\r
                 this.openModule(smb.getMid().getPath(), smb.getMid());\r
                     return;\r
                 }\r
                 this.openModule(smb.getMid().getPath(), smb.getMid());\r


@@ -3179,14 +3201,14 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         // Check if there is any item can be cloned\r
         //\r
         if (iTree.getSelectionPath() == null) {\r
         // Check if there is any item can be cloned\r
         //\r
         if (iTree.getSelectionPath() == null) {\r

-            Log.err("Please select a target to clone!");\r
+            Log.wrn("Clone", "Please select a target to clone!");\r

             return;\r
         }\r
         int category = iTree.getSelectCategory();\r
         Identification id = iTree.getSelectNode().getId();\r
         if (category == IDefaultMutableTreeNode.MODULE || category == IDefaultMutableTreeNode.PACKAGE\r
             || category == IDefaultMutableTreeNode.PLATFORM) {\r
             return;\r
         }\r
         int category = iTree.getSelectCategory();\r
         Identification id = iTree.getSelectNode().getId();\r
         if (category == IDefaultMutableTreeNode.MODULE || category == IDefaultMutableTreeNode.PACKAGE\r
             || category == IDefaultMutableTreeNode.PLATFORM) {\r

-            Log.err("Please select a target to clone!");\r
+            Log.wrn("Clone", "Please select a target to clone!");\r

             return;\r
         }\r
 \r
             return;\r
         }\r
 \r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
index 3d5a696954ea12a71d0722224d76815d8aadf9bd..3e081969386a235de36b2fc618dcb510fdfdaf39 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
@@ -472,19 +472,19 @@ public class SelectModuleBelong extends IDialog {
         // Check if all required fields are not empty\r
         //\r
         if (isEmpty(this.jTextFieldFilePath.getText())) {\r
         // Check if all required fields are not empty\r
         //\r
         if (isEmpty(this.jTextFieldFilePath.getText())) {\r

-            Log.err("File Path couldn't be empty");\r
+            Log.wrn("New File", "File Path couldn't be empty");\r

             return false;\r
         }\r
         if (isEmpty(this.jTextFieldName.getText())) {\r
             return false;\r
         }\r
         if (isEmpty(this.jTextFieldName.getText())) {\r

-            Log.err("Name couldn't be empty");\r
+            Log.wrn("New File", "Name couldn't be empty");\r

             return false;\r
         }\r
         if (isEmpty(this.jTextFieldGuid.getText())) {\r
             return false;\r
         }\r
         if (isEmpty(this.jTextFieldGuid.getText())) {\r

-            Log.err("Guid Value couldn't be empty");\r
+            Log.wrn("New File", "Guid Value couldn't be empty");\r

             return false;\r
         }\r
         if (isEmpty(this.jTextFieldVersion.getText())) {\r
             return false;\r
         }\r
         if (isEmpty(this.jTextFieldVersion.getText())) {\r

-            Log.err("Version couldn't be empty");\r
+            Log.wrn("New File", "Version couldn't be empty");\r

             return false;\r
         }\r
 \r
             return false;\r
         }\r
 \r


@@ -492,11 +492,11 @@ public class SelectModuleBelong extends IDialog {
         // Check if all fields have correct data types \r
         //\r
         if (!DataValidation.isBaseName(this.jTextFieldName.getText())) {\r
         // Check if all fields have correct data types \r
         //\r
         if (!DataValidation.isBaseName(this.jTextFieldName.getText())) {\r

-            Log.err("Incorrect data type for Base Name");\r
+            Log.wrn("New File", "Incorrect data type for Base Name");\r

             return false;\r
         }\r
         if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {\r
             return false;\r
         }\r
         if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {\r

-            Log.err("Incorrect data type for Guid");\r
+            Log.wrn("New File", "Incorrect data type for Guid");\r

             return false;\r
         }\r
 \r
             return false;\r
         }\r
 \r


@@ -510,7 +510,7 @@ public class SelectModuleBelong extends IDialog {
 \r
             for (int index = 0; index < msaFile.size(); index++) {\r
                 if (msaFile.elementAt(index).equals(modulePath)) {\r
 \r
             for (int index = 0; index < msaFile.size(); index++) {\r
                 if (msaFile.elementAt(index).equals(modulePath)) {\r

-                    Log.err("This module is already existing in selected package");\r
+                    Log.wrn("New File", "This module is already existing in selected package");\r

                     return false;\r
                 }\r
             }\r
                     return false;\r
                 }\r
             }\r


@@ -525,7 +525,7 @@ public class SelectModuleBelong extends IDialog {
             if (vPackageList != null && vPackageList.size() > 0) {\r
                 for (int index = 0; index < vPackageList.size(); index++) {\r
                     if (vPackageList.get(index).getPath().equals(path)) {\r
             if (vPackageList != null && vPackageList.size() > 0) {\r
                 for (int index = 0; index < vPackageList.size(); index++) {\r
                     if (vPackageList.get(index).getPath().equals(path)) {\r

-                        Log.err("This package is already existing in database");\r
+                        Log.wrn("New File", "This package is already existing in database");\r

                         return false;\r
                     }\r
                 }\r
                         return false;\r
                     }\r
                 }\r


@@ -541,7 +541,7 @@ public class SelectModuleBelong extends IDialog {
             if (vPlatfromList != null && vPlatfromList.size() > 0) {\r
                 for (int index = 0; index < vPlatfromList.size(); index++) {\r
                     if (vPlatfromList.get(index).getPath().equals(path)) {\r
             if (vPlatfromList != null && vPlatfromList.size() > 0) {\r
                 for (int index = 0; index < vPlatfromList.size(); index++) {\r
                     if (vPlatfromList.get(index).getPath().equals(path)) {\r

-                        Log.err("This platform is already existing in database");\r
+                        Log.wrn("New File", "This platform is already existing in database");\r

                         return false;\r
                     }\r
                 }\r
                         return false;\r
                     }\r
                 }\r


@@ -599,8 +599,8 @@ public class SelectModuleBelong extends IDialog {
         //\r
         try {\r
             SaveFile.saveMsaFile(path, msa);\r
         //\r
         try {\r
             SaveFile.saveMsaFile(path, msa);\r

-\r

         } catch (Exception e) {\r
         } catch (Exception e) {\r

+            Log.wrn("Save Module to file system", e.getMessage());\r

             Log.err("Save Module to file system", e.getMessage());\r
             return;\r
         }\r
             Log.err("Save Module to file system", e.getMessage());\r
             return;\r
         }\r


@@ -636,7 +636,7 @@ public class SelectModuleBelong extends IDialog {
 \r
             spd.setSpdHeader(spdHeader);\r
         } catch (Exception e) {\r
 \r
             spd.setSpdHeader(spdHeader);\r
         } catch (Exception e) {\r

-            Log.err("Save PackageSurfaceArea Document", e.getMessage());\r
+            Log.wrn("Save PackageSurfaceArea Document", e.getMessage());\r

             return;\r
         }\r
 \r
             return;\r
         }\r
 \r


@@ -647,6 +647,7 @@ public class SelectModuleBelong extends IDialog {
             SaveFile.saveSpdFile(path, spd);\r
 \r
         } catch (Exception e) {\r
             SaveFile.saveSpdFile(path, spd);\r
 \r
         } catch (Exception e) {\r

+            Log.wrn("Save Package to file system", e.getMessage());\r

             Log.err("Save Package to file system", e.getMessage());\r
             return;\r
         }\r
             Log.err("Save Package to file system", e.getMessage());\r
             return;\r
         }\r


@@ -681,7 +682,7 @@ public class SelectModuleBelong extends IDialog {
 \r
             fpd.setPlatformHeader(fpdHeader);\r
         } catch (Exception e) {\r
 \r
             fpd.setPlatformHeader(fpdHeader);\r
         } catch (Exception e) {\r

-            Log.err("Save FrameworkPlatformDescription Document", e.getMessage());\r
+            Log.wrn("Save FrameworkPlatformDescription Document", e.getMessage());\r

             return;\r
         }\r
 \r
             return;\r
         }\r
 \r


@@ -692,6 +693,7 @@ public class SelectModuleBelong extends IDialog {
             SaveFile.saveFpdFile(path, fpd);\r
 \r
         } catch (Exception e) {\r
             SaveFile.saveFpdFile(path, fpd);\r
 \r
         } catch (Exception e) {\r

+            Log.wrn("Save Platform to file system", e.getMessage());\r

             Log.err("Save Platform to file system", e.getMessage());\r
             return;\r
         }\r
             Log.err("Save Platform to file system", e.getMessage());\r
             return;\r
         }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfig.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfig.java
index ce3f96c91c64b5f1af53ae29967efa1c602c1681..8b901cbcb68776a08b9745897f18d7643b487fb7 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfig.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/ToolChainConfig.java
@@ -362,8 +362,8 @@ public class ToolChainConfig extends IFrame implements ListSelectionListener, Ta
                     currentFile = fc.getSelectedFile().getPath();\r
                     this.setTitle("Tool Chain Configuration" + " [" + currentFile + "]");\r
                 } catch (IOException e) {\r
                     currentFile = fc.getSelectedFile().getPath();\r
                     this.setTitle("Tool Chain Configuration" + " [" + currentFile + "]");\r
                 } catch (IOException e) {\r

+                    Log.wrn(this.currentFile + "Read Error", e.getMessage());\r

                     Log.err(this.currentFile + "Read Error", e.getMessage());\r
                     Log.err(this.currentFile + "Read Error", e.getMessage());\r

-                    e.printStackTrace();\r

                     return;\r
                 }\r
                 this.showTable();\r
                     return;\r
                 }\r
                 this.showTable();\r


@@ -383,8 +383,8 @@ public class ToolChainConfig extends IFrame implements ListSelectionListener, Ta
                 try {\r
                     vtcc.saveFile(currentFile);\r
                 } catch (IOException e) {\r
                 try {\r
                     vtcc.saveFile(currentFile);\r
                 } catch (IOException e) {\r

+                    Log.wrn(this.currentFile + "Write Error", e.getMessage());\r

                     Log.err(this.currentFile + "Write Error", e.getMessage());\r
                     Log.err(this.currentFile + "Write Error", e.getMessage());\r

-                    e.printStackTrace();\r

                     return;\r
                 }\r
             }\r
                     return;\r
                 }\r
             }\r


@@ -452,12 +452,12 @@ public class ToolChainConfig extends IFrame implements ListSelectionListener, Ta
      **/\r
     private boolean check() {\r
         if (isEmpty(this.jTextFieldName.getText())) {\r
      **/\r
     private boolean check() {\r
         if (isEmpty(this.jTextFieldName.getText())) {\r

-            Log.err("Add Tool Chain", "Name couldn't be empty!");\r
+            Log.wrn("Add Tool Chain", "Name couldn't be empty!");\r

             return false;\r
         }\r
 \r
         if (isEmpty(this.jTextFieldValue.getText())) {\r
             return false;\r
         }\r
 \r
         if (isEmpty(this.jTextFieldValue.getText())) {\r

-            Log.err("Add Tool Chain", "Value couldn't be empty");\r
+            Log.wrn("Add Tool Chain", "Value couldn't be empty");\r

             return false;\r
         }\r
         return true;\r
             return false;\r
         }\r
         return true;\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Log.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Log.java
index d85fbf5a96743900191a8bd3b4d4d5bda30b32b7..0de6aa78f011725c0d50ad5214c09986093660ad 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Log.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Log.java
@@ -33,6 +33,11 @@ public class Log {
     //\r
     private static File fleLogFile = null;\r
 \r
     //\r
     private static File fleLogFile = null;\r
 \r

+    //\r
+    //Wrn file\r
+    //\r
+    private static File fleWrnFile = null;\r
+\r

     //\r
     //Err file\r
     //\r
     //\r
     //Err file\r
     //\r


@@ -43,6 +48,11 @@ public class Log {
     //\r
     static String strLogFileName = "Log.log";\r
 \r
     //\r
     static String strLogFileName = "Log.log";\r
 \r

+    //\r
+    //Wrn file name\r
+    //\r
+    static String strWrnFileName = "Wrn.log";\r
+\r

     //\r
     //Err file name\r
     //\r
     //\r
     //Err file name\r
     //\r


@@ -56,22 +66,18 @@ public class Log {
      **/\r
     public static void main(String[] args) {\r
         try {\r
      **/\r
     public static void main(String[] args) {\r
         try {\r

-            Log.log("Test", "test");\r
-            Log.err("Test1", "test1");\r
-            Log.err("sdfsdfsd fsdfsdfsdfsdfj dsfksdjflsdjf sdkfjsdklfjsdkf dskfsjdkfjks dskfjsdklfjsdkf sdkfjsdlf sdkfjsdk kdfjskdf sdkfjsdkf ksdjfksdfjskdf sdkfsjdfksd fskdfjsdf", "dfsdf sdfksdf sd sdfksd fsdf");\r
+            //Log.log("Test", "test");\r
+            //Log.err("Test1", "test1");\r
+            Log.wrn("1");\r
+            Log\r
+               .wrn(\r
+                    "aaa bbbbbb cccccccccccc ddddddddddd eeeeeeeeee fffffffffff gggggggggggggggggg hhhhhhhhhhhhhhhhhhhhhhhhhhhhh",\r
+                    "iiiiii jjjj kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk lll mmm nn poooooooooooooooooooooooooooooooooooooooooooop");\r

         } catch (Exception e) {\r
             e.printStackTrace();\r
         }\r
     }\r
 \r
         } catch (Exception e) {\r
             e.printStackTrace();\r
         }\r
     }\r
 \r

-    /**\r
-     This is the default constructor\r
-     Do nothing\r
-     \r
-     **/\r
-    public Log() {\r
-    }\r
-\r

     /**\r
      Call writeToLogFile to save log item and log information to log file\r
      \r
     /**\r
      Call writeToLogFile to save log item and log information to log file\r
      \r


@@ -101,6 +107,37 @@ public class Log {
         }\r
     }\r
 \r
         }\r
     }\r
 \r

+    /**\r
+     Call writeToWrnFile to save wrn item and wrn information to wrn file\r
+     \r
+     @param strItem The wrn item\r
+     @param strLog The wrn information\r
+     \r
+     **/\r
+    public static void wrn(String strItem, String strWrn) {\r
+        try {\r
+            writeToWrnFile("Warning when " + strItem + "::" + strWrn);\r
+            showWrnMessage(strWrn);\r
+        } catch (IOException e) {\r
+            e.printStackTrace();\r
+        }\r
+    }\r
+\r
+    /**\r
+     Call writeToWrnFile to save wrn information to wrn file\r
+     \r
+     @param strLog The wrn information\r
+     \r
+     **/\r
+    public static void wrn(String strWrn) {\r
+        try {\r
+            writeToWrnFile("Warning::" + strWrn);\r
+            showWrnMessage("Warning::" + strWrn);\r
+        } catch (IOException e) {\r
+            e.printStackTrace();\r
+        }\r
+    }\r
+\r

     /**\r
      Call writeToErrFile to save err item and err information to err file\r
      \r
     /**\r
      Call writeToErrFile to save err item and err information to err file\r
      \r


@@ -111,7 +148,6 @@ public class Log {
     public static void err(String strItem, String strErr) {\r
         try {\r
             writeToErrFile("Error when " + strItem + "::" + strErr);\r
     public static void err(String strItem, String strErr) {\r
         try {\r
             writeToErrFile("Error when " + strItem + "::" + strErr);\r

-            showErrMessage("Error when " + strItem + "::" + strErr);\r

         } catch (IOException e) {\r
             e.printStackTrace();\r
         }\r
         } catch (IOException e) {\r
             e.printStackTrace();\r
         }\r


@@ -126,7 +162,6 @@ public class Log {
     public static void err(String strErr) {\r
         try {\r
             writeToErrFile("Error::" + strErr);\r
     public static void err(String strErr) {\r
         try {\r
             writeToErrFile("Error::" + strErr);\r

-            showErrMessage("Error::" + strErr);\r

         } catch (IOException e) {\r
             e.printStackTrace();\r
         }\r
         } catch (IOException e) {\r
             e.printStackTrace();\r
         }\r


@@ -139,22 +174,9 @@ public class Log {
      @param strErr The input data of err message\r
      \r
      **/\r
      @param strErr The input data of err message\r
      \r
      **/\r

-    private static void showErrMessage(String strErr) {\r
-        int intMaxLength = 40;\r
-        String strReturn = "";\r
-        String strTemp = "";\r
-        while (strErr.length() > 0) {\r
-            if (strErr.length() > intMaxLength) {\r
-                strTemp = strErr.substring(0, intMaxLength);\r
-                strErr = strErr.substring(strTemp.length());\r
-                strReturn = strReturn + strTemp + DataType.UNIX_LINE_SEPARATOR;\r
-                \r
-            } else if (strErr.length() <= intMaxLength) {\r
-                strReturn = strReturn + strErr;\r
-                strErr = "";\r
-            }\r
-        }\r
-        JOptionPane.showConfirmDialog(null, strReturn, "Error", JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE);\r
+    private static void showWrnMessage(String strErr) {\r
+        String strReturn = Tools.wrapStringByWord(strErr);\r
+        JOptionPane.showConfirmDialog(null, strReturn, "Warning", JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE);\r

     }\r
 \r
     /**\r
     }\r
 \r
     /**\r


@@ -182,6 +204,31 @@ public class Log {
         }\r
     }\r
 \r
         }\r
     }\r
 \r

+    /**\r
+     Open wrn file and write wrn information\r
+     \r
+     @param strLog The log information\r
+     @throws IOException\r
+     \r
+     **/\r
+    private static void writeToWrnFile(String strLog) throws IOException {\r
+        try {\r
+            if (fleWrnFile == null) {\r
+                fleWrnFile = new File(strWrnFileName);\r
+                fleWrnFile.createNewFile();\r
+            }\r
+            FileOutputStream fos = new FileOutputStream(fleWrnFile, true);\r
+            fos.write((Tools.getCurrentDateTime() + DataType.DOS_LINE_SEPARATOR).getBytes());\r
+            fos.write((strLog + DataType.DOS_LINE_SEPARATOR).getBytes());\r
+            fos.flush();\r
+            fos.close();\r
+        } catch (FileNotFoundException e) {\r
+            e.printStackTrace();\r
+        } catch (IOException e) {\r
+            e.printStackTrace();\r
+        }\r
+    }\r
+\r

     /**\r
      Open err file and write err information\r
      \r
     /**\r
      Open err file and write err information\r
      \r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
index 26604d0d39a2d738c84e5d86765eb3651e2d8e95..59204a8adbf7778c60370198d8917b5b67103710 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
@@ -336,4 +336,75 @@ public class Tools {
         }\r
         return arg0;\r
     }\r
         }\r
         return arg0;\r
     }\r

+\r
+    /**\r
+     Wrap single line long input string to multiple short line string by word\r
+     \r
+     @param arg0 input string\r
+     @return wraped string\r
+     \r
+     **/\r
+    public static String wrapStringByWord(String arg0) {\r
+        int intMaxLength = 40;\r
+        String strReturn = "";\r
+        String strTemp = "";\r
+        boolean isCopied = true;\r
+\r
+        //\r
+        // Convert string to array by " "\r
+        //\r
+        String s[] = arg0.split(" ");\r
+        if (arg0.indexOf(" ") == -1) {\r
+            s[0] = arg0;\r
+        }\r
+\r
+        //\r
+        // Add each string of array one by one\r
+        //\r
+        for (int index = 0; index < s.length; index++) {\r
+            String ss = s[index];\r
+            isCopied = false;\r
+            //\r
+            // The word length > defined line length\r
+            //\r
+            if (ss.length() > intMaxLength) {\r
+                //\r
+                // Finish previous line\r
+                //\r
+                if (!isCopied) {\r
+                    strReturn = strReturn + strTemp + DataType.UNIX_LINE_SEPARATOR;\r
+                    strTemp = "";\r
+                }\r
+                //\r
+                // Separater to short lines\r
+                //\r
+                while (ss.length() > 0) {\r
+                    if (ss.length() > intMaxLength) {\r
+                        strReturn = strReturn + s[index].substring(0, intMaxLength - 1) + DataType.UNIX_LINE_SEPARATOR;\r
+                        ss = ss.substring(intMaxLength);\r
+                        isCopied = true;\r
+                    } else {\r
+                        strTemp = ss;\r
+                        ss = "";\r
+                        isCopied = false;\r
+                    }\r
+                }\r
+            } else {\r
+                if ((strTemp + " " + ss).length() <= intMaxLength) {\r
+                    strTemp = strTemp + " " + ss;\r
+                    continue;\r
+                } else {\r
+                    strReturn = strReturn + strTemp + DataType.UNIX_LINE_SEPARATOR;\r
+                    strTemp = ss + " ";\r
+                    isCopied = true;\r
+                }\r
+            }\r
+        }\r
+\r
+        if (!isCopied) {\r
+            strReturn = strReturn + strTemp;\r
+        }\r
+\r
+        return strReturn;\r
+    }\r

 }\r
 }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java
index 2ce541a27623e084288ad47a89a36eeee4d7e680..314d0d0b1eceb6c8de32a717731f35e92278e228 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java
@@ -236,7 +236,7 @@ public class CreateStepFour extends IDialog implements MouseListener {
             // Guid Check, File Check etc.\r
             //\r
             if (this.jTextFieldSaveToFile.getText() == null) {\r
             // Guid Check, File Check etc.\r
             //\r
             if (this.jTextFieldSaveToFile.getText() == null) {\r

-                Log.err("Please input the Far name!");\r
+                Log.wrn("Create far", "Please input the Far name!");\r

             }\r
             try {\r
                 //\r
             }\r
             try {\r
                 //\r


@@ -250,7 +250,8 @@ public class CreateStepFour extends IDialog implements MouseListener {
                                                                                                   .getFileFilter(),\r
                              this.getPreviousStep().getPreviousStep().getPreviousStep().getFarHeader());\r
             } catch (Exception exp) {\r
                                                                                                   .getFileFilter(),\r
                              this.getPreviousStep().getPreviousStep().getPreviousStep().getFarHeader());\r
             } catch (Exception exp) {\r

-                Log.err("Create error! ");\r
+                Log.wrn("Create far", exp.getMessage());\r
+                Log.err("Create far", exp.getMessage());\r

                 return;\r
             }\r
             getPreviousStep().getPreviousStep().getPreviousStep().returnType = DataType.RETURN_TYPE_OK;\r
                 return;\r
             }\r
             getPreviousStep().getPreviousStep().getPreviousStep().returnType = DataType.RETURN_TYPE_OK;\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepOne.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepOne.java
index 54baaeb102260a06c51c065c6b44f7cf9d731f5f..758dab651b0c86916cdef5071bb55a4aaea46727 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepOne.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepOne.java
@@ -482,11 +482,11 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check BaseName\r
         //\r
         if (isEmpty(this.jTextFieldBaseName.getText())) {\r
         // Check BaseName\r
         //\r
         if (isEmpty(this.jTextFieldBaseName.getText())) {\r

-            Log.err("Base Name couldn't be empty");\r
+            Log.wrn("Create far", "Base Name couldn't be empty");\r

             return false;\r
         }\r
         if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) {\r
             return false;\r
         }\r
         if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) {\r

-            Log.err("Incorrect data type for Base Name");\r
+            Log.wrn("Create far", "Incorrect data type for Base Name");\r

             return false;\r
         }\r
         farHeader.setFarName(this.jTextFieldBaseName.getText());\r
             return false;\r
         }\r
         farHeader.setFarName(this.jTextFieldBaseName.getText());\r


@@ -495,11 +495,11 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check Guid\r
         //\r
         if (isEmpty(this.jTextFieldGuid.getText())) {\r
         // Check Guid\r
         //\r
         if (isEmpty(this.jTextFieldGuid.getText())) {\r

-            Log.err("Guid Value couldn't be empty");\r
+            Log.wrn("Create far", "Guid Value couldn't be empty");\r

             return false;\r
         }\r
         if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {\r
             return false;\r
         }\r
         if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {\r

-            Log.err("Incorrect data type for Guid");\r
+            Log.wrn("Create far", "Incorrect data type for Guid");\r

             return false;\r
         }\r
         farHeader.setGuidValue(this.jTextFieldGuid.getText());\r
             return false;\r
         }\r
         farHeader.setGuidValue(this.jTextFieldGuid.getText());\r


@@ -508,11 +508,11 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check Version\r
         //\r
         if (isEmpty(this.jTextFieldVersion.getText())) {\r
         // Check Version\r
         //\r
         if (isEmpty(this.jTextFieldVersion.getText())) {\r

-            Log.err("Version couldn't be empty");\r
+            Log.wrn("Create far", "Version couldn't be empty");\r

             return false;\r
         }\r
         if (!DataValidation.isVersion(this.jTextFieldVersion.getText())) {\r
             return false;\r
         }\r
         if (!DataValidation.isVersion(this.jTextFieldVersion.getText())) {\r

-            Log.err("Incorrect data type for Version");\r
+            Log.wrn("Create far", "Incorrect data type for Version");\r

             return false;\r
         }\r
         farHeader.setVersion(this.jTextFieldVersion.getText());\r
             return false;\r
         }\r
         farHeader.setVersion(this.jTextFieldVersion.getText());\r


@@ -521,11 +521,11 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check Abstact\r
         //\r
         if (isEmpty(this.jTextFieldAbstract.getText())) {\r
         // Check Abstact\r
         //\r
         if (isEmpty(this.jTextFieldAbstract.getText())) {\r

-            Log.err("Abstract couldn't be empty");\r
+            Log.wrn("Create far", "Abstract couldn't be empty");\r

             return false;\r
         }\r
         if (!DataValidation.isAbstract(this.jTextFieldAbstract.getText())) {\r
             return false;\r
         }\r
         if (!DataValidation.isAbstract(this.jTextFieldAbstract.getText())) {\r

-            Log.err("Incorrect data type for Abstract");\r
+            Log.wrn("Create far", "Incorrect data type for Abstract");\r

             return false;\r
         }\r
         farHeader.setAbstractStr(this.jTextFieldAbstract.getText());\r
             return false;\r
         }\r
         farHeader.setAbstractStr(this.jTextFieldAbstract.getText());\r


@@ -534,7 +534,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check Description\r
         //\r
         if (isEmpty(this.jTextAreaDescription.getText())) {\r
         // Check Description\r
         //\r
         if (isEmpty(this.jTextAreaDescription.getText())) {\r

-            Log.err("Description couldn't be empty");\r
+            Log.wrn("Create far", "Description couldn't be empty");\r

             return false;\r
         }\r
         farHeader.setDescription(this.jTextAreaDescription.getText());\r
             return false;\r
         }\r
         farHeader.setDescription(this.jTextAreaDescription.getText());\r


@@ -543,7 +543,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check Copyright\r
         //\r
         if (isEmpty(this.jTextFieldCopyright.getText())) {\r
         // Check Copyright\r
         //\r
         if (isEmpty(this.jTextFieldCopyright.getText())) {\r

-            Log.err("Copyright couldn't be empty");\r
+            Log.wrn("Create far", "Copyright couldn't be empty");\r

             return false;\r
         }\r
         farHeader.setCopyright(this.jTextFieldCopyright.getText());\r
             return false;\r
         }\r
         farHeader.setCopyright(this.jTextFieldCopyright.getText());\r


@@ -552,7 +552,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check License\r
         //\r
         if (isEmpty(this.jTextAreaLicense.getText())) {\r
         // Check License\r
         //\r
         if (isEmpty(this.jTextAreaLicense.getText())) {\r

-            Log.err("License couldn't be empty");\r
+            Log.wrn("Create far", "License couldn't be empty");\r

             return false;\r
         }\r
         farHeader.setLicense(this.jTextAreaLicense.getText());\r
             return false;\r
         }\r
         farHeader.setLicense(this.jTextAreaLicense.getText());\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java
index 5763963e049dcf6fb30dabad1762839b766bd30e..75c4bc83c0b313fd4c79b5150b76c6634517a172 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java
@@ -252,7 +252,7 @@ public class CreateStepTwo extends IDialog implements MouseListener {
             //\r
             if (jComboBoxPlatform.getAllCheckedItemsIndex().size() == 0\r
                 && jComboBoxPackage.getAllCheckedItemsIndex().size() == 0) {\r
             //\r
             if (jComboBoxPlatform.getAllCheckedItemsIndex().size() == 0\r
                 && jComboBoxPackage.getAllCheckedItemsIndex().size() == 0) {\r

-                Log.err("At least choose one of packages and platforms. ");\r
+                Log.wrn("Create far", "At least choose one of packages and platforms. ");\r

                 return;\r
             }\r
             if (stepThree == null) {\r
                 return;\r
             }\r
             if (stepThree == null) {\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepOne.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepOne.java
index 3c76c0fd18e0e3fa6ca8da447a7d458a9d2e94c4..fabee7a8cd06664c9b436da0573d9cf98f098e5f 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepOne.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepOne.java
@@ -262,7 +262,7 @@ public class InstallStepOne extends IDialog implements MouseListener {
             //\r
             File farFile = new File(jTextFieldFarFile.getText());\r
             if (!farFile.exists() || !farFile.isFile()) {\r
             //\r
             File farFile = new File(jTextFieldFarFile.getText());\r
             if (!farFile.exists() || !farFile.isFile()) {\r

-                Log.err("Please choose a FAR file already exists. ");\r
+                Log.wrn("Install far", "Please choose a FAR file already exists. ");\r

                 return;\r
             }\r
 \r
                 return;\r
             }\r
 \r


@@ -288,8 +288,8 @@ public class InstallStepOne extends IDialog implements MouseListener {
                 }\r
 \r
             } catch (Exception exp) {\r
                 }\r
 \r
             } catch (Exception exp) {\r

-                exp.printStackTrace();\r
-                Log.err("Far file invaild! The error message as follow:" + exp.getMessage());\r
+                Log.wrn("Install far" + exp.getMessage());\r
+                Log.err("Install far" + exp.getMessage());\r

             }\r
 \r
             if (stepTwo == null) {\r
             }\r
 \r
             if (stepTwo == null) {\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java
index ac919cbcbe95106b9aaedd6164e5b345400d2a92..35793436a1926ed485a63d4d66269c39eeb8eb2b 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java
@@ -345,11 +345,11 @@ public class InstallStepTwo extends IDialog implements MouseListener {
                 File toFile = new File(Workspace.getCurrentWorkspace() + File.separatorChar\r
                                        + packageModel.getValueAt(i, 3));\r
                 if (!isPackagePathValid(toFile)) {\r
                 File toFile = new File(Workspace.getCurrentWorkspace() + File.separatorChar\r
                                        + packageModel.getValueAt(i, 3));\r
                 if (!isPackagePathValid(toFile)) {\r

-                    Log.err(packageVector.get(i) + " path already has package now. ");\r
+                    Log.wrn("Install far", packageVector.get(i) + " path already has package now. ");\r

                     return;\r
                 }\r
                 if (allNewPath.contains(toFile)) {\r
                     return;\r
                 }\r
                 if (allNewPath.contains(toFile)) {\r

-                    Log.err("Path " + packageModel.getValueAt(i, 3) + " is specified by twice. ");\r
+                    Log.wrn("Install far", "Path " + packageModel.getValueAt(i, 3) + " is specified by twice. ");\r

                     return;\r
                 }\r
                 allNewPath.add(toFile);\r
                     return;\r
                 }\r
                 allNewPath.add(toFile);\r


@@ -364,7 +364,7 @@ public class InstallStepTwo extends IDialog implements MouseListener {
                 File toFile = new File(Workspace.getCurrentWorkspace() + File.separatorChar\r
                                        + platformModel.getValueAt(i, 3));\r
                 if (!isPlatformPathValid(toFile)) {\r
                 File toFile = new File(Workspace.getCurrentWorkspace() + File.separatorChar\r
                                        + platformModel.getValueAt(i, 3));\r
                 if (!isPlatformPathValid(toFile)) {\r

-                    Log.err(platformVector.get(i) + " path already has platform now. ");\r
+                    Log.wrn("Install far", platformVector.get(i) + " path already has platform now. ");\r

                     return;\r
                 }\r
                 File fpdFile = new File((String) platformModel.getValueAt(i, 3) + File.separatorChar\r
                     return;\r
                 }\r
                 File fpdFile = new File((String) platformModel.getValueAt(i, 3) + File.separatorChar\r


@@ -385,8 +385,8 @@ public class InstallStepTwo extends IDialog implements MouseListener {
                 WorkspaceTools wt = new WorkspaceTools();\r
                 wt.addFarToDb(packageList, platformList, far.mainfest.getHeader());\r
             } catch (Exception ex) {\r
                 WorkspaceTools wt = new WorkspaceTools();\r
                 wt.addFarToDb(packageList, platformList, far.mainfest.getHeader());\r
             } catch (Exception ex) {\r

-                ex.printStackTrace();\r
-                Log.err("Install error. ");\r
+                Log.wrn("Install far", ex.getMessage());\r
+                Log.err("Install far", ex.getMessage());\r

                 return;\r
             }\r
 \r
                 return;\r
             }\r
 \r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepOne.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepOne.java
index ae36591d58055f8486a3cfe36111fc97e28fa9ed..47d3db52e49425ed4ee03b55a1660969f203c934 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepOne.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepOne.java
@@ -241,7 +241,7 @@ public class UpdateStepOne extends IDialog implements MouseListener {
             //\r
             farFile = new File(jTextFieldFarFile.getText());\r
             if (!farFile.exists() || !farFile.isFile()) {\r
             //\r
             farFile = new File(jTextFieldFarFile.getText());\r
             if (!farFile.exists() || !farFile.isFile()) {\r

-                Log.err("Please choose a FAR file already exists. ");\r
+                Log.wrn("Update far", "Please choose a FAR file already exists. ");\r

                 return;\r
             }\r
 \r
                 return;\r
             }\r
 \r


@@ -252,14 +252,15 @@ public class UpdateStepOne extends IDialog implements MouseListener {
                 JarFile file = new JarFile(farFile);\r
                 this.far = new Far(file);\r
             } catch (Exception ex) {\r
                 JarFile file = new JarFile(farFile);\r
                 this.far = new Far(file);\r
             } catch (Exception ex) {\r

-                Log.err(ex.getMessage());\r
+                Log.wrn("Update far", ex.getMessage());\r
+                Log.err("Update far", ex.getMessage());\r

             }\r
 \r
             //\r
             // Add more logic process here\r
             //\r
             if (jListFarFromDb.getSelectedValue() == null) {\r
             }\r
 \r
             //\r
             // Add more logic process here\r
             //\r
             if (jListFarFromDb.getSelectedValue() == null) {\r

-                Log.err("Please choose a FAR from framework database. ");\r
+                Log.wrn("Update far", "Please choose a FAR from framework database. ");\r

                 return;\r
             }\r
 \r
                 return;\r
             }\r
 \r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java
index 34c5a42d96778a6cab83b755dfddfd2c8c405a05..45e6e979911aa12424fef3d60707e31e75d599c0 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java
@@ -273,7 +273,7 @@ public class UpdateStepTwo extends IDialog implements MouseListener {
                                                                                                            dbPkgList));\r
             Iterator resultIter = resultList.iterator();\r
             while (resultIter.hasNext()) {\r
                                                                                                            dbPkgList));\r
             Iterator resultIter = resultList.iterator();\r
             while (resultIter.hasNext()) {\r

-                Log.err("Missing dependency package " + ((PackageIdentification) resultIter.next()).toString()\r
+                Log.wrn("Update far", "Missing dependency package " + ((PackageIdentification) resultIter.next()).toString()\r

                         + "in workspace!");\r
                 return;\r
             }\r
                         + "in workspace!");\r
                 return;\r
             }\r


@@ -322,7 +322,8 @@ public class UpdateStepTwo extends IDialog implements MouseListener {
                 try {\r
                     stepOne.getFar().installPackage(pkgId, new File(pkgId.getSpdFile().getParent()));\r
                 } catch (Exception ex) {\r
                 try {\r
                     stepOne.getFar().installPackage(pkgId, new File(pkgId.getSpdFile().getParent()));\r
                 } catch (Exception ex) {\r

-                    Log.err("Can install " + pkgId.toString() + " pakcage, please check it!");\r
+                    Log.wrn("Install " + pkgId.toString(), ex.getMessage());\r
+                    Log.err("Install " + pkgId.toString(), ex.getMessage());\r

                 }\r
 \r
             }\r
                 }\r
 \r
             }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleBootModes.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleBootModes.java
index 51fa6f81968c905d7cb4a4f240c1ec2701f7e32a..d1ec613c8613214807251e09a400730364d17e58 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleBootModes.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleBootModes.java
@@ -346,7 +346,7 @@ public class ModuleBootModes extends IInternalFrame {
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r

-                Log.err("Please select one record first.");\r
+                Log.wrn("Update Boot Modes", "Please select one record first.");\r

                 return;\r
             }\r
             showEdit(selectedRow);\r
                 return;\r
             }\r
             showEdit(selectedRow);\r


@@ -403,6 +403,7 @@ public class ModuleBootModes extends IInternalFrame {
             this.msa.setBootModes(bootModes);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r
             this.msa.setBootModes(bootModes);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r

+            Log.wrn("Update Boot Modes", e.getMessage());\r

             Log.err("Update Boot Modes", e.getMessage());\r
         }\r
     }\r
             Log.err("Update Boot Modes", e.getMessage());\r
         }\r
     }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDataHubs.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDataHubs.java
index 753b7e8eab6cc2a6e9faa0d3de4e327b75d8d4da..585eaec33facd263b2757f08ef861cece1dbbd05 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDataHubs.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDataHubs.java
@@ -343,7 +343,7 @@ public class ModuleDataHubs extends IInternalFrame {
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r

-                Log.err("Please select one record first.");\r
+                Log.wrn("Update Data Hubs", "Please select one record first.");\r

                 return;\r
             }\r
             showEdit(selectedRow);\r
                 return;\r
             }\r
             showEdit(selectedRow);\r


@@ -400,6 +400,7 @@ public class ModuleDataHubs extends IInternalFrame {
             this.msa.setDataHubs(dataHubs);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r
             this.msa.setDataHubs(dataHubs);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r

+            Log.wrn("Update Data Hubs", e.getMessage());\r

             Log.err("Update Data Hubs", e.getMessage());\r
         }\r
     }\r
             Log.err("Update Data Hubs", e.getMessage());\r
         }\r
     }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDefinitions.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDefinitions.java
index 5732035c1e9443a90d6e986f5ba9e68a21729fe1..fa0963d6d8e847c308cd0728d5cdd8c0ef7494b4 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDefinitions.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDefinitions.java
@@ -286,11 +286,11 @@ public class ModuleDefinitions extends IInternalFrame {
     \r
     private boolean check() {\r
         if (isEmpty(this.jTextFieldOutputFileBasename.getText())) {\r
     \r
     private boolean check() {\r
         if (isEmpty(this.jTextFieldOutputFileBasename.getText())) {\r

-            Log.err("Output File Basename couldn't be empty!");\r
+            Log.wrn("Update Definitions", "Output File Basename couldn't be empty!");\r

             return false;\r
         }\r
         if (!DataValidation.isOutputFileBasename(this.jTextFieldOutputFileBasename.getText())) {\r
             return false;\r
         }\r
         if (!DataValidation.isOutputFileBasename(this.jTextFieldOutputFileBasename.getText())) {\r

-            Log.err("Incorrect data type for Output File Basename");\r
+            Log.wrn("Update Definitions", "Incorrect data type for Output File Basename");\r

             return false;\r
         }\r
         return true;\r
             return false;\r
         }\r
         return true;\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java
index 52d4ff99533838e23015b973490dac698a3ed8cc..d7a4e138131a70573ab126ad96df4c162c5ec4c1 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java
@@ -372,7 +372,7 @@ public class ModuleEvents extends IInternalFrame {
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r

-                Log.err("Please select one record first.");\r
+                Log.wrn("Update Events", "Please select one record first.");\r

                 return;\r
             }\r
             showEdit(selectedRow);\r
                 return;\r
             }\r
             showEdit(selectedRow);\r


@@ -468,7 +468,7 @@ public class ModuleEvents extends IInternalFrame {
             this.msa.setEvents(events);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r
             this.msa.setEvents(events);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r

-            e.printStackTrace();\r
+            Log.wrn("Update Events", e.getMessage());\r

             Log.err("Update Events", e.getMessage());\r
         }\r
     }\r
             Log.err("Update Events", e.getMessage());\r
         }\r
     }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java
index 99a24302cd425c9fb901a4e6e1f20022a51e6c49..c90a6ba7404477cdc6e703968a7ede48c36d4c7d 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java
@@ -410,7 +410,7 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r

-                Log.err("Please select one record first.");\r
+                Log.wrn("Update Externs", "Please select one record first.");\r

                 return;\r
             }\r
             showEdit(selectedRow);\r
                 return;\r
             }\r
             showEdit(selectedRow);\r


@@ -546,6 +546,7 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
             this.msa.setExterns(externs);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r
             this.msa.setExterns(externs);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r

+            Log.wrn("Update Externs", e.getMessage());\r

             Log.err("Update Externs", e.getMessage());\r
         }\r
     }\r
             Log.err("Update Externs", e.getMessage());\r
         }\r
     }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleGuids.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleGuids.java
index 6c0c4114db43204e36ae67cfacb905d5a1bcad1d..472d501eacc48a54305b55ffbb4dfee2a06b1129 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleGuids.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleGuids.java
@@ -340,7 +340,7 @@ public class ModuleGuids extends IInternalFrame {
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r

-                Log.err("Please select one record first.");\r
+                Log.wrn("Update Guids", "Please select one record first.");\r

                 return;\r
             }\r
             showEdit(selectedRow);\r
                 return;\r
             }\r
             showEdit(selectedRow);\r


@@ -396,6 +396,7 @@ public class ModuleGuids extends IInternalFrame {
             this.msa.setGuids(guids);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r
             this.msa.setGuids(guids);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r

+            Log.wrn("Update Guids", e.getMessage());\r

             Log.err("Update Guids", e.getMessage());\r
         }\r
     }\r
             Log.err("Update Guids", e.getMessage());\r
         }\r
     }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHiiPackages.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHiiPackages.java
index 884879e177d35a971440bd38a0d92bdc018c5a1a..27e2470731399a8a48780c7c3a8c37ed6fa5dc21 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHiiPackages.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHiiPackages.java
@@ -343,7 +343,7 @@ public class ModuleHiiPackages extends IInternalFrame {
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r

-                Log.err("Please select one record first.");\r
+                Log.wrn("Update Hii Packages", "Please select one record first.");\r

                 return;\r
             }\r
             showEdit(selectedRow);\r
                 return;\r
             }\r
             showEdit(selectedRow);\r


@@ -400,6 +400,7 @@ public class ModuleHiiPackages extends IInternalFrame {
             this.msa.setHiiPackages(hiiPackages);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r
             this.msa.setHiiPackages(hiiPackages);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r

+            Log.wrn("Update hiiPackages", e.getMessage());\r

             Log.err("Update hiiPackages", e.getMessage());\r
         }\r
     }\r
             Log.err("Update hiiPackages", e.getMessage());\r
         }\r
     }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java
index 8b11f081d89f2f85689ad749b3db6b9331bbe532..ca6cdc42f35fa5950d0a31d97d3b383886e2599d 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java
@@ -346,7 +346,7 @@ public class ModuleHobs extends IInternalFrame {
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r

-                Log.err("Please select one record first.");\r
+                Log.wrn("Update Hobs", "Please select one record first.");\r

                 return;\r
             }\r
             showEdit(selectedRow);\r
                 return;\r
             }\r
             showEdit(selectedRow);\r


@@ -402,7 +402,7 @@ public class ModuleHobs extends IInternalFrame {
             this.msa.setHobs(hobs);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r
             this.msa.setHobs(hobs);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r

-            e.printStackTrace();\r
+            Log.wrn("Update Hobs", e.getMessage());\r

             Log.err("Update Hobs", e.getMessage());\r
         }\r
     }\r
             Log.err("Update Hobs", e.getMessage());\r
         }\r
     }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleLibraryClassDefinitions.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleLibraryClassDefinitions.java
index 5104651700f551c4860e377e286708506e20cfa5..28cf57e5823bd15515023da2e64ea3a236863da9 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleLibraryClassDefinitions.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleLibraryClassDefinitions.java
@@ -334,6 +334,7 @@ public class ModuleLibraryClassDefinitions extends IInternalFrame {
 \r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r
 \r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r

+            Log.wrn("Update Library Class Definitions", e.getMessage());\r

             Log.err("Update Library Class Definitions", e.getMessage());\r
         }\r
     }\r
             Log.err("Update Library Class Definitions", e.getMessage());\r
         }\r
     }\r


@@ -368,7 +369,7 @@ public class ModuleLibraryClassDefinitions extends IInternalFrame {
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r

-                Log.err("Please select one record first.");\r
+                Log.wrn("Update Library Class Definitions", "Please select one record first.");\r

                 return;\r
             }\r
             showEdit(selectedRow);\r
                 return;\r
             }\r
             showEdit(selectedRow);\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java
index 492b305c7260a1f15208daf6e3f6ab55c50296f0..8d72515e84359a042c4d88254053f4b2f0bae21c 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java
@@ -345,7 +345,7 @@ public class ModulePCDs extends IInternalFrame {
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r

-                Log.err("Please select one record first.");\r
+                Log.wrn("Update PcdCoded", "Please select one record first.");\r

                 return;\r
             }\r
             showEdit(selectedRow);\r
                 return;\r
             }\r
             showEdit(selectedRow);\r


@@ -408,7 +408,8 @@ public class ModulePCDs extends IInternalFrame {
             this.msa.setPcdCoded(pcds);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r
             this.msa.setPcdCoded(pcds);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r

-            Log.err("Update Hobs", e.getMessage());\r
+            Log.wrn("Update PcdCoded", e.getMessage());\r
+            Log.err("Update PcdCoded", e.getMessage());\r

         }\r
     }\r
 \r
         }\r
     }\r
 \r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePackageDependencies.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePackageDependencies.java
index e9942429ab00714ba81d63ae2cebbb26ba3d4348..7464035ba8a2beb2f94af646e86c3aafd7b92b6e 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePackageDependencies.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePackageDependencies.java
@@ -352,7 +352,7 @@ public class ModulePackageDependencies extends IInternalFrame {
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r

-                Log.err("Please select one record first.");\r
+                Log.wrn("Update Package Dependencies", "Please select one record first.");\r

                 return;\r
             }\r
             showEdit(selectedRow);\r
                 return;\r
             }\r
             showEdit(selectedRow);\r


@@ -410,7 +410,7 @@ public class ModulePackageDependencies extends IInternalFrame {
             this.msa.setPackageDependencies(pd);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r
             this.msa.setPackageDependencies(pd);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r

-            e.printStackTrace();\r
+            Log.wrn("Update Package Dependencies", e.getMessage());\r

             Log.err("Update Package Dependencies", e.getMessage());\r
         }\r
     }\r
             Log.err("Update Package Dependencies", e.getMessage());\r
         }\r
     }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePpis.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePpis.java
index aef4addfd60b4f8ffaea8dce0e0eea118cc9826b..7ce181b70731971158a8fa5da687ef6b06bac18d 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePpis.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePpis.java
@@ -365,7 +365,7 @@ public class ModulePpis extends IInternalFrame {
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r

-                Log.err("Please select one record first.");\r
+                Log.wrn("Update Ppis", "Please select one record first.");\r

                 return;\r
             }\r
             showEdit(selectedRow);\r
                 return;\r
             }\r
             showEdit(selectedRow);\r


@@ -445,7 +445,7 @@ public class ModulePpis extends IInternalFrame {
             this.msa.setPPIs(ppis);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r
             this.msa.setPPIs(ppis);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r

-            e.printStackTrace();\r
+            Log.wrn("Update Ppis", e.getMessage());\r

             Log.err("Update Ppis", e.getMessage());\r
         }\r
     }\r
             Log.err("Update Ppis", e.getMessage());\r
         }\r
     }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleProtocols.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleProtocols.java
index ed55f3ce73e62a1e16d3cf782027404ff6c57a89..f7088403f2fdef7edbf62f95cdb620d080097dfb 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleProtocols.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleProtocols.java
@@ -366,7 +366,7 @@ public class ModuleProtocols extends IInternalFrame {
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r

-                Log.err("Please select one record first.");\r
+                Log.wrn("Update Protocols", "Please select one record first.");\r

                 return;\r
             }\r
             showEdit(selectedRow);\r
                 return;\r
             }\r
             showEdit(selectedRow);\r


@@ -446,7 +446,7 @@ public class ModuleProtocols extends IInternalFrame {
             this.msa.setProtocols(protocols);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r
             this.msa.setProtocols(protocols);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r

-            e.printStackTrace();\r
+            Log.wrn("Update Protocols", e.getMessage());\r

             Log.err("Update Protocols", e.getMessage());\r
         }\r
     }\r
             Log.err("Update Protocols", e.getMessage());\r
         }\r
     }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java
index eaeb13e52d79208238c40195272c8440275e6c77..b2fee47a482c1131186924d357543fc49c3fe518 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java
@@ -342,6 +342,7 @@ public class ModuleSourceFiles extends IInternalFrame {
             this.msa.setSourceFiles(sourceFiles);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r
             this.msa.setSourceFiles(sourceFiles);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r

+            Log.wrn("Update Source Files", e.getMessage());\r

             Log.err("Update Source Files", e.getMessage());\r
         }\r
     }\r
             Log.err("Update Source Files", e.getMessage());\r
         }\r
     }\r


@@ -378,7 +379,7 @@ public class ModuleSourceFiles extends IInternalFrame {
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r

-                Log.err("Please select one record first.");\r
+                Log.wrn("Update Source Files", "Please select one record first.");\r

                 return;\r
             }\r
             showEdit(selectedRow);\r
                 return;\r
             }\r
             showEdit(selectedRow);\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSystemTables.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSystemTables.java
index bf78fb5611b1a5a43bf7dd2dc87fb79dd1696ecf..cabd9a3f2db27a09fcf9bc86b6c6ad3d5c41c1ac 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSystemTables.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSystemTables.java
@@ -343,7 +343,7 @@ public class ModuleSystemTables extends IInternalFrame {
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r

-                Log.err("Please select one record first.");\r
+                Log.wrn("Update System Tables", "Please select one record first.");\r

                 return;\r
             }\r
             showEdit(selectedRow);\r
                 return;\r
             }\r
             showEdit(selectedRow);\r


@@ -400,6 +400,7 @@ public class ModuleSystemTables extends IInternalFrame {
             this.msa.setSystemTables(systemTables);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r
             this.msa.setSystemTables(systemTables);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r

+            Log.wrn("Update System Tables", e.getMessage());\r

             Log.err("Update System Tables", e.getMessage());\r
         }\r
     }\r
             Log.err("Update System Tables", e.getMessage());\r
         }\r
     }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java
index 5dfbb1deef44490e54d7af7b9351304eaa892d7d..ac16e2b31fca59b975686e5d1d4bd438205b9986 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java
@@ -342,7 +342,7 @@ public class ModuleVariables extends IInternalFrame {
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r

-                Log.err("Please select one record first.");\r
+                Log.wrn("Update Variables", "Please select one record first.");\r

                 return;\r
             }\r
             showEdit(selectedRow);\r
                 return;\r
             }\r
             showEdit(selectedRow);\r


@@ -402,6 +402,7 @@ public class ModuleVariables extends IInternalFrame {
             this.msa.setVariables(variables);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r
             this.msa.setVariables(variables);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r

+            Log.wrn("Update Variables", e.getMessage());\r

             Log.err("Update Variables", e.getMessage());\r
         }\r
     }\r
             Log.err("Update Variables", e.getMessage());\r
         }\r
     }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java
index 295cde4676afab9bc74db4b7f8eebe2debbd5402..826a7cbf1f67292e1bd933bc1189be43c987cf38 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java
@@ -695,12 +695,12 @@ public class MsaHeader extends IInternalFrame {
         // Check Base Name\r
         //\r
         if (isEmpty(this.jTextFieldBaseName.getText())) {\r
         // Check Base Name\r
         //\r
         if (isEmpty(this.jTextFieldBaseName.getText())) {\r

-            Log.err("Base Name couldn't be empty");\r
+            Log.wrn("Update Msa Header", "Base Name couldn't be empty");\r

             //this.jTextFieldBaseName.requestFocus();\r
             return false;\r
         }\r
         if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) {\r
             //this.jTextFieldBaseName.requestFocus();\r
             return false;\r
         }\r
         if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) {\r

-            Log.err("Incorrect data type for Base Name");\r
+            Log.wrn("Update Msa Header", "Incorrect data type for Base Name");\r

             //this.jTextFieldBaseName.requestFocus();\r
             return false;\r
         }\r
             //this.jTextFieldBaseName.requestFocus();\r
             return false;\r
         }\r


@@ -709,12 +709,12 @@ public class MsaHeader extends IInternalFrame {
         // Check Guid\r
         //\r
         if (isEmpty(this.jTextFieldGuid.getText())) {\r
         // Check Guid\r
         //\r
         if (isEmpty(this.jTextFieldGuid.getText())) {\r

-            Log.err("Guid Value couldn't be empty");\r
+            Log.wrn("Update Msa Header", "Guid Value couldn't be empty");\r

             //this.jTextFieldGuid.requestFocus();\r
             return false;\r
         }\r
         if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {\r
             //this.jTextFieldGuid.requestFocus();\r
             return false;\r
         }\r
         if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {\r

-            Log.err("Incorrect data type for Guid");\r
+            Log.wrn("Update Msa Header", "Incorrect data type for Guid");\r

             //this.jTextFieldGuid.requestFocus();\r
             return false;\r
         }\r
             //this.jTextFieldGuid.requestFocus();\r
             return false;\r
         }\r


@@ -723,12 +723,12 @@ public class MsaHeader extends IInternalFrame {
         // Check Version\r
         //\r
         if (isEmpty(this.jTextFieldVersion.getText())) {\r
         // Check Version\r
         //\r
         if (isEmpty(this.jTextFieldVersion.getText())) {\r

-            Log.err("Version couldn't be empty");\r
+            Log.wrn("Update Msa Header", "Version couldn't be empty");\r

             //this.jTextFieldVersion.requestFocus();\r
             return false;\r
         }\r
         if (!DataValidation.isVersion(this.jTextFieldVersion.getText())) {\r
             //this.jTextFieldVersion.requestFocus();\r
             return false;\r
         }\r
         if (!DataValidation.isVersion(this.jTextFieldVersion.getText())) {\r

-            Log.err("Incorrect data type for Version");\r
+            Log.wrn("Update Msa Header", "Incorrect data type for Version");\r

             //this.jTextFieldVersion.requestFocus();\r
             return false;\r
         }\r
             //this.jTextFieldVersion.requestFocus();\r
             return false;\r
         }\r


@@ -737,12 +737,12 @@ public class MsaHeader extends IInternalFrame {
         // Check Abstact\r
         //\r
         if (isEmpty(this.jTextFieldAbstract.getText())) {\r
         // Check Abstact\r
         //\r
         if (isEmpty(this.jTextFieldAbstract.getText())) {\r

-            Log.err("Abstract couldn't be empty");\r
+            Log.wrn("Update Msa Header", "Abstract couldn't be empty");\r

             //this.jTextFieldAbstract.requestFocus();\r
             return false;\r
         }\r
         if (!DataValidation.isAbstract(this.jTextFieldAbstract.getText())) {\r
             //this.jTextFieldAbstract.requestFocus();\r
             return false;\r
         }\r
         if (!DataValidation.isAbstract(this.jTextFieldAbstract.getText())) {\r

-            Log.err("Incorrect data type for Abstract");\r
+            Log.wrn("Update Msa Header", "Incorrect data type for Abstract");\r

             //this.jTextFieldAbstract.requestFocus();\r
             return false;\r
         }\r
             //this.jTextFieldAbstract.requestFocus();\r
             return false;\r
         }\r


@@ -751,7 +751,7 @@ public class MsaHeader extends IInternalFrame {
         // Check Description\r
         //\r
         if (isEmpty(this.jTextAreaDescription.getText())) {\r
         // Check Description\r
         //\r
         if (isEmpty(this.jTextAreaDescription.getText())) {\r

-            Log.err("Description couldn't be empty");\r
+            Log.wrn("Update Msa Header", "Description couldn't be empty");\r

             //this.jTextAreaDescription.requestFocus();\r
             return false;\r
         }\r
             //this.jTextAreaDescription.requestFocus();\r
             return false;\r
         }\r


@@ -760,7 +760,7 @@ public class MsaHeader extends IInternalFrame {
         // Check Copyright\r
         //\r
         if (isEmpty(this.jTextFieldCopyright.getText())) {\r
         // Check Copyright\r
         //\r
         if (isEmpty(this.jTextFieldCopyright.getText())) {\r

-            Log.err("Copyright couldn't be empty");\r
+            Log.wrn("Update Msa Header", "Copyright couldn't be empty");\r

             //this.jTextFieldCopyright.requestFocus();\r
             return false;\r
         }\r
             //this.jTextFieldCopyright.requestFocus();\r
             return false;\r
         }\r


@@ -769,7 +769,7 @@ public class MsaHeader extends IInternalFrame {
         // Check License\r
         //\r
         if (isEmpty(this.jTextAreaLicense.getText())) {\r
         // Check License\r
         //\r
         if (isEmpty(this.jTextAreaLicense.getText())) {\r

-            Log.err("License couldn't be empty");\r
+            Log.wrn("Update Msa Header", "License couldn't be empty");\r

             //this.jTextAreaLicense.requestFocus();\r
             return false;\r
         }\r
             //this.jTextAreaLicense.requestFocus();\r
             return false;\r
         }\r


@@ -778,12 +778,12 @@ public class MsaHeader extends IInternalFrame {
         // Check Specification\r
         //\r
         if (isEmpty(this.jTextFieldSpecification.getText())) {\r
         // Check Specification\r
         //\r
         if (isEmpty(this.jTextFieldSpecification.getText())) {\r

-            Log.err("Specification couldn't be empty");\r
+            Log.wrn("Update Msa Header", "Specification couldn't be empty");\r

             //this.jTextFieldSpecification.requestFocus();\r
             return false;\r
         }\r
         if (!DataValidation.isSpecification(this.jTextFieldSpecification.getText())) {\r
             //this.jTextFieldSpecification.requestFocus();\r
             return false;\r
         }\r
         if (!DataValidation.isSpecification(this.jTextFieldSpecification.getText())) {\r

-            Log.err("Incorrect data type for Specification");\r
+            Log.wrn("Update Msa Header", "Incorrect data type for Specification");\r

             //this.jTextFieldSpecification.requestFocus();\r
             return false;\r
         }\r
             //this.jTextFieldSpecification.requestFocus();\r
             return false;\r
         }\r


@@ -823,6 +823,7 @@ public class MsaHeader extends IInternalFrame {
             msa.setMsaHeader(msaHeader);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r
             msa.setMsaHeader(msaHeader);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r

+            Log.wrn("Save Module", e.getMessage());\r

             Log.err("Save Module", e.getMessage());\r
         }\r
     }\r
             Log.err("Save Module", e.getMessage());\r
         }\r
     }\r


@@ -889,12 +890,12 @@ public class MsaHeader extends IInternalFrame {
         //\r
         if (arg0.getSource() == this.jTextFieldBaseName) {\r
             if (isEmpty(this.jTextFieldBaseName.getText())) {\r
         //\r
         if (arg0.getSource() == this.jTextFieldBaseName) {\r
             if (isEmpty(this.jTextFieldBaseName.getText())) {\r

-                Log.err("Base Name couldn't be empty");\r
+                Log.wrn("Update Msa Header", "Base Name couldn't be empty");\r

                 //this.jTextFieldBaseName.requestFocus();\r
                 return;\r
             }\r
             if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) {\r
                 //this.jTextFieldBaseName.requestFocus();\r
                 return;\r
             }\r
             if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) {\r

-                Log.err("Incorrect data type for Base Name");\r
+                Log.wrn("Update Msa Header", "Incorrect data type for Base Name");\r

                 //this.jTextFieldBaseName.requestFocus();\r
                 return;\r
             }\r
                 //this.jTextFieldBaseName.requestFocus();\r
                 return;\r
             }\r


@@ -921,12 +922,12 @@ public class MsaHeader extends IInternalFrame {
         //\r
         if (arg0.getSource() == this.jTextFieldGuid) {\r
             if (isEmpty(this.jTextFieldGuid.getText())) {\r
         //\r
         if (arg0.getSource() == this.jTextFieldGuid) {\r
             if (isEmpty(this.jTextFieldGuid.getText())) {\r

-                Log.err("Guid Value couldn't be empty");\r
+                Log.wrn("Update Msa Header", "Guid Value couldn't be empty");\r

                 //this.jTextFieldGuid.requestFocus();\r
                 return;\r
             }\r
             if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {\r
                 //this.jTextFieldGuid.requestFocus();\r
                 return;\r
             }\r
             if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {\r

-                Log.err("Incorrect data type for Guid");\r
+                Log.wrn("Update Msa Header", "Incorrect data type for Guid");\r

                 //this.jTextFieldGuid.requestFocus();\r
                 return;\r
             }\r
                 //this.jTextFieldGuid.requestFocus();\r
                 return;\r
             }\r


@@ -942,12 +943,12 @@ public class MsaHeader extends IInternalFrame {
         //\r
         if (arg0.getSource() == this.jTextFieldVersion) {\r
             if (isEmpty(this.jTextFieldVersion.getText())) {\r
         //\r
         if (arg0.getSource() == this.jTextFieldVersion) {\r
             if (isEmpty(this.jTextFieldVersion.getText())) {\r

-                Log.err("Version couldn't be empty");\r
+                Log.wrn("Update Msa Header", "Version couldn't be empty");\r

                 //this.jTextFieldVersion.requestFocus();\r
                 return;\r
             }\r
             if (!DataValidation.isVersion(this.jTextFieldVersion.getText())) {\r
                 //this.jTextFieldVersion.requestFocus();\r
                 return;\r
             }\r
             if (!DataValidation.isVersion(this.jTextFieldVersion.getText())) {\r

-                Log.err("Incorrect data type for Version");\r
+                Log.wrn("Update Msa Header", "Incorrect data type for Version");\r

                 //this.jTextFieldVersion.requestFocus();\r
                 return;\r
             }\r
                 //this.jTextFieldVersion.requestFocus();\r
                 return;\r
             }\r


@@ -963,12 +964,12 @@ public class MsaHeader extends IInternalFrame {
         //\r
         if (arg0.getSource() == this.jTextFieldAbstract) {\r
             if (isEmpty(this.jTextFieldAbstract.getText())) {\r
         //\r
         if (arg0.getSource() == this.jTextFieldAbstract) {\r
             if (isEmpty(this.jTextFieldAbstract.getText())) {\r

-                Log.err("Abstract couldn't be empty");\r
+                Log.wrn("Update Msa Header", "Abstract couldn't be empty");\r

                 //this.jTextFieldAbstract.requestFocus();\r
                 return;\r
             }\r
             if (!DataValidation.isAbstract(this.jTextFieldAbstract.getText())) {\r
                 //this.jTextFieldAbstract.requestFocus();\r
                 return;\r
             }\r
             if (!DataValidation.isAbstract(this.jTextFieldAbstract.getText())) {\r

-                Log.err("Incorrect data type for Abstract");\r
+                Log.wrn("Update Msa Header", "Incorrect data type for Abstract");\r

                 //this.jTextFieldAbstract.requestFocus();\r
                 return;\r
             }\r
                 //this.jTextFieldAbstract.requestFocus();\r
                 return;\r
             }\r


@@ -984,7 +985,7 @@ public class MsaHeader extends IInternalFrame {
         //\r
         if (arg0.getSource() == this.jTextAreaDescription) {\r
             if (isEmpty(this.jTextAreaDescription.getText())) {\r
         //\r
         if (arg0.getSource() == this.jTextAreaDescription) {\r
             if (isEmpty(this.jTextAreaDescription.getText())) {\r

-                Log.err("Description couldn't be empty");\r
+                Log.wrn("Update Msa Header", "Description couldn't be empty");\r

                 //this.jTextAreaDescription.requestFocus();\r
                 return;\r
             }\r
                 //this.jTextAreaDescription.requestFocus();\r
                 return;\r
             }\r


@@ -1000,7 +1001,7 @@ public class MsaHeader extends IInternalFrame {
         //\r
         if (arg0.getSource() == this.jTextFieldCopyright) {\r
             if (isEmpty(this.jTextFieldCopyright.getText())) {\r
         //\r
         if (arg0.getSource() == this.jTextFieldCopyright) {\r
             if (isEmpty(this.jTextFieldCopyright.getText())) {\r

-                Log.err("Copyright couldn't be empty");\r
+                Log.wrn("Update Msa Header", "Copyright couldn't be empty");\r

                 //this.jTextFieldCopyright.requestFocus();\r
                 return;\r
             }\r
                 //this.jTextFieldCopyright.requestFocus();\r
                 return;\r
             }\r


@@ -1016,7 +1017,7 @@ public class MsaHeader extends IInternalFrame {
         //\r
         if (arg0.getSource() == this.jTextAreaLicense) {\r
             if (isEmpty(this.jTextAreaLicense.getText())) {\r
         //\r
         if (arg0.getSource() == this.jTextAreaLicense) {\r
             if (isEmpty(this.jTextAreaLicense.getText())) {\r

-                Log.err("License couldn't be empty");\r
+                Log.wrn("Update Msa Header", "License couldn't be empty");\r

                 //this.jTextAreaLicense.requestFocus();\r
                 return;\r
             }\r
                 //this.jTextAreaLicense.requestFocus();\r
                 return;\r
             }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java
index 8a5b4b8992acd56f63dbc1087741f4f2864fd45b..95441eda39d80f51413e2fd5ffa6840803804f0f 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java
@@ -359,7 +359,7 @@ public class BootModesDlg extends IDialog {
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r

-                Log.err("Incorrect data type for Feature Flag");\r
+                Log.wrn("Update Boot Modes", "Incorrect data type for Feature Flag");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java
index a10d8ebedc8e6f6df36e036be214b8723203d5eb..98c3703534008f58065782e01744d8561a84a207 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java
@@ -361,13 +361,13 @@ public class DataHubsDlg extends IDialog {
         // Check DataHubRecord \r
         //\r
         if (isEmpty(this.jTextFieldDataHubRecord.getText())) {\r
         // Check DataHubRecord \r
         //\r
         if (isEmpty(this.jTextFieldDataHubRecord.getText())) {\r

-            Log.err("Data Hub Record couldn't be empty");\r
+            Log.wrn("Update Hubs", "Data Hub Record couldn't be empty");\r

             return false;\r
         }\r
 \r
         if (!isEmpty(this.jTextFieldDataHubRecord.getText())) {\r
             if (!DataValidation.isC_NameType(this.jTextFieldDataHubRecord.getText())) {\r
             return false;\r
         }\r
 \r
         if (!isEmpty(this.jTextFieldDataHubRecord.getText())) {\r
             if (!DataValidation.isC_NameType(this.jTextFieldDataHubRecord.getText())) {\r

-                Log.err("Incorrect data type for Data Hub Record");\r
+                Log.wrn("Update Hubs", "Incorrect data type for Data Hub Record");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r


@@ -377,7 +377,7 @@ public class DataHubsDlg extends IDialog {
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r

-                Log.err("Incorrect data type for Feature Flag");\r
+                Log.wrn("Update Hubs", "Incorrect data type for Feature Flag");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java
index 663397d9c61644815d1418a33e776ae11fb5532d..3bb8b3b717c9943c474923bbef1f90ded367fa67 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java
@@ -422,13 +422,13 @@ public class EventsDlg extends IDialog {
         // Check Name \r
         //\r
         if (isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {\r
         // Check Name \r
         //\r
         if (isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {\r

-            Log.err("Event Name couldn't be empty");\r
+            Log.wrn("Update Events", "Event Name couldn't be empty");\r

             return false;\r
         }\r
 \r
         if (!isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {\r
             if (!DataValidation.isC_NameType(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {\r
             return false;\r
         }\r
 \r
         if (!isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {\r
             if (!DataValidation.isC_NameType(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {\r

-                Log.err("Incorrect data type for Event Name");\r
+                Log.wrn("Update Events", "Incorrect data type for Event Name");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r


@@ -438,7 +438,7 @@ public class EventsDlg extends IDialog {
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r

-                Log.err("Incorrect data type for Feature Flag");\r
+                Log.wrn("Update Events", "Incorrect data type for Feature Flag");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java
index c85a2231c3865690b99791455333f5b9c5c9fbdc..a67e60fb8ae9a17ea07d8f96bf8d0ce32e0815e4 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java
@@ -338,19 +338,19 @@ public class ExternsDlg extends IDialog implements ItemListener {
             // Check CName \r
             //\r
             if (isEmpty(this.jTextFieldC_Name.getText())) {\r
             // Check CName \r
             //\r
             if (isEmpty(this.jTextFieldC_Name.getText())) {\r

-                Log.err("Value couldn't be empty");\r
+                Log.wrn("Update Externs", "Value couldn't be empty");\r

                 return false;\r
             }\r
 \r
             if (!isEmpty(this.jTextFieldC_Name.getText())) {\r
                 if (this.jComboBoxType.getSelectedItem().toString().equals(EnumerationData.EXTERNS_SPECIFICATION)) {\r
                     if (!DataValidation.isSentence(this.jTextFieldC_Name.getText())) {\r
                 return false;\r
             }\r
 \r
             if (!isEmpty(this.jTextFieldC_Name.getText())) {\r
                 if (this.jComboBoxType.getSelectedItem().toString().equals(EnumerationData.EXTERNS_SPECIFICATION)) {\r
                     if (!DataValidation.isSentence(this.jTextFieldC_Name.getText())) {\r

-                        Log.err("Incorrect data type for Specification");\r
+                        Log.wrn("Update Externs", "Incorrect data type for Specification");\r

                         return false;\r
                     }\r
                 } else {\r
                     if (!DataValidation.isC_NameType(this.jTextFieldC_Name.getText())) {\r
                         return false;\r
                     }\r
                 } else {\r
                     if (!DataValidation.isC_NameType(this.jTextFieldC_Name.getText())) {\r

-                        Log.err("Incorrect data type for C_Name");\r
+                        Log.wrn("Update Externs", "Incorrect data type for C_Name");\r

                         return false;\r
                     }\r
                 }\r
                         return false;\r
                     }\r
                 }\r


@@ -361,13 +361,13 @@ public class ExternsDlg extends IDialog implements ItemListener {
             //\r
             if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
                 if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
             //\r
             if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
                 if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r

-                    Log.err("Incorrect data type for Feature Flag");\r
+                    Log.wrn("Update Externs", "Incorrect data type for Feature Flag");\r

                     return false;\r
                 }\r
             }\r
         } else {\r
             if (this.jComboBoxPcdIsDriver.getSelectedItem().toString().equals(DataType.EMPTY_SELECT_ITEM)) {\r
                     return false;\r
                 }\r
             }\r
         } else {\r
             if (this.jComboBoxPcdIsDriver.getSelectedItem().toString().equals(DataType.EMPTY_SELECT_ITEM)) {\r

-                Log.err("You must select one PCD DRIVER type");\r
+                Log.wrn("Update Externs", "You must select one PCD DRIVER type");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java
index 04f5232dd68bb0fc1159cdd74f95310c460ed687..24d8f942d3ba28a411b74078e37882975532af01 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java
@@ -363,7 +363,7 @@ public class GuidsDlg extends IDialog {
         //\r
         if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {\r
             if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {\r
         //\r
         if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {\r
             if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {\r

-                Log.err("Incorrect data type for Guid Name");\r
+                Log.wrn("Update Guids", "Incorrect data type for Guid Name");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r


@@ -373,7 +373,7 @@ public class GuidsDlg extends IDialog {
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r

-                Log.err("Incorrect data type for Feature Flag");\r
+                Log.wrn("Update Guids", "Incorrect data type for Feature Flag");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java
index e3cf02b5fe872c3b9f208e0180dd6987cbd6e53d..1a024875010b0f10ef4af2b58f90689df1d6325d 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java
@@ -360,13 +360,13 @@ public class HiiPackagesDlg extends IDialog {
         // Check Hii Package Name \r
         //\r
         if (isEmpty(this.jTextFieldName.getText())) {\r
         // Check Hii Package Name \r
         //\r
         if (isEmpty(this.jTextFieldName.getText())) {\r

-            Log.err("Hii Package Name Record couldn't be empty");\r
+            Log.wrn("Update Hii Packages", "Hii Package Name Record couldn't be empty");\r

             return false;\r
         }\r
 \r
         if (!isEmpty(this.jTextFieldName.getText())) {\r
             if (!DataValidation.isC_NameType(this.jTextFieldName.getText())) {\r
             return false;\r
         }\r
 \r
         if (!isEmpty(this.jTextFieldName.getText())) {\r
             if (!DataValidation.isC_NameType(this.jTextFieldName.getText())) {\r

-                Log.err("Incorrect data type for Hii Package Name");\r
+                Log.wrn("Update Hii Packages", "Incorrect data type for Hii Package Name");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r


@@ -376,7 +376,7 @@ public class HiiPackagesDlg extends IDialog {
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r

-                Log.err("Incorrect data type for Feature Flag");\r
+                Log.wrn("Update Hii Packages", "Incorrect data type for Feature Flag");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java
index d12841439da5f610f935bdaa8d9f1063aa8f19bc..a9621a601b2988575225fa72c6664bd39b5112e5 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java
@@ -382,13 +382,13 @@ public class HobsDlg extends IDialog {
         // Check Name \r
         //\r
         if (isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {\r
         // Check Name \r
         //\r
         if (isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {\r

-            Log.err("Hob Name couldn't be empty");\r
+            Log.wrn("Update Hobs", "Hob Name couldn't be empty");\r

             return false;\r
         }\r
 \r
         if (!isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {\r
             if (!DataValidation.isC_NameType(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {\r
             return false;\r
         }\r
 \r
         if (!isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {\r
             if (!DataValidation.isC_NameType(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {\r

-                Log.err("Incorrect data type for Hob Name");\r
+                Log.wrn("Update Hobs", "Incorrect data type for Hob Name");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r


@@ -398,7 +398,7 @@ public class HobsDlg extends IDialog {
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r

-                Log.err("Incorrect data type for Feature Flag");\r
+                Log.wrn("Update Hobs", "Incorrect data type for Feature Flag");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java
index 00fe724ae2ab35ea2a62a5e67fdbb925e16dacdf..cb89109d3dc05ade3d1c5fb8086c3c663d2aa75c 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java
@@ -468,11 +468,11 @@ public class LibraryClassDefsDlg extends IDialog {
         // Check LibraryClass\r
         //\r
         if (this.jComboBoxLibraryClassName.getSelectedItem() == null) {\r
         // Check LibraryClass\r
         //\r
         if (this.jComboBoxLibraryClassName.getSelectedItem() == null) {\r

-            Log.err("No Library Class can be added");\r
+            Log.wrn("Update Library Class Definitions", "No Library Class can be added");\r

             return false;\r
         }\r
         if (!DataValidation.isLibraryClass(this.jComboBoxLibraryClassName.getSelectedItem().toString())) {\r
             return false;\r
         }\r
         if (!DataValidation.isLibraryClass(this.jComboBoxLibraryClassName.getSelectedItem().toString())) {\r

-            Log.err("Incorrect data type for Library Class");\r
+            Log.wrn("Update Library Class Definitions", "Incorrect data type for Library Class");\r

             return false;\r
         }\r
 \r
             return false;\r
         }\r
 \r


@@ -501,7 +501,7 @@ public class LibraryClassDefsDlg extends IDialog {
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r

-                Log.err("Incorrect data type for Feature Flag");\r
+                Log.wrn("Update Library Class Definitions", "Incorrect data type for Feature Flag");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java
index 463cb3cb31d8c9661ae313b2db7055716c264a5c..dcb4946e905360f1556d86619bbe55f9111c8329 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java
@@ -421,7 +421,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
         //\r
         if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {\r
             if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {\r
         //\r
         if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {\r
             if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {\r

-                Log.err("Incorrect data type for C_Name");\r
+                Log.wrn("Update PcdCoded", "Incorrect data type for C_Name");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r


@@ -431,7 +431,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
         //\r
         if (!isEmpty(this.jTextFieldTokenSpaceGuid.getText())) {\r
             if (!DataValidation.isC_NameType(this.jTextFieldTokenSpaceGuid.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldTokenSpaceGuid.getText())) {\r
             if (!DataValidation.isC_NameType(this.jTextFieldTokenSpaceGuid.getText())) {\r

-                Log.err("Incorrect data type for the selected pcd entry, please check in in spd file");\r
+                Log.wrn("Update PcdCoded", "Incorrect data type for the selected pcd entry, please check in in spd file");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r


@@ -441,7 +441,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
         //\r
         if (!isEmpty(this.jTextFieldDefaultValue.getText())) {\r
             if (!DataValidation.isDefaultValueType(this.jTextFieldDefaultValue.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldDefaultValue.getText())) {\r
             if (!DataValidation.isDefaultValueType(this.jTextFieldDefaultValue.getText())) {\r

-                Log.err("Incorrect data type for Default Value");\r
+                Log.wrn("Update PcdCoded", "Incorrect data type for Default Value");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r


@@ -450,7 +450,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
         // Check HelpText\r
         //\r
         if (isEmpty(this.jTextFieldHelpText.getText())) {\r
         // Check HelpText\r
         //\r
         if (isEmpty(this.jTextFieldHelpText.getText())) {\r

-            Log.err("Help Text couldn't be empty");\r
+            Log.wrn("Update PcdCoded", "Help Text couldn't be empty");\r

             return false;\r
         }\r
 \r
             return false;\r
         }\r
 \r


@@ -459,7 +459,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r

-                Log.err("Incorrect data type for Feature Flag");\r
+                Log.wrn("Update PcdCoded", "Incorrect data type for Feature Flag");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r


@@ -500,7 +500,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
         if (arg0.getSource() == this.jComboBoxCName && arg0.getStateChange() == ItemEvent.SELECTED ) {\r
             if (pcd.getPcd(index).getGuidCName() == null || isEmpty(pcd.getPcd(index).getGuidCName())\r
                 || pcd.getPcd(index).getType() == null || pcd.getPcd(index).getHelp() == null || isEmpty(pcd.getPcd(index).getHelp())) {\r
         if (arg0.getSource() == this.jComboBoxCName && arg0.getStateChange() == ItemEvent.SELECTED ) {\r
             if (pcd.getPcd(index).getGuidCName() == null || isEmpty(pcd.getPcd(index).getGuidCName())\r
                 || pcd.getPcd(index).getType() == null || pcd.getPcd(index).getHelp() == null || isEmpty(pcd.getPcd(index).getHelp())) {\r

-                Log.err("select pcd entry when editing msa", "The selected is defined incorrectly.\r\nPlease check it in spd file");\r
+                Log.wrn("select pcd entry when editing msa", "The selected is defined incorrectly.\r\nPlease check it in spd file");\r

             } else {\r
                 this.jTextFieldTokenSpaceGuid.setText(pcd.getPcd(index).getGuidCName());\r
                 Tools.generateComboBoxByVector(this.jComboBoxItemType, pcd.getPcd(index).getType());\r
             } else {\r
                 this.jTextFieldTokenSpaceGuid.setText(pcd.getPcd(index).getGuidCName());\r
                 Tools.generateComboBoxByVector(this.jComboBoxItemType, pcd.getPcd(index).getType());\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java
index 0f96bdf31875a77dd58ee649ca59c0878a431123..d8f6cb5b23f57e5330d534799bbeacc4475e5b27 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java
@@ -386,7 +386,7 @@ public class PackageDepDlg extends IDialog implements ItemListener {
         //\r
         if (!isEmpty(this.jTextFieldPackageVersion.getText())) {\r
             if (!DataValidation.isVersion(this.jTextFieldPackageVersion.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldPackageVersion.getText())) {\r
             if (!DataValidation.isVersion(this.jTextFieldPackageVersion.getText())) {\r

-                Log.err("Incorrect data type for Package Version");\r
+                Log.wrn("Update Package Dependencies", "Incorrect data type for Package Version");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r


@@ -396,7 +396,7 @@ public class PackageDepDlg extends IDialog implements ItemListener {
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r

-                Log.err("Incorrect data type for Feature Flag");\r
+                Log.wrn("Update Package Dependencies", "Incorrect data type for Feature Flag");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java
index f7f50017ff630571f5684c8fc21759543c7b724e..de182cd4ea9c51fba25073b369540c5988c2f62e 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java
@@ -375,7 +375,7 @@ public class PpisDlg extends IDialog implements ItemListener {
         //\r
         if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {\r
             if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {\r
         //\r
         if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {\r
             if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {\r

-                Log.err("Incorrect data type for Ppi/PpiNotify Name");\r
+                Log.wrn("Update Ppis", "Incorrect data type for Ppi/PpiNotify Name");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r


@@ -385,7 +385,7 @@ public class PpisDlg extends IDialog implements ItemListener {
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r

-                Log.err("Incorrect data type for Feature Flag");\r
+                Log.wrn("Update Ppis", "Incorrect data type for Feature Flag");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java
index 0f4970cc88d3b2eb536a5ec3bb509603d143866b..c77585a3af7c4afd3d93de3cd99021cf6609604b 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java
@@ -394,7 +394,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
         //\r
         if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {\r
             if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {\r
         //\r
         if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {\r
             if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {\r

-                Log.err("Incorrect data type for Protocol/ProtocolNotify Name");\r
+                Log.wrn("Update Protocols", "Incorrect data type for Protocol/ProtocolNotify Name");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r


@@ -404,7 +404,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r

-                Log.err("Incorrect data type for Feature Flag");\r
+                Log.wrn("Update Protocols", "Incorrect data type for Feature Flag");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java
index d11c979e25cdb8c315f09ee51afc9dd494948817..d45bd218978c007bd4a6c45e12f11a2b455972d5 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java
@@ -403,11 +403,11 @@ public class SourceFilesDlg extends IDialog {
         // Check Filename\r
         //\r
         if (isEmpty(this.jTextFieldFileName.getText())) {\r
         // Check Filename\r
         //\r
         if (isEmpty(this.jTextFieldFileName.getText())) {\r

-            Log.err("File Name couldn't be empty");\r
+            Log.wrn("Update Source Files", "File Name couldn't be empty");\r

             return false;\r
         }\r
         if (!DataValidation.isFilename(this.jTextFieldFileName.getText())) {\r
             return false;\r
         }\r
         if (!DataValidation.isFilename(this.jTextFieldFileName.getText())) {\r

-            Log.err("Incorrect data type for File Name");\r
+            Log.wrn("Update Source Files", "Incorrect data type for File Name");\r

             return false;\r
         }\r
 \r
             return false;\r
         }\r
 \r


@@ -416,7 +416,7 @@ public class SourceFilesDlg extends IDialog {
         //\r
         if (!isEmpty(this.jTextFieldTagName.getText())) {\r
             if (!DataValidation.isTagName(this.jTextFieldTagName.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldTagName.getText())) {\r
             if (!DataValidation.isTagName(this.jTextFieldTagName.getText())) {\r

-                Log.err("Incorrect data type for Tag Name");\r
+                Log.wrn("Update Source Files", "Incorrect data type for Tag Name");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r


@@ -426,7 +426,7 @@ public class SourceFilesDlg extends IDialog {
         //\r
         if (!isEmpty(this.jTextFieldToolCode.getText())) {\r
             if (!DataValidation.isToolCode(this.jTextFieldToolCode.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldToolCode.getText())) {\r
             if (!DataValidation.isToolCode(this.jTextFieldToolCode.getText())) {\r

-                Log.err("Incorrect data type for Tool Code");\r
+                Log.wrn("Update Source Files", "Incorrect data type for Tool Code");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r


@@ -436,7 +436,7 @@ public class SourceFilesDlg extends IDialog {
         //\r
         if (!isEmpty(this.jTextFieldToolChainFamily.getText())) {\r
             if (!DataValidation.isToolChainFamily(this.jTextFieldToolChainFamily.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldToolChainFamily.getText())) {\r
             if (!DataValidation.isToolChainFamily(this.jTextFieldToolChainFamily.getText())) {\r

-                Log.err("Incorrect data type for Tool Chain Family");\r
+                Log.wrn("Update Source Files", "Incorrect data type for Tool Chain Family");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r


@@ -446,7 +446,7 @@ public class SourceFilesDlg extends IDialog {
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r

-                Log.err("Incorrect data type for Feature Flag");\r
+                Log.wrn("Update Source Files", "Incorrect data type for Feature Flag");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java
index d866e01cd9283c06f3a18bbfd214c6a2eb5b636d..c285626537861106f96022efc2b065cc45ff5804 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java
@@ -362,7 +362,7 @@ public class SystemTablesDlg extends IDialog {
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r

-                Log.err("Incorrect data type for Feature Flag");\r
+                Log.wrn("Update System Tables", "Incorrect data type for Feature Flag");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java
index 1a215cec00106c02ea2c3bee4ef0caacfa2a70e9..7ff3f99536808cf3ee3fe4c5a308b35036522aa8 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java
@@ -391,13 +391,13 @@ public class VariablesDlg extends IDialog {
         // Check VariableName \r
         //\r
         if (isEmpty(this.jTextFieldVariableName.getText())) {\r
         // Check VariableName \r
         //\r
         if (isEmpty(this.jTextFieldVariableName.getText())) {\r

-            Log.err("Variable Name couldn't be empty");\r
+            Log.wrn("Update Variables", "Variable Name couldn't be empty");\r

             return false;\r
         }\r
 \r
         if (!isEmpty(this.jTextFieldVariableName.getText())) {\r
             if (!DataValidation.isHexWordArrayType(this.jTextFieldVariableName.getText())) {\r
             return false;\r
         }\r
 \r
         if (!isEmpty(this.jTextFieldVariableName.getText())) {\r
             if (!DataValidation.isHexWordArrayType(this.jTextFieldVariableName.getText())) {\r

-                Log.err("Incorrect data type for Variable Name");\r
+                Log.wrn("Update Variables", "Incorrect data type for Variable Name");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r


@@ -407,7 +407,7 @@ public class VariablesDlg extends IDialog {
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
             if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r

-                Log.err("Incorrect data type for Feature Flag");\r
+                Log.wrn("Update Variables", "Incorrect data type for Feature Flag");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java
index 046fe8cb6c430e37d489df7cc47f9a3740d53f3a..911469dcc994225a804d0c09127f0351dd19d22d 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java
@@ -639,31 +639,31 @@ public class SpdHeader extends IInternalFrame {
         // Check if all required fields are not empty\r
         //\r
         if (isEmpty(this.jTextFieldBaseName.getText())) {\r
         // Check if all required fields are not empty\r
         //\r
         if (isEmpty(this.jTextFieldBaseName.getText())) {\r

-            Log.err("Base Name couldn't be empty");\r
+            Log.wrn("Update Spd Header", "Base Name couldn't be empty");\r

             return false;\r
         }\r
         if (isEmpty(this.jTextFieldGuid.getText())) {\r
             return false;\r
         }\r
         if (isEmpty(this.jTextFieldGuid.getText())) {\r

-            Log.err("Guid couldn't be empty");\r
+            Log.wrn("Update Spd Header", "Guid couldn't be empty");\r

             return false;\r
         }\r
         if (isEmpty(this.jTextFieldVersion.getText())) {\r
             return false;\r
         }\r
         if (isEmpty(this.jTextFieldVersion.getText())) {\r

-            Log.err("Version couldn't be empty");\r
+            Log.wrn("Update Spd Header", "Version couldn't be empty");\r

             return false;\r
         }\r
         if (isEmpty(this.jTextAreaLicense.getText())) {\r
             return false;\r
         }\r
         if (isEmpty(this.jTextAreaLicense.getText())) {\r

-            Log.err("License couldn't be empty");\r
+            Log.wrn("Update Spd Header", "License couldn't be empty");\r

             return false;\r
         }\r
         if (isEmpty(this.jTextFieldCopyright.getText())) {\r
             return false;\r
         }\r
         if (isEmpty(this.jTextFieldCopyright.getText())) {\r

-            Log.err("Copyright couldn't be empty");\r
+            Log.wrn("Update Spd Header", "Copyright couldn't be empty");\r

             return false;\r
         }\r
         if (isEmpty(this.jTextAreaDescription.getText())) {\r
             return false;\r
         }\r
         if (isEmpty(this.jTextAreaDescription.getText())) {\r

-            Log.err("Description couldn't be empty");\r
+            Log.wrn("Update Spd Header", "Description couldn't be empty");\r

             return false;\r
         }\r
         if (isEmpty(this.jTextFieldAbstract.getText())) {\r
             return false;\r
         }\r
         if (isEmpty(this.jTextFieldAbstract.getText())) {\r

-            Log.err("Abstract couldn't be empty");\r
+            Log.wrn("Update Spd Header", "Abstract couldn't be empty");\r

             return false;\r
         }\r
 \r
             return false;\r
         }\r
 \r


@@ -671,19 +671,19 @@ public class SpdHeader extends IInternalFrame {
         // Check if all fields have correct data types \r
         //\r
         if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) {\r
         // Check if all fields have correct data types \r
         //\r
         if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) {\r

-            Log.err("Incorrect data type for Base Name");\r
+            Log.wrn("Update Spd Header", "Incorrect data type for Base Name");\r

             return false;\r
         }\r
         if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {\r
             return false;\r
         }\r
         if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {\r

-            Log.err("Incorrect data type for Guid");\r
+            Log.wrn("Update Spd Header", "Incorrect data type for Guid");\r

             return false;\r
         }\r
         if (!DataValidation.isAbstract(this.jTextFieldAbstract.getText())) {\r
             return false;\r
         }\r
         if (!DataValidation.isAbstract(this.jTextFieldAbstract.getText())) {\r

-            Log.err("Incorrect data type for Abstract");\r
+            Log.wrn("Update Spd Header", "Incorrect data type for Abstract");\r

             return false;\r
         }\r
         if (!DataValidation.isCopyright(this.jTextFieldCopyright.getText())) {\r
             return false;\r
         }\r
         if (!DataValidation.isCopyright(this.jTextFieldCopyright.getText())) {\r

-            Log.err("Incorrect data type for Copyright");\r
+            Log.wrn("Update Spd Header", "Incorrect data type for Copyright");\r

             return false;\r
         }\r
         return true;\r
             return false;\r
         }\r
         return true;\r


@@ -699,6 +699,7 @@ public class SpdHeader extends IInternalFrame {
         try {\r
             \r
         } catch (Exception e) {\r
         try {\r
             \r
         } catch (Exception e) {\r

+            Log.wrn("Save Package", e.getMessage());\r

             Log.err("Save Package", e.getMessage());\r
         }\r
     }\r
             Log.err("Save Package", e.getMessage());\r
         }\r
     }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java
index 53fb6e4e94514149d3c8a0e684037cdbd70d09ab..486518656b0027f30ffc2c0a903facb92dfe5069 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java
@@ -639,31 +639,31 @@ public class FpdHeader extends IInternalFrame {
         // Check if all required fields are not empty\r
         //\r
         if (isEmpty(this.jTextFieldBaseName.getText())) {\r
         // Check if all required fields are not empty\r
         //\r
         if (isEmpty(this.jTextFieldBaseName.getText())) {\r

-            Log.err("Base Name couldn't be empty");\r
+            Log.wrn("Update Fpd Header", "Base Name couldn't be empty");\r

             return false;\r
         }\r
         if (isEmpty(this.jTextFieldGuid.getText())) {\r
             return false;\r
         }\r
         if (isEmpty(this.jTextFieldGuid.getText())) {\r

-            Log.err("Guid couldn't be empty");\r
+            Log.wrn("Update Fpd Header", "Guid couldn't be empty");\r

             return false;\r
         }\r
         if (isEmpty(this.jTextFieldVersion.getText())) {\r
             return false;\r
         }\r
         if (isEmpty(this.jTextFieldVersion.getText())) {\r

-            Log.err("Version couldn't be empty");\r
+            Log.wrn("Update Fpd Header", "Version couldn't be empty");\r

             return false;\r
         }\r
         if (isEmpty(this.jTextAreaLicense.getText())) {\r
             return false;\r
         }\r
         if (isEmpty(this.jTextAreaLicense.getText())) {\r

-            Log.err("License couldn't be empty");\r
+            Log.wrn("Update Fpd Header", "License couldn't be empty");\r

             return false;\r
         }\r
         if (isEmpty(this.jTextFieldCopyright.getText())) {\r
             return false;\r
         }\r
         if (isEmpty(this.jTextFieldCopyright.getText())) {\r

-            Log.err("Copyright couldn't be empty");\r
+            Log.wrn("Update Fpd Header", "Copyright couldn't be empty");\r

             return false;\r
         }\r
         if (isEmpty(this.jTextAreaDescription.getText())) {\r
             return false;\r
         }\r
         if (isEmpty(this.jTextAreaDescription.getText())) {\r

-            Log.err("Description couldn't be empty");\r
+            Log.wrn("Update Fpd Header", "Description couldn't be empty");\r

             return false;\r
         }\r
         if (isEmpty(this.jTextFieldAbstract.getText())) {\r
             return false;\r
         }\r
         if (isEmpty(this.jTextFieldAbstract.getText())) {\r

-            Log.err("Abstract couldn't be empty");\r
+            Log.wrn("Update Fpd Header", "Abstract couldn't be empty");\r

             return false;\r
         }\r
 \r
             return false;\r
         }\r
 \r


@@ -671,19 +671,19 @@ public class FpdHeader extends IInternalFrame {
         // Check if all fields have correct data types \r
         //\r
         if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) {\r
         // Check if all fields have correct data types \r
         //\r
         if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) {\r

-            Log.err("Incorrect data type for Base Name");\r
+            Log.wrn("Update Fpd Header", "Incorrect data type for Base Name");\r

             return false;\r
         }\r
         if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {\r
             return false;\r
         }\r
         if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {\r

-            Log.err("Incorrect data type for Guid");\r
+            Log.wrn("Update Fpd Header", "Incorrect data type for Guid");\r

             return false;\r
         }\r
         if (!DataValidation.isAbstract(this.jTextFieldAbstract.getText())) {\r
             return false;\r
         }\r
         if (!DataValidation.isAbstract(this.jTextFieldAbstract.getText())) {\r

-            Log.err("Incorrect data type for Abstract");\r
+            Log.wrn("Update Fpd Header", "Incorrect data type for Abstract");\r

             return false;\r
         }\r
         if (!DataValidation.isCopyright(this.jTextFieldCopyright.getText())) {\r
             return false;\r
         }\r
         if (!DataValidation.isCopyright(this.jTextFieldCopyright.getText())) {\r

-            Log.err("Incorrect data type for Copyright");\r
+            Log.wrn("Update Fpd Header", "Incorrect data type for Copyright");\r

             return false;\r
         }\r
         return true;\r
             return false;\r
         }\r
         return true;\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java
index 43ae277eee22abe9caf072d091ab6ee74db712b4..3c575ed3cd437e963d2e6d06260cdd21de124697 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java
@@ -107,7 +107,7 @@ public class WorkspaceTools {
         try {\r
             SaveFile.saveDbFile(strFrameworkDbFilePath, fdb);\r
         } catch (Exception e) {\r
         try {\r
             SaveFile.saveDbFile(strFrameworkDbFilePath, fdb);\r
         } catch (Exception e) {\r

-            e.printStackTrace();\r
+            Log.err("Save Database File", e.getMessage());\r

         }\r
     }\r
 \r
         }\r
     }\r
 \r


@@ -157,7 +157,7 @@ public class WorkspaceTools {
         try {\r
             SaveFile.saveDbFile(strFrameworkDbFilePath, fdb);\r
         } catch (Exception e) {\r
         try {\r
             SaveFile.saveDbFile(strFrameworkDbFilePath, fdb);\r
         } catch (Exception e) {\r

-            e.printStackTrace();\r
+            Log.err("Save Database File", e.getMessage());\r

         }\r
     }\r
 \r
         }\r
     }\r
 \r


@@ -219,11 +219,11 @@ public class WorkspaceTools {
                 }\r
             }\r
         } catch (IOException e) {\r
                 }\r
             }\r
         } catch (IOException e) {\r

-\r
+            Log.err("Get all mdoules of a package " + path, e.getMessage());\r

         } catch (XmlException e) {\r
         } catch (XmlException e) {\r

-\r
+            Log.err("Get all mdoules of a package " + path, e.getMessage());\r

         } catch (Exception e) {\r
         } catch (Exception e) {\r

-\r
+            Log.err("Get all mdoules of a package " + path, e.getMessage());\r

         }\r
         return modulePath;\r
     }\r
         }\r
         return modulePath;\r
     }\r


@@ -247,11 +247,11 @@ public class WorkspaceTools {
                 }\r
             }\r
         } catch (IOException e) {\r
                 }\r
             }\r
         } catch (IOException e) {\r

-\r
+            Log.err("Get all Industry Std Includes of a package " + path, e.getMessage());\r

         } catch (XmlException e) {\r
         } catch (XmlException e) {\r

-\r
+            Log.err("Get all Industry Std Includes of a package " + path, e.getMessage());\r

         } catch (Exception e) {\r
         } catch (Exception e) {\r

-\r
+            Log.err("Get all Industry Std Includes of a package " + path, e.getMessage());\r

         }\r
         return includePath;\r
     }\r
         }\r
         return includePath;\r
     }\r


@@ -277,13 +277,10 @@ public class WorkspaceTools {
                 vPackageList.addElement(new PackageIdentification(id));\r
             } catch (IOException e) {\r
                 Log.err("Open Package Surface Area " + path, e.getMessage());\r
                 vPackageList.addElement(new PackageIdentification(id));\r
             } catch (IOException e) {\r
                 Log.err("Open Package Surface Area " + path, e.getMessage());\r

-\r

             } catch (XmlException e) {\r
                 Log.err("Open Package Surface Area " + path, e.getMessage());\r
             } catch (XmlException e) {\r
                 Log.err("Open Package Surface Area " + path, e.getMessage());\r

-\r

             } catch (Exception e) {\r
                 Log.err("Open Package Surface Area " + path, "Invalid file type");\r
             } catch (Exception e) {\r
                 Log.err("Open Package Surface Area " + path, "Invalid file type");\r

-\r

             }\r
         }\r
         Sort.sortPackages(vPackageList, DataType.SORT_TYPE_ASCENDING);\r
             }\r
         }\r
         Sort.sortPackages(vPackageList, DataType.SORT_TYPE_ASCENDING);\r


@@ -318,13 +315,10 @@ public class WorkspaceTools {
                     v.addElement(new PackageIdentification(id));\r
                 } catch (IOException e) {\r
                     Log.err("Open Package Surface Area " + path, e.getMessage());\r
                     v.addElement(new PackageIdentification(id));\r
                 } catch (IOException e) {\r
                     Log.err("Open Package Surface Area " + path, e.getMessage());\r

-                    e.printStackTrace();\r

                 } catch (XmlException e) {\r
                     Log.err("Open Package Surface Area " + path, e.getMessage());\r
                 } catch (XmlException e) {\r
                     Log.err("Open Package Surface Area " + path, e.getMessage());\r

-                    e.printStackTrace();\r

                 } catch (Exception e) {\r
                     Log.err("Open Package Surface Area " + path, "Invalid file type");\r
                 } catch (Exception e) {\r
                     Log.err("Open Package Surface Area " + path, "Invalid file type");\r

-                    e.printStackTrace();\r

                 }\r
             }\r
         }\r
                 }\r
             }\r
         }\r


@@ -347,13 +341,10 @@ public class WorkspaceTools {
                     v.addElement(new PlatformIdentification(id));\r
                 } catch (IOException e) {\r
                     Log.err("Open Platform Surface Area " + path, e.getMessage());\r
                     v.addElement(new PlatformIdentification(id));\r
                 } catch (IOException e) {\r
                     Log.err("Open Platform Surface Area " + path, e.getMessage());\r

-                    e.printStackTrace();\r

                 } catch (XmlException e) {\r
                     Log.err("Open Platform Surface Area " + path, e.getMessage());\r
                 } catch (XmlException e) {\r
                     Log.err("Open Platform Surface Area " + path, e.getMessage());\r

-                    e.printStackTrace();\r

                 } catch (Exception e) {\r
                     Log.err("Open Platform Surface Area " + path, "Invalid file type");\r
                 } catch (Exception e) {\r
                     Log.err("Open Platform Surface Area " + path, "Invalid file type");\r

-                    e.printStackTrace();\r

                 }\r
             }\r
         }\r
                 }\r
             }\r
         }\r


@@ -378,11 +369,11 @@ public class WorkspaceTools {
                 modulePath = modulePaths.get(index);\r
                 id = getId(modulePath, OpenFile.openMsaFile(modulePath));\r
             } catch (IOException e) {\r
                 modulePath = modulePaths.get(index);\r
                 id = getId(modulePath, OpenFile.openMsaFile(modulePath));\r
             } catch (IOException e) {\r

-                Log.log("Error when Open Module Surface Area " + modulePath, e.getMessage());\r
+                Log.err("Open Module Surface Area " + modulePath, e.getMessage());\r

             } catch (XmlException e) {\r
             } catch (XmlException e) {\r

-                Log.log("Error when Open Module Surface Area " + modulePath, e.getMessage());\r
+                Log.err("Open Module Surface Area " + modulePath, e.getMessage());\r

             } catch (Exception e) {\r
             } catch (Exception e) {\r

-                Log.log("Error when Open Module Surface Area " + modulePath, "Invalid file type " + e.getMessage());\r
+                Log.err("Open Module Surface Area " + modulePath, "Invalid file type " + e.getMessage());\r

             }\r
             v.addElement(new ModuleIdentification(id, pid));\r
         }\r
             }\r
             v.addElement(new ModuleIdentification(id, pid));\r
         }\r


@@ -577,11 +568,11 @@ public class WorkspaceTools {
                     vector.addAll(v);\r
                 }\r
             } catch (IOException e) {\r
                     vector.addAll(v);\r
                 }\r
             } catch (IOException e) {\r

-                // TODO Auto-generated catch block\r
+                Log.err("getAllLibraryClassDefinitionsFromWorkspace ", e.getMessage());\r

             } catch (XmlException e) {\r
             } catch (XmlException e) {\r

-                // TODO Auto-generated catch block\r
+                Log.err("getAllLibraryClassDefinitionsFromWorkspace ", e.getMessage());\r

             } catch (Exception e) {\r
             } catch (Exception e) {\r

-                // TODO Auto-generated catch block\r
+                Log.err("getAllLibraryClassDefinitionsFromWorkspace ", e.getMessage());\r

             }\r
         }\r
         Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r
             }\r
         }\r
         Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r


@@ -603,11 +594,11 @@ public class WorkspaceTools {
                     vector.addAll(v);\r
                 }\r
             } catch (IOException e) {\r
                     vector.addAll(v);\r
                 }\r
             } catch (IOException e) {\r

-                // TODO Auto-generated catch block\r
+                Log.err("getAllProtocolDeclarationsFromPackage", e.getMessage());\r

             } catch (XmlException e) {\r
             } catch (XmlException e) {\r

-                // TODO Auto-generated catch block\r
+                Log.err("getAllProtocolDeclarationsFromPackage", e.getMessage());\r

             } catch (Exception e) {\r
             } catch (Exception e) {\r

-                // TODO Auto-generated catch block\r
+                Log.err("getAllProtocolDeclarationsFromPackage", e.getMessage());\r

             }\r
         }\r
         Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r
             }\r
         }\r
         Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r


@@ -629,11 +620,11 @@ public class WorkspaceTools {
                     vector.addAll(v);\r
                 }\r
             } catch (IOException e) {\r
                     vector.addAll(v);\r
                 }\r
             } catch (IOException e) {\r

-                // TODO Auto-generated catch block\r
+                Log.err("getAllPpiDeclarationsFromWorkspace", e.getMessage());\r

             } catch (XmlException e) {\r
             } catch (XmlException e) {\r

-                // TODO Auto-generated catch block\r
+                Log.err("getAllPpiDeclarationsFromWorkspace", e.getMessage());\r

             } catch (Exception e) {\r
             } catch (Exception e) {\r

-                // TODO Auto-generated catch block\r
+                Log.err("getAllPpiDeclarationsFromWorkspace", e.getMessage());\r

             }\r
         }\r
         Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r
             }\r
         }\r
         Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r


@@ -655,11 +646,11 @@ public class WorkspaceTools {
                     vector.addAll(v);\r
                 }\r
             } catch (IOException e) {\r
                     vector.addAll(v);\r
                 }\r
             } catch (IOException e) {\r

-                // TODO Auto-generated catch block\r
+                Log.err("getAllGuidDeclarationsFromWorkspace", e.getMessage());\r

             } catch (XmlException e) {\r
             } catch (XmlException e) {\r

-                // TODO Auto-generated catch block\r
+                Log.err("getAllGuidDeclarationsFromWorkspace", e.getMessage());\r

             } catch (Exception e) {\r
             } catch (Exception e) {\r

-                // TODO Auto-generated catch block\r
+                Log.err("getAllGuidDeclarationsFromWorkspace", e.getMessage());\r

             }\r
         }\r
         Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r
             }\r
         }\r
         Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r


@@ -680,11 +671,11 @@ public class WorkspaceTools {
                     vector.addAll(v);\r
                 }\r
             } catch (IOException e) {\r
                     vector.addAll(v);\r
                 }\r
             } catch (IOException e) {\r

-                // TODO Auto-generated catch block\r
+                Log.err("getAllPcdDeclarationsFromWorkspace", e.getMessage());\r

             } catch (XmlException e) {\r
             } catch (XmlException e) {\r

-                // TODO Auto-generated catch block\r
+                Log.err("getAllPcdDeclarationsFromWorkspace", e.getMessage());\r

             } catch (Exception e) {\r
             } catch (Exception e) {\r

-                // TODO Auto-generated catch block\r
+                Log.err("getAllPcdDeclarationsFromWorkspace", e.getMessage());\r

             }\r
         }\r
         Sort.sortPcds(vector, DataType.SORT_TYPE_ASCENDING);\r
             }\r
         }\r
         Sort.sortPcds(vector, DataType.SORT_TYPE_ASCENDING);\r


@@ -722,11 +713,11 @@ public class WorkspaceTools {
                         return vPackageList.elementAt(indexI);\r
                     }\r
                 } catch (IOException e) {\r
                         return vPackageList.elementAt(indexI);\r
                     }\r
                 } catch (IOException e) {\r

-\r
+                    Log.err("getPackageIdByModuleId " + id.getPath(), e.getMessage());\r

                 } catch (XmlException e) {\r
                 } catch (XmlException e) {\r

-\r
+                    Log.err("getPackageIdByModuleId " + id.getPath(), e.getMessage());\r

                 } catch (Exception e) {\r
                 } catch (Exception e) {\r

-\r
+                    Log.err("getPackageIdByModuleId " + id.getPath(), e.getMessage());\r

                 }\r
             }\r
         }\r
                 }\r
             }\r
         }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/ui/SwitchWorkspace.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/ui/SwitchWorkspace.java
index 0db3b435fe4063c2c8a8e8f92de90741602880fd..4925ac7cd93a84797d65a575d5fcbd96d4a33fbf 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/ui/SwitchWorkspace.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/ui/SwitchWorkspace.java
@@ -182,11 +182,11 @@ public class SwitchWorkspace extends IDialog {
 \r
     private boolean check() {\r
         if (isEmpty(this.jTextFieldNew.getText())) {\r
 \r
     private boolean check() {\r
         if (isEmpty(this.jTextFieldNew.getText())) {\r

-            Log.err("New workspace can't be empty!");\r
+            Log.wrn("Switch Workspace", "New workspace can't be empty!");\r

             return false;\r
         }\r
         if (!Workspace.checkWorkspace(this.jTextFieldNew.getText())) {\r
             return false;\r
         }\r
         if (!Workspace.checkWorkspace(this.jTextFieldNew.getText())) {\r

-            Log.err("Please select a valid workspace!");\r
+            Log.wrn("Switch Workspace", "Please select a valid workspace!");\r

             return false;\r
         }\r
         return true;\r
             return false;\r
         }\r
         return true;\r