Skip to content

Commit 83729f0

Browse files
vagishavagisha
committed
Renamed PrivateDataMessageSettings -> PrivateDataReminderSettings.java.
1 parent 36e0b33 commit 83729f0

5 files changed

Lines changed: 24 additions & 23 deletions

File tree

‎panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
import org.labkey.panoramapublic.datacite.Doi;
155155
import org.labkey.panoramapublic.datacite.DoiMetadata;
156156
import org.labkey.panoramapublic.message.PrivateDataMessageScheduler;
157-
import org.labkey.panoramapublic.message.PrivateDataMessageSettings;
157+
import org.labkey.panoramapublic.message.PrivateDataReminderSettings;
158158
import org.labkey.panoramapublic.model.CatalogEntry;
159159
import org.labkey.panoramapublic.model.DataLicense;
160160
import org.labkey.panoramapublic.model.DatasetStatus;
@@ -10170,7 +10170,7 @@ public ModelAndView getConfirmView(ShortUrlForm shortUrlForm, BindException erro
1017010170
@Override
1017110171
protected void doValidationForAction(Errors errors)
1017210172
{
10173-
PrivateDataMessageSettings settings = PrivateDataMessageSettings.get();
10173+
PrivateDataReminderSettings settings = PrivateDataReminderSettings.get();
1017410174
if (_datasetStatus != null)
1017510175
{
1017610176
if (_datasetStatus.isExtensionCurrent(settings))
@@ -10205,7 +10205,7 @@ protected void postNotification()
1020510205
public ModelAndView getSuccessView(ShortUrlForm shortUrlForm)
1020610206
{
1020710207
setTitle("Extension Request Success");
10208-
PrivateDataMessageSettings settings = PrivateDataMessageSettings.get();
10208+
PrivateDataReminderSettings settings = PrivateDataReminderSettings.get();
1020910209
return new HtmlView(DIV("An extension request was successfully submitted for the data at " + _exptAnnotations.getShortUrl().renderShortURL(),
1021010210
DIV("The extension is valid until " + _datasetStatus.extensionValidUntilFormatted(settings)),
1021110211
BR(),
@@ -10332,7 +10332,7 @@ public ModelAndView getView(PrivateDataReminderSettingsForm form, boolean reshow
1033210332
{
1033310333
if (!reshow)
1033410334
{
10335-
PrivateDataMessageSettings settings = PrivateDataMessageSettings.get();
10335+
PrivateDataReminderSettings settings = PrivateDataReminderSettings.get();
1033610336
form.setEnabled(settings.isEnableReminders());
1033710337
form.setExtensionLength(settings.getExtensionLength());
1033810338
form.setReminderFrequency(settings.getReminderFrequency());
@@ -10348,11 +10348,11 @@ public ModelAndView getView(PrivateDataReminderSettingsForm form, boolean reshow
1034810348
@Override
1034910349
public boolean handlePost(PrivateDataReminderSettingsForm form, BindException errors) throws Exception
1035010350
{
10351-
PrivateDataMessageSettings settings = new PrivateDataMessageSettings();
10351+
PrivateDataReminderSettings settings = new PrivateDataReminderSettings();
1035210352
settings.setEnableReminders(form.isEnabled());
1035310353
settings.setExtensionLength(form.getExtensionLength());
1035410354
settings.setReminderFrequency(form.getReminderFrequency());
10355-
PrivateDataMessageSettings.save(settings);
10355+
PrivateDataReminderSettings.save(settings);
1035610356

1035710357
PrivateDataMessageScheduler.getInstance().initialize(settings.isEnableReminders());
1035810358
return true;

panoramapublic/src/org/labkey/panoramapublic/message/PrivateDataMessageSettings.java renamed to panoramapublic/src/org/labkey/panoramapublic/message/PrivateDataReminderSettings.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.labkey.api.data.PropertyManager;
44

5-
public class PrivateDataMessageSettings
5+
public class PrivateDataReminderSettings
66
{
77
public static final String PROP_PRIVATE_DATA_REMINDER = "Panorama Public private data reminder settings";
88
public static final String PROP_ENABLE_REMINDER = "Enable private data reminder";
@@ -18,11 +18,11 @@ public class PrivateDataMessageSettings
1818
private int _extensionLength;
1919
private int _reminderFrequency;
2020

21-
public static PrivateDataMessageSettings get()
21+
public static PrivateDataReminderSettings get()
2222
{
2323
PropertyManager.WritablePropertyMap settingsMap = PropertyManager.getWritableProperties(PROP_PRIVATE_DATA_REMINDER, false);
2424

25-
PrivateDataMessageSettings settings = new PrivateDataMessageSettings();
25+
PrivateDataReminderSettings settings = new PrivateDataReminderSettings();
2626
if(settingsMap != null)
2727
{
2828
boolean enableReminders = settingsMap.get(PROP_EXTENSION_MONTHS) == null ? DEFAULT_ENABLE_REMINDERS : Boolean.valueOf(settingsMap.get(PROP_ENABLE_REMINDER));
@@ -42,7 +42,7 @@ public static PrivateDataMessageSettings get()
4242
return settings;
4343
}
4444

45-
public static void save(PrivateDataMessageSettings settings)
45+
public static void save(PrivateDataReminderSettings settings)
4646
{
4747
PropertyManager.WritablePropertyMap settingsMap = PropertyManager.getWritableProperties(PROP_PRIVATE_DATA_REMINDER, true);
4848
settingsMap.put(PROP_ENABLE_REMINDER, String.valueOf(settings.isEnableReminders()));

‎panoramapublic/src/org/labkey/panoramapublic/model/DatasetStatus.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import org.jetbrains.annotations.Nullable;
44
import org.labkey.api.util.DateUtil;
55
import org.labkey.api.view.ShortURLRecord;
6-
import org.labkey.panoramapublic.message.PrivateDataMessageSettings;
6+
import org.labkey.panoramapublic.message.PrivateDataReminderSettings;
77

88
import java.time.ZoneId;
99
import java.util.Date;
@@ -78,7 +78,7 @@ public boolean reminderSent()
7878
return _lastReminderDate != null;
7979
}
8080

81-
public boolean isExtensionCurrent(PrivateDataMessageSettings settings)
81+
public boolean isExtensionCurrent(PrivateDataReminderSettings settings)
8282
{
8383
if (_extensionRequestedDate == null)
8484
{
@@ -94,7 +94,7 @@ public boolean isExtensionCurrent(PrivateDataMessageSettings settings)
9494
return extensionDate.isAfter(extensionValidStartDate);
9595
}
9696

97-
public boolean isLastReminderRecent(PrivateDataMessageSettings settings)
97+
public boolean isLastReminderRecent(PrivateDataReminderSettings settings)
9898
{
9999
if (_lastReminderDate == null)
100100
{
@@ -110,7 +110,7 @@ public boolean isLastReminderRecent(PrivateDataMessageSettings settings)
110110
return reminderDate.isAfter(reminderValidStartDate);
111111
}
112112

113-
public @Nullable Date extensionValidUntil(PrivateDataMessageSettings settings)
113+
public @Nullable Date extensionValidUntil(PrivateDataReminderSettings settings)
114114
{
115115
if (_extensionRequestedDate == null)
116116
{
@@ -125,7 +125,7 @@ public boolean isLastReminderRecent(PrivateDataMessageSettings settings)
125125
);
126126
}
127127

128-
public @Nullable String extensionValidUntilFormatted(PrivateDataMessageSettings settings)
128+
public @Nullable String extensionValidUntilFormatted(PrivateDataReminderSettings settings)
129129
{
130130
return format(extensionValidUntil(settings));
131131
}

‎panoramapublic/src/org/labkey/panoramapublic/pipeline/PrivateDataReminderJob.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import org.labkey.api.view.ViewBackgroundInfo;
1818
import org.labkey.panoramapublic.PanoramaPublicManager;
1919
import org.labkey.panoramapublic.PanoramaPublicNotification;
20-
import org.labkey.panoramapublic.message.PrivateDataMessageSettings;
20+
import org.labkey.panoramapublic.message.PrivateDataReminderSettings;
2121
import org.labkey.panoramapublic.model.DatasetStatus;
2222
import org.labkey.panoramapublic.model.ExperimentAnnotations;
2323
import org.labkey.panoramapublic.model.Journal;
@@ -71,7 +71,7 @@ public static List<Integer> getPrivateDatasets(Journal panoramaPublic)
7171

7272
Set<Container> subFolders = ContainerManager.getAllChildren(panoramaPublic.getProject());
7373
List<Integer> privateDataIds = new ArrayList<>();
74-
PrivateDataMessageSettings settings = PrivateDataMessageSettings.get();
74+
PrivateDataReminderSettings settings = PrivateDataReminderSettings.get();
7575
for (Container folder : subFolders)
7676
{
7777
ExperimentAnnotations exptAnnotations = ExperimentAnnotationsManager.getExperimentInContainer(folder);
@@ -81,7 +81,7 @@ public static List<Integer> getPrivateDatasets(Journal panoramaPublic)
8181
return privateDataIds;
8282
}
8383

84-
private static ReminderDecision getReminderDecision(ExperimentAnnotations exptAnnotations, PrivateDataMessageSettings settings)
84+
private static ReminderDecision getReminderDecision(ExperimentAnnotations exptAnnotations, PrivateDataReminderSettings settings)
8585
{
8686
if (exptAnnotations == null)
8787
return ReminderDecision.skip("Experiment annotations are null");
@@ -157,7 +157,7 @@ private void postMessage(List<Integer> expAnnotationIds, Journal panoramaPublic)
157157

158158
int done = 0;
159159

160-
PrivateDataMessageSettings settings = PrivateDataMessageSettings.get();
160+
PrivateDataReminderSettings settings = PrivateDataReminderSettings.get();
161161

162162
AnnouncementService announcementSvc = AnnouncementService.get();
163163

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@
2020
<%@ page import="org.labkey.api.view.JspView" %>
2121
<%@ page import="org.labkey.panoramapublic.PanoramaPublicController" %>
2222
<%@ page import="org.labkey.api.view.template.ClientDependencies" %>
23-
<%@ page import="org.labkey.panoramapublic.message.PrivateDataMessageSettings" %>
23+
<%@ page import="org.labkey.panoramapublic.message.PrivateDataReminderSettings" %>
2424
<%@ page import="org.labkey.api.view.ActionURL" %>
2525
<%@ page import="org.labkey.panoramapublic.PanoramaPublicController.PrivateDataReminderSettingsForm" %>
2626
<%@ page import="org.labkey.panoramapublic.PanoramaPublicController.PanoramaPublicAdminViewAction" %>
2727
<%@ page import="org.labkey.panoramapublic.query.JournalManager" %>
2828
<%@ page import="org.labkey.panoramapublic.model.Journal" %>
2929
<%@ page import="java.util.List" %>
3030
<%@ page import="org.labkey.panoramapublic.PanoramaPublicController.PrivateDataReminderSettingsAction" %>
31+
<%@ page import="org.labkey.panoramapublic.message.PrivateDataReminderSettings" %>
3132
<%@ page extends="org.labkey.api.jsp.JspBase" %>
3233

3334
<%!
@@ -74,23 +75,23 @@
7475
<table class="lk-fields-table">
7576
<tr>
7677
<td class="labkey-form-label">
77-
<span><%=h(PrivateDataMessageSettings.PROP_ENABLE_REMINDER)%></span>
78+
<span><%=h(PrivateDataReminderSettings.PROP_ENABLE_REMINDER)%></span>
7879
</td>
7980
<td>
8081
<input style="padding:0 10px 0 0;" type="checkbox" name="enabled" <%=checked(form.isEnabled())%> />
8182
</td>
8283
</tr>
8384
<tr>
8485
<td class="labkey-form-label">
85-
<span><%=h(PrivateDataMessageSettings.PROP_EXTENSION_MONTHS)%></span>
86+
<span><%=h(PrivateDataReminderSettings.PROP_EXTENSION_MONTHS)%></span>
8687
</td>
8788
<td>
8889
<input style="padding:0 10px 0 0;" type="text" name="extensionLength" value="<%=form.getExtensionLength()%>" />
8990
</td>
9091
</tr>
9192
<tr>
9293
<td class="labkey-form-label">
93-
<span><%=h(PrivateDataMessageSettings.PROP_REMINDER_FREQUENCY)%></span>
94+
<span><%=h(PrivateDataReminderSettings.PROP_REMINDER_FREQUENCY)%></span>
9495
</td>
9596
<td>
9697
<input style="padding:0 10px 0 0;" type="text" name="reminderFrequency" value="<%=form.getReminderFrequency()%>" />

0 commit comments

Comments
 (0)