convert \t to

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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Common.java b/Tools/Source/MigrationTools/org/tianocore/migration/Common.java
index 0ca7ca8cb3a16eebfb2203930bfb809e92d65749..b2265c0c5ea4af49993bbaca24e5bc97188c826a 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/Common.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/Common.java
@@ -66,7 +66,7 @@ public final class Common {
     }\r
 \r
     public static final void fileCopy(String src, String des) throws Exception {\r
     }\r
 \r
     public static final void fileCopy(String src, String des) throws Exception {\r

-       string2file(file2string(src), des);\r
+        string2file(file2string(src), des);\r

     }\r
     \r
     //-----------------------------------file&string---------------------------------------//\r
     }\r
     \r
     //-----------------------------------file&string---------------------------------------//\r


@@ -127,14 +127,14 @@ public final class Common {
     }\r
     \r
     public static final void oneLevelDirCopy(String src, String des, String type) throws Exception {\r
     }\r
     \r
     public static final void oneLevelDirCopy(String src, String des, String type) throws Exception {\r

-       String[] list = new File(src).list();\r
-       \r
-       ensureDir(des);\r
-       for (int i = 0; i < list.length; i++) {\r
-               if (list[i].contains(type)) {\r
+        String[] list = new File(src).list();\r
+        \r
+        ensureDir(des);\r
+        for (int i = 0; i < list.length; i++) {\r
+            if (list[i].contains(type)) {\r

                 string2file(file2string(src + File.separator + list[i]), des + File.separator + list[i]);\r
                 string2file(file2string(src + File.separator + list[i]), des + File.separator + list[i]);\r

-               }\r
-       }\r
+            }\r
+        }\r

     }\r
 \r
     //--------------------------------------dir--------------------------------------------//\r
     }\r
 \r
     //--------------------------------------dir--------------------------------------------//\r

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
index 004950f96b5fa2437a26dbe833bbbc506596fb71..cb1e886009211b49e45b3fb5124e5f08336a5fec 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
@@ -74,7 +74,7 @@ public class MigrationTool {
     }\r
 \r
     public static final String getTempDir(String modulepath) {\r
     }\r
 \r
     public static final String getTempDir(String modulepath) {\r

-       return "C:" + File.separator + "MigrationTool_Temp" + modulepath.replace(startpath, "");\r
+        return "C:" + File.separator + "MigrationTool_Temp" + modulepath.replace(startpath, "");\r

     }\r
 \r
     private static final String assignOutPutPath(String inputpath) {\r
     }\r
 \r
     private static final String assignOutPutPath(String inputpath) {\r


@@ -92,7 +92,7 @@ public class MigrationTool {
     }\r
 \r
     public static final void startMigrateAll(String path) throws Exception {\r
     }\r
 \r
     public static final void startMigrateAll(String path) throws Exception {\r

-       startpath = path;\r
+        startpath = path;\r

         MigrationTool.ui.println("Project Migration");\r
         MigrationTool.ui.println("Copyright (c) 2006, Intel Corporation");\r
         \r
         MigrationTool.ui.println("Project Migration");\r
         MigrationTool.ui.println("Copyright (c) 2006, Intel Corporation");\r
         \r

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
index 5467b3eff464a673a96f6de79edfeb1ace087478..7880f2bd6c3aee8653b5d7f1d8d74e9e5551515f 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
@@ -19,7 +19,7 @@ import java.util.regex.*;
 import org.tianocore.*;\r
 \r
 public final class ModuleReader implements Common.ForDoAll {\r
 import org.tianocore.*;\r
 \r
 public final class ModuleReader implements Common.ForDoAll {\r

-       private static final ModuleReader modulereader = new ModuleReader();\r
+    private static final ModuleReader modulereader = new ModuleReader();\r

     private ModuleInfo mi;\r
     private final CommentLaplace commentlaplace = new CommentLaplace();\r
     \r
     private ModuleInfo mi;\r
     private final CommentLaplace commentlaplace = new CommentLaplace();\r
     \r


@@ -113,7 +113,7 @@ public final class ModuleReader implements Common.ForDoAll {
             if (mtrsection.group(1).contains("sources.")) {\r
                 mtrfilename = ptnfilename.matcher(mtrsection.group(2));\r
                 while (mtrfilename.find()) {\r
             if (mtrsection.group(1).contains("sources.")) {\r
                 mtrfilename = ptnfilename.matcher(mtrsection.group(2));\r
                 while (mtrfilename.find()) {\r

-                       mi.infsources.add(mtrfilename.group());\r
+                    mi.infsources.add(mtrfilename.group());\r

                     if (!mi.localmodulesources.contains(mtrfilename.group())) {\r
                         MigrationTool.ui.println("Warn: Source File Missing! : " + mtrfilename.group());\r
                     }\r
                     if (!mi.localmodulesources.contains(mtrfilename.group())) {\r
                         MigrationTool.ui.println("Warn: Source File Missing! : " + mtrfilename.group());\r
                     }\r


@@ -122,45 +122,45 @@ public final class ModuleReader implements Common.ForDoAll {
             if (mtrsection.group(1).matches("includes.")) {\r
                 mtrfilename = ptnfilename.matcher(mtrsection.group(2));\r
                 while (mtrfilename.find()) {\r
             if (mtrsection.group(1).matches("includes.")) {\r
                 mtrfilename = ptnfilename.matcher(mtrsection.group(2));\r
                 while (mtrfilename.find()) {\r

-                       mi.infincludes.add(mtrfilename.group());\r
+                    mi.infincludes.add(mtrfilename.group());\r

                 }\r
             }\r
         }\r
     }\r
     \r
     private final void preProcessModule() throws Exception {\r
                 }\r
             }\r
         }\r
     }\r
     \r
     private final void preProcessModule() throws Exception {\r

-       // according to .inf file, add extraordinary includes and sourcefiles\r
-        Common.dirCopy(mi.modulepath, mi.temppath);    // collect all Laplace.namechange to here???\r
+        // according to .inf file, add extraordinary includes and sourcefiles\r
+        Common.dirCopy(mi.modulepath, mi.temppath);    // collect all Laplace.namechange to here???\r

         \r
         \r

-       if (!mi.infincludes.isEmpty()) {\r
+        if (!mi.infincludes.isEmpty()) {\r

             Iterator<String> it = mi.infincludes.iterator();\r
             String tempincludename = null;\r
             Iterator<String> it = mi.infincludes.iterator();\r
             String tempincludename = null;\r

-               while (it.hasNext()) {\r
-                       tempincludename = it.next();\r
-                       if (tempincludename.contains("..")) {\r
-                               Matcher mtr = Common.PTNSEPARATER.matcher(tempincludename);\r
-                               if (mtr.find() && !mtr.group(2).matches(".")) {\r
-                                       Common.oneLevelDirCopy(mi.modulepath.replaceAll(Common.STRSEPARATER, "$1") + File.separator + mtr.group(2), mi.temppath, ".h");\r
-                               } else {\r
-                                       Common.oneLevelDirCopy(mi.modulepath.replaceAll(Common.STRSEPARATER, "$1"), mi.temppath, ".h");\r
-                               }\r
-                       }\r
-               }\r
-       }\r
-       if (!mi.infsources.isEmpty()) {\r
+            while (it.hasNext()) {\r
+                tempincludename = it.next();\r
+                if (tempincludename.contains("..")) {\r
+                    Matcher mtr = Common.PTNSEPARATER.matcher(tempincludename);\r
+                    if (mtr.find() && !mtr.group(2).matches(".")) {\r
+                        Common.oneLevelDirCopy(mi.modulepath.replaceAll(Common.STRSEPARATER, "$1") + File.separator + mtr.group(2), mi.temppath, ".h");\r
+                    } else {\r
+                        Common.oneLevelDirCopy(mi.modulepath.replaceAll(Common.STRSEPARATER, "$1"), mi.temppath, ".h");\r
+                    }\r
+                }\r
+            }\r
+        }\r
+        if (!mi.infsources.isEmpty()) {\r

             Iterator<String> it = mi.infsources.iterator();\r
             String tempsourcename = null;\r
             while (it.hasNext()) {\r
             Iterator<String> it = mi.infsources.iterator();\r
             String tempsourcename = null;\r
             while (it.hasNext()) {\r

-               tempsourcename = it.next();\r
-               if (tempsourcename.contains("..")) {\r
-                       Common.ensureDir(mi.temppath + File.separator + "MT_Parent_Sources");\r
-                               Matcher mtr = Common.PTNSEPARATER.matcher(tempsourcename);\r
-                               if (mtr.find()) {\r
-                                       Common.fileCopy(mi.modulepath.replaceAll(Common.STRSEPARATER, "$1") + File.separator + mtr.group(2), mi.temppath + File.separator + "MT_Parent_Sources" + File.separator + mtr.group(2));\r
-                               }\r
-               }\r
+                tempsourcename = it.next();\r
+                if (tempsourcename.contains("..")) {\r
+                    Common.ensureDir(mi.temppath + File.separator + "MT_Parent_Sources");\r
+                    Matcher mtr = Common.PTNSEPARATER.matcher(tempsourcename);\r
+                    if (mtr.find()) {\r
+                        Common.fileCopy(mi.modulepath.replaceAll(Common.STRSEPARATER, "$1") + File.separator + mtr.group(2), mi.temppath + File.separator + "MT_Parent_Sources" + File.separator + mtr.group(2));\r
+                    }\r
+                }\r

             }\r
             }\r

-       }\r
+        }\r

 \r
         //CommentOutNonLocalHFile();\r
         Common.toDoAll(mi.temppath, this, Common.FILE);\r
 \r
         //CommentOutNonLocalHFile();\r
         Common.toDoAll(mi.temppath, this, Common.FILE);\r


@@ -268,38 +268,38 @@ public final class ModuleReader implements Common.ForDoAll {
     \r
     public class CommentLaplace extends Common.Laplace {\r
         public String operation(String wholeline) {\r
     \r
     public class CommentLaplace extends Common.Laplace {\r
         public String operation(String wholeline) {\r

-               StringBuffer wholebuffer = new StringBuffer();\r
-               String templine = null;\r
+            StringBuffer wholebuffer = new StringBuffer();\r
+            String templine = null;\r

             Pattern ptnincludefile = Pattern.compile("[\"<](.*[.]h)[\">]");\r
             Pattern ptninclude = Pattern.compile("#include\\s*(.*)");\r
             Matcher mtrinclude = ptninclude.matcher(wholeline);\r
             Matcher mtrincludefile = null;\r
             while (mtrinclude.find()) {\r
             Pattern ptnincludefile = Pattern.compile("[\"<](.*[.]h)[\">]");\r
             Pattern ptninclude = Pattern.compile("#include\\s*(.*)");\r
             Matcher mtrinclude = ptninclude.matcher(wholeline);\r
             Matcher mtrincludefile = null;\r
             while (mtrinclude.find()) {\r

-               mtrincludefile = ptnincludefile.matcher(mtrinclude.group(1));\r
-               if (mtrincludefile.find() && mi.localmodulesources.contains(mtrincludefile.group(1))) {\r
-                       templine = mtrinclude.group();\r
-               } else {\r
-                       templine = MigrationTool.MIGRATIONCOMMENT + mtrinclude.group();\r
-               }\r
-               mtrinclude.appendReplacement(wholebuffer, templine);\r
+                mtrincludefile = ptnincludefile.matcher(mtrinclude.group(1));\r
+                if (mtrincludefile.find() && mi.localmodulesources.contains(mtrincludefile.group(1))) {\r
+                    templine = mtrinclude.group();\r
+                } else {\r
+                    templine = MigrationTool.MIGRATIONCOMMENT + mtrinclude.group();\r
+                }\r
+                mtrinclude.appendReplacement(wholebuffer, templine);\r

             }\r
             mtrinclude.appendTail(wholebuffer);\r
             return wholebuffer.toString();\r
         }\r
         \r
         public boolean recognize(String filename) {\r
             }\r
             mtrinclude.appendTail(wholebuffer);\r
             return wholebuffer.toString();\r
         }\r
         \r
         public boolean recognize(String filename) {\r

-               return filename.contains(".c") || filename.contains(".h");\r
+            return filename.contains(".c") || filename.contains(".h");\r

         }\r
         \r
         public String namechange(String oldname) {\r
         }\r
         \r
         public String namechange(String oldname) {\r

-               return oldname;\r
+            return oldname;\r

         }\r
     }\r
 \r
     //-----------------------------------ForDoAll-----------------------------------//\r
     public void run(String filepath) throws Exception {\r
         }\r
     }\r
 \r
     //-----------------------------------ForDoAll-----------------------------------//\r
     public void run(String filepath) throws Exception {\r

-       String name = mi.temppath + File.separator + filepath.replace(mi.temppath + File.separator, "");\r
-       commentlaplace.transform(name, name);\r
+        String name = mi.temppath + File.separator + filepath.replace(mi.temppath + File.separator, "");\r
+        commentlaplace.transform(name, name);\r

     }\r
 \r
     public boolean filter(File dir) {\r
     }\r
 \r
     public boolean filter(File dir) {\r


@@ -308,11 +308,11 @@ public final class ModuleReader implements Common.ForDoAll {
     //-----------------------------------ForDoAll-----------------------------------//\r
     \r
     public final void setModuleInfo(ModuleInfo m) {\r
     //-----------------------------------ForDoAll-----------------------------------//\r
     \r
     public final void setModuleInfo(ModuleInfo m) {\r

-       mi = m;\r
+        mi = m;\r

     }\r
     \r
     public static final void aimAt(ModuleInfo mi) throws Exception {\r
     }\r
     \r
     public static final void aimAt(ModuleInfo mi) throws Exception {\r

-       modulereader.setModuleInfo(mi);\r
-       modulereader.ModuleScan();\r
+        modulereader.setModuleInfo(mi);\r
+        modulereader.ModuleScan();\r

     }\r
 }\r
     }\r
 }\r