little modify

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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
index fdc6aca781fe48c3e4c54f0dfd8a3953423bca24..958e6bda4c02baa3a26d15bb6fab62ffdc20fa1b 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
@@ -34,7 +34,7 @@ public final class ModuleInfo {
                }\r
        }\r
 \r
-       public String modulepath = null;\r
+       public final String modulepath;\r
        \r
        public String outputpath = null;\r
        \r

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
index d55cf6e893931b144687a0599dc86094848daf04..cf1cabe22a6506640ab4f41985acaa27fa36bc03 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
@@ -35,7 +35,11 @@ public final class ModuleReader {
                        ModuleInfo.ui.println("No INF nor MSA file found!");\r
                        System.exit(0);\r
                } else {\r
-                       filename = ModuleInfo.ui.choose("Found .inf or .msa file for module\n" + mi.modulepath + "\nChoose one Please", mi.msaorinf.toArray());\r
+                       if (mi.msaorinf.size() == 1) {\r
+                               filename = (String)mi.msaorinf.toArray()[0];\r
+                       } else {\r
+                               filename = ModuleInfo.ui.choose("Found .inf or .msa file for module\n" + mi.modulepath + "\nChoose one Please", mi.msaorinf.toArray());\r
+                       }\r
                }\r
                if (filename.contains(".inf")) {\r
                        readInf(filename);\r

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
index 7d4c13ba96668ff3f328b9cff29ada8ed8aa9cb2..7d9859c815c34cf52b5607d41260fb740d08530b 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
@@ -44,9 +44,12 @@ public final class SourceFileReplacer {
                \r
                String outname = null;\r
                String inname = null;\r
+               /*\r
                if (ModuleInfo.ui.yesOrNo("Changes will be made to the Source Code.  View details?")) {\r
                        showdetails = true;\r
                }\r
+               */\r
+               showdetails = true;                     // set this as default now, may be changed in the future\r
                \r
                Iterator<String> di = mi.localmodulesources.iterator();\r
                while (di.hasNext()) {\r