Revision f89ecd52
Added by Andreas Müller over 1 year ago
| src/main/java/eu/etaxonomy/vaadin/mvp/AbstractPopupEditor.java | ||
|---|---|---|
| 17 | 17 |
import java.util.Set; |
| 18 | 18 |
import java.util.Stack; |
| 19 | 19 |
|
| 20 |
import org.apache.logging.log4j.Level; |
|
| 21 | 20 |
import org.apache.logging.log4j.LogManager; |
| 22 | 21 |
import org.apache.logging.log4j.Logger; |
| 23 | 22 |
import org.vaadin.spring.events.EventScope; |
| ... | ... | |
| 429 | 428 |
viewEventBus.publish(EventScope.UI, this, new DoneWithPopupEvent(this, Reason.CANCEL)); |
| 430 | 429 |
} |
| 431 | 430 |
|
| 432 |
/** |
|
| 433 |
* @return |
|
| 434 |
*/ |
|
| 435 | 431 |
private void delete() {
|
| 436 | 432 |
viewEventBus.publish(this, new EditorDeleteEvent<DTO>(this, fieldGroup.getItemDataSource().getBean())); |
| 437 | 433 |
viewEventBus.publish(EventScope.UI, this, new DoneWithPopupEvent(this, Reason.DELETE)); |
| ... | ... | |
| 478 | 474 |
} |
| 479 | 475 |
} |
| 480 | 476 |
|
| 481 |
/** |
|
| 482 |
* @param invalidFields |
|
| 483 |
*/ |
|
| 484 | 477 |
private void updateFieldNotifications(Map<Field<?>, InvalidValueException> invalidFields) {
|
| 485 | 478 |
for(Field<?> f : invalidFields.keySet()){
|
| 486 | 479 |
if(f instanceof AbstractField){
|
| 487 | 480 |
String message = invalidFields.get(f).getHtmlMessage(); |
| 488 |
((AbstractField)f).setComponentError(new UserError(message, ContentMode.HTML, ErrorLevel.ERROR)); |
|
| 481 |
((AbstractField<?>)f).setComponentError(new UserError(message, ContentMode.HTML, ErrorLevel.ERROR));
|
|
| 489 | 482 |
} |
| 490 | 483 |
} |
| 491 |
|
|
| 492 | 484 |
} |
| 493 | 485 |
|
| 494 | 486 |
// ------------------------ field adding methods ------------------------ // |
| ... | ... | |
| 613 | 605 |
if(propertyId == null){
|
| 614 | 606 |
// not found in the editor field group. Maybe the field is bound to a nested fieldgroup? |
| 615 | 607 |
// 1. find the NestedFieldGroup implementations from the field up to the editor |
| 616 |
LogUtils.setLevel(logger, Level.DEBUG); |
|
| 617 | 608 |
PropertyIdPath nestedPropertyIds = new PropertyIdPath(); |
| 618 |
Field parentField = field; |
|
| 609 |
Field<?> parentField = field;
|
|
| 619 | 610 |
HasComponents parentComponent = parentField.getParent(); |
| 620 |
logger.debug("field: " + parentField.getClass().getSimpleName());
|
|
| 611 |
LogUtils.logAsDebug(logger, "field: " + parentField.getClass().getSimpleName());
|
|
| 621 | 612 |
while(parentComponent != null){
|
| 622 |
logger.debug("parentComponent: " + parentComponent.getClass().getSimpleName());
|
|
| 613 |
LogUtils.logAsDebug(logger, "parentComponent: " + parentComponent.getClass().getSimpleName());
|
|
| 623 | 614 |
if(NestedFieldGroup.class.isAssignableFrom(parentComponent.getClass()) && AbstractField.class.isAssignableFrom(parentComponent.getClass())){
|
| 624 | 615 |
Optional<FieldGroup> parentFieldGroup = ((NestedFieldGroup)parentComponent).getFieldGroup(); |
| 625 | 616 |
if(parentFieldGroup.isPresent()){
|
| 626 | 617 |
Object propId = parentFieldGroup.get().getPropertyId(parentField); |
| 627 | 618 |
if(propId != null){
|
| 628 |
logger.debug("propId: " + propId.toString());
|
|
| 619 |
LogUtils.logAsDebug(logger, "propId: " + propId.toString());
|
|
| 629 | 620 |
nestedPropertyIds.addParent(propId); |
| 630 | 621 |
} |
| 631 |
logger.debug("parentField: " + parentField.getClass().getSimpleName());
|
|
| 632 |
parentField = (Field)parentComponent; |
|
| 622 |
LogUtils.logAsDebug(logger, "parentField: " + parentField.getClass().getSimpleName());
|
|
| 623 |
parentField = (Field<?>)parentComponent;
|
|
| 633 | 624 |
} else {
|
| 634 |
logger.debug("parentFieldGroup is null, continuing ...");
|
|
| 625 |
LogUtils.logAsDebug(logger, "parentFieldGroup is null, continuing ...");
|
|
| 635 | 626 |
} |
| 636 | 627 |
} else if(parentComponent == this) {
|
| 637 | 628 |
// we reached the editor itself |
| 638 | 629 |
Object propId = fieldGroup.getPropertyId(parentField); |
| 639 | 630 |
if(propId != null){
|
| 640 |
logger.debug("propId: " + propId.toString());
|
|
| 631 |
LogUtils.logAsDebug(logger, "propId: " + propId.toString());
|
|
| 641 | 632 |
nestedPropertyIds.addParent(propId); |
| 642 | 633 |
} |
| 643 | 634 |
propertyIdPath = nestedPropertyIds; |
Also available in: Unified diff
ref #10072 some adaptations for setLevel in vaadin