Author: tchemit Date: 2008-01-20 12:12:05 +0000 (Sun, 20 Jan 2008) New Revision: 238 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java Log: lors du lancement d'un chargement d'un tab, on doit aussi scruter la toolbar pour activer les actions Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java 2008-01-20 12:11:21 UTC (rev 237) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTabManager.java 2008-01-20 12:12:05 UTC (rev 238) @@ -37,6 +37,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import jaxx.runtime.JAXXObject; + /** @author tony */ public class SimExplorerTabManager { @@ -105,6 +107,16 @@ if (instance == null) { try { instance = getAnnotation().impl().newInstance(); + log.info("new tab : "+instance); + // chargement dans l'ui des actions + if (instance instanceof JAXXObject) { + JAXXObject ui = (JAXXObject) instance; + SimExplorerActionManager.loadActions(ui); + JAXXObject toolbar = (JAXXObject) ui.getObjectById("toolbar"); + if (toolbar!=null) { + SimExplorerActionManager.loadActions(toolbar); + } + } } catch (InstantiationException e) { throw new RuntimeException(e); } catch (IllegalAccessException e) { @@ -132,7 +144,7 @@ public static void reloadUI() { for (Tab tab : Tab.values()) { - tab.instance=null; + tab.instance = null; } } @@ -146,7 +158,7 @@ container.setSelectedComponent(comp); int index1 = getTabIndex(container, tab); - log.info(tab + " index " + index1); + log.debug(tab + " index " + index1); if (tab.isUseToggle()) { MyToggleButton buton = (MyToggleButton) SimExplorer.getUI().getToolbar().getObjectById("toggleTab_" + tab.name()); buton.setSelected(true); @@ -158,7 +170,7 @@ int index = getTabIndex(container, tab); if (index != -1) { container.removeTabAt(index); - log.info(tab + " index " + index); + log.debug(tab + " index " + index); } if (tab.isUseToggle()) { MyToggleButton buton = (MyToggleButton) SimExplorer.getUI().getToolbar().getObjectById("toggleTab_" + tab.name()); @@ -239,23 +251,12 @@ public static class ToggleTabAction extends SimExplorerAbstractTabAction { private static final long serialVersionUID = -8701628964349439830L; - public ToggleTabAction(String name) { super(name, "toggleTab"); } - } /** @author chemit */ - public static class ShowTabAction extends SimExplorerAbstractTabAction { - private static final long serialVersionUID = 2095444969568347534L; - - public ShowTabAction(String name) { - super(name, "showTab"); - } - } - - /** @author chemit */ public static class CloseTabAction extends SimExplorerAbstractTabAction { private static final long serialVersionUID = 352590468112645109L;