Minor cleanup

Evolveum · Apr 5, 2024 · 088bfd4 · 088bfd4
1 parent 36c2195
commit 088bfd4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerPanel.java b/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismContainerPanel.java
@@ -30,10 +30,6 @@ public class PrismContainerPanel<C extends Containerable, PCW extends PrismConta
 
     public PrismContainerPanel(String id, IModel<PCW> model, ItemPanelSettings settings) {
         super(id, model, settings);
-
-        if (getModelObject() != null) {
-            getModelObject().setExpanded(true);
-        }
     }
 
     @Override
@@ -56,25 +52,24 @@ protected Component createValuesPanel() {
         valueContainer.add(AttributeAppender.append(
                 "aria-label",
                 () -> {
+                    if (getModelObject() == null) {
+                        return null;
+                    }
                     if (getModelObject().isMultiValue()) {
-                        if (getHeader() == null) {
-                            return getParentPage().createStringResource(
-                                    "PrismContainerPanel.container");
-                        }
                         return getParentPage().createStringResource(
-                                        "PrismContainerPanel.container", getHeader().createLabelModel().getObject())
+                                "PrismContainerPanel.container", getHeader().createLabelModel().getObject())
                                 .getString();
                     }
                     return null;
                 }));
         valueContainer.add(AttributeAppender.append(
                 "tabindex",
-                () -> getModelObject().isMultiValue() ? "0" : null));
+                () -> getModelObject() != null && getModelObject().isMultiValue() ? "0" : null));
         return valueContainer;
     }
 
     private PrismContainerHeaderPanel getHeader() {
-        return (PrismContainerHeaderPanel) get(ID_HEADER);
+        return (PrismContainerHeaderPanel)get(ID_HEADER);
     }
 
     @Override

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/IconAndStylesUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/IconAndStylesUtil.java
@@ -100,7 +100,7 @@ public static <T extends ObjectType> String createDefaultColoredIcon(QName objec
             return GuiStyleConstants.CLASS_ROLE_ANALYSIS_CLUSTER_ICON;
         } else if (QNameUtil.match(RoleAnalysisSessionType.COMPLEX_TYPE, objectType)) {
             return GuiStyleConstants.CLASS_ROLE_ANALYSIS_SESSION_ICON;
-        }else {
+        } else {
             return "";
         }
     }