Merge pull request #51 from LabKey/fb_appendNavTrail

Author: labkey-adam

SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisController.java

@@ -320,10 +320,10 @@ public ModelAndView getView(FastqcForm form, BindException errors) throws Except
             }
         }
 
-        public NavTree appendNavTrail(NavTree root)
+        @Override
+        public void addNavTrail(NavTree root)
         {
             root.addChild("FastQC Report"); //necessary to set page title, it seems
-            return root;
         }
     }
 
@@ -335,9 +335,10 @@ public SequenceAnalysisAction()
             super("views/sequenceAnalysis.html");
         }
 
-        public NavTree appendNavTrail(NavTree tree)
+        @Override
+        public void addNavTrail(NavTree tree)
         {
-            return tree.addChild("Sequence Analysis");
+            tree.addChild("Sequence Analysis");
         }
     }
 
@@ -350,9 +351,9 @@ public VariantProcessingAction()
         }
 
         @Override
-        public NavTree appendNavTrail(NavTree tree)
+        public void addNavTrail(NavTree tree)
         {
-            return tree.addChild("1".equals(getViewContext().getActionURL().getParameter("showGenotypeGVCFs")) ? "Genotype gVCFs" : "Filter/Process Variants");
+            tree.addChild("1".equals(getViewContext().getActionURL().getParameter("showGenotypeGVCFs")) ? "Genotype gVCFs" : "Filter/Process Variants");
         }
     }
 
@@ -365,9 +366,9 @@ public AlignmentImportAction()
         }
 
         @Override
-        public NavTree appendNavTrail(NavTree tree)
+        public void addNavTrail(NavTree tree)
         {
-            return tree.addChild("Import Alignments");
+            tree.addChild("Import Alignments");
         }
     }
 
@@ -417,9 +418,9 @@ public AlignmentAnalysisAction()
             super("views/alignmentAnalysis.html");
         }
 
-        public NavTree appendNavTrail(NavTree tree)
+        public void addNavTrail(NavTree tree)
         {
-            return tree.addChild("Analyze Alignments");
+            tree.addChild("Analyze Alignments");
         }
     }
 

blast/src/org/labkey/blast/BLASTController.java

@@ -88,6 +88,7 @@ public BLASTController()
     @RequiresPermission(AdminPermission.class)
     public class GetSettingsAction extends ReadOnlyApiAction<Object>
     {
+        @Override
         public ApiResponse execute(Object form, BindException errors)
         {
             Map<String, Object> resultProperties = new HashMap<>();
@@ -208,7 +209,6 @@ public void validateCommand(RunBlastForm form, Errors errors)
 
         protected File getTargetFile(String filename) throws IOException
         {
-
             AssayFileWriter writer = new AssayFileWriter();
             try
             {
@@ -547,9 +547,8 @@ public ModelAndView getView(BlastResultForm form, BindException errors) throws E
         }
 
         @Override
-        public NavTree appendNavTrail(NavTree root)
+        public void addNavTrail(NavTree root)
         {
-            return root;
         }
     }
 

jbrowse/src/org/labkey/jbrowse/JBrowseController.java

@@ -415,9 +415,9 @@ public ModelAndView getView(BrowserForm form, BindException errors) throws Excep
         }
 
         @Override
-        public NavTree appendNavTrail(NavTree root)
+        public void addNavTrail(NavTree root)
         {
-            return root.addChild(_title);
+            root.addChild(_title);
         }
     }