Remove unnecessary HttpView.currentView() casts in JSPs

elisa/src/org/labkey/elisa/view/runDetailsView.jsp

@@ -30,7 +30,7 @@
     }
 %>
 <%
-    JspView<ElisaController.RunDetailsForm> me = (JspView<ElisaController.RunDetailsForm>) HttpView.currentView();
+    JspView<ElisaController.RunDetailsForm> me = HttpView.currentView();
     ElisaController.RunDetailsForm form = me.getModelBean();
     String appId = "run-details-" + getRequestScopedUID();
 %>

elispotassay/src/org/labkey/elispot/view/plateSummary.jsp

@@ -30,7 +30,7 @@
     }
 %>
 <%
-    JspView<ElispotController.PlateSummaryBean> me = (JspView<ElispotController.PlateSummaryBean>)HttpView.currentView();
+    JspView<ElispotController.PlateSummaryBean> me = HttpView.currentView();
     ElispotController.PlateSummaryBean bean = me.getModelBean();
 
     String renderId = "plate-summary-div-" + 1; // getRequestScopedUID(); // TODO ElispotAssayTest test expects 1

flow/src/org/labkey/flow/controllers/executescript/chooseAnalysisName.jsp

@@ -30,7 +30,7 @@
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%
-    JspView<ChooseRunsToAnalyzeForm> me = (JspView<ChooseRunsToAnalyzeForm>) HttpView.currentView();
+    JspView<ChooseRunsToAnalyzeForm> me = HttpView.currentView();
     ChooseRunsToAnalyzeForm form = me.getModelBean();
     Container c = getContainer();
 %>

flow/src/org/labkey/flow/controllers/executescript/chooseRunsToAnalyze.jsp

@@ -44,7 +44,7 @@
     }
 %>
 <%
-    JspView<ChooseRunsToAnalyzeForm> me = (JspView<ChooseRunsToAnalyzeForm>) HttpView.currentView();
+    JspView<ChooseRunsToAnalyzeForm> me = HttpView.currentView();
     ChooseRunsToAnalyzeForm form = me.getModelBean();
     ChooseRunsView view = new ChooseRunsView(form);
     Collection<FlowExperiment> targetExperiments = new ArrayList(form.getAvailableAnalyses());

flow/src/org/labkey/flow/controllers/executescript/confirmRunsToImport.jsp

@@ -32,7 +32,7 @@
 <%@ page import="java.util.Set" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%
-    JspView<ImportRunsForm> me = (JspView<ImportRunsForm>) HttpView.currentView();
+    JspView<ImportRunsForm> me = HttpView.currentView();
     ImportRunsForm form = me.getModelBean();
     Container c = getContainer();
 

flow/src/org/labkey/flow/controllers/well/chooseGraph.jsp

@@ -39,7 +39,7 @@
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%
-    HttpView<ChooseGraphForm> me = (HttpView<ChooseGraphForm>) HttpView.currentView();
+    HttpView<ChooseGraphForm> me = HttpView.currentView();
     ChooseGraphForm form = me.getModelBean();
 
     boolean hasScripts = false;

flow/src/org/labkey/flow/view/exportAnalysis.jsp

@@ -28,7 +28,7 @@
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%
-    JspView<ExportAnalysisForm> me = (JspView<ExportAnalysisForm>) HttpView.currentView();
+    JspView<ExportAnalysisForm> me = HttpView.currentView();
     ExportAnalysisForm bean = me.getModelBean();
 
     Map<AnalysisSerializer.Options, String> exportFormats = new EnumMap<>(AnalysisSerializer.Options.class);

luminex/src/org/labkey/luminex/view/defaultValues.jsp

@@ -24,7 +24,7 @@
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%
-    JspView<DefaultValuesForm> me = (JspView<DefaultValuesForm>) HttpView.currentView();
+    JspView<DefaultValuesForm> me = HttpView.currentView();
     DefaultValuesForm bean = me.getModelBean();
     List<String> analytes = bean.getAnalytes();
     List<String> positivityThresholds = bean.getPositivityThresholds();

