From a7a7033316a1ca8cf316daf636b78336146df514 Mon Sep 17 00:00:00 2001
From: qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 30 Oct 2006 11:57:37 +0000
Subject: Fix several issues: Misreplace library name Support commenting out
 nonlocal header files for dxs FileArg.class Add a new protocol Guid to
 database

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1864 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Source/MigrationTools/org/tianocore/migration/ModuleReader.java    | 2 +-
 .../MigrationTools/org/tianocore/migration/SourceFileReplacer.java     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'Tools/Java/Source/MigrationTools/org')

diff --git a/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
index f6cfa85582..d6a7ed639e 100644
--- a/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
+++ b/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
@@ -310,7 +310,7 @@ public final class ModuleReader implements Common.ForDoAll {
         }
         
         public boolean recognize(String filename) {
-            return filename.contains(".c") || filename.contains(".h");
+            return filename.contains(".c") || filename.contains(".h") || filename.contains(".dxs");
         }
         
         public String namechange(String oldname) {
diff --git a/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
index cdb833db83..b8d37c3bb6 100644
--- a/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
+++ b/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
@@ -315,7 +315,8 @@ public final class SourceFileReplacer implements Common.ForDoAll {
             if ((r9thing = MigrationTool.db.getR9Func(r8thing)) != null) {
                 if (!r8thing.equals(r9thing)) {
                     if (wholeline.contains(r8thing)) {
-                        wholeline = wholeline.replaceAll(r8thing, r9thing);
+                    	String findString = "(?<!(?:\\d|\\w))" + r8thing + "(?!(?:\\d|\\w))";
+                        wholeline = wholeline.replaceAll(findString, r9thing);
                         filefunc.add(new r8tor9(r8thing, r9thing));
                         Iterator<r8tor9> rt = filefunc.iterator();
                         while (rt.hasNext()) {
-- 
cgit v1.2.3