Skip to content
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

Jump to bottom

Fixed optional setting fields requiring a value set #1525

Merged
merged 3 commits into from
Oct 6, 2023
Merged

Fixed optional setting fields requiring a value set #1525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9cb148
Spelling
Mailaender Oct 6, 2023
9619b73
Mark export folder as required.
Mailaender Oct 6, 2023
33e3e13
Don't always complain for missing fields.
Mailaender Oct 6, 2023
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
2 changes: 1 addition & 1 deletion ...lipse/chemclipse/chromatogram/xxd/report/settings/AbstractChromatogramReportSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

public abstract class AbstractChromatogramReportSettings extends AbstractProcessSettings implements IChromatogramReportSettings {

@JsonProperty(value = "Export Folder", defaultValue = "")
@JsonProperty(value = "Export Folder", defaultValue = "", required = true)
@FileSettingProperty(onlyDirectory = true)
private File exportFolder;
@JsonProperty(value = "Append", defaultValue = "false")
Expand Down
2 changes: 1 addition & 1 deletion ...clipse/chemclipse/chromatogram/xxd/report/settings/DefaultChromatogramReportSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ protected String getDefaultFolder() {
}

/**
* Method that check if systemsettings are available, this is used in conjunction with the SystemSettings annotation but can also be called by user code
* Method that check if system settings are available, this is used in conjunction with the SystemSettings annotation but can also be called by user code
*
* @return
*/
Expand Down
4 changes: 2 additions & 2 deletions ...lipse.support/src/org/eclipse/chemclipse/support/settings/parser/SettingsClassParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
import org.eclipse.chemclipse.support.settings.SystemSettings;
import org.eclipse.chemclipse.support.settings.SystemSettingsStrategy;
import org.eclipse.chemclipse.support.settings.ValidatorSettingsProperty;
import org.eclipse.chemclipse.support.settings.validation.EmptyStringValidator;
import org.eclipse.chemclipse.support.settings.validation.EvenOddValidatorByte;
import org.eclipse.chemclipse.support.settings.validation.EvenOddValidatorInteger;
import org.eclipse.chemclipse.support.settings.validation.EvenOddValidatorLong;
import org.eclipse.chemclipse.support.settings.validation.EvenOddValidatorShort;
import org.eclipse.chemclipse.support.settings.validation.InputValidator;
import org.eclipse.chemclipse.support.settings.validation.MinMaxValidator;
import org.eclipse.chemclipse.support.settings.validation.RegularExpressionValidator;
import org.eclipse.core.databinding.validation.IValidator;
Expand Down Expand Up @@ -128,7 +128,7 @@ public List<InputValue> getInputValues() {
for(Annotation annotation : annotations) {
if(annotation instanceof JsonProperty jsonProperty) {
if(jsonProperty.required()) {
inputValue.addValidator(new InputValidator(inputValue));
inputValue.addValidator(new EmptyStringValidator());
}
}
if(annotation instanceof LabelProperty labelProperty) {
Expand Down
37 changes: 37 additions & 0 deletions ....support/src/org/eclipse/chemclipse/support/settings/validation/EmptyStringValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*******************************************************************************
* Copyright (c) 2023 Lablicate GmbH.
*
* All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Matthias Mailänder - initial API and implementation
*******************************************************************************/
package org.eclipse.chemclipse.support.settings.validation;

import org.eclipse.core.databinding.validation.IValidator;
import org.eclipse.core.databinding.validation.ValidationStatus;
import org.eclipse.core.runtime.IStatus;

public class EmptyStringValidator implements IValidator<Object> {

private static final String ERROR = "Please enter a value.";

public EmptyStringValidator() {

}

@Override
public IStatus validate(Object value) {

if(value == null) {
return ValidationStatus.error(ERROR);
}
if(value instanceof String text && text.isEmpty()) {
Mailaender marked this conversation as resolved.
Show resolved Hide resolved
return ValidationStatus.error(ERROR);
}
return ValidationStatus.ok();
}
}
4 changes: 1 addition & 3 deletions ...clipse.support/src/org/eclipse/chemclipse/support/settings/validation/InputValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ public IStatus validate(Object value) {
String message = null;
if(value == null) {
message = ERROR;
} else if(value instanceof String text && text.isEmpty()) {
message = ERROR;
} else {
Class<?> rawType = inputValue.getRawType();
if(rawType != null) {
Expand All @@ -65,7 +63,7 @@ private String parse(Class<?> rawType, String value) {
}
} else if(rawType == File.class) {
FileSettingProperty property = inputValue.getFileSettingProperty();
if(property != null && !(property.dialogType() == DialogType.SAVE_DIALOG)) {
if(property != null && property.dialogType() != DialogType.SAVE_DIALOG) {
if(value != null && !value.isEmpty() && !new File(value).exists()) {
return "Location does not exits, please choose a valid location";
}
Expand Down