From 73991f03501d64900b8d63fa87daa642e9c70a05 Mon Sep 17 00:00:00 2001 From: Gintas Grigelionis Date: Mon, 2 Apr 2018 20:17:20 +0200 Subject: [PATCH] Use switch --- .../tools/ant/taskdefs/condition/Os.java | 79 +++++++++++-------- .../optional/ejb/GenericDeploymentTool.java | 16 ++-- .../taskdefs/optional/vss/MSVSSHISTORY.java | 25 +++--- .../apache/tools/ant/types/PropertySet.java | 24 +++--- 4 files changed, 84 insertions(+), 60 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java index da638584a..716375aa0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java @@ -272,39 +272,52 @@ public class Os implements Condition { || OS_NAME.contains("ce")); isNT = !is9x; } - if (family.equals(FAMILY_WINDOWS)) { - isFamily = isWindows; - } else if (family.equals(FAMILY_9X)) { - isFamily = isWindows && is9x; - } else if (family.equals(FAMILY_NT)) { - isFamily = isWindows && isNT; - } else if (family.equals(FAMILY_OS2)) { - isFamily = OS_NAME.contains(FAMILY_OS2); - } else if (family.equals(FAMILY_NETWARE)) { - isFamily = OS_NAME.contains(FAMILY_NETWARE); - } else if (family.equals(FAMILY_DOS)) { - isFamily = PATH_SEP.equals(";") && !isFamily(FAMILY_NETWARE); - } else if (family.equals(FAMILY_MAC)) { - isFamily = OS_NAME.contains(FAMILY_MAC) - || OS_NAME.contains(DARWIN); - } else if (family.equals(FAMILY_TANDEM)) { - isFamily = OS_NAME.contains("nonstop_kernel"); - } else if (family.equals(FAMILY_UNIX)) { - isFamily = PATH_SEP.equals(":") - && !isFamily(FAMILY_VMS) - && (!isFamily(FAMILY_MAC) || OS_NAME.endsWith("x") - || OS_NAME.contains(DARWIN)); - } else if (family.equals(FAMILY_ZOS)) { - isFamily = OS_NAME.contains(FAMILY_ZOS) - || OS_NAME.contains("os/390"); - } else if (family.equals(FAMILY_OS400)) { - isFamily = OS_NAME.contains(FAMILY_OS400); - } else if (family.equals(FAMILY_VMS)) { - isFamily = OS_NAME.contains(FAMILY_VMS); - } else { - throw new BuildException( - "Don\'t know how to detect os family \"" - + family + "\""); + switch (family) { + case FAMILY_WINDOWS: + isFamily = isWindows; + break; + case FAMILY_9X: + isFamily = isWindows && is9x; + break; + case FAMILY_NT: + isFamily = isWindows && isNT; + break; + case FAMILY_OS2: + isFamily = OS_NAME.contains(FAMILY_OS2); + break; + case FAMILY_NETWARE: + isFamily = OS_NAME.contains(FAMILY_NETWARE); + break; + case FAMILY_DOS: + isFamily = PATH_SEP.equals(";") && !isFamily(FAMILY_NETWARE); + break; + case FAMILY_MAC: + isFamily = OS_NAME.contains(FAMILY_MAC) + || OS_NAME.contains(DARWIN); + break; + case FAMILY_TANDEM: + isFamily = OS_NAME.contains("nonstop_kernel"); + break; + case FAMILY_UNIX: + isFamily = PATH_SEP.equals(":") + && !isFamily(FAMILY_VMS) + && (!isFamily(FAMILY_MAC) || OS_NAME.endsWith("x") + || OS_NAME.contains(DARWIN)); + break; + case FAMILY_ZOS: + isFamily = OS_NAME.contains(FAMILY_ZOS) + || OS_NAME.contains("os/390"); + break; + case FAMILY_OS400: + isFamily = OS_NAME.contains(FAMILY_OS400); + break; + case FAMILY_VMS: + isFamily = OS_NAME.contains(FAMILY_VMS); + break; + default: + throw new BuildException( + "Don\'t know how to detect os family \"" + + family + "\""); } } if (name != null) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java index 64672c9ac..1c7283773 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java @@ -262,12 +262,16 @@ public class GenericDeploymentTool implements EJBDeploymentTool { } String analyzerClassName = null; - if (analyzer.equals(ANALYZER_SUPER)) { - analyzerClassName = ANALYZER_CLASS_SUPER; - } else if (analyzer.equals(ANALYZER_FULL)) { - analyzerClassName = ANALYZER_CLASS_FULL; - } else { - analyzerClassName = analyzer; + switch (analyzer) { + case ANALYZER_SUPER: + analyzerClassName = ANALYZER_CLASS_SUPER; + break; + case ANALYZER_FULL: + analyzerClassName = ANALYZER_CLASS_FULL; + break; + default: + analyzerClassName = analyzer; + break; } try { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java index 4fdc95d98..bffdf91cb 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java @@ -171,16 +171,21 @@ public class MSVSSHISTORY extends MSVSS { */ public void setStyle(BriefCodediffNofile attr) { String option = attr.getValue(); - if (option.equals(STYLE_BRIEF)) { - super.setInternalStyle(FLAG_BRIEF); - } else if (option.equals(STYLE_CODEDIFF)) { - super.setInternalStyle(FLAG_CODEDIFF); - } else if (option.equals(STYLE_DEFAULT)) { - super.setInternalStyle(""); - } else if (option.equals(STYLE_NOFILE)) { - super.setInternalStyle(FLAG_NO_FILE); - } else { - throw new BuildException("Style " + attr + " unknown.", getLocation()); + switch (option) { + case STYLE_BRIEF: + super.setInternalStyle(FLAG_BRIEF); + break; + case STYLE_CODEDIFF: + super.setInternalStyle(FLAG_CODEDIFF); + break; + case STYLE_DEFAULT: + super.setInternalStyle(""); + break; + case STYLE_NOFILE: + super.setInternalStyle(FLAG_NO_FILE); + break; + default: + throw new BuildException("Style " + attr + " unknown.", getLocation()); } } diff --git a/src/main/org/apache/tools/ant/types/PropertySet.java b/src/main/org/apache/tools/ant/types/PropertySet.java index 85e65d2f4..7d1fd7ec4 100644 --- a/src/main/org/apache/tools/ant/types/PropertySet.java +++ b/src/main/org/apache/tools/ant/types/PropertySet.java @@ -405,17 +405,19 @@ public class PropertySet extends DataType implements ResourceCollection { } } } else if (r.builtin != null) { - - if (r.builtin.equals(BuiltinPropertySetName.ALL)) { - names.addAll(props.keySet()); - } else if (r.builtin.equals(BuiltinPropertySetName.SYSTEM)) { - names.addAll(getAllSystemProperties().keySet()); - } else if (r.builtin.equals(BuiltinPropertySetName - .COMMANDLINE)) { - names.addAll(getProject().getUserProperties().keySet()); - } else { - throw new BuildException("Impossible: Invalid builtin " - + "attribute!"); + switch (r.builtin) { + case BuiltinPropertySetName.ALL: + names.addAll(props.keySet()); + break; + case BuiltinPropertySetName.SYSTEM: + names.addAll(getAllSystemProperties().keySet()); + break; + case BuiltinPropertySetName.COMMANDLINE: + names.addAll(getProject().getUserProperties().keySet()); + break; + default: + throw new BuildException("Impossible: Invalid builtin " + + "attribute!"); } } else { throw new BuildException("Impossible: Invalid PropertyRef!");