Adjust code format and remove unused code.

[mirror_edk2.git] / Tools / Source / Cpptasks / net / sf / antcontrib / cpptasks / userdefine / UserDefineMapping.java

diff --git a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineMapping.java b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineMapping.java
index 282bf689d16609fda65b7097b2d865a3d69af567..491cadd7f52393f97527ca10bbb12583e0c4cb72 100644 (file)
--- a/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineMapping.java
+++ b/Tools/Source/Cpptasks/net/sf/antcontrib/cpptasks/userdefine/UserDefineMapping.java
@@ -15,32 +15,47 @@
  *  limitations under the License.\r
  */\r
 package net.sf.antcontrib.cpptasks.userdefine;\r
-public class UserDefineMapping {\r
-\r
-\r
-    // list of Vendor: Microsoft, Intel, Gcc\r
-    public final String[] families = { "MSFT", "INTEL", "GCC"};\r
 \r
-    // list of Command Type: CC, SLINK, DLINK, ASL, ASM, ASMLINK, PP\r
-    public final String[] commandType = { "CC", "SLINK", "DLINK", "ASL",\r
-            "ASM", "ASMLINK", "PP" };\r
+/**\r
+ * Relationship between {family, command type} and flags\r
+ * \r
+ */\r
+public class UserDefineMapping {\r
 \r
-    public final String[][] includePathFlag = { { "MSFT_CC", "/I" },\r
-            { "GCC_CC", "-I" }, { "INTEL_CC", "/I" }, { "WINDDK_CC", "/I" },\r
-            { "MSFT_ASM", "/I" }, { "GCC_ASM", "-I" }, { "WINDDK_CC", "/I" },\r
-            { "MSFT_PP", "/I" }, { "GCC_PP", "-I" }, { "WINDDK_PP", "/I" } };\r
+    /**\r
+     * Mapping info: include path delimiter <--> family (vendor) + command type\r
+     */\r
+    public static final String[][] includePathFlag = { { "MSFT_CC", "/I" },\r
+                    { "GCC_CC", "-I" }, { "INTEL_CC", "/I" },\r
+                    { "WINDDK_CC", "/I" }, { "MSFT_ASM", "/I" },\r
+                    { "GCC_ASM", "-I" }, { "WINDDK_CC", "/I" },\r
+                    { "MSFT_PP", "/I" }, { "GCC_PP", "-I" },\r
+                    { "WINDDK_PP", "/I" } };\r
 \r
-    public final String[][] outputFileFlag = { { "MSFT_CC", "/Fo" },\r
-            { "GCC_CC", "-o" }, { "INTEL_CC", "/Fo" }, { "WINDDK_CC", "/Fo" },\r
-            { "MSFT_SLINK", "/OUT:" }, { "GCC_SLINK", "-cr" },\r
-            { "INTEL_SLINK", "/OUT:" }, { "WINDDK_SLINK", "/OUT:" },\r
-            { "MSFT_DLINK", "/OUT:" }, { "GCC_DLINK", "-o" },\r
-            { "INTEL_DLINK", "/OUT:" }, { "WINDDK_DLINK", "/OUT:" },\r
-            { "MSFT_ASM", "/Fo" }, { "GCC_ASM", "-o" },\r
-            { "WINDDK_ASM", "/Fo" },{"WINDDK_IPF_ASM", "-o"} };\r
+    /**\r
+     * Mapping info: output file flag <--> family (vendor) + command type\r
+     */\r
+    public static final String[][] outputFileFlag = { { "MSFT_CC", "/Fo" },\r
+                    { "GCC_CC", "-o" }, { "INTEL_CC", "/Fo" },\r
+                    { "WINDDK_CC", "/Fo" }, { "MSFT_SLINK", "/OUT:" },\r
+                    { "GCC_SLINK", "-cr" }, { "INTEL_SLINK", "/OUT:" },\r
+                    { "WINDDK_SLINK", "/OUT:" }, { "MSFT_DLINK", "/OUT:" },\r
+                    { "GCC_DLINK", "-o" }, { "INTEL_DLINK", "/OUT:" },\r
+                    { "WINDDK_DLINK", "/OUT:" }, { "MSFT_ASM", "/Fo" },\r
+                    { "GCC_ASM", "-o" }, { "WINDDK_ASM", "/Fo" },\r
+                    { "WINDDK_IPF_ASM", "-o" } };\r
 \r
-    public String getIncludePathDelimiter(String vendor,\r
-            String commandType) {\r
+    /**\r
+     * Get include delimiter with vendow and command type.\r
+     * \r
+     * @param vendor\r
+     *            Vendor\r
+     * @param commandType\r
+     *            Command Type\r
+     * @return include path delimiter\r
+     */\r
+    public static String getIncludePathDelimiter(String vendor,\r
+                    String commandType) {\r
         String key = vendor + "_" + commandType;\r
         for (int i = 0; i < includePathFlag.length; i++) {\r
             if (includePathFlag[i][0].equalsIgnoreCase(key)) {\r
@@ -50,7 +65,16 @@ public class UserDefineMapping {
         return "/I";\r
     }\r
 \r
-    public String getOutputFileFlag(String vendor, String commandType) {\r
+    /**\r
+     * Get Output Flag with vendor and command type.\r
+     * \r
+     * @param vendor\r
+     *            Vendor\r
+     * @param commandType\r
+     *            Command Type\r
+     * @return Output File Flag\r
+     */\r
+    public static String getOutputFileFlag(String vendor, String commandType) {\r
         String key = vendor + "_" + commandType;\r
         for (int i = 0; i < outputFileFlag.length; i++) {\r
             if (outputFileFlag[i][0].equalsIgnoreCase(key)) {\r