mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-09-22 21:55:39 +00:00
bug 5774: Implemented default value handling.
This commit is contained in:
+2
-2
@@ -45,8 +45,8 @@ public abstract class AbstractValueSetting<T> extends AbstractHasValueSetting<T>
|
||||
}
|
||||
|
||||
@Override
|
||||
public final void resetToDefault() {
|
||||
setValue(defaultValue);
|
||||
public void resetToDefault() {
|
||||
this.setValue(defaultValue);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+19
-1
@@ -26,7 +26,7 @@ public abstract class AbstractSecuredValueSetting<T> extends AbstractValueSetti
|
||||
}
|
||||
|
||||
@Override
|
||||
public T getValue() {
|
||||
public final T getValue() {
|
||||
if(dtoContext.isPresent() && paywallResolver.hasPermission(action, dtoContext.getSecuredDTO())) {
|
||||
return super.getValue();
|
||||
}else {
|
||||
@@ -41,6 +41,24 @@ public abstract class AbstractSecuredValueSetting<T> extends AbstractValueSetti
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public final void resetToDefault() {
|
||||
super.setValue(getDefaultValue());
|
||||
}
|
||||
|
||||
@Override
|
||||
public final boolean isDefaultValue() {
|
||||
final T value = super.getValue();
|
||||
if (value == getDefaultValue()) {
|
||||
return true;
|
||||
}
|
||||
if (value != null) {
|
||||
return value.equals(getDefaultValue());
|
||||
}
|
||||
// value == null && defaultValue != null => value isn't default
|
||||
return false;
|
||||
}
|
||||
|
||||
public void getUnlockingSubscriptionPlans(Consumer<List<String>> callback) {
|
||||
this.paywallResolver.getUnlockingSubscriptionPlans(action, dtoContext.getSecuredDTO(), callback);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user