Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
8006432
Create base ConstellationInputField
capricornunicorn123 Apr 19, 2024
b737c0f
Enhance Value Inputs
capricornunicorn123 Apr 21, 2024
2b5076d
Enhance File Inputs
capricornunicorn123 Apr 23, 2024
00a8d8f
Enhance focus
capricornunicorn123 Apr 24, 2024
d3b8e19
Enhance Color Inputs
capricornunicorn123 Apr 30, 2024
87c061e
Enhance Inputs
capricornunicorn123 May 1, 2024
1fbc12e
Formatting enhancments
capricornunicorn123 May 1, 2024
2be7c51
Enhance ColorInputFiled validation and mode changes
capricornunicorn123 May 13, 2024
4df80e5
Enhance SingleChoice Inputs
capricornunicorn123 May 13, 2024
05b2739
Enhance MultiChoice Inputs
capricornunicorn123 May 13, 2024
e99cd64
Enhance Choice Inputs with icons and separators
capricornunicorn123 May 14, 2024
212cde5
Choice Input validation enhancement and change listeners implementation
capricornunicorn123 May 14, 2024
2ed16d4
Enhance ChoiceInput listeners
capricornunicorn123 May 15, 2024
ffa098a
Enhance input field appearance
capricornunicorn123 May 15, 2024
48adfd8
Enable spinner style single choice field
capricornunicorn123 May 15, 2024
602a91f
Enhance Date Inputs
capricornunicorn123 May 15, 2024
2898f56
Refine ParameterInputPane responsibility and enhance PluginParameter …
capricornunicorn123 May 16, 2024
e0c6e09
ConstellationInputField commenting, consolidation and cleaning
capricornunicorn123 May 23, 2024
e73dd0b
Merge branch 'master' into Enhancement/input-fields
capricornunicorn123 May 23, 2024
7514c3a
Revert ValueInputPane Enhancements
capricornunicorn123 May 23, 2024
5e5b8f9
Fix Borken ColorIOProviderNGTest
capricornunicorn123 May 23, 2024
b1067f1
Attempt to fix online tests
capricornunicorn123 May 23, 2024
d7ce0b3
Decouple SpellChecker from SpellCheckingTextArea
capricornunicorn123 May 28, 2024
e43fd84
Enhance PassswrdInputPane
capricornunicorn123 May 28, 2024
50e1ee6
Separate the dependency of StyleableTextArea on InlineCssTextArea
capricornunicorn123 May 28, 2024
17bb2d7
Encapsulate StyleableTextArea functionality in ConstellationTextArea
capricornunicorn123 May 29, 2024
a038c90
Refactor Recent Parameter Framework to Revent Value Framework to enab…
capricornunicorn123 May 29, 2024
50711b6
Enable dynamic creation of ContextMenu on ConstellationInputField
capricornunicorn123 Jun 3, 2024
7502c46
Merge branch 'master' into Enhancement/input-fields
capricornunicorn123 Jun 20, 2024
a8e51c2
Refactor ConstellationTextArea to use TextInputControl
capricornunicorn123 Jun 21, 2024
408b16f
ColorInput validation enhancements
capricornunicorn123 Jun 21, 2024
8bcb7d6
Implement NumberInputPane
capricornunicorn123 Jun 21, 2024
7363a4b
Refactor ConstellationInputField to use HBox instead of GridPane
capricornunicorn123 Jun 23, 2024
9e99e55
Implement InputInfoWindow to add extra context to input fields
capricornunicorn123 Jun 24, 2024
13af8b5
Fix single choice shortcuts
capricornunicorn123 Jun 24, 2024
9eb576c
Override the traverse focus key shortcut for TextAreas in Constelatio…
capricornunicorn123 Jun 24, 2024
cd629e9
Reinstate AutoComplete and extend to ChoiceInputs
capricornunicorn123 Jun 25, 2024
9aa2d8b
Enhance Tests
capricornunicorn123 Jun 25, 2024
1408a06
Implement ConstellationInputFieldListener
capricornunicorn123 Jun 26, 2024
5963600
Refactor button creation to interface
capricornunicorn123 Jun 27, 2024
2cceb21
Refactor InfoWindow to Interface
capricornunicorn123 Jun 27, 2024
1f901fe
Commit missed files
capricornunicorn123 Jun 27, 2024
5c1f181
Refactor auto complete to Interface
capricornunicorn123 Jun 27, 2024
53b5ffb
Commit missed classes
capricornunicorn123 Jun 27, 2024
69f65bd
Refactor ContellationInputFiels supporting framework to unexported pa…
capricornunicorn123 Jun 27, 2024
08f2110
Refactor KeyPressShortcut to Interface
capricornunicorn123 Jun 27, 2024
75a5747
Fix build issues
capricornunicorn123 Jun 27, 2024
8a3f89b
Remove dependence on LayoutConstants
capricornunicorn123 Jun 27, 2024
bdc1139
Refactor RecentValueListener to be more generic
capricornunicorn123 Jun 27, 2024
a218428
Enabled ConstelationColor swatch on ColorInputField
capricornunicorn123 Jun 28, 2024
9a9a120
Separate Choice Input Types
capricornunicorn123 Jun 28, 2024
5313d17
Refactor input field support framework interfaces
capricornunicorn123 Jun 28, 2024
49d3c16
Abstract choice input
capricornunicorn123 Jun 28, 2024
b465c43
Enable ChoiceInput options to be listenable
capricornunicorn123 Jun 28, 2024
c2a7429
Simplify input field class names
capricornunicorn123 Jun 28, 2024
03b3be3
Make Choice input options observable
capricornunicorn123 Jun 30, 2024
819c3af
Increase code documentation
capricornunicorn123 Jul 2, 2024
a38467a
Enhance code documentation
capricornunicorn123 Jul 3, 2024
a0b49a6
Enhance code documentation
capricornunicorn123 Jul 3, 2024
6ba013d
Fix code smells
capricornunicorn123 Jul 3, 2024
f7f5c42
Enhance text area sizing
capricornunicorn123 Jul 4, 2024
bad0a4a
Fix number incrementation issues when no step value provided
capricornunicorn123 Jul 4, 2024
34debaa
Fix ContextMenu dimensions
capricornunicorn123 Jul 4, 2024
f8b22a8
Fix colorinput swatch button label
capricornunicorn123 Jul 4, 2024
73bab16
Enable case insensitive autocorrect options
capricornunicorn123 Jul 4, 2024
f964a58
Enhance field validity visual indications
capricornunicorn123 Jul 6, 2024
0dc1890
Refactor file extension setting to enable updating input fields
capricornunicorn123 Jul 6, 2024
c7f82e7
Enable inputFileds to be validated by external contributors
capricornunicorn123 Jul 9, 2024
8ac9bf3
Merge branch 'master' into Enhancement/input-fields
Delphinus8821 Feb 10, 2026
8b9b979
Fix merge issues
Delphinus8821 Feb 11, 2026
b193eb7
Fix exceptions
Delphinus8821 Feb 18, 2026
1db5d56
Merge branch 'master' into Enhancement/input-fields
Delphinus8821 Feb 18, 2026
b553b42
Fix buttons
Delphinus8821 Feb 23, 2026
215a9fb
Fix unit tests
Delphinus8821 Feb 24, 2026
1604127
Fix unit tests
Delphinus8821 Feb 24, 2026
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
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
import au.gov.asd.tac.constellation.plugins.templates.PluginTags;
import au.gov.asd.tac.constellation.plugins.templates.SimpleReadPlugin;
import au.gov.asd.tac.constellation.utilities.color.ConstellationColor;
import au.gov.asd.tac.constellation.utilities.temporal.TimeZoneUtilities;
import au.gov.asd.tac.constellation.utilities.temporal.TemporalUtilities;
import java.awt.Color;
import java.text.SimpleDateFormat;
import java.time.Instant;
Expand Down Expand Up @@ -282,8 +282,8 @@ public void updateParameters(final Graph graph, final PluginParameters parameter
return;
}

