Skip to content

Commit

Permalink
GUI *WrapperImpl classes: @NotNull propagated from superclass
Browse files Browse the repository at this point in the history
  • Loading branch information
@virgo47
virgo47 committed Jun 19, 2020
1 parent ebdc650 commit adc92d9
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 31 deletions.
36 changes: 12 additions & 24 deletions ...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ItemWrapperImpl.java
View file
@@ -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.
Expand All @@ -12,22 +12,19 @@
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;
import org.jetbrains.annotations.NotNull;

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;
Expand All @@ -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<I extends Item, VW extends PrismValueWrapper> implements ItemWrapper<I, VW>, Serializable {

Expand All @@ -69,7 +66,6 @@ public abstract class ItemWrapperImpl<I extends Item, VW extends PrismValueWrapp

private boolean showInVirtualContainer;


//consider
private boolean readOnly;
private UserInterfaceElementVisibilityType visibleOverwrite;
Expand Down Expand Up @@ -101,7 +97,7 @@ public ItemWrapperImpl(PrismContainerValueWrapper<?> parent, I item, ItemStatus
}

for (VW value : values) {
value.addToDelta((ItemDelta)delta);
value.addToDelta((ItemDelta) delta);
}

if (delta.isEmpty()) {
Expand All @@ -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();
}
Expand Down Expand Up @@ -262,7 +256,6 @@ private String localizeName(String nameKey, String defaultString) {
return ColumnUtils.createStringResource(nameKey, defaultString).getString();
}


@Override
public ItemStatus findObjectStatus() {
if (parent == null) {
Expand Down Expand Up @@ -304,7 +297,6 @@ private <OW extends PrismObjectWrapper<O>, O extends ObjectType> OW findObjectWr

}


@Override
public List<VW> getValues() {
return values;
Expand Down Expand Up @@ -443,7 +435,7 @@ public boolean isValidFor(QName elementQName, Class<? extends ItemDefinition> cl
}

@Override
public boolean isValidFor(QName elementQName, Class<? extends ItemDefinition> clazz, boolean caseInsensitive) {
public boolean isValidFor(@NotNull QName elementQName, @NotNull Class<? extends ItemDefinition> clazz, boolean caseInsensitive) {
return getItemDefinition().isValidFor(elementQName, clazz, caseInsensitive);
}

Expand All @@ -465,7 +457,7 @@ public I instantiate(QName name) throws SchemaException {
}

@Override
public <T extends ItemDefinition> T findItemDefinition(ItemPath path, Class<T> clazz) {
public <T extends ItemDefinition> T findItemDefinition(@NotNull ItemPath path, @NotNull Class<T> clazz) {
return getItemDefinition().findItemDefinition(path, clazz);
}

Expand All @@ -475,7 +467,7 @@ public ItemDelta createEmptyDelta(ItemPath path) {
}

@Override
public ItemDefinition<I> clone() {
public @NotNull ItemDefinition<I> clone() {
return getItemDefinition().clone();
}

Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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)) {
Expand All @@ -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());
Expand Down Expand Up @@ -756,7 +744,7 @@ private int countUsableValues(List<VW> values) {

private boolean hasEmptyPlaceholder(List<VW> values) {
for (VW value : values) {
if (ValueStatus.ADDED.equals(value.getStatus()) ) {//&& !value.hasValueChanged()) {
if (ValueStatus.ADDED.equals(value.getStatus())) {//&& !value.hasValueChanged()) {
return true;
}
}
Expand Down
13 changes: 6 additions & 7 deletions ...src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismReferenceWrapperImpl.java
View file
@@ -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.
Expand All @@ -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;
Expand Down Expand Up @@ -51,7 +50,7 @@ public boolean isComposite() {
}

@Override
public PrismReferenceDefinition clone() {
public @NotNull PrismReferenceDefinition clone() {
return getItemDefinition().clone();
}

Expand Down Expand Up @@ -84,7 +83,7 @@ public List<QName> getTargetTypes() {

@Override
public boolean isEmpty() {
if (super.isEmpty()) return true;
if (super.isEmpty()) { return true; }

List<PrismReferenceValue> pVals = getItem().getValues();
boolean allEmpty = true;
Expand Down

0 comments on commit adc92d9

Please sign in to comment.