Skip to content

Commit 9dcfceb

Browse files
labkey-adamlabkey-adam
authored
Remove unnecessary HttpView.currentView() casts in JSPs (#538)
1 parent f03d96b commit 9dcfceb

36 files changed

Lines changed: 112 additions & 120 deletions

‎SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolDetails.jsp‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
<%@ page import="org.apache.commons.lang3.StringUtils" %>
2+
<%@ page import="org.labkey.api.portal.ProjectUrls" %>
23
<%@ page import="org.labkey.api.security.permissions.DeletePermission" %>
34
<%@ page import="org.labkey.api.security.permissions.InsertPermission" %>
45
<%@ page import="org.labkey.api.settings.AppProps" %>
6+
<%@ page import="org.labkey.api.util.DOM" %>
57
<%@ page import="org.labkey.api.util.HtmlString" %>
68
<%@ page import="org.labkey.api.util.SafeToRender" %>
79
<%@ page import="org.labkey.api.view.ActionURL" %>
810
<%@ page import="org.labkey.api.view.HttpView" %>
911
<%@ page import="org.labkey.api.view.JspView" %>
12+
<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
1013
<%@ page import="org.labkey.skylinetoolsstore.RatingManager" %>
1114
<%@ page import="org.labkey.skylinetoolsstore.SkylineToolsStoreController" %>
1215
<%@ page import="org.labkey.skylinetoolsstore.SkylineToolsStoreManager" %>
@@ -17,19 +20,14 @@
1720
<%@ page import="java.text.DateFormat" %>
1821
<%@ page import="java.text.SimpleDateFormat" %>
1922
<%@ page import="java.util.ArrayList" %>
23+
<%@ page import="java.util.Arrays" %>
2024
<%@ page import="java.util.HashMap" %>
2125
<%@ page import="java.util.Iterator" %>
2226
<%@ page import="java.util.List" %>
2327
<%@ page import="java.util.Map" %>
24-
<%@ page import="java.util.Arrays" %>
25-
<%@ page import="org.labkey.api.portal.ProjectUrls" %>
26-
<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
27-
<%@ page import="org.labkey.api.settings.AppProps" %>
28-
<%@ page import="org.labkey.api.util.DOM" %>
2928
<%@ page import="static org.labkey.api.util.DOM.IMG" %>
3029
<%@ page import="static org.labkey.api.util.DOM.Attribute.src" %>
3130
<%@ page import="static org.labkey.api.util.DOM.Attribute.alt" %>
32-
<%@ page import="org.labkey.api.util.PageFlowUtil" %>
3331
<%@ page extends="org.labkey.api.jsp.JspBase" %>
3432

3533
<%!
@@ -46,7 +44,7 @@
4644
<link rel="stylesheet" href="https://code.jquery.com/ui/1.13.2/themes/smoothness/jquery-ui.min.css">
4745

4846
<%
49-
JspView<?> me = (JspView<?>) HttpView.currentView();
47+
JspView<?> me = HttpView.currentView();
5048
final SkylineTool tool = (SkylineTool)me.getModelBean();
5149
final boolean admin = getUser().hasSiteAdminPermission();
5250

‎SkylineToolsStore/src/org/labkey/skylinetoolsstore/view/SkylineToolsStoreWebPart.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<link rel="stylesheet" href="https://code.jquery.com/ui/1.13.2/themes/smoothness/jquery-ui.min.css">
3535

3636
<%
37-
JspView<?> me = (JspView<?>)HttpView.currentView();
37+
JspView<?> me = HttpView.currentView();
3838
List<SkylineTool> tools = (List<SkylineTool>)me.getModelBean();
3939
4040
final boolean admin = getUser().hasSiteAdminPermission();

‎lincs/src/org/labkey/lincs/view/customGCTForm.jsp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<%@ page import="org.labkey.api.view.JspView" %>
2020
<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
2121
<%@ page import="org.labkey.lincs.LincsController" %>
22+
<%@ page import="org.labkey.lincs.LincsController.CustomGCTBean" %>
2223
<%@ page import="java.util.List" %>
2324
<%@ page extends="org.labkey.api.jsp.JspBase" %>
2425
<%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
@@ -32,8 +33,8 @@
3233
}
3334
%>
3435
<%
35-
JspView<LincsController.CustomGCTBean> jspView = (JspView<LincsController.CustomGCTBean>) HttpView.currentView();
36-
LincsController.CustomGCTBean bean = jspView.getModelBean();
36+
JspView<CustomGCTBean> jspView = HttpView.currentView();
37+
CustomGCTBean bean = jspView.getModelBean();
3738
LincsController.CustomGCTForm form = bean.getForm();
3839
List<LincsController.SelectedAnnotation> annotations = bean.getAnnotations();
3940
%>

‎lincs/src/org/labkey/lincs/view/downloadCustomGCT.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
}
3939
%>
4040
<%
41-
JspView<CustomGCTForm> jspView = (JspView<CustomGCTForm>) HttpView.currentView();
41+
JspView<CustomGCTForm> jspView = HttpView.currentView();
4242
CustomGCTForm form = jspView.getModelBean();
4343
List<SelectedAnnotation> annotations = form.getSelectedAnnotationValues();
4444
GctBean gctBean = form.getCustomGctBean();

‎panoramapublic/src/org/labkey/panoramapublic/view/combinationModInfo.jsp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
<%@ page import="org.labkey.api.view.ActionURL" %>
12
<%@ page import="org.labkey.api.view.HttpView" %>
23
<%@ page import="org.labkey.api.view.JspView" %>
3-
<%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
44
<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
5-
<%@ page import="org.labkey.api.view.ActionURL" %>
6-
<%@ page import="org.labkey.panoramapublic.proteomexchange.UnimodModification" %>
5+
<%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
76
<%@ page import="org.labkey.panoramapublic.proteomexchange.ChemElement" %>
87
<%@ page import="org.labkey.panoramapublic.proteomexchange.Formula" %>
8+
<%@ page import="org.labkey.panoramapublic.proteomexchange.UnimodModification" %>
99
<%@ page import="java.util.Map" %>
1010
<%@ page extends="org.labkey.api.jsp.JspBase" %>
1111
<%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
@@ -18,7 +18,7 @@
1818
}
1919
%>
2020
<%
21-
JspView<PanoramaPublicController.CombinationModificationBean> view = (JspView<PanoramaPublicController.CombinationModificationBean>) HttpView.currentView();
21+
JspView<PanoramaPublicController.CombinationModificationBean> view = HttpView.currentView();
2222
var bean = view.getModelBean();
2323
var form = bean.getForm();
2424
var modification = bean.getModification();

‎panoramapublic/src/org/labkey/panoramapublic/view/confirmPostMessage.jsp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
2-
<%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
3-
<%@ page import="org.labkey.api.view.JspView" %>
2+
<%@ page import="org.labkey.api.util.StringUtilsLabKey" %>
43
<%@ page import="org.labkey.api.view.HttpView" %>
4+
<%@ page import="org.labkey.api.view.JspView" %>
5+
<%@ page import="org.labkey.panoramapublic.PanoramaPublicController.MessageExampleBean" %>
56
<%@ page import="org.labkey.panoramapublic.model.ExperimentAnnotations" %>
6-
<%@ page import="org.labkey.api.util.StringUtilsLabKey" %>
77
<%@ page extends="org.labkey.api.jsp.JspBase" %>
88
<%
9-
JspView<PanoramaPublicController.MessageExampleBean> view = (JspView<PanoramaPublicController.MessageExampleBean>) HttpView.currentView();
9+
JspView<MessageExampleBean> view = HttpView.currentView();
1010
var messageExample = view.getModelBean();
1111
var exampleExpAnnot = messageExample.getExperimentAnnotations();
1212
var exampleShortUrl = exampleExpAnnot.getShortUrl().renderShortURL();

‎panoramapublic/src/org/labkey/panoramapublic/view/createMessageForm.jsp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
*/
1717
%>
1818
<%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
19-
<%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
20-
<%@ page import="org.labkey.api.view.JspView" %>
2119
<%@ page import="org.labkey.api.view.HttpView" %>
20+
<%@ page import="org.labkey.api.view.JspView" %>
21+
<%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
22+
<%@ page import="org.labkey.panoramapublic.PanoramaPublicController.PanoramaPublicMessageForm" %>
2223
<%@ page import="org.labkey.panoramapublic.PanoramaPublicNotification" %>
2324
<%@ page extends="org.labkey.api.jsp.JspBase" %>
2425

@@ -43,7 +44,7 @@
4344
}
4445
</script>
4546
<%
46-
JspView<PanoramaPublicController.PanoramaPublicMessageForm> view = (JspView<PanoramaPublicController.PanoramaPublicMessageForm>) HttpView.currentView();
47+
JspView<PanoramaPublicMessageForm> view = HttpView.currentView();
4748
var form = view.getModelBean();
4849
%>
4950

‎panoramapublic/src/org/labkey/panoramapublic/view/editSpecLibInfo.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
%>
1818
<%
19-
JspView<PanoramaPublicController.SpecLibInfoBean> view = (JspView<PanoramaPublicController.SpecLibInfoBean>) HttpView.currentView();
19+
JspView<PanoramaPublicController.SpecLibInfoBean> view = HttpView.currentView();
2020
var bean = view.getModelBean();
2121
var form = bean.getForm();
2222
var library = bean.getLibrary();

‎panoramapublic/src/org/labkey/panoramapublic/view/expannotations/experimentDetails.jsp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
*/
1717
%>
1818
<%@ page import="org.apache.commons.lang3.StringUtils" %>
19+
<%@ page import="org.labkey.api.security.permissions.AdminPermission" %>
20+
<%@ page import="org.labkey.api.settings.AppProps" %>
21+
<%@ page import="org.labkey.api.util.DOM" %>
22+
<%@ page import="org.labkey.api.util.HtmlString" %>
1923
<%@ page import="org.labkey.api.view.ActionURL" %>
2024
<%@ page import="org.labkey.api.view.HttpView" %>
2125
<%@ page import="org.labkey.api.view.JspView" %>
@@ -24,29 +28,25 @@
2428
<%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
2529
<%@ page import="org.labkey.panoramapublic.PanoramaPublicController.ExperimentAnnotationsDetails" %>
2630
<%@ page import="org.labkey.panoramapublic.PanoramaPublicController.ShowExperimentAnnotationsAction" %>
31+
<%@ page import="org.labkey.panoramapublic.datacite.DataCiteService" %>
32+
<%@ page import="org.labkey.panoramapublic.model.CatalogEntry" %>
2733
<%@ page import="org.labkey.panoramapublic.model.DataLicense" %>
2834
<%@ page import="org.labkey.panoramapublic.model.ExperimentAnnotations" %>
2935
<%@ page import="org.labkey.panoramapublic.model.Journal" %>
30-
<%@ page import="org.labkey.panoramapublic.query.JournalManager" %>
31-
<%@ page import="java.text.SimpleDateFormat" %>
32-
<%@ page import="org.labkey.panoramapublic.model.Submission" %>
3336
<%@ page import="org.labkey.panoramapublic.model.JournalSubmission" %>
34-
<%@ page import="org.labkey.api.security.permissions.AdminPermission" %>
35-
<%@ page import="org.labkey.panoramapublic.query.DataValidationManager" %>
37+
<%@ page import="org.labkey.panoramapublic.model.Submission" %>
3638
<%@ page import="org.labkey.panoramapublic.model.validation.DataValidation" %>
37-
<%@ page import="org.labkey.panoramapublic.model.validation.PxStatus" %>
38-
<%@ page import="org.labkey.api.util.HtmlString" %>
3939
<%@ page import="static org.labkey.api.util.DOM.SPAN" %>
4040
<%@ page import="static org.labkey.api.util.DOM.Attribute.style" %>
41-
<%@ page import="org.labkey.api.util.DOM" %>
41+
<%@ page import="org.labkey.panoramapublic.model.validation.PxStatus" %>
4242
<%@ page import="static org.labkey.api.util.DOM.Attribute.title" %>
4343
<%@ page import="static org.labkey.api.util.DOM.Attribute.href" %>
44+
<%@ page import="org.labkey.panoramapublic.proteomexchange.ProteomeXchangeService" %>
4445
<%@ page import="org.labkey.panoramapublic.query.CatalogEntryManager" %>
46+
<%@ page import="org.labkey.panoramapublic.query.DataValidationManager" %>
47+
<%@ page import="org.labkey.panoramapublic.query.JournalManager" %>
4548
<%@ page import="org.labkey.panoramapublic.view.publish.CatalogEntryWebPart" %>
46-
<%@ page import="org.labkey.panoramapublic.model.CatalogEntry" %>
47-
<%@ page import="org.labkey.api.settings.AppProps" %>
48-
<%@ page import="org.labkey.panoramapublic.proteomexchange.ProteomeXchangeService" %>
49-
<%@ page import="org.labkey.panoramapublic.datacite.DataCiteService" %>
49+
<%@ page import="java.text.SimpleDateFormat" %>
5050
<%@ page extends="org.labkey.api.jsp.JspBase" %>
5151

5252
<%!
@@ -65,7 +65,7 @@
6565
%>
6666

6767
<%
68-
JspView<ExperimentAnnotationsDetails> me = (JspView<ExperimentAnnotationsDetails>) HttpView.currentView();
68+
JspView<ExperimentAnnotationsDetails> me = HttpView.currentView();
6969
ExperimentAnnotationsDetails annotDetails = me.getModelBean();
7070
ExperimentAnnotations annot = annotDetails.getExperimentAnnotations();
7171
ActionURL editUrl = PanoramaPublicController.getEditExperimentDetailsURL(getContainer(), annot.getId(),

‎panoramapublic/src/org/labkey/panoramapublic/view/publish/catalogEntryForm.jsp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
%>
1818
<%@ taglib prefix="labkey" uri="http://www.labkey.org/taglib" %>
1919
<%@ page import="org.apache.commons.io.FileUtils" %>
20+
<%@ page import="org.labkey.api.data.ContainerManager" %>
21+
<%@ page import="org.labkey.api.settings.AppProps" %>
22+
<%@ page import="org.labkey.api.settings.LookAndFeelProperties" %>
2023
<%@ page import="org.labkey.api.view.ActionURL" %>
2124
<%@ page import="org.labkey.api.view.HttpView" %>
2225
<%@ page import="org.labkey.api.view.JspView" %>
2326
<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
2427
<%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
2528
<%@ page import="org.labkey.panoramapublic.catalog.CatalogEntrySettings" %>
2629
<%@ page import="org.labkey.panoramapublic.query.CatalogEntryManager" %>
27-
<%@ page import="org.labkey.api.settings.AppProps" %>
28-
<%@ page import="org.labkey.api.settings.LookAndFeelProperties" %>
29-
<%@ page import="org.labkey.api.data.ContainerManager" %>
3030
<%@ page extends="org.labkey.api.jsp.JspBase" %>
3131
<%!
3232
@Override
@@ -39,7 +39,7 @@
3939
}
4040
%>
4141
<%
42-
JspView<PanoramaPublicController.CatalogEntryBean> view = (JspView<PanoramaPublicController.CatalogEntryBean>) HttpView.currentView();
42+
JspView<PanoramaPublicController.CatalogEntryBean> view = HttpView.currentView();
4343
var bean = view.getModelBean();
4444
var form = bean.getForm();
4545

0 commit comments

Comments
 (0)