Removed child component - now handled by parent component. git-svn-id: https://taverna.googlecode.com/svn/taverna/utils/net.sf.taverna.t2.lang/trunk@15899 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/ffe467c7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/ffe467c7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/ffe467c7 Branch: refs/heads/master Commit: ffe467c789e189ab959cacfcfa73e96a30331f31 Parents: 807910c Author: [email protected] <[email protected]@bf327186-88b3-11dd-a302-d386e5130c1c> Authored: Mon Jul 22 13:50:57 2013 +0000 Committer: [email protected] <[email protected]@bf327186-88b3-11dd-a302-d386e5130c1c> Committed: Mon Jul 22 13:50:57 2013 +0000 ---------------------------------------------------------------------- .../ui/tabselector/TabSelectorComponent.java | 42 +++++++++----------- 1 file changed, 19 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/ffe467c7/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 fbacc1c..23e6343 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 @@ -21,14 +21,12 @@ package net.sf.taverna.t2.lang.ui.tabselector; import java.awt.BorderLayout; -import java.awt.Component; import java.awt.Graphics; import java.awt.Graphics2D; import java.util.HashMap; import java.util.Map; import javax.swing.ButtonGroup; -import javax.swing.JComponent; import javax.swing.JPanel; /** @@ -42,29 +40,25 @@ public abstract class TabSelectorComponent<T> extends JPanel { private Map<T, Tab<T>> tabMap; private ButtonGroup tabGroup; - private JComponent tabBar; private ScrollController scrollController; - public TabSelectorComponent(Component component) { + public TabSelectorComponent() { tabMap = new HashMap<T, Tab<T>>(); tabGroup = new ButtonGroup(); setLayout(new BorderLayout()); - tabBar = new JPanel() { - @Override - protected void paintComponent(Graphics g) { - super.paintComponent(g); - Graphics2D g2 = (Graphics2D) g.create(); - g2.setColor(Tab.midGrey); - g2.drawLine(0, getHeight() - 1, getWidth(), getHeight() - 1); - g2.dispose(); - } - }; - scrollController = new ScrollController(tabBar); - tabBar.add(scrollController.getScrollLeft()); - tabBar.add(scrollController.getScrollRight()); - tabBar.setLayout(new TabLayout(scrollController)); - add(tabBar, BorderLayout.NORTH); - add(component, BorderLayout.CENTER); + scrollController = new ScrollController(this); + add(scrollController.getScrollLeft()); + add(scrollController.getScrollRight()); + setLayout(new TabLayout(scrollController)); + } + + @Override + protected void paintComponent(Graphics g) { + super.paintComponent(g); + Graphics2D g2 = (Graphics2D) g.create(); + g2.setColor(Tab.midGrey); + g2.drawLine(0, getHeight() - 1, getWidth(), getHeight() - 1); + g2.dispose(); } protected abstract Tab<T> createTab(T object); @@ -73,7 +67,9 @@ public abstract class TabSelectorComponent<T> extends JPanel { Tab<T> button = createTab(object); tabMap.put(object, button); tabGroup.add(button); - tabBar.add(button); + add(button); + revalidate(); + repaint(); button.setSelected(true); } @@ -81,8 +77,8 @@ public abstract class TabSelectorComponent<T> extends JPanel { Tab<T> button = tabMap.remove(object); if (button != null) { tabGroup.remove(button); - tabBar.remove(button); - tabBar.repaint(); + remove(button); + repaint(); } }
