fixing "required" fileds...

Evolveum · Jan 31, 2017 · bfcaa96 · bfcaa96
1 parent 904e253
commit bfcaa96
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 16 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
@@ -528,14 +528,14 @@ public <O extends ObjectType> void collectModifications(ObjectDelta<O> delta) th
 	}
 
 	private ItemDelta computePropertyDeltas(PropertyWrapper propertyWrapper, ItemPath containerPath) {
-		ItemDefinition itemDef = propertyWrapper.getItem().getDefinition();
+		ItemDefinition itemDef = propertyWrapper.getItemDefinition();
 		ItemDelta pDelta = itemDef.createEmptyDelta(containerPath.subPath(itemDef.getName()));
 		addItemDelta(propertyWrapper, pDelta, itemDef, containerPath);
 		return pDelta;
 	}
 
 	private ReferenceDelta computeReferenceDeltas(ReferenceWrapper referenceWrapper, ItemPath containerPath) {
-		PrismReferenceDefinition propertyDef = referenceWrapper.getItem().getDefinition();
+		PrismReferenceDefinition propertyDef = referenceWrapper.getItemDefinition();
 		ReferenceDelta pDelta = new ReferenceDelta(containerPath, propertyDef.getName(), propertyDef,
 				propertyDef.getPrismContext());
 		addItemDelta(referenceWrapper, pDelta, propertyDef, containerPath.subPath(propertyDef.getName()));

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapperComparator.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ItemWrapperComparator.java
@@ -29,8 +29,8 @@ public class ItemWrapperComparator implements Comparator<ItemWrapper>, Serializa
 
     @Override
     public int compare(ItemWrapper p1, ItemWrapper p2) {
-        ItemDefinition def1 = p1.getItem().getDefinition();
-        ItemDefinition def2 = p2.getItem().getDefinition();
+        ItemDefinition def1 = p1.getItemDefinition();
+        ItemDefinition def2 = p2.getItemDefinition();
 
         if (isMainContainer(p1)) {
             return -1;

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
@@ -59,7 +59,7 @@ public PrismContainerPanel(String id, final IModel<ContainerWrapper> model, bool
             public boolean isVisible() {
                 ContainerWrapper<? extends PrismContainer> containerWrapper = model.getObject();
                 PrismContainer prismContainer = containerWrapper.getItem();
-                if (prismContainer.getDefinition().isOperational()) {
+                if (containerWrapper.getItemDefinition().isOperational()) {
                     return false;
                 }
 

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
@@ -134,8 +134,7 @@ public boolean isVisible() {
             @Override
             public boolean isVisible() {
                 IW wrapper = model.getObject();
-                Item property = wrapper.getItem();
-                ItemDefinition def = property.getDefinition();
+                ItemDefinition def = wrapper.getItemDefinition();
 
                 if (ObjectType.F_NAME.equals(def.getName())) {
                     //fix for "name as required" MID-789
@@ -207,8 +206,8 @@ protected String getValueCssClass() {
     }
 
     private String loadHelpText(IModel<IW> model) {
-        Item property = (Item) model.getObject().getItem();
-        ItemDefinition def = property.getDefinition();
+        IW property = (IW) model.getObject();
+        ItemDefinition def = property.getItemDefinition();
         String doc = def.getHelp();
         if (StringUtils.isEmpty(doc)) {
             return null;
@@ -247,8 +246,8 @@ private int getIndexOfValue(ValueWrapper value) {
 
     private boolean hasOutbound(IModel<IW> model) {
         ItemWrapper wrapper = model.getObject();
-        Item property = wrapper.getItem();
-        ItemDefinition def = property.getDefinition();
+//        Item property = wrapper.getItem();
+        ItemDefinition def = wrapper.getItemDefinition();
         if (!(def instanceof RefinedAttributeDefinition)) {
             return false;
         }

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java b/...i/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyOrReferenceWrapper.java
@@ -140,9 +140,9 @@ public I getItem() {
 		return item;
 	}
 
-	public ItemDefinition getDefinition() {
-		return item.getDefinition();
-	}
+//	public ItemDefinition getDefinition() {
+//		return item.getDefinition();
+//	}
 
 	public boolean hasChanged() {
 		for (ValueWrapper value : getValues()) {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyWrapper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyWrapper.java
@@ -58,7 +58,7 @@ private List<ValueWrapper> createValues() {
             values.add(new ValueWrapper(this, prismValue, ValueStatus.NOT_CHANGED));
         }
 
-        int minOccurs = getDefinition().getMinOccurs();
+        int minOccurs = getItemDefinition().getMinOccurs();
         while (values.size() < minOccurs) {
             values.add(createAddedValue());
         }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ReferenceWrapper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ReferenceWrapper.java
@@ -47,7 +47,7 @@ private List<ValueWrapper> createValues() {
 			values.add(new ValueWrapper(this, prismValue, prismValue, ValueStatus.NOT_CHANGED));
 		}
 
-		int minOccurs = getDefinition().getMinOccurs();
+		int minOccurs = getItemDefinition().getMinOccurs();
 		while (values.size() < minOccurs) {
 			values.add(createAddedValue());
 		}