removing of compilation errors

Evolveum · Nov 29, 2018 · c4f0915 · c4f0915
1 parent c8ba35e
commit c4f0915
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java b/...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
@@ -25,7 +25,7 @@
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.gui.impl.model.PropertyWrapperFromContainerValueWrapperModel;
+import com.evolveum.midpoint.gui.impl.model.PropertyWrapperFromContainerModel;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.util.MiscUtil;
 import com.evolveum.midpoint.util.logging.Trace;
@@ -236,7 +236,7 @@ public static String getName(ContainerValueWrapper<AssignmentType> assignmentVal
 
 		if (assignment.getPolicyRule() != null){
 			ContainerWrapper<PolicyRuleType> policyRuleWrapper = assignmentValueWrapper.findContainerWrapper(new ItemPath(assignmentValueWrapper.getPath(), AssignmentType.F_POLICY_RULE));
-			PropertyWrapperFromContainerValueWrapperModel<String, AssignmentType> propertyModel = new PropertyWrapperFromContainerValueWrapperModel(policyRuleWrapper.getValues().get(0), PolicyRuleType.F_NAME);
+			PropertyWrapperFromContainerModel<String, AssignmentType> propertyModel = new PropertyWrapperFromContainerModel(policyRuleWrapper, PolicyRuleType.F_NAME);
 	    	String name = propertyModel.getObject().getValues().get(0).getValue().getRealValue();
 			if (StringUtils.isNotEmpty(name)){
                 return name;

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
@@ -19,7 +19,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import com.evolveum.midpoint.gui.impl.model.PropertyWrapperFromContainerValueWrapperModel;
+import com.evolveum.midpoint.gui.impl.model.PropertyWrapperFromContainerModel;
 import com.evolveum.midpoint.prism.PrismContainerDefinition;
 import com.evolveum.midpoint.prism.PrismContainerValue;
 import com.evolveum.midpoint.prism.path.ItemPath;
@@ -85,7 +85,7 @@ public void populateItem(Item<ICellPopulator<ContainerValueWrapper<AssignmentTyp
             public void populateItem(Item<ICellPopulator<ContainerValueWrapper<AssignmentType>>> cellItem, String componentId,
                                      final IModel<ContainerValueWrapper<AssignmentType>> rowModel) {
             	ContainerWrapper<PolicyRuleType> policyRuleWrapper = rowModel.getObject().findContainerWrapper(new ItemPath(rowModel.getObject().getPath(), AssignmentType.F_POLICY_RULE));
-            	PropertyWrapperFromContainerValueWrapperModel<String, PolicyRuleType> propertyModel = new PropertyWrapperFromContainerValueWrapperModel(policyRuleWrapper.getValues().get(0), PolicyRuleType.F_POLICY_SITUATION);
+            	PropertyWrapperFromContainerModel<String, PolicyRuleType> propertyModel = new PropertyWrapperFromContainerModel(policyRuleWrapper, PolicyRuleType.F_POLICY_SITUATION);
             	String situationValue = propertyModel.getObject().getValues().get(0).getValue().getRealValue();
                 cellItem.add(new Label(componentId, Model.of(situationValue)));
             }
@@ -111,7 +111,7 @@ public void populateItem(Item<ICellPopulator<ContainerValueWrapper<AssignmentTyp
             @Override
             public void populateItem(Item<ICellPopulator<ContainerValueWrapper<AssignmentType>>> cellItem, String componentId,
                                      final IModel<ContainerValueWrapper<AssignmentType>> rowModel) {
-            	PropertyWrapperFromContainerValueWrapperModel<Integer, AssignmentType> propertyModel = new PropertyWrapperFromContainerValueWrapperModel(rowModel.getObject(), AssignmentType.F_ORDER);
+            	PropertyWrapperFromContainerModel<Integer, AssignmentType> propertyModel = new PropertyWrapperFromContainerModel(rowModel.getObject(), AssignmentType.F_ORDER);
 
                 String orderValue;
                 if (propertyModel == null || propertyModel.getObject().getValues().get(0).getValue().getRealValue() == null){