Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Code style improvements and formatting.
- Loading branch information
1 parent
dde3fdd
commit 42825de
Showing
3 changed files
with
108 additions
and
149 deletions.
There are no files selected for viewing
177 changes: 90 additions & 87 deletions
177
rapidoid-gui/src/main/java/org/rapidoid/gui/BtnMenu.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,98 +1,101 @@ | ||
| package org.rapidoid.gui; | ||
|
|
||
|
|
||
| import org.rapidoid.annotation.Authors; | ||
| import org.rapidoid.annotation.Since; | ||
| import org.rapidoid.html.Tag; | ||
| import org.rapidoid.u.U; | ||
|
|
||
| import java.util.*; | ||
|
|
||
| /** | ||
| * Created by milievski on 12/14/2015. | ||
| */ | ||
| @Authors({"Marjan Ilievski", "Nikolche Mihajlovski"}) | ||
| @Since("5.0.11") | ||
| public class BtnMenu { | ||
| private String title; | ||
| private List<Map<Object,String>> menuItems; | ||
|
|
||
| public BtnMenu() { | ||
| menuItems = U.list(); | ||
| menuItems.add(new LinkedHashMap<Object, String>()); | ||
| } | ||
|
|
||
| public void addMenuItem(String text,String url){ | ||
| menuItems.get(menuItems.size()-1).put(text,url); | ||
| } | ||
|
|
||
| public void addSeparator(){ | ||
| menuItems.add(new LinkedHashMap<Object, String>()); | ||
| } | ||
|
|
||
| private Tag generateButtonHtmlContent() { | ||
| Tag span = GUI.span().class_("caret"); | ||
| return GUI.button().type("button").class_("btn btn-default dropdown-toggle") | ||
| .attr("data-toggle","dropdown") | ||
| .attr("aria-haspopup","true") | ||
| .attr("aria-expanded","false").contents(title+" ",span); | ||
| } | ||
|
|
||
|
|
||
| private Optional<Tag> generateMenuHtmlContent(){ | ||
|
|
||
| if(!menuItems.get(0).isEmpty()) { | ||
| List<Tag> content = U.list(); | ||
|
|
||
| for (Iterator<Map<Object, String>> iterator = menuItems.iterator(); iterator.hasNext(); ) { | ||
|
|
||
| generateMenuItems(content, iterator); | ||
|
|
||
| if (iterator.hasNext()) { | ||
| content.add(GUI.li().role("separator").class_("divider")); | ||
| } | ||
| } | ||
|
|
||
| return Optional.of(GUI.ul().class_("dropdown-menu").contents(content)); | ||
| } | ||
| return Optional.empty(); | ||
| } | ||
|
|
||
| private void generateMenuItems(List<Tag> content, Iterator<Map<Object, String>> subMenuIterator) { | ||
| for (Map.Entry<Object, String> menuItem : subMenuIterator.next().entrySet()) { | ||
| Tag a = GUI.a().href(menuItem.getValue()).contents(menuItem.getKey()); | ||
| Tag li = GUI.li().contents(a); | ||
| content.add(li); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return render(); | ||
| } | ||
|
|
||
| public String render(){ | ||
| List<Tag> content = U.list(); | ||
| content.add(generateButtonHtmlContent()); | ||
| Optional<Tag> menuContent = generateMenuHtmlContent(); | ||
| if(menuContent.isPresent()) { | ||
| content.add(menuContent.get()); | ||
| } | ||
| return GUI.div().class_("btn-group").contents(content).toString(); | ||
| } | ||
|
|
||
| public String title() { | ||
| return title; | ||
| } | ||
|
|
||
| public BtnMenu title(String title) { | ||
| this.title = title; | ||
| return this; | ||
| } | ||
|
|
||
| public List<Map<Object, String>> items() { | ||
| return menuItems; | ||
| } | ||
|
|
||
| public BtnMenu items(Map<Object, String> items) { | ||
| this.menuItems.add(items); | ||
| return this; | ||
| } | ||
|
|
||
| private String title; | ||
|
|
||
| private List<Map<Object, String>> menuItems; | ||
|
|
||
| public BtnMenu() { | ||
| menuItems = U.list(); | ||
| menuItems.add(new LinkedHashMap<Object, String>()); | ||
| } | ||
|
|
||
| public void addMenuItem(String text, String url) { | ||
| menuItems.get(menuItems.size() - 1).put(text, url); | ||
| } | ||
|
|
||
| public void addSeparator() { | ||
| menuItems.add(new LinkedHashMap<Object, String>()); | ||
| } | ||
|
|
||
| private Tag generateButtonHtmlContent() { | ||
| Tag span = GUI.span().class_("caret"); | ||
| return GUI.button().type("button").class_("btn btn-default dropdown-toggle") | ||
| .attr("data-toggle", "dropdown") | ||
| .attr("aria-haspopup", "true") | ||
| .attr("aria-expanded", "false").contents(title + " ", span); | ||
| } | ||
|
|
||
|
|
||
| private Optional<Tag> generateMenuHtmlContent() { | ||
|
|
||
| if (!menuItems.get(0).isEmpty()) { | ||
| List<Tag> content = U.list(); | ||
|
|
||
| for (Iterator<Map<Object, String>> iterator = menuItems.iterator(); iterator.hasNext(); ) { | ||
|
|
||
| generateMenuItems(content, iterator); | ||
|
|
||
| if (iterator.hasNext()) { | ||
| content.add(GUI.li().role("separator").class_("divider")); | ||
| } | ||
| } | ||
|
|
||
| return Optional.of(GUI.ul().class_("dropdown-menu").contents(content)); | ||
| } | ||
| return Optional.empty(); | ||
| } | ||
|
|
||
| private void generateMenuItems(List<Tag> content, Iterator<Map<Object, String>> subMenuIterator) { | ||
| for (Map.Entry<Object, String> menuItem : subMenuIterator.next().entrySet()) { | ||
| Tag a = GUI.a().href(menuItem.getValue()).contents(menuItem.getKey()); | ||
| Tag li = GUI.li().contents(a); | ||
| content.add(li); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return render(); | ||
| } | ||
|
|
||
| public String render() { | ||
| List<Tag> content = U.list(); | ||
| content.add(generateButtonHtmlContent()); | ||
| Optional<Tag> menuContent = generateMenuHtmlContent(); | ||
| if (menuContent.isPresent()) { | ||
| content.add(menuContent.get()); | ||
| } | ||
| return GUI.div().class_("btn-group").contents(content).toString(); | ||
| } | ||
|
|
||
| public String title() { | ||
| return title; | ||
| } | ||
|
|
||
| public BtnMenu title(String title) { | ||
| this.title = title; | ||
| return this; | ||
| } | ||
|
|
||
| public List<Map<Object, String>> items() { | ||
| return menuItems; | ||
| } | ||
|
|
||
| public BtnMenu items(Map<Object, String> items) { | ||
| this.menuItems.add(items); | ||
| return this; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 8 additions & 22 deletions
30
rapidoid-gui/src/test/java/org/rapidoid/gui/BtnMenuTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,16 @@ | ||
| package org.rapidoid.gui; | ||
|
|
||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
| import org.rapidoid.html.tag.ObjectTag; | ||
| import org.rapidoid.u.U; | ||
| import org.rapidoid.annotation.Authors; | ||
| import org.rapidoid.annotation.Since; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.LinkedHashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import static org.junit.Assert.*; | ||
|
|
||
| /** | ||
| * Created by milievski on 12/23/2015. | ||
| */ | ||
| @Authors({"Marjan Ilievski", "Nikolche Mihajlovski"}) | ||
| @Since("5.0.11") | ||
| public class BtnMenuTest { | ||
|
|
||
|
|
||
| @Test | ||
| public void shouldGenerateBtnMenuHtmlContent(){ | ||
|
|
||
|
|
||
|
|
||
|
|
||
| } | ||
| @Test | ||
| public void shouldGenerateBtnMenuHtmlContent() { | ||
| // FIXME add test | ||
| } | ||
|
|
||
| } |