ZonedDateTime min = ZonedDateTime.ofInstant(Instant.now(), TimeZoneUtilities.UTC);
ZonedDateTime max = ZonedDateTime.ofInstant(Instant.EPOCH, TimeZoneUtilities.UTC);
ZonedDateTime min = ZonedDateTime.ofInstant(Instant.now(), TemporalUtilities.UTC);
ZonedDateTime max = ZonedDateTime.ofInstant(Instant.EPOCH, TemporalUtilities.UTC);
final int txCount = rg.getTransactionCount();
boolean nonNullDateTimeFound = false;
for (int position = 0; position < txCount; position++) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import au.gov.asd.tac.constellation.graph.attribute.ZonedDateTimeAttributeDescription;
import au.gov.asd.tac.constellation.graph.attribute.interaction.ValueValidator;
import au.gov.asd.tac.constellation.utilities.temporal.TemporalFormatting;
import au.gov.asd.tac.constellation.utilities.temporal.TimeZoneUtilities;
import au.gov.asd.tac.constellation.utilities.temporal.TemporalUtilities;
import au.gov.asd.tac.constellation.views.attributeeditor.editors.operations.EditOperation;
import java.time.LocalDate;
import java.time.LocalTime;
Expand Down Expand Up @@ -153,7 +153,7 @@ protected Node createEditorControls() {
final ObservableList<ZoneId> timeZones = FXCollections.observableArrayList();
ZoneId.getAvailableZoneIds().forEach(id -> timeZones.add(ZoneId.of(id)));
timeZoneComboBox = new ComboBox<>(timeZones.sorted(zoneIdComparator));
timeZoneComboBox.getSelectionModel().select(TimeZoneUtilities.UTC);
timeZoneComboBox.getSelectionModel().select(TemporalUtilities.UTC);
timeZoneComboBox.getSelectionModel().selectedItemProperty().addListener(updateTimeFromZone);

final Label timeZoneComboBoxLabel = new Label("Time Zone:");
Expand All @@ -165,15 +165,18 @@ protected Node createEditorControls() {
protected void updateItem(final ZoneId item, final boolean empty) {
super.updateItem(item, empty);
if (item != null) {
setText(TimeZoneUtilities.getTimeZoneAsString(currentValue == null ? null : currentValue.toLocalDateTime(), item));
setText(TemporalUtilities.getTimeZoneAsString(currentValue == null ? null : currentValue.toLocalDateTime(), item));
}
}
};
timeZoneComboBox.setCellFactory(cellFactory);
timeZoneComboBox.setButtonCell(cellFactory.call(null));

final HBox timeZoneHbox = new HBox(CONTROLS_DEFAULT_HORIZONTAL_SPACING,
timeZoneComboBoxLabel, timeZoneComboBox);
timeZoneComboBox.getSelectionModel().select(TemporalUtilities.UTC);
timeZoneComboBox.getSelectionModel().selectedItemProperty().addListener(updateTimeFromZone);

final HBox timeZoneHbox = new HBox(timeZoneComboBoxLabel, timeZoneComboBox);
timeZoneHbox.setSpacing(5);

final HBox timeSpinnerContainer = createTimeSpinners();

final VBox controls = new VBox(CONTROLS_DEFAULT_VERTICAL_SPACING,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import au.gov.asd.tac.constellation.graph.attribute.TimeZoneAttributeDescription;
import au.gov.asd.tac.constellation.graph.attribute.interaction.ValueValidator;
import au.gov.asd.tac.constellation.utilities.temporal.TimeZoneUtilities;
import au.gov.asd.tac.constellation.utilities.temporal.TemporalUtilities;
import au.gov.asd.tac.constellation.views.attributeeditor.editors.operations.EditOperation;
import java.time.ZoneId;
import java.util.Comparator;
Expand Down Expand Up @@ -85,15 +85,15 @@ protected Node createEditorControls() {
final ObservableList<ZoneId> timeZones = FXCollections.observableArrayList();
ZoneId.getAvailableZoneIds().forEach(id -> timeZones.add(ZoneId.of(id)));
timeZoneComboBox = new ComboBox<>(timeZones.sorted(zoneIdComparator));
timeZoneComboBox.getSelectionModel().select(TimeZoneUtilities.UTC);
timeZoneComboBox.getSelectionModel().select(TemporalUtilities.UTC);
timeZoneComboBox.getSelectionModel().selectedItemProperty().addListener((o, n, v) -> update());

final Callback<ListView<ZoneId>, ListCell<ZoneId>> cellFactory = p -> new ListCell<>() {
@Override
protected void updateItem(final ZoneId item, final boolean empty) {
super.updateItem(item, empty);
if (item != null) {
setText(TimeZoneUtilities.getTimeZoneAsString(item));
setText(TemporalUtilities.getTimeZoneAsString(item));
}
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package au.gov.asd.tac.constellation.views.attributeeditor.editors;

import au.gov.asd.tac.constellation.graph.attribute.interaction.ValueValidator;
import au.gov.asd.tac.constellation.utilities.temporal.TimeZoneUtilities;
import au.gov.asd.tac.constellation.utilities.temporal.TemporalUtilities;
import au.gov.asd.tac.constellation.views.attributeeditor.editors.AbstractEditorFactory.AbstractEditor;
import au.gov.asd.tac.constellation.views.attributeeditor.editors.AbstractEditorFactory.ControlsInvalidException;
import au.gov.asd.tac.constellation.views.attributeeditor.editors.DateTimeEditorFactory.DateTimeEditor;
Expand Down Expand Up @@ -110,7 +110,7 @@ public void testUpdateControlsWithValue() {
assertEquals(editor.getMinValue(), (Integer) 0);
assertEquals(editor.getSecValue(), (Integer) 0);
assertEquals(editor.getMilliValue(), (Integer) 0);
assertEquals(editor.getTZValue(), TimeZoneUtilities.UTC);
assertEquals(editor.getTZValue(), TemporalUtilities.UTC);

editor.updateControlsWithValue(ZonedDateTime.of(2050, 5, 5, 5, 50, 50, 5000000, ZoneId.of("GMT+2")));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package au.gov.asd.tac.constellation.views.attributeeditor.editors;

import au.gov.asd.tac.constellation.graph.attribute.interaction.ValueValidator;
import au.gov.asd.tac.constellation.utilities.temporal.TimeZoneUtilities;
import au.gov.asd.tac.constellation.utilities.temporal.TemporalUtilities;
import au.gov.asd.tac.constellation.views.attributeeditor.editors.AbstractEditorFactory.AbstractEditor;
import au.gov.asd.tac.constellation.views.attributeeditor.editors.TimeZoneEditorFactory.TimeZoneEditor;
import java.time.ZoneId;
Expand Down Expand Up @@ -108,7 +108,7 @@ public void testUpdateControlsWithValue() {
editor.createEditorControls();

// default values from instantiation
assertEquals(editor.getValueFromControls(), TimeZoneUtilities.UTC);
assertEquals(editor.getValueFromControls(), TemporalUtilities.UTC);

editor.updateControlsWithValue(ZoneId.of("GMT+2"));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import au.gov.asd.tac.constellation.graph.GraphReadMethods;
import au.gov.asd.tac.constellation.utilities.javafx.JavafxStyleManager;
import au.gov.asd.tac.constellation.utilities.temporal.TimeZoneUtilities;
import au.gov.asd.tac.constellation.utilities.temporal.TemporalUtilities;
import java.time.ZonedDateTime;
import java.time.temporal.ChronoField;
import java.util.List;
Expand All @@ -40,7 +40,7 @@ public void updateMessageBackgrounds(final GraphReadMethods graph, final List<Co

for (final ConversationMessage message : messages) {
// Get the unique day since the epcoh of the date-time in UTC.
final int day = (int) ZonedDateTime.of(message.getDatetime().getDate().toLocalDateTime(), TimeZoneUtilities.UTC).getLong(ChronoField.EPOCH_DAY);
final int day = (int) ZonedDateTime.of(message.getDatetime().getDate().toLocalDateTime(), TemporalUtilities.UTC).getLong(ChronoField.EPOCH_DAY);

if (day != currentDay) {
currentColor ^= 1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import au.gov.asd.tac.constellation.graph.manager.GraphManager;
import au.gov.asd.tac.constellation.plugins.parameters.PluginParameters;
import au.gov.asd.tac.constellation.plugins.parameters.RecentParameterValues;
import au.gov.asd.tac.constellation.plugins.parameters.types.DateTimeRange;
import au.gov.asd.tac.constellation.utilities.text.SeparatorConstants;
import au.gov.asd.tac.constellation.views.dataaccess.CoreGlobalParameters;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import au.gov.asd.tac.constellation.plugins.gui.PluginParametersPaneListener;
import au.gov.asd.tac.constellation.plugins.parameters.PluginParameter;
import au.gov.asd.tac.constellation.plugins.parameters.PluginParameters;
import au.gov.asd.tac.constellation.plugins.parameters.RecentParameterValues;
import au.gov.asd.tac.constellation.utilities.gui.recentvalue.RecentValueUtility;
import au.gov.asd.tac.constellation.views.dataaccess.api.DataAccessPaneState;
import au.gov.asd.tac.constellation.views.dataaccess.components.DataAccessTabPane;
import au.gov.asd.tac.constellation.views.dataaccess.plugins.DataAccessPlugin;
Expand Down Expand Up @@ -406,7 +406,7 @@ public void storeParameterValues() {
-> param.getValue().getStringValue() != null
&& !param.getValue().getStringValue().isEmpty()
)
.forEach(param -> RecentParameterValues.storeRecentValue(
.forEach(param -> RecentValueUtility.storeRecentValue(
param.getKey(), param.getValue().getStringValue()
));

Expand All @@ -420,12 +420,12 @@ public void storeParameterValues() {
.filter(param -> param.getValue().getObjectValue() != null)
.forEach(param -> {
if (!param.getValue().getType().toString().contains(DataAccessTabPane.LOCAL_DATE_PARAMETER_TYPE)) {
RecentParameterValues.storeRecentValue(
RecentValueUtility.storeRecentValue(
param.getKey(),
param.getValue().getStringValue()
);
} else {
RecentParameterValues.storeRecentValue(
RecentValueUtility.storeRecentValue(
param.getKey(),
param.getValue().getObjectValue().toString()
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
import au.gov.asd.tac.constellation.plugins.templates.PluginTags;
import au.gov.asd.tac.constellation.utilities.color.ConstellationColor;
import au.gov.asd.tac.constellation.utilities.file.FileExtensionConstants;
import au.gov.asd.tac.constellation.utilities.gui.field.framework.ConstellationInputConstants.FileInputKind;
import au.gov.asd.tac.constellation.utilities.text.SpellCheckingTextArea;
import au.gov.asd.tac.constellation.views.dataaccess.CoreGlobalParameters;
import au.gov.asd.tac.constellation.views.dataaccess.plugins.DataAccessPlugin;
Expand All @@ -83,12 +84,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import javafx.scene.control.CheckBox;
import javafx.scene.control.ComboBox;
import javafx.scene.control.ListCell;
import javafx.scene.control.ListView;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.paint.Color;
import javafx.stage.FileChooser.ExtensionFilter;
import org.netbeans.api.annotations.common.StaticResource;
import org.openide.util.NbBundle.Messages;
Expand Down Expand Up @@ -272,14 +268,14 @@ public PluginParameters createParameters() {
final PluginParameter<FileParameterValue> openFileParam = FileParameterType.build(INPUT_FILE_PARAMETER_ID);
openFileParam.setName("Input file");
openFileParam.setDescription("A file to read stuff from");
FileParameterType.setKind(openFileParam, FileParameterType.FileParameterKind.OPEN);
FileParameterType.setKind(openFileParam, FileInputKind.OPEN);
FileParameterType.enableAcceptAllFileFilter(openFileParam);
params.addParameter(openFileParam);

final PluginParameter<FileParameterValue> saveFileParam = FileParameterType.build(OUTPUT_FILE_PARAMETER_ID);
saveFileParam.setName("Output file");
saveFileParam.setDescription("A file to write stuff to");
FileParameterType.setKind(saveFileParam, FileParameterType.FileParameterKind.SAVE);
FileParameterType.setKind(saveFileParam, FileInputKind.SAVE);
FileParameterType.setFileFilters(saveFileParam, new ExtensionFilter("Text files", FileExtensionConstants.TEXT));
params.addParameter(saveFileParam);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
import au.gov.asd.tac.constellation.graph.manager.GraphManager;
import au.gov.asd.tac.constellation.plugins.parameters.PluginParameter;
import au.gov.asd.tac.constellation.plugins.parameters.PluginParameters;
import au.gov.asd.tac.constellation.plugins.parameters.RecentParameterValues;
import au.gov.asd.tac.constellation.plugins.parameters.types.BooleanParameterType;
import au.gov.asd.tac.constellation.plugins.parameters.types.DateTimeRange;
import au.gov.asd.tac.constellation.plugins.parameters.types.LocalDateParameterType;
import au.gov.asd.tac.constellation.utilities.gui.recentvalue.RecentValueUtility;
import au.gov.asd.tac.constellation.views.dataaccess.DataAccessViewTopComponent;
import au.gov.asd.tac.constellation.views.dataaccess.api.DataAccessPaneState;
import au.gov.asd.tac.constellation.views.dataaccess.panes.DataAccessPane;
Expand Down Expand Up @@ -372,12 +372,12 @@ public void storeParameterValues_verify_global_params_stored() {
when(pluginParameter3.getStringValue()).thenReturn("PluginParam3 String Value");

try (
final MockedStatic<RecentParameterValues> recentParamValsMockedStatic
= Mockito.mockStatic(RecentParameterValues.class);) {
final MockedStatic<RecentValueUtility> recentParamValsMockedStatic
= Mockito.mockStatic(RecentValueUtility.class);) {
dataAccessTabPane.storeParameterValues();

// Verify that only plugin 3 parameter was set in the store
recentParamValsMockedStatic.verify(() -> RecentParameterValues
recentParamValsMockedStatic.verify(() -> RecentValueUtility
.storeRecentValue("plugin3", "PluginParam3 String Value"));
}
}
Expand Down Expand Up @@ -456,14 +456,15 @@ public void storeParameterValues_verify_plugin_params_stored() {
when(pluginParameter3.getStringValue()).thenReturn("PluginParam3 String Value");

try (
final MockedStatic<RecentParameterValues> recentParamValsMockedStatic
= Mockito.mockStatic(RecentParameterValues.class);) {
final MockedStatic<RecentValueUtility> recentParamValsMockedStatic =
Mockito.mockStatic(RecentValueUtility.class);
) {
dataAccessTabPane.storeParameterValues();

// Verify that parameters for plugins 2 and 3 were set to the store correctly
recentParamValsMockedStatic.verify(() -> RecentParameterValues
recentParamValsMockedStatic.verify(() -> RecentValueUtility
.storeRecentValue("plugin2", "PluginParam2 Object Value"));
recentParamValsMockedStatic.verify(() -> RecentParameterValues
recentParamValsMockedStatic.verify(() -> RecentValueUtility
.storeRecentValue("plugin3", "PluginParam3 String Value"));
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import au.gov.asd.tac.constellation.graph.GraphElementType;
import au.gov.asd.tac.constellation.graph.attribute.ZonedDateTimeAttributeDescription;
import au.gov.asd.tac.constellation.utilities.temporal.TimeZoneUtilities;
import au.gov.asd.tac.constellation.utilities.temporal.TemporalUtilities;
import au.gov.asd.tac.constellation.views.find.components.AdvancedFindTab;
import au.gov.asd.tac.constellation.views.find.components.advanced.criteriavalues.DateTimeCriteriaValues;
import au.gov.asd.tac.constellation.views.find.components.advanced.criteriavalues.FindCriteriaValues;
Expand Down Expand Up @@ -236,15 +236,15 @@ private void timeFrameSelectionAction(final String choiceSelection) {
// and the previously selected timeZone
dateStringTwo = LocalDate.now().toString();
timeStringTwo = "23:59:59.999";
timeZoneStringTwo = (StringUtils.isEmpty(timeZoneString) ? TimeZoneUtilities.getTimeZoneAsString(TimeZoneUtilities.UTC) : TimeZoneUtilities.getTimeZoneAsString(ZoneId.of(formattedTimeZoneString)));
timeZoneStringTwo = (StringUtils.isEmpty(timeZoneString) ? TemporalUtilities.getTimeZoneAsString(TemporalUtilities.UTC) : TemporalUtilities.getTimeZoneAsString(ZoneId.of(formattedTimeZoneString)));

// set dateTime one data to the min time of today
// and the previously selected timeZone
timeString = "00:00:00.000";
timeZoneString = (StringUtils.isEmpty(timeZoneString) ? TimeZoneUtilities.getTimeZoneAsString(TimeZoneUtilities.UTC) : TimeZoneUtilities.getTimeZoneAsString(ZoneId.of(formattedTimeZoneString)));
timeZoneString = (StringUtils.isEmpty(timeZoneString) ? TemporalUtilities.getTimeZoneAsString(TemporalUtilities.UTC) : TemporalUtilities.getTimeZoneAsString(ZoneId.of(formattedTimeZoneString)));

// The Local Date value of the current date based of the timeZone
final LocalDate calculatedDate = LocalDate.now(StringUtils.isEmpty(dateString) ? TimeZoneUtilities.UTC : ZoneId.of(formattedTimeZoneString));
final LocalDate calculatedDate = LocalDate.now(dateString.equals("") ? TemporalUtilities.UTC : ZoneId.of(formattedTimeZoneString));

// Switch statment that determines the date string one value based
// off the choiceSelection
Expand Down
Loading