diff options
| author | alfred <alfred@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-09-07 07:19:39 +0000 |
|---|---|---|
| committer | alfred <alfred@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-09-07 07:19:39 +0000 |
| commit | 99b0f0e6b22edef02dcaaac5ecd6b2ff0993259b (patch) | |
| tree | df7b93e793d66434f30722404df67b2785af24ed /Tools/Source/MigrationTools | |
| parent | 02c768ee72f71bf3fef9c88068081b6112f68614 (diff) | |
| download | edk2-99b0f0e6b22edef02dcaaac5ecd6b2ff0993259b.zip edk2-99b0f0e6b22edef02dcaaac5ecd6b2ff0993259b.tar.gz edk2-99b0f0e6b22edef02dcaaac5ecd6b2ff0993259b.tar.bz2 | |
fix logfile.close(), trim \n
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1490 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'Tools/Source/MigrationTools')
4 files changed, 11 insertions, 12 deletions
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Common.java b/Tools/Source/MigrationTools/org/tianocore/migration/Common.java index 3371a54..5c8629c 100644 --- a/Tools/Source/MigrationTools/org/tianocore/migration/Common.java +++ b/Tools/Source/MigrationTools/org/tianocore/migration/Common.java @@ -184,10 +184,6 @@ public final class Common { Common.string2file(operation(Common.file2string(src)), des);
}
- public void run() {
-
- }
-
public abstract String operation(String wholeline);
public abstract boolean recognize(String filename);
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java b/Tools/Source/MigrationTools/org/tianocore/migration/Critic.java index a234b6e..2d9bb7b 100644 --- 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");
} else if (line.matches("\\*\\*\\/")) {
incomment = false;
- templine.append(line + "\n");
+ templine.append("\n" + line + "\n");
} else if (incomment) {
if (line.contains("Routine Description:")) {
description = true;
@@ -73,10 +73,12 @@ public final class Critic { description = false;
arguments = true;
returns = false;
+ templine.append("\n");
} else if (line.contains("Returns:")) {
description = false;
arguments = false;
returns = true;
+ templine.append("\n");
} else if (description) {
if (line.trim().length() != 0) {
templine.append(" " + line.trim() + "\n");
@@ -88,11 +90,12 @@ public final class Critic { templine.append(" @param " + mtrcommentequation.group(1) + " " + mtrcommentequation.group(2) + "\n");
} else if (inequation && line.trim().length() == 0) {
inequation = false;
- templine.append(line + "\n");
} else if (inequation && line.trim().length() != 0) {
templine.append("#%#%" + line + "\n");
} else {
- templine.append(" " + line.trim() + "\n");
+ if (line.trim().length() != 0) {
+ templine.append(" " + line.trim() + "\n");
+ }
}
} else if (returns) {
mtrcommentequation = ptncommentequation.matcher(line);
@@ -101,13 +104,10 @@ public final class Critic { templine.append(" @retval " + mtrcommentequation.group(1) + " " + mtrcommentequation.group(2) + "\n");
} else if (inequation && line.trim().length() == 0) {
inequation = false;
- templine.append(line + "\n");
} else if (inequation && line.trim().length() != 0) {
templine.append("#%#%" + line + "\n");
} else {
- if (line.trim().length() == 0) {
- templine.append(" " + line.trim() + "\n");
- } else {
+ if (line.trim().length() != 0) {
templine.append(" @return " + line.trim() + "\n");
}
}
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java b/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java index e99a76e..ac03041 100644 --- a/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java +++ b/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java @@ -183,6 +183,7 @@ public final class FirstPanel extends JPanel implements ActionListener, ItemList logfile = new PrintWriter(new BufferedWriter(new FileWriter(startpath.replaceAll(Common.strseparate, "$1") + File.separator + "migration.log")));
MigrationTool.startMigrateAll(startpath);
logfile.flush();
+ logfile.close();
} catch (Exception en) {
println(en.getMessage());
}
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java index 07f93ce..a2bc6c3 100644 --- a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java +++ b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java @@ -240,7 +240,8 @@ public final class SourceFileReplacer implements Common.ForDoAll { }
}
//---------------------------------------inner classes---------------------------------------//
-
+
+ //-------------------------------------process functions-------------------------------------//
private static final String addincludefile(String wholeline, String hfile) {
return wholeline.replaceFirst("(\\*/\\s)", "$1\n#include " + hfile + "\n");
}
@@ -315,6 +316,7 @@ public final class SourceFileReplacer implements Common.ForDoAll { mi.localmodulesources.add("R8Lib.h");
mi.localmodulesources.add("R8Lib.c");
}
+ //-------------------------------------process functions-------------------------------------//
//-----------------------------------ForDoAll-----------------------------------//
public void run(String filepath) throws Exception {
|