Add new-line characters in error message to make them shorter in multi-lines.

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
index 67b7ad8c3c63a7cb4792df64b81e263427cc9614..d08202b94ec9f924c3ed691cffc4e418d6089580 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
@@ -1184,7 +1184,7 @@ public class FpdFileContents {
                 //\r
                 // ToDo Error \r
                 //\r
                 //\r
                 // ToDo Error \r
                 //\r

-                throw new PcdDeclNotFound("No Declaration for PCD Entry " + msaPcd.getCName() + " used by Module "\r
+                throw new PcdDeclNotFound("No Declaration for PCD Entry " + msaPcd.getCName() + "\n used by Module "\r

                                           + mi.getName() + " or its Library Instances.");\r
             }\r
             //\r
                                           + mi.getName() + " or its Library Instances.");\r
             }\r
             //\r


@@ -3703,10 +3703,10 @@ class PcdItemTypeConflictException extends Exception {
     PcdItemTypeConflictException (String pcdName, String info) {\r
         ModuleIdentification mi = WorkspaceProfile.getModuleId(info);\r
         if (mi != null) {\r
     PcdItemTypeConflictException (String pcdName, String info) {\r
         ModuleIdentification mi = WorkspaceProfile.getModuleId(info);\r
         if (mi != null) {\r

-            details = pcdName + " ItemType Conflicts with " + mi.getName() + " in Pkg " + mi.getPackageId().getName();    \r
+            details = pcdName + " ItemType Conflicts with " + mi.getName() + "\n in Pkg " + mi.getPackageId().getName();    \r

         }\r
         else {\r
         }\r
         else {\r

-            details = pcdName + " ItemType Conflicts with " + info;\r
+            details = pcdName + " ItemType Conflicts with \n" + info;\r

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


@@ -3729,7 +3729,7 @@ class PcdItemTypeConflictException extends Exception {
             moduleInfo2 = info2;\r
         }\r
         \r
             moduleInfo2 = info2;\r
         }\r
         \r

-        details = pcdName + " ItemType Conflicts in " + moduleInfo1 + " and " + moduleInfo2;\r
+        details = pcdName + " ItemType Conflicts in \n" + moduleInfo1 + "\n and " + moduleInfo2;\r

     }\r
     \r
     public String getMessage() {\r
     }\r
     \r
     public String getMessage() {\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
index 72da8bd72c81a83ef0135f08e542f9a67485dc19..380a702eb4d0216c2608dcb52181966f1b0e4f0f 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
@@ -1189,7 +1189,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
                         addLibInstance (libMi);\r
                     }\r
                     catch (Exception exception) {\r
                         addLibInstance (libMi);\r
                     }\r
                     catch (Exception exception) {\r

-                        JOptionPane.showMessageDialog(frame, "Adding Instance" + libMi.getName() + ": "+ exception.getMessage());\r
+                        JOptionPane.showMessageDialog(frame, "Adding Instance " + libMi.getName() + " : \n"+ exception.getMessage());\r

                         return;\r
                     }\r
                     docConsole.setSaved(false);\r
                         return;\r
                     }\r
                     docConsole.setSaved(false);\r