T3-896 Added icons to tabs git-svn-id: https://taverna.googlecode.com/svn/taverna/utils/net.sf.taverna.t2.lang/trunk@16341 bf327186-88b3-11dd-a302-d386e5130c1c
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/79819425 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/79819425 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/79819425 Branch: refs/heads/master Commit: 79819425e15ce03a53cbf8cc5900b95895bffc0a Parents: abbb57a Author: [email protected] <[email protected]@bf327186-88b3-11dd-a302-d386e5130c1c> Authored: Mon Nov 11 16:56:48 2013 +0000 Committer: [email protected] <[email protected]@bf327186-88b3-11dd-a302-d386e5130c1c> Committed: Mon Nov 11 16:56:48 2013 +0000 ---------------------------------------------------------------------- .../net/sf/taverna/t2/lang/ui/tabselector/Tab.java | 13 +++++++++++++ .../t2/lang/ui/tabselector/TabSelectorComponent.java | 4 ++++ 2 files changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/79819425/ui/src/main/java/net/sf/taverna/t2/lang/ui/tabselector/Tab.java ---------------------------------------------------------------------- diff --git a/ui/src/main/java/net/sf/taverna/t2/lang/ui/tabselector/Tab.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/tabselector/Tab.java index 6cd9b70..3c40b42 100644 --- a/ui/src/main/java/net/sf/taverna/t2/lang/ui/tabselector/Tab.java +++ b/ui/src/main/java/net/sf/taverna/t2/lang/ui/tabselector/Tab.java @@ -32,6 +32,7 @@ import java.awt.RenderingHints; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import javax.swing.Icon; import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JToggleButton; @@ -51,10 +52,16 @@ public abstract class Tab<T> extends JToggleButton { protected final T selection; private String name; + private Icon icon; private JLabel label; public Tab(String name, T selection) { + this(name, null, selection); + } + + public Tab(String name, Icon icon, T selection) { this.name = name; + this.icon = icon; this.selection = selection; initialise(); } @@ -69,6 +76,7 @@ public abstract class Tab<T> extends JToggleButton { GridBagConstraints c = new GridBagConstraints(); label = new JLabel(this.name); + label.setIcon(icon); c.anchor = GridBagConstraints.WEST; c.fill = GridBagConstraints.BOTH; c.insets = new Insets(0, 5, 0, 5); @@ -101,6 +109,11 @@ public abstract class Tab<T> extends JToggleButton { } } + public void setIcon(Icon icon) { + label.setIcon(icon); + repaint(); + } + @Override public void updateUI() { // override to ignore UI update http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/79819425/ui/src/main/java/net/sf/taverna/t2/lang/ui/tabselector/TabSelectorComponent.java ---------------------------------------------------------------------- diff --git a/ui/src/main/java/net/sf/taverna/t2/lang/ui/tabselector/TabSelectorComponent.java b/ui/src/main/java/net/sf/taverna/t2/lang/ui/tabselector/TabSelectorComponent.java index a918143..d09b6ec 100644 --- a/ui/src/main/java/net/sf/taverna/t2/lang/ui/tabselector/TabSelectorComponent.java +++ b/ui/src/main/java/net/sf/taverna/t2/lang/ui/tabselector/TabSelectorComponent.java @@ -63,6 +63,10 @@ public abstract class TabSelectorComponent<T> extends JPanel { protected abstract Tab<T> createTab(T object); + public Tab<T> getTab(T object) { + return tabMap.get(object); + } + public void addObject(T object) { Tab<T> button = createTab(object); tabMap.put(object, button);
