fix logfile.close(), trim \n

[mirror_edk2.git] / Tools / Source / MigrationTools / org / tianocore / migration / Critic.java

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java b/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java
index a234b6e37adb8c6a53395db29f01aa670dd995ca..2d9bb7b14c2a0a0938f9215ca30ae54fa976182d 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java
@@ -63,7 +63,7 @@ public final class Critic {
                                        templine.append(line + "\n");\r
                                } else if (line.matches("\\*\\*\\/")) {\r
                                        incomment = false;\r
-                                       templine.append(line + "\n");\r
+                                       templine.append("\n" + line + "\n");\r
                                } else if (incomment) {\r
                                        if (line.contains("Routine Description:")) {\r
                                                description = true;\r
@@ -73,10 +73,12 @@ public final class Critic {
                                                description = false;\r
                                                arguments = true;\r
                                                returns = false;\r
+                                               templine.append("\n");\r
                                        } else if (line.contains("Returns:")) {\r
                                                description = false;\r
                                                arguments = false;\r
                                                returns = true;\r
+                                               templine.append("\n");\r
                                        } else if (description) {\r
                                                if (line.trim().length() != 0) {\r
                                                        templine.append("  " + line.trim() + "\n");\r
@@ -88,11 +90,12 @@ public final class Critic {
                                                        templine.append("  @param  " + mtrcommentequation.group(1) + "     " + mtrcommentequation.group(2) + "\n");\r
                                                } else if (inequation && line.trim().length() == 0) {\r
                                                        inequation = false;\r
-                                                       templine.append(line + "\n");\r
                                                } else if (inequation && line.trim().length() != 0) {\r
                                                        templine.append("#%#%" + line + "\n");\r
                                                } else {\r
-                                                       templine.append("  " + line.trim() + "\n");\r
+                                                       if (line.trim().length() != 0) {\r
+                                                               templine.append("  " + line.trim() + "\n");\r
+                                                       }\r
                                                }\r
                                        } else if (returns) {\r
                                                mtrcommentequation = ptncommentequation.matcher(line);\r
@@ -101,13 +104,10 @@ public final class Critic {
                                                        templine.append("  @retval " + mtrcommentequation.group(1) + "     " + mtrcommentequation.group(2) + "\n");\r
                                                } else if (inequation && line.trim().length() == 0) {\r
                                                        inequation = false;\r
-                                                       templine.append(line + "\n");\r
                                                } else if (inequation && line.trim().length() != 0) {\r
                                                        templine.append("#%#%" + line + "\n");\r
                                                } else {\r
-                                                       if (line.trim().length() == 0) {\r
-                                                               templine.append("  " + line.trim() + "\n");\r
-                                                       } else {\r
+                                                       if (line.trim().length() != 0) {\r
                                                                templine.append("  @return " + line.trim() + "\n");\r
                                                        }\r
                                                }\r