youys
/
ant
Not watched
1
0
Fork 1
Code
Releases 0 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

Use switch

master
Gintas Grigelionis 7 years ago
parent
805b6eb058
commit
73991f0350
4 changed files with 84 additions and 60 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +46
    -33
      src/main/org/apache/tools/ant/taskdefs/condition/Os.java
  2. +10
    -6
      src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
  3. +15
    -10
      src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java
  4. +13
    -11
      src/main/org/apache/tools/ant/types/PropertySet.java

+ 46
- 33
src/main/org/apache/tools/ant/taskdefs/condition/Os.java View File

@@ -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) {


+ 10
- 6
src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java View File

@@ -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 {


+ 15
- 10
src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java View File

@@ -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());
}
}



+ 13
- 11
src/main/org/apache/tools/ant/types/PropertySet.java View File

@@ -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!");


Write Preview
Loading…
Cancel
Save