From adc92d931edf65b350bba312576f35da8d4abce6 Mon Sep 17 00:00:00 2001 From: Richard Richter Date: Wed, 17 Jun 2020 13:43:21 +0200 Subject: [PATCH] GUI *WrapperImpl classes: @NotNull propagated from superclass --- .../impl/prism/wrapper/ItemWrapperImpl.java | 36 +++++++------------ .../wrapper/PrismReferenceWrapperImpl.java | 13 ++++--- 2 files changed, 18 insertions(+), 31 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ItemWrapperImpl.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ItemWrapperImpl.java index 75b9a1b8bac..e156026e9a9 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ItemWrapperImpl.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ItemWrapperImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2018 Evolveum and contributors + * Copyright (c) 2010-2020 Evolveum and contributors * * This work is dual-licensed under the Apache License 2.0 * and European Union Public License. See LICENSE file for details. @@ -12,14 +12,8 @@ import java.util.List; import java.util.Map; import java.util.function.Consumer; - import javax.xml.namespace.QName; -import com.evolveum.midpoint.gui.api.prism.wrapper.*; -import com.evolveum.midpoint.gui.api.util.ModelServiceLocator; -import com.evolveum.midpoint.prism.*; -import com.evolveum.midpoint.xml.ns._public.common.common_3.*; - import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.Validate; @@ -27,7 +21,10 @@ import com.evolveum.midpoint.gui.api.page.PageBase; import com.evolveum.midpoint.gui.api.prism.ItemStatus; +import com.evolveum.midpoint.gui.api.prism.wrapper.*; +import com.evolveum.midpoint.gui.api.util.ModelServiceLocator; import com.evolveum.midpoint.gui.api.util.WebPrismUtil; +import com.evolveum.midpoint.prism.*; import com.evolveum.midpoint.prism.delta.ItemDelta; import com.evolveum.midpoint.prism.path.ItemName; import com.evolveum.midpoint.prism.path.ItemPath; @@ -39,10 +36,10 @@ import com.evolveum.midpoint.web.component.data.column.ColumnUtils; import com.evolveum.midpoint.web.component.prism.ItemVisibility; import com.evolveum.midpoint.web.component.prism.ValueStatus; +import com.evolveum.midpoint.xml.ns._public.common.common_3.*; /** * @author katka - * */ public abstract class ItemWrapperImpl implements ItemWrapper, Serializable { @@ -69,7 +66,6 @@ public abstract class ItemWrapperImpl parent, I item, ItemStatus } for (VW value : values) { - value.addToDelta((ItemDelta)delta); + value.addToDelta((ItemDelta) delta); } if (delta.isEmpty()) { @@ -122,14 +118,12 @@ public String getDisplayName() { return displayName; } - - @Override public String getHelp() { return WebPrismUtil.getHelpText(getItemDefinition()); } - @Override + @Override public boolean isExperimental() { return getItemDefinition().isExperimental(); } @@ -262,7 +256,6 @@ private String localizeName(String nameKey, String defaultString) { return ColumnUtils.createStringResource(nameKey, defaultString).getString(); } - @Override public ItemStatus findObjectStatus() { if (parent == null) { @@ -304,7 +297,6 @@ private , O extends ObjectType> OW findObjectWr } - @Override public List getValues() { return values; @@ -443,7 +435,7 @@ public boolean isValidFor(QName elementQName, Class cl } @Override - public boolean isValidFor(QName elementQName, Class clazz, boolean caseInsensitive) { + public boolean isValidFor(@NotNull QName elementQName, @NotNull Class clazz, boolean caseInsensitive) { return getItemDefinition().isValidFor(elementQName, clazz, caseInsensitive); } @@ -465,7 +457,7 @@ public I instantiate(QName name) throws SchemaException { } @Override - public T findItemDefinition(ItemPath path, Class clazz) { + public T findItemDefinition(@NotNull ItemPath path, @NotNull Class clazz) { return getItemDefinition().findItemDefinition(path, clazz); } @@ -475,7 +467,7 @@ public ItemDelta createEmptyDelta(ItemPath path) { } @Override - public ItemDefinition clone() { + public @NotNull ItemDefinition clone() { return getItemDefinition().clone(); } @@ -655,13 +647,11 @@ public boolean isVisible(PrismContainerValueWrapper parent, ItemVisibilityHan return false; } - protected boolean isVisibleByVisibilityHandler(boolean parentExpanded, ItemVisibilityHandler visibilityHandler) { if (!parentExpanded) { return false; } - if (visibilityHandler != null) { ItemVisibility visible = visibilityHandler.isVisible(this); if (visible != null) { @@ -704,8 +694,6 @@ public void remove(VW valueWrapper, ModelServiceLocator locator) throws SchemaEx } } - - @Override public void removeAll(ModelServiceLocator locator) throws SchemaException { for (VW value : new ArrayList<>(values)) { @@ -718,7 +706,7 @@ public void removeAll(ModelServiceLocator locator) throws SchemaException { } private void removeValue(VW valueWrapper) { - switch(valueWrapper.getStatus()) { + switch (valueWrapper.getStatus()) { case ADDED: values.remove(valueWrapper); getItem().remove(valueWrapper.getOldValue()); @@ -756,7 +744,7 @@ private int countUsableValues(List values) { private boolean hasEmptyPlaceholder(List values) { for (VW value : values) { - if (ValueStatus.ADDED.equals(value.getStatus()) ) {//&& !value.hasValueChanged()) { + if (ValueStatus.ADDED.equals(value.getStatus())) {//&& !value.hasValueChanged()) { return true; } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismReferenceWrapperImpl.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismReferenceWrapperImpl.java index db055d8c54f..58450c74897 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismReferenceWrapperImpl.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismReferenceWrapperImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2018 Evolveum and contributors + * Copyright (c) 2010-2020 Evolveum and contributors * * This work is dual-licensed under the Apache License 2.0 * and European Union Public License. See LICENSE file for details. @@ -9,13 +9,12 @@ import java.util.List; import javax.xml.namespace.QName; -import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper; -import com.evolveum.midpoint.gui.api.prism.wrapper.PrismReferenceWrapper; -import com.evolveum.midpoint.gui.api.util.ModelServiceLocator; - import org.jetbrains.annotations.NotNull; import com.evolveum.midpoint.gui.api.prism.ItemStatus; +import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper; +import com.evolveum.midpoint.gui.api.prism.wrapper.PrismReferenceWrapper; +import com.evolveum.midpoint.gui.api.util.ModelServiceLocator; import com.evolveum.midpoint.gui.api.util.WebComponentUtil; import com.evolveum.midpoint.prism.*; import com.evolveum.midpoint.prism.query.ObjectFilter; @@ -51,7 +50,7 @@ public boolean isComposite() { } @Override - public PrismReferenceDefinition clone() { + public @NotNull PrismReferenceDefinition clone() { return getItemDefinition().clone(); } @@ -84,7 +83,7 @@ public List getTargetTypes() { @Override public boolean isEmpty() { - if (super.isEmpty()) return true; + if (super.isEmpty()) { return true; } List pVals = getItem().getValues(); boolean allEmpty = true;