zzh
/
gatk-3.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1243 from broadinstitute/gvda_rodwalkers_dont_downsample_1179 

Fix bug where gatkdocs of RodWalkers reported default LocusWalker downsampling settings
This commit is contained in:
Geraldine Van der Auwera 2015-11-23 21:39:43 -05:00
parent 5a3756410c 88a0514ec7
commit 1f8e45f0ba
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
public/gatk-tools-public/src/main/java/org/broadinstitute/gatk/tools/walkers/help/WalkerDocumentationHandler.java
View File

@ -228,13 +228,17 @@ public class WalkerDocumentationHandler extends GenericDocumentationHandler {
*/ */
private HashMap<String, Object> getDownSamplingSettings(Class myClass, HashMap<String, Object> dsSettings) { private HashMap<String, Object> getDownSamplingSettings(Class myClass, HashMap<String, Object> dsSettings) {
// //
// Retrieve annotation // Check for RODWalker first
if (myClass.isAnnotationPresent(Downsample.class)) { if (!checkForRODWalker(myClass).equals("yes")) {
final Annotation thisAnnotation = myClass.getAnnotation(Downsample.class); //
if(thisAnnotation instanceof Downsample) { // Retrieve annotation
final Downsample dsAnnotation = (Downsample) thisAnnotation; if (myClass.isAnnotationPresent(Downsample.class)) {
dsSettings.put("by", dsAnnotation.by().toString()); final Annotation thisAnnotation = myClass.getAnnotation(Downsample.class);
dsSettings.put("to_cov", dsAnnotation.toCoverage()); if(thisAnnotation instanceof Downsample) {
final Downsample dsAnnotation = (Downsample) thisAnnotation;
dsSettings.put("by", dsAnnotation.by().toString());
dsSettings.put("to_cov", dsAnnotation.toCoverage());
}
} }
} }
return dsSettings; return dsSettings;
@ -320,6 +324,24 @@ public class WalkerDocumentationHandler extends GenericDocumentationHandler {
return getWalkerType(mySuperClass); return getWalkerType(mySuperClass);
} }
/**
* Utility function that checks whether an instance of class c is a subclass of RODWalker.
*
* @param myClass the class to query for the annotation
* @return "yes" or "no" (can't use a Boolean because of the recursion)
*/
private String checkForRODWalker(Class myClass) {
//
// Look up superclasses recursively until we find either RODWalker or (Walker or Object)
final Class mySuperClass = myClass.getSuperclass();
if (mySuperClass.getSimpleName().equals("RodWalker")) {
return "yes";
} else if (mySuperClass.getSimpleName().equals("Object") || mySuperClass.getSimpleName().equals("Walker")) {
return "";
}
return checkForRODWalker(mySuperClass);
}
/** /**
* Utility function that finds the values of ReadFilters annotation applied to an instance of class c. * Utility function that finds the values of ReadFilters annotation applied to an instance of class c.
* *