catch up with branch development
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractFieldWidgetPresenter.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractFieldWidgetPresenter.java
index 9926e24..3e754b5 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractFieldWidgetPresenter.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/common/AbstractFieldWidgetPresenter.java
@@ -343,17 +343,16 @@
IFieldValidationManager service = getViewContext().getService(
IFieldValidationManager.class.getName());
if (service != null) {
- // reset all status
- service.registerResult(getModel(),
- Collections.<IStatus> emptyList());
-
+ List<IStatus> statuses = new ArrayList<IStatus>();
if (validators != null) {
- List<IStatus> statuses = new ArrayList<IStatus>();
for (IValidator validator : validators.keySet()) {
statuses.addAll(validator.getCurrentStatus());
}
- service.registerResult(getModel(), statuses);
}
+ if(externalStatusValidator != null) {
+ statuses.addAll(externalStatusValidator.getCurrentStatus());
+ }
+ service.registerResult(getModel(), statuses);
}
}
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/DateTimePresentation.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/DateTimePresentation.java
index 4c4c6c3..c9c6f6f 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/DateTimePresentation.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/internal/DateTimePresentation.java
@@ -424,6 +424,7 @@
resetDate.setIcon(FontAwesome.CALENDAR_CHECK_O);
resetDate.addClickListener(e -> {
property.setValue(new Date(System.currentTimeMillis()));
+ super.focus();
});
setFocusDelegate(field);
@@ -431,7 +432,6 @@
resetDate.setVisible(field.isVisible());
resetDate.setEnabled(field.isEnabled());
if(field.isReadOnly()){
- resetDate.setEnabled(false);
resetDate.setVisible(false);
}
diff --git a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/validator/ExternalStatusAwareValidator.java b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/validator/ExternalStatusAwareValidator.java
index 85fb17f..28a040c 100644
--- a/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/validator/ExternalStatusAwareValidator.java
+++ b/org.eclipse.osbp.runtime.web.ecview.presentation.vaadin/src/org/eclipse/osbp/runtime/web/ecview/presentation/vaadin/validator/ExternalStatusAwareValidator.java
@@ -42,7 +42,7 @@
public void addStatus(IStatus status) {
// only add errors
- if (!status.isError()) {
+ if (!status.isError() && !status.isWarning() && !status.isInfo()) {
return;
}
