You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2020/09/28 00:46:55 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2457] code
clean-up
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new be9e2af [OPENMEETINGS-2457] code clean-up
be9e2af is described below
commit be9e2af12db46e3d859494b1edece8260a677ec5
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Mon Sep 28 07:46:39 2020 +0700
[OPENMEETINGS-2457] code clean-up
---
.../org/apache/openmeetings/web/common/menu/OmMenuItem.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/OmMenuItem.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/OmMenuItem.java
index e1e63fd..53377ac 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/OmMenuItem.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/OmMenuItem.java
@@ -26,6 +26,7 @@ import java.util.List;
import java.util.stream.Collectors;
import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.model.Model;
@@ -98,8 +99,8 @@ public class OmMenuItem implements INavbarComponent {
return items.stream().map(mItem -> ((OmMenuItem)mItem).createLink(markupId, false)).collect(Collectors.toList());
}
};
+ setAttributes(item);
}
- item.add(AttributeModifier.append(ATTR_TITLE, desc));
return item;
}
@@ -118,10 +119,15 @@ public class OmMenuItem implements INavbarComponent {
if (topLevel) {
link.add(AttributeModifier.append(ATTR_CLASS, "nav-link"));
}
- link.setVisible(visible);
+ setAttributes(link);
return link.setIconType(icon);
}
+ private void setAttributes(Component comp) {
+ comp.add(AttributeModifier.append(ATTR_TITLE, desc));
+ comp.setVisible(visible);
+ }
+
@Override
public ComponentPosition getPosition() {
return ComponentPosition.LEFT; //FIXME TODO