diff options
Diffstat (limited to 'src/main/org/apache/tools/ant/taskdefs/condition/Os.java')
-rw-r--r-- | src/main/org/apache/tools/ant/taskdefs/condition/Os.java | 34 |
1 files changed, 18 insertions, 16 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 974c396fb..07ccb59f5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java +++ b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java @@ -38,22 +38,6 @@ public class Os implements Condition { System.getProperty("path.separator"); /** - * OS family to look for - */ - private String family; - /** - * Name of OS - */ - private String name; - /** - * version of OS - */ - private String version; - /** - * OS architecture - */ - private String arch; - /** * OS family that can be tested for. {@value} */ public static final String FAMILY_WINDOWS = "windows"; @@ -108,6 +92,23 @@ public class Os implements Condition { private static final String DARWIN = "darwin"; /** + * OS family to look for + */ + private String family; + /** + * Name of OS + */ + private String name; + /** + * version of OS + */ + private String version; + /** + * OS architecture + */ + private String arch; + + /** * Default constructor * */ @@ -179,6 +180,7 @@ public class Os implements Condition { * @throws BuildException if there is an error. * @see Os#setFamily(String) */ + @Override public boolean eval() throws BuildException { return isOs(family, name, arch, version); } |