little modify

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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
index ad50952ec844591a1976059bb0d103fcba646205..cf1cabe22a6506640ab4f41985acaa27fa36bc03 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
@@ -27,22 +27,26 @@ public final class ModuleReader {
        \r
        public static final void ModuleScan(ModuleInfo m) throws Exception {\r
                mi = m;\r
-               \r
+\r
                Common.toDoAll(mi.modulepath, ModuleInfo.class.getMethod("enroll", String.class), mi, null, Common.FILE);\r
-               \r
+\r
                String filename = null;\r
                if (mi.msaorinf.isEmpty()) {\r
                        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
                } else if (filename.contains(".msa")) {\r
                        readMsa(filename);\r
                }\r
-               \r
+\r
                CommentOutNonLocalHFile();\r
                parsePreProcessedSourceCode();\r
 \r
@@ -203,7 +207,7 @@ public final class ModuleReader {
                        // find guid\r
                        matguid = Guid.ptnguid.matcher(line);                                                                           // several ways to implement this , which one is faster ? :\r
                        while (matguid.find()) {                                                                                                        // 1.currently , find once , then call to identify which is it\r
-                               if ((temp = Guid.register(matguid, mi, MigrationTool.db)) != null) {                            // 2.use 3 different matchers , search 3 times to find each\r
+                               if ((temp = Guid.register(matguid, mi, ModuleInfo.db)) != null) {                               // 2.use 3 different matchers , search 3 times to find each\r
                                        //matguid.appendReplacement(result, ModuleInfo.db.getR9Guidname(temp));         // search the database for all 3 kinds of guids , high cost\r
                                }\r
                        }\r
@@ -220,7 +224,7 @@ public final class ModuleReader {
                        // find function call\r
                        matfuncc = Func.ptnfuncc.matcher(line);\r
                        while (matfuncc.find()) {\r
-                               if ((temp = Func.register(matfuncc, mi, MigrationTool.db)) != null) {\r
+                               if ((temp = Func.register(matfuncc, mi, ModuleInfo.db)) != null) {\r
                                        //ModuleInfo.ui.println(ifile + "  dofunc  " + temp);\r
                                        //matfuncc.appendReplacement(result, ModuleInfo.db.getR9Func(temp));\r
                                }\r
@@ -231,7 +235,7 @@ public final class ModuleReader {
                        // find macro\r
                        matmacro = Macro.ptntmacro.matcher(line);\r
                        while (matmacro.find()) {\r
-                               if ((temp = Macro.register(matmacro, mi, MigrationTool.db)) != null) {\r
+                               if ((temp = Macro.register(matmacro, mi, ModuleInfo.db)) != null) {\r
                                }\r
                        }\r
                        \r
@@ -243,7 +247,7 @@ public final class ModuleReader {
 \r
                        matfuncd = Func.ptnfuncd.matcher(line);\r
                        while (matfuncd.find()) {\r
-                               if ((temp = Func.register(matfuncd, mi, MigrationTool.db)) != null) {\r
+                               if ((temp = Func.register(matfuncd, mi, ModuleInfo.db)) != null) {\r
                                }\r
                        }\r
                }\r