From a35251c29cf1e08cc0852d315cc3b6c2d35d1f9f Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Sun, 6 Apr 2025 16:54:56 -0700 Subject: [PATCH 1/2] Remove unnecessary HttpView.currentView() casts in JSPs --- EHR_SM/src/org/labkey/ehr_sm/view/admin.jsp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/EHR_SM/src/org/labkey/ehr_sm/view/admin.jsp b/EHR_SM/src/org/labkey/ehr_sm/view/admin.jsp index db104ce57..215b9b81e 100644 --- a/EHR_SM/src/org/labkey/ehr_sm/view/admin.jsp +++ b/EHR_SM/src/org/labkey/ehr_sm/view/admin.jsp @@ -19,12 +19,12 @@ <%@ page import="org.labkey.api.exp.api.ExpSampleType" %> <%@ page import="org.labkey.api.view.HttpView" %> <%@ page import="org.labkey.api.view.JspView" %> -<%@ page import="org.labkey.ehr_sm.EHR_SMController" %> +<%@ page import="org.labkey.ehr_sm.EHR_SMController.AdminForm" %> <%@ page import="java.util.Set" %> <%@ page extends="org.labkey.api.jsp.JspBase" %> <% - JspView me = (JspView) HttpView.currentView(); - EHR_SMController.AdminForm form = me.getModelBean(); + JspView me = HttpView.currentView(); + AdminForm form = me.getModelBean(); %> From dc9ebde6ecf7d78b32e52ecbd5ba056e5b71077b Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Sun, 6 Apr 2025 20:46:38 -0700 Subject: [PATCH 2/2] Use non-deprecated parse method --- snd/api-src/org/labkey/api/snd/Project.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/snd/api-src/org/labkey/api/snd/Project.java b/snd/api-src/org/labkey/api/snd/Project.java index c71cf534c..fe9a1b259 100644 --- a/snd/api-src/org/labkey/api/snd/Project.java +++ b/snd/api-src/org/labkey/api/snd/Project.java @@ -36,8 +36,6 @@ import java.util.TreeSet; /** - * Created by marty on 8/4/2017. - * * Class for project data and related methods. Used when saving, updating, deleting and getting a project */ @@ -181,7 +179,7 @@ public Date getStartDate() @Nullable public String startDateToString() { - return DateUtil.formatDateISO8601(getStartDate()); + return DateUtil.formatIsoDate(getStartDate()); } public void setStartDate(Date startDate) @@ -198,7 +196,7 @@ public Date getEndDate() @Nullable public String endDateToString() { - return DateUtil.formatDateISO8601(getEndDate()); + return DateUtil.formatIsoDate(getEndDate()); } public void setEndDate(Date endDate) @@ -330,7 +328,7 @@ public JSONObject toJSON(Container c, User u) if (getEndDate() != null) json.put(PROJECT_ENDDATE, endDateToString()); - if (getProjectItems().size() > 0) + if (!getProjectItems().isEmpty()) { JSONArray jsonProjectItems = new JSONArray(); for (ProjectItem projectItem : getProjectItems()) @@ -342,7 +340,7 @@ public JSONObject toJSON(Container c, User u) JSONArray extras = new JSONArray(); Map extraFields = getExtraFields(); - if(extraFields.size() > 0) + if (!extraFields.isEmpty()) { JSONObject jsonExtra; Set keys = new TreeSet<>(