npe fixes in ui

Evolveum · Feb 9, 2023 · 9b6f3a5 · 9b6f3a5
1 parent c1286d0
commit 9b6f3a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BadgePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BadgePanel.java
@@ -40,7 +40,9 @@ protected void onComponentTag(ComponentTag tag) {
 
     private void initLayout() {
         add(AttributeAppender.append("class", () -> getModelObject().getCssClass()));
-        add(new VisibleBehaviour(() -> StringUtils.isNotEmpty(getModelObject().getText()) || StringUtils.isNotEmpty(getModelObject().getIconCssClass())));
+        add(new VisibleBehaviour(() ->
+                getModelObject() != null
+                        && (StringUtils.isNotEmpty(getModelObject().getText()) || StringUtils.isNotEmpty(getModelObject().getIconCssClass()))));
 
         WebMarkupContainer icon = new WebMarkupContainer(ID_ICON);
         icon.add(AttributeAppender.append("class", () -> getModelObject().getIconCssClass()));

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/SimplePopupable.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/SimplePopupable.java
@@ -7,7 +7,6 @@
 
 package com.evolveum.midpoint.web.component.dialog;
 
-import org.apache.wicket.Component;
 import org.apache.wicket.model.IModel;
 
 /**