add .. support

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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Common.java b/Tools/Source/MigrationTools/org/tianocore/migration/Common.java
index 2f10521238c739f6df55cc155c9745a2a2560062..0ca7ca8cb3a16eebfb2203930bfb809e92d65749 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/Common.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/Common.java
@@ -22,8 +22,8 @@ public final class Common {
     public static final int FILE = 1;\r
     public static final int DIR = 2;\r
     \r
-    public static final String strseparate = "(.*)\\\\([^\\\\]*)";\r
-    public static final Pattern ptnseparate = Pattern.compile("(.*)\\\\([^\\\\]*)");\r
+    public static final String STRSEPARATER = "(.*)\\\\([^\\\\]*)";\r
+    public static final Pattern PTNSEPARATER = Pattern.compile("(.*)\\\\([^\\\\]*)");\r
 \r
     //-------------------------------------regex------------------------------------------//\r
     \r
@@ -53,6 +53,7 @@ public final class Common {
         while ((line = rd.readLine()) != null) {\r
             wholefile.append(line + "\n");\r
         }\r
+        rd.close();\r
         return wholefile.toString();\r
     }\r
 \r
@@ -64,6 +65,10 @@ public final class Common {
         outfile.close();\r
     }\r
 \r
+    public static final void fileCopy(String src, String des) throws Exception {\r
+       string2file(file2string(src), des);\r
+    }\r
+    \r
     //-----------------------------------file&string---------------------------------------//\r
 \r
     //--------------------------------------dir--------------------------------------------//\r
@@ -76,7 +81,7 @@ public final class Common {
     */\r
     public static final void ensureDir(String objFileWhole) {\r
         File tempdir;\r
-        Matcher mtrseparate = ptnseparate.matcher(objFileWhole);\r
+        Matcher mtrseparate = PTNSEPARATER.matcher(objFileWhole);\r
         if (mtrseparate.find()) {\r
             tempdir = new File(mtrseparate.group(1));\r
             if (!tempdir.exists()) tempdir.mkdirs();\r
@@ -98,7 +103,7 @@ public final class Common {
     }\r
     \r
     public static final String dirCopy_(String src) throws Exception {\r
-        Matcher mtrseparate = Common.ptnseparate.matcher(src);\r
+        Matcher mtrseparate = Common.PTNSEPARATER.matcher(src);\r
         if (mtrseparate.find()) {\r
             dirCopy(src, mtrseparate.group(1) + File.separator + "_" + mtrseparate.group(2));\r
         }\r
@@ -109,16 +114,28 @@ public final class Common {
         String[] list = new File(src).list();\r
         File test;\r
 \r
+        ensureDir(des);\r
         for (int i = 0 ; i < list.length ; i++) {\r
             test = new File(src + File.separator + list[i]);\r
             if (test.isDirectory()) {\r
                 dirCopy(src + File.separator + list[i], des + File.separator + list[i]);\r
             } else {\r
-                ensureDir(des + File.separator + list[i]);\r
+                //ensureDir(des + File.separator + list[i]);\r
                 string2file(file2string(src + File.separator + list[i]), des + File.separator + list[i]);\r
             }\r
         }\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
+                string2file(file2string(src + File.separator + list[i]), des + File.separator + list[i]);\r
+               }\r
+       }\r
+    }\r
 \r
     //--------------------------------------dir--------------------------------------------//\r
 \r