WebComponentUtil,ShadowAssociationWrapperFI: fixed "assoc(i)ation" typo

Evolveum · Mar 7, 2020 · 0a1a9f7 · 0a1a9f7
1 parent bd0ee6a
commit 0a1a9f7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -3013,15 +3013,16 @@ public static boolean isAllNulls(Iterable<?> array) {
         return StreamSupport.stream(array.spliterator(), true).allMatch(o -> o == null);
     }
 
-    public static ObjectFilter createAssociationShadowRefFilter(RefinedAssociationDefinition refinedAssocationDefinition, PrismContext prismContext,
-                                                                String resourceOid){
+    public static ObjectFilter createAssociationShadowRefFilter(
+            RefinedAssociationDefinition refinedAssociationDefinition,
+            PrismContext prismContext, String resourceOid) {
         S_FilterEntryOrEmpty atomicFilter = prismContext.queryFor(ShadowType.class);
         List<ObjectFilter> orFilterClauses = new ArrayList<>();
-        refinedAssocationDefinition.getIntents()
+        refinedAssociationDefinition.getIntents()
                 .forEach(intent -> orFilterClauses.add(atomicFilter.item(ShadowType.F_INTENT).eq(intent).buildFilter()));
         OrFilter intentFilter = prismContext.queryFactory().createOr(orFilterClauses);
 
-        AndFilter filter = (AndFilter) atomicFilter.item(ShadowType.F_KIND).eq(refinedAssocationDefinition.getKind()).and()
+        AndFilter filter = (AndFilter) atomicFilter.item(ShadowType.F_KIND).eq(refinedAssociationDefinition.getKind()).and()
                 .item(ShadowType.F_RESOURCE_REF).ref(resourceOid, ResourceType.COMPLEX_TYPE).buildFilter();
         filter.addCondition(intentFilter);
         return filter;

diff --git a/...main/java/com/evolveum/midpoint/gui/impl/factory/ShadowAssociationWrapperFactoryImpl.java b/...main/java/com/evolveum/midpoint/gui/impl/factory/ShadowAssociationWrapperFactoryImpl.java
@@ -176,17 +176,17 @@ protected PrismContainerWrapper<C> createWrapper(PrismContainerValueWrapper<?> p
                     ItemStatus.ADDED == status ? ValueStatus.ADDED : ValueStatus.NOT_CHANGED, context);
 
             List<ItemWrapper<?,?,?,?>> items = new ArrayList<>();
-            for (RefinedAssociationDefinition refinedAssocationDefinition: refinedAssociationDefinitions) {
+            for (RefinedAssociationDefinition refinedAssociationDefinition: refinedAssociationDefinitions) {
                 MutablePrismReferenceDefinition shadowRefDef = prismContext
-                        .definitionFactory().createReferenceDefinition(refinedAssocationDefinition.getName(), ObjectReferenceType.COMPLEX_TYPE);
+                        .definitionFactory().createReferenceDefinition(refinedAssociationDefinition.getName(), ObjectReferenceType.COMPLEX_TYPE);
                 shadowRefDef.toMutable().setMaxOccurs(-1);
                 shadowRefDef.setTargetTypeName(ShadowType.COMPLEX_TYPE);
                 PrismReference shadowAss = shadowRefDef.instantiate();
                 ItemPath itemPath = null;
                 for (PrismContainerValue<C> associationValue : association.getValues()) {
                     if (association.getDefinition().getCompileTimeClass().equals(ShadowAssociationType.class)) {
                         ShadowAssociationType shadowAssociation = (ShadowAssociationType)associationValue.asContainerable();
-                        if (shadowAssociation.getName().equals(refinedAssocationDefinition.getName())) {
+                        if (shadowAssociation.getName().equals(refinedAssociationDefinition.getName())) {
                             itemPath = associationValue.getPath();
                             shadowAss.add(associationValue.findReference(ShadowAssociationType.F_SHADOW_REF).getValue().clone());
                         }
@@ -197,9 +197,9 @@ protected PrismContainerWrapper<C> createWrapper(PrismContainerValueWrapper<?> p
                     itemPath = ShadowType.F_ASSOCIATION;
                 }
 
-                String displayName = refinedAssocationDefinition.getDisplayName();
+                String displayName = refinedAssociationDefinition.getDisplayName();
                 if (StringUtils.isBlank(displayName)) {
-                    displayName = refinedAssocationDefinition.getName().getLocalPart();
+                    displayName = refinedAssociationDefinition.getName().getLocalPart();
                 }
 
                 ShadowAssociationReferenceWrapperImpl item = new ShadowAssociationReferenceWrapperImpl(shadowValueWrapper, shadowAss,
@@ -221,7 +221,7 @@ protected PrismContainerWrapper<C> createWrapper(PrismContainerValueWrapper<?> p
                     refValues.add(refValue);
                 }
                 item.getValues().addAll((Collection)refValues);
-                item.setFilter(WebComponentUtil.createAssociationShadowRefFilter(refinedAssocationDefinition,
+                item.setFilter(WebComponentUtil.createAssociationShadowRefFilter(refinedAssociationDefinition,
                         prismContext, resource.getOid()));
 //                item.setReadOnly(true);