luminex/src/org/labkey/luminex/view/exclusionWarning.jsp

@@ -25,7 +25,7 @@
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%
-    JspView<LuminexRunUploadForm> me = (JspView<LuminexRunUploadForm>) HttpView.currentView();
+    JspView<LuminexRunUploadForm> me = HttpView.currentView();
     LuminexRunUploadForm bean = me.getModelBean();
     long exclusionCount = bean.getExclusionCount();
     long lostExclusions = bean.getLostExclusions();

luminex/src/org/labkey/luminex/view/guideSetConfirmDelete.jsp

@@ -39,7 +39,7 @@
     }
 %>
 <%
-    JspView<LuminexController.GuideSetsDeleteBean> me = (JspView<LuminexController.GuideSetsDeleteBean>) HttpView.currentView();
+    JspView<LuminexController.GuideSetsDeleteBean> me = HttpView.currentView();
     LuminexController.GuideSetsDeleteBean bean = me.getModelBean();
     List<GuideSet> guideSets = bean.getGuideSets();
 

luminex/src/org/labkey/luminex/view/leveyJenningsMenu.jsp

@@ -14,22 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-/**
-* User: jeckels
-* Date: August 27, 2013
-*/
-
 %>
+<%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.luminex.LeveyJenningsForm" %>
 <%@ page import="org.labkey.luminex.LeveyJenningsMenuView" %>
 <%@ page import="org.labkey.luminex.LuminexController" %>
-<%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 
 <%
-    LeveyJenningsMenuView me = (LeveyJenningsMenuView) HttpView.currentView();
+    LeveyJenningsMenuView me = HttpView.currentView();
     LeveyJenningsMenuView.Bean bean = me.getModelBean();
 %>
 

luminex/src/org/labkey/luminex/view/leveyJenningsReport.jsp

@@ -14,12 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-/**
-* User: cnathe
-* Date: Sept 19, 2011
-*/
-
 %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
@@ -36,7 +30,7 @@
     }
 %>
 <%
-    JspView<LeveyJenningsForm> me = (JspView<LeveyJenningsForm>) HttpView.currentView();
+    JspView<LeveyJenningsForm> me = HttpView.currentView();
     LeveyJenningsForm bean = me.getModelBean();
 %>
 

luminex/src/org/labkey/luminex/view/titrationWellRoles.jsp

@@ -42,7 +42,7 @@
 </style>
 
 <%
-    JspView<LuminexRunUploadForm> me = (JspView<LuminexRunUploadForm>) HttpView.currentView();
+    JspView<LuminexRunUploadForm> me = HttpView.currentView();
     LuminexRunUploadForm bean = me.getModelBean();
     Map<String, Titration> titrationsWithTypes = bean.getParser().getTitrationsWithTypes();
 

microarray/src/org/labkey/microarray/view/uploadFeatureAnnotation.jsp

@@ -18,7 +18,6 @@
 <%@ page import="org.labkey.api.data.Container" %>
 <%@ page import="org.labkey.api.data.ContainerManager" %>
 <%@ page import="org.labkey.api.security.permissions.InsertPermission" %>
-<%@ page import="org.labkey.api.util.PageFlowUtil" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
@@ -27,7 +26,6 @@
 <%@ page import="org.springframework.validation.Errors" %>
 <%@ page import="org.springframework.validation.ObjectError" %>
 <%@ page import="java.util.LinkedHashMap" %>
-<%@ page import="java.util.List" %>
 <%@ page import="java.util.Map" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%!
@@ -38,7 +36,7 @@
     }
 %>
 <%
-    JspView<FeatureAnnotationSetController.FeatureAnnotationSetForm> me = (JspView<FeatureAnnotationSetController.FeatureAnnotationSetForm>) HttpView.currentView();
+    JspView<FeatureAnnotationSetController.FeatureAnnotationSetForm> me = HttpView.currentView();
     String vendor = me.getModelBean().getVendor();
     String name = me.getModelBean().getName();
     String description = me.getModelBean().getDescription();

ms2/src/org/labkey/ms2/blastAdmin.jsp

@@ -19,7 +19,7 @@
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%
-    HttpView<String> me = (HttpView<String>) HttpView.currentView();
+    HttpView<String> me = HttpView.currentView();
     String url = me.getModelBean();
 %>
 <labkey:form method="POST">

ms2/src/org/labkey/ms2/compare/compareProteinProphetQueryOptions.jsp

@@ -38,7 +38,7 @@
 <%@ page extends="org.labkey.api.jsp.JspBase"%>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%
-JspView<MS2Controller.CompareOptionsBean> view = (JspView<MS2Controller.CompareOptionsBean>) HttpView.currentView();
+JspView<MS2Controller.CompareOptionsBean> view = HttpView.currentView();
 MS2Controller.CompareOptionsBean bean = view.getModelBean();
 MS2Controller.PeptideFilteringComparisonForm form = bean.getForm();
 String peptideViewName = form.getPeptideCustomViewName(getViewContext());

ms2/src/org/labkey/ms2/compare/spectraCountOptions.jsp

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 %>
-<%@ page import="org.labkey.ms2.MS2Controller.PeptideFilteringFormElements" %>
 <%@ page import="org.labkey.api.protein.search.ProphetFilterType" %>
 <%@ page import="org.labkey.api.util.HtmlString" %>
 <%@ page import="org.labkey.api.util.PageFlowUtil" %>
@@ -24,6 +23,7 @@
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ page import="org.labkey.api.view.template.ClientDependencies" %>
 <%@ page import="org.labkey.ms2.MS2Controller" %>
+<%@ page import="org.labkey.ms2.MS2Controller.PeptideFilteringFormElements" %>
 <%@ page import="static org.labkey.ms2.MS2Controller.PeptideFilteringFormElements.peptideFilterType" %>
 <%@ page import="static org.labkey.api.protein.search.ProphetFilterType.probability" %>
 <%@ page import="static org.labkey.api.protein.search.ProphetFilterType.customView" %>
@@ -41,7 +41,7 @@
     }
 %>
 <%
-    JspView<MS2Controller.CompareOptionsBean> view = (JspView<MS2Controller.CompareOptionsBean>) HttpView.currentView();
+    JspView<MS2Controller.CompareOptionsBean> view = HttpView.currentView();
     MS2Controller.CompareOptionsBean<MS2Controller.SpectraCountForm> bean = view.getModelBean();
     MS2Controller.SpectraCountForm form = bean.getForm();
     String peptideViewName = form.getPeptideCustomViewName(getViewContext());

ms2/src/org/labkey/ms2/decoySummary.jsp

@@ -27,7 +27,7 @@
 <%@ page import="java.util.Map" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%
-    JspView<MS2Manager.DecoySummaryBean> me = ((JspView<MS2Manager.DecoySummaryBean>)HttpView.currentView());
+    JspView<MS2Manager.DecoySummaryBean> me = HttpView.currentView();
     MS2Manager.DecoySummaryBean bean = me.getModelBean();
 
     NumberFormat defaultFormat = NumberFormat.getPercentInstance();

ms2/src/org/labkey/ms2/editElution.jsp

@@ -24,7 +24,7 @@
 <%@ page import="java.text.DecimalFormat"%>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%
-    JspView<EditElutionGraphContext> me = (JspView<EditElutionGraphContext>) HttpView.currentView();
+    JspView<EditElutionGraphContext> me = HttpView.currentView();
     EditElutionGraphContext ctx = me.getModelBean();
     MS2Peptide p = ctx.getPeptide();
     PeptideQuantitation quant = ctx.getQuantitation();

ms2/src/org/labkey/ms2/filterHeader.jsp

@@ -20,13 +20,14 @@
 <%@ page import="org.labkey.api.util.HtmlString" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
-<%@ page import="org.labkey.ms2.MS2Controller" %>
+<%@ page import="org.labkey.ms2.MS2Controller.FilterHeaderBean" %>
 <%@ page import="org.labkey.ms2.peptideview.MS2RunViewType" %>
 <%@ page import="static org.labkey.api.util.DOM.Attribute.style" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%
-    MS2Controller.FilterHeaderBean bean = ((JspView<MS2Controller.FilterHeaderBean>)HttpView.currentView()).getModelBean();
+    JspView<FilterHeaderBean> view = HttpView.currentView();
+    FilterHeaderBean bean = view.getModelBean();
     User user = getUser();
     String runChargeFilterColumnName = bean.run.getChargeFilterColumnName();
     String grouping = getViewContext().cloneActionURL().getParameter("grouping");

ms2/src/org/labkey/ms2/manageViews.jsp

@@ -21,7 +21,7 @@
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%
-    HttpView<MS2Controller.ManageViewsBean> me = (HttpView<MS2Controller.ManageViewsBean>) HttpView.currentView();
+    HttpView<MS2Controller.ManageViewsBean> me = HttpView.currentView();
     MS2Controller.ManageViewsBean bean = me.getModelBean();
 %>
 <labkey:form method="post" name="manageViewsForm" action="">

ms2/src/org/labkey/ms2/ms2Admin.jsp

@@ -20,10 +20,12 @@
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ page import="org.labkey.ms2.MS2Controller" %>
+<%@ page import="org.labkey.ms2.MS2Controller.MS2AdminBean" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%
-    MS2Controller.MS2AdminBean bean = ((JspView<MS2Controller.MS2AdminBean>)HttpView.currentView()).getModelBean();
+    JspView<MS2AdminBean> view = HttpView.currentView();
+    MS2AdminBean bean = view.getModelBean();
 %>
 <table class="labkey-data-region-legacy labkey-show-borders" cellpadding="4" cellspacing="4">
 <tr>

ms2/src/org/labkey/ms2/pickView.jsp

@@ -19,10 +19,12 @@
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ page import="org.labkey.ms2.MS2Controller" %>
+<%@ page import="org.labkey.ms2.MS2Controller.PickViewBean" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%
-    MS2Controller.PickViewBean bean = ((JspView<MS2Controller.PickViewBean>)HttpView.currentView()).getModelBean();
+    JspView<PickViewBean> view = HttpView.currentView();
+    PickViewBean bean = view.getModelBean();
 %>
 <p><%=h(bean.viewInstructions)%></p>
 <p>

ms2/src/org/labkey/ms2/pipeline/ConfigureSequenceDB.jsp

@@ -21,7 +21,7 @@
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%
-    HttpView<String> me = (HttpView<String>) HttpView.currentView();
+    HttpView<String> me = HttpView.currentView();
     String localPathRoot = me.getModelBean();
 %>
 <labkey:form method="POST" name="updateClusterSequenceDB" action="<%=urlFor(PipelineController.SetupClusterSequenceDBAction.class)%>">

ms2/src/org/labkey/ms2/pipeline/comet/setCometDefaults.jsp

@@ -31,7 +31,7 @@
     }
 %>
 <%
-    JspView<PipelineController.SetDefaultsForm> view = (JspView<PipelineController.SetDefaultsForm>) HttpView.currentView();
+    JspView<PipelineController.SetDefaultsForm> view = HttpView.currentView();
     PipelineController.SetDefaultsForm form = view.getModelBean();
     Container c = getContainer();
 %>

ms2/src/org/labkey/ms2/pipeline/mascot/setMascotDefaults.jsp

@@ -31,7 +31,7 @@
     }
 %>
 <%
-    JspView<PipelineController.SetDefaultsForm> view = (JspView<PipelineController.SetDefaultsForm>) HttpView.currentView();
+    JspView<PipelineController.SetDefaultsForm> view = HttpView.currentView();
     PipelineController.SetDefaultsForm form = view.getModelBean();
     Container c = getContainer();
 %>

ms2/src/org/labkey/ms2/pipeline/sequest/setSequestDefaults.jsp

@@ -31,7 +31,7 @@
     }
 %>
 <%
-    JspView<PipelineController.SetDefaultsForm> view = (JspView<PipelineController.SetDefaultsForm>) HttpView.currentView();
+    JspView<PipelineController.SetDefaultsForm> view = HttpView.currentView();
     PipelineController.SetDefaultsForm form = view.getModelBean();
     Container c = getContainer();
 %>

ms2/src/org/labkey/ms2/pipeline/tandem/setTandemDefaults.jsp

@@ -31,7 +31,7 @@
     }
 %>
 <%
-    JspView<PipelineController.SetDefaultsForm> view = (JspView<PipelineController.SetDefaultsForm>)HttpView.currentView();
+    JspView<PipelineController.SetDefaultsForm> view = HttpView.currentView();
     PipelineController.SetDefaultsForm form = view.getModelBean();
     Container c = getContainer();
 %>

ms2/src/org/labkey/ms2/protein.jsp

@@ -16,18 +16,19 @@
  */
 %>
 <%@ page import="org.labkey.api.util.Formats" %>
+<%@ page import="org.labkey.api.util.HtmlString" %>
 <%@ page import="org.labkey.api.util.Pair" %>
 <%@ page import="org.labkey.api.view.ActionURL" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
 <%@ page import="org.labkey.ms2.PeptideManager" %>
 <%@ page import="org.labkey.ms2.protein.ProteinViewBean" %>
 <%@ page import="java.text.Format" %>
-<%@ page import="org.labkey.api.util.HtmlString" %>
 <%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%
-    ProteinViewBean bean = ((JspView<ProteinViewBean>)HttpView.currentView()).getModelBean();
+    JspView<ProteinViewBean> view = HttpView.currentView();
+    ProteinViewBean bean = view.getModelBean();
     Format intFormat = Formats.commaf0;
     Format percentFormat = Formats.percent;
 %>

ms2/src/org/labkey/ms2/proteinCoverageMapHeader.jsp

@@ -22,7 +22,8 @@
 <%@ page import="org.labkey.ms2.protein.ProteinViewBean" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%
-    ProteinViewBean bean = ((JspView<ProteinViewBean>)HttpView.currentView()).getModelBean();
+    JspView<ProteinViewBean> view = HttpView.currentView();
+    ProteinViewBean bean = view.getModelBean();
 
     if (bean.showPeptides)
     {

ms2/src/org/labkey/ms2/proteinDisambiguation.jsp

@@ -74,7 +74,7 @@
 %>
 
 <%
-    JspView<Pair<ActionURL, List<Protein>>> view = (JspView<Pair<ActionURL, List<Protein>>>) HttpView.currentView();
+    JspView<Pair<ActionURL, List<Protein>>> view = HttpView.currentView();
     Pair<ActionURL, List<Protein>> actionWithProteins = view.getModelBean();
     List<Protein> proteins = actionWithProteins.second;
     ActionURL baseUrl = actionWithProteins.first;

ms2/src/org/labkey/ms2/runSummary.jsp

@@ -28,7 +28,7 @@
 <%@ page import="java.util.List" %>
 <%@ page extends="org.labkey.api.jsp.JspBase" %>
 <%
-    JspView<MS2Controller.RunSummaryBean> me = ((JspView<MS2Controller.RunSummaryBean>)HttpView.currentView());
+    JspView<MS2Controller.RunSummaryBean> me = HttpView.currentView();
     Container c = getContainer();
     MS2Controller.RunSummaryBean bean = me.getModelBean();
     MS2Run run = bean.run;

ms2/src/org/labkey/ms2/search/peptidePanel.jsp

@@ -29,7 +29,7 @@
 <%
     // This panel is optionally rendered by proteinPanel.jsp for MS2 deployments only. It requires "MS2/inlineViewDesigner.js",
     // which is optionally included by searchProteins.jsp.
-    JspView<ProteinSearchBean> me = (JspView<ProteinSearchBean>) HttpView.currentView();
+    JspView<ProteinSearchBean> me = HttpView.currentView();
     ProteinSearchBean bean = me.getModelBean();
     ViewContext ctx = getViewContext();
     FilterView peptideView = new FilterView(ctx, true);