Skip to content

Commit 2e09fa3

Browse files
authored
Remove unnecessary HttpView.currentView() casts in JSPs (#930)
1 parent 48b8cb7 commit 2e09fa3

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

EHR_SM/src/org/labkey/ehr_sm/view/admin.jsp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
<%@ page import="org.labkey.api.exp.api.ExpSampleType" %>
2020
<%@ page import="org.labkey.api.view.HttpView" %>
2121
<%@ page import="org.labkey.api.view.JspView" %>
22-
<%@ page import="org.labkey.ehr_sm.EHR_SMController" %>
22+
<%@ page import="org.labkey.ehr_sm.EHR_SMController.AdminForm" %>
2323
<%@ page import="java.util.Set" %>
2424
<%@ page extends="org.labkey.api.jsp.JspBase" %>
2525
<%
26-
JspView<EHR_SMController.AdminForm> me = (JspView<EHR_SMController.AdminForm>) HttpView.currentView();
27-
EHR_SMController.AdminForm form = me.getModelBean();
26+
JspView<AdminForm> me = HttpView.currentView();
27+
AdminForm form = me.getModelBean();
2828
%>
2929
<labkey:errors/>
3030
<labkey:form method="POST">

snd/api-src/org/labkey/api/snd/Project.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
import java.util.TreeSet;
3737

3838
/**
39-
* Created by marty on 8/4/2017.
40-
*
4139
* Class for project data and related methods. Used when saving, updating, deleting and getting a project
4240
*/
4341

@@ -181,7 +179,7 @@ public Date getStartDate()
181179
@Nullable
182180
public String startDateToString()
183181
{
184-
return DateUtil.formatDateISO8601(getStartDate());
182+
return DateUtil.formatIsoDate(getStartDate());
185183
}
186184

187185
public void setStartDate(Date startDate)
@@ -198,7 +196,7 @@ public Date getEndDate()
198196
@Nullable
199197
public String endDateToString()
200198
{
201-
return DateUtil.formatDateISO8601(getEndDate());
199+
return DateUtil.formatIsoDate(getEndDate());
202200
}
203201

204202
public void setEndDate(Date endDate)
@@ -330,7 +328,7 @@ public JSONObject toJSON(Container c, User u)
330328
if (getEndDate() != null)
331329
json.put(PROJECT_ENDDATE, endDateToString());
332330

333-
if (getProjectItems().size() > 0)
331+
if (!getProjectItems().isEmpty())
334332
{
335333
JSONArray jsonProjectItems = new JSONArray();
336334
for (ProjectItem projectItem : getProjectItems())
@@ -342,7 +340,7 @@ public JSONObject toJSON(Container c, User u)
342340

343341
JSONArray extras = new JSONArray();
344342
Map<GWTPropertyDescriptor, Object> extraFields = getExtraFields();
345-
if(extraFields.size() > 0)
343+
if (!extraFields.isEmpty())
346344
{
347345
JSONObject jsonExtra;
348346
Set<GWTPropertyDescriptor> keys = new TreeSet<>(

0 commit comments

Comments
 (0)