X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix_swing%2Fgui%2Fbrowser%2FTagsTab.java;h=4224fb343a51126f45ea1eae66f12879d742075f;hb=62c7e07ef88c8f809b46f4e4525aa0d3f8a9cb14;hp=746f268928f07ae15ddb7287c26bf1a5b11b282e;hpb=3cdf3fd8a60d22a592e1cd0634cb108faa1f5f9f;p=nikiroo-utils.git diff --git a/src/be/nikiroo/fanfix_swing/gui/browser/TagsTab.java b/src/be/nikiroo/fanfix_swing/gui/browser/TagsTab.java index 746f268..4224fb3 100644 --- a/src/be/nikiroo/fanfix_swing/gui/browser/TagsTab.java +++ b/src/be/nikiroo/fanfix_swing/gui/browser/TagsTab.java @@ -1,12 +1,15 @@ package be.nikiroo.fanfix_swing.gui.browser; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import javax.swing.tree.DefaultMutableTreeNode; import be.nikiroo.fanfix.Instance; +import be.nikiroo.fanfix.bundles.StringIdGui; import be.nikiroo.fanfix.data.MetaData; +import be.nikiroo.fanfix.library.MetaResultList; public class TagsTab extends BasicTab> { public TagsTab(int index, String listenerCommand) { @@ -20,9 +23,12 @@ public class TagsTab extends BasicTab> { @Override protected void fillData(List data) { + data.clear(); try { - List metas = Instance.getInstance().getLibrary().getList(); - for (MetaData meta : metas) { + MetaResultList metas = Instance.getInstance().getLibrary() + .getList(); + // TODO: getTagList, getAuthorList... ? + for (MetaData meta : metas.getMetas()) { List tags = meta.getTags(); if (tags != null) { for (String tag : tags) { @@ -32,6 +38,8 @@ public class TagsTab extends BasicTab> { } } } + + sort(data); } catch (Exception e) { // TODO e.printStackTrace(); @@ -45,14 +53,22 @@ public class TagsTab extends BasicTab> { @Override protected String keyToDisplay(String key) { + if (key.trim().isEmpty()) { + // TODO: new TAG_UNKNOWN needed + key = Instance.getInstance().getTransGui() + .getString(StringIdGui.MENU_AUTHORS_UNKNOWN); + } + return key; } @Override - protected int loadData(DefaultMutableTreeNode root, List tags, String filter) { + protected int loadData(DefaultMutableTreeNode root, List tags, + String filter) { for (String tag : tags) { if (checkFilter(filter, tag)) { - DefaultMutableTreeNode sourceNode = new DefaultMutableTreeNode(tag); + DefaultMutableTreeNode sourceNode = new DefaultMutableTreeNode( + tag); root.add(sourceNode); } }