appendNavTrail() to addNavTrail() migration (#70)

Author: labkey-adam

src/org/labkey/trialshare/StudyITNFolderType.java

@@ -62,6 +62,7 @@ public Set<String> getLegacyNames()
         return Collections.singleton("Study Redesign (ITN)");
     }
 
+    @Override
     protected String getFolderTitle(ViewContext ctx)
     {
         Study study = StudyService.get().getStudy(ctx.getContainer());
@@ -75,6 +76,7 @@ public String getStartPageLabel(ViewContext ctx)
         return study == null ? "New Study" : study.getLabel();
     }
 
+    @Override
     public List<FolderTab> getDefaultTabs()
     {
         return PAGES;

src/org/labkey/trialshare/TrialShareController.java

@@ -196,9 +196,9 @@ public TrialShareController()
     @RequiresPermission(ReadPermission.class)
     public class BeginAction extends SimpleViewAction
     {
-        public NavTree appendNavTrail(NavTree root)
+        @Override
+        public void addNavTrail(NavTree root)
         {
-            return root;
         }
 
         @Override
@@ -564,6 +564,7 @@ public class TrialShareExportAction extends MutatingApiAction<TrialShareExportFo
     {
         private ActionURL _successURL;
 
+        @Override
         public ApiResponse execute(TrialShareExportForm form, BindException errors) throws Exception
         {
             // JSONObject json = form.getJsonObject();
@@ -772,9 +773,9 @@ public URLHelper getSuccessURL(CubeAdminForm form)
         }
 
         @Override
-        public NavTree appendNavTrail(NavTree root)
+        public void addNavTrail(NavTree root)
         {
-            return root.addChild("Data Cube Administration");
+            root.addChild("Data Cube Administration");
         }
     }
 
@@ -966,15 +967,16 @@ public Object execute(Object o, BindException errors) throws Exception
     @RequiresPermission(ReadPermission.class)
     public class DataFinderAction extends SimpleViewAction
     {
+        @Override
         public ModelAndView getView(Object o, BindException errors) throws Exception
         {
             setTitle("Data Finder");
             return new DataFinderWebPart(getContainer());
         }
 
-        public NavTree appendNavTrail(NavTree root)
+        @Override
+        public void addNavTrail(NavTree root)
         {
-            return root;
         }
     }
 
@@ -1293,9 +1295,8 @@ public ModelAndView getView(StudyIdForm form, BindException errors) throws Excep
         }
 
         @Override
-        public NavTree appendNavTrail(NavTree root)
+        public void addNavTrail(NavTree root)
         {
-            return root;
         }
     }
 
@@ -1537,9 +1538,9 @@ public ModelAndView getView(CubeObjectNameForm form, BindException errors) throw
         }
 
         @Override
-        public NavTree appendNavTrail(NavTree root)
+        public void addNavTrail(NavTree root)
         {
-            return root.addChild("Manage Data");
+            root.addChild("Manage Data");
         }
     }
 
@@ -1723,6 +1724,7 @@ public void setObjectName(String name)
             }
         }
 
+        @Override
         public void validate(Errors errors)
         {
             if (getObjectName() == null)
@@ -1733,6 +1735,7 @@ public void validate(Errors errors)
     @RequiresPermission(InsertPermission.class)
     public class InsertDataFormAction extends CubeObjectDetailFormAction
     {
+        @Override
         protected String getMode()
         {
             return "insert";
@@ -1743,6 +1746,7 @@ protected String getMode()
     @RequiresPermission(UpdatePermission.class)
     public class UpdateDataAction extends CubeObjectDetailFormAction
     {
+        @Override
         protected String getMode()
         {
             return "update";
@@ -1752,6 +1756,7 @@ protected String getMode()
     @RequiresPermission(ReadPermission.class)
     public class ViewDataAction extends CubeObjectDetailFormAction
     {
+        @Override
         protected String getMode()
         {
             return "view";
@@ -1806,7 +1811,7 @@ public ModelAndView getView(CubeObjectDetailForm bean, BindException errors) thr
         }
 
         @Override
-        public NavTree appendNavTrail(NavTree root)
+        public void addNavTrail(NavTree root)
         {
             String name = getViewContext().getActionURL().getParameter("objectName");
             if (name != null)
@@ -1819,7 +1824,8 @@ public NavTree appendNavTrail(NavTree root)
                 }
                 catch (IllegalArgumentException ignore) {} // Don't throw because of bad user input
             }
-            return (root.hasChildren() ? root : root.addChild(StringUtils.capitalize(getMode()) + " Data"));
+            if (!root.hasChildren())
+                root.addChild(StringUtils.capitalize(getMode()) + " Data");
         }
     }
 

src/org/labkey/trialshare/query/ManagePublicationsQueryView.java

@@ -46,6 +46,7 @@ public ManagePublicationsQueryView(ViewContext context, BindException errors)
         setSettings(getSchema().getSettings(context, QueryView.DATAREGIONNAME_DEFAULT, TrialShareQuerySchema.PUBLICATION_TABLE));
     }
 
+    @Override
     protected TableInfo getTable(User user, Container container)
     {
         return new TrialShareQuerySchema(user, container).getPublicationsTableInfo();

src/org/labkey/trialshare/query/ManageStudiesQueryView.java

@@ -45,6 +45,7 @@ public ManageStudiesQueryView(ViewContext context, BindException errors)
         setSettings(getSchema().getSettings(context, QueryView.DATAREGIONNAME_DEFAULT, TrialShareQuerySchema.STUDY_TABLE));
     }
 
+    @Override
     protected TableInfo getTable(User user, Container container)
     {
         return new TrialShareQuerySchema(user, container).getStudyPropertiesTableInfo();

test/src/org/labkey/test/tests/trialshare/ManageStudiesTest.java

@@ -39,6 +39,7 @@ public class ManageStudiesTest extends DataFinderTestBase
     private static final String PROJECT_NAME = "ManageStudiesTest Project";
     private static final String DATA_PROJECT_NAME = "ManageStudiesTestData Project";
 
+    @Override
     public BrowserType bestBrowser()
     {
         return BrowserType.CHROME;

test/src/org/labkey/test/tests/trialshare/TrialShareDataFinderTest.java

@@ -101,6 +101,7 @@ protected void createStudies(String parentProjectName)
         pubUpdatePage.setPermissionsContainers("/" + getDataProjectName() + "/" + PUBLIC_STUDY_NAME, "/" + getDataProjectName() + "/" + OPERATIONAL_STUDY_NAME);
     }
 
+    @Override
     protected void createUsers()
     {
         log("Creating users and setting permissions");