Skip to content

Remove unnecessary HttpView.currentView() casts in JSPs #930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-adam merged 2 commits into from
Apr 7, 2025
Merged

Remove unnecessary HttpView.currentView() casts in JSPs #930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a35251c
Remove unnecessary HttpView.currentView() casts in JSPs
labkey-adam Apr 6, 2025
dc9ebde
Use non-deprecated parse method
labkey-adam Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions EHR_SM/src/org/labkey/ehr_sm/view/admin.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<EHR_SMController.AdminForm> me = (JspView<EHR_SMController.AdminForm>) HttpView.currentView();
EHR_SMController.AdminForm form = me.getModelBean();
JspView<AdminForm> me = HttpView.currentView();
AdminForm form = me.getModelBean();
%>
<labkey:errors/>
<labkey:form method="POST">
Expand Down
10 changes: 4 additions & 6 deletions snd/api-src/org/labkey/api/snd/Project.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/

Expand Down Expand Up @@ -181,7 +179,7 @@ public Date getStartDate()
@Nullable
public String startDateToString()
{
return DateUtil.formatDateISO8601(getStartDate());
return DateUtil.formatIsoDate(getStartDate());
}

public void setStartDate(Date startDate)
Expand All @@ -198,7 +196,7 @@ public Date getEndDate()
@Nullable
public String endDateToString()
{
return DateUtil.formatDateISO8601(getEndDate());
return DateUtil.formatIsoDate(getEndDate());
}

public void setEndDate(Date endDate)
Expand Down Expand Up @@ -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())
Expand All @@ -342,7 +340,7 @@ public JSONObject toJSON(Container c, User u)

JSONArray extras = new JSONArray();
Map<GWTPropertyDescriptor, Object> extraFields = getExtraFields();
if(extraFields.size() > 0)
if (!extraFields.isEmpty())
{
JSONObject jsonExtra;
Set<GWTPropertyDescriptor> keys = new TreeSet<>(
Expand Down