Browse Source

use adapter for FileProvider instead of instanceof in MappedResource

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@718211 13f79535-47bb-0310-9956-ffa450edef68
remotes/1776816827838153613/tmp_25f451bd36ab3145e487fcb2cd5c62c571e5b602
Stefan Bodewig 17 years ago
parent
commit
be943a8c95
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      src/main/org/apache/tools/ant/types/resources/MappedResource.java

+ 4
- 4
src/main/org/apache/tools/ant/types/resources/MappedResource.java View File

@@ -175,7 +175,7 @@ public class MappedResource extends Resource {
}

public static MappedResource map(Resource r) {
return r instanceof FileProvider
return r.as(FileProvider.class) != null
? new FileProviderMR(r) : new MappedResource(r);
}

@@ -185,12 +185,12 @@ public class MappedResource extends Resource {

protected FileProviderMR(Resource r) {
super(r);
if (!(r instanceof FileProvider)) {
p = (FileProvider) r.as(FileProvider.class);
if (p == null) {
throw new IllegalArgumentException("trying to wrap something "
+ "that is not a "
+ "that is not adaptable to "
+ " FileProvider");
}
p = (FileProvider) r;
}

/**


Loading…
Cancel
Save