Author: tchemit Date: 2008-02-12 13:41:33 +0000 (Tue, 12 Feb 2008) New Revision: 203 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java Log: utilisation JAXXTab Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java 2008-02-12 13:41:14 UTC (rev 202) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java 2008-02-12 13:41:33 UTC (rev 203) @@ -18,7 +18,7 @@ * ##% */ package jaxx.runtime.builder; -import jaxx.runtime.JAXXObject; +import jaxx.runtime.swing.JAXXTab; import javax.swing.JTabbedPane; import java.lang.annotation.ElementType; @@ -39,7 +39,7 @@ Class<? extends TabModel> model(); - Class<? extends JAXXObject> impl(); + Class<? extends JAXXTab> impl(); Class<? extends JTabbedPane> parentImpl(); Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java 2008-02-12 13:41:14 UTC (rev 202) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java 2008-02-12 13:41:33 UTC (rev 203) @@ -19,6 +19,7 @@ package jaxx.runtime.builder; import jaxx.runtime.JAXXObject; +import jaxx.runtime.swing.JAXXTab; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -46,16 +47,16 @@ protected Map<String, TabContentConfig> configs; /** dictionary of instanciated actions */ - protected Map<String, JComponent> cache; + protected Map<String, JAXXTab> cache; /** dictionary of instanciated models */ protected Map<String, TabModel> models; protected abstract Map<String, TabContentConfig> initFactory(); - protected abstract void initTab(JComponent tab, String tabName, TabContentConfig config); + protected abstract void initTab(JAXXTab tab, String tabName, TabContentConfig config); - protected JComponent newTab(String tabName) { + protected JAXXTab newTab(String tabName) { checkRegistredConfig(tabName); @@ -67,9 +68,9 @@ TabContentConfig config = configs.get(tabName); - JComponent instance; + JAXXTab instance; try { - instance = (JComponent) config.impl().newInstance(); + instance = config.impl().newInstance(); log.info("new tab : " + instance); cache.put(tabName, instance); @@ -113,7 +114,7 @@ TabContentConfig config = getConfig(tabName); - JComponent comp = newTab(tabName); + JAXXTab comp = newTab(tabName); int index = getTabIndex(container, comp); if (index == -1) { @@ -155,16 +156,16 @@ protected TabFactory() { configs = initFactory(); - cache = new TreeMap<String, JComponent>(); + cache = new TreeMap<String, JAXXTab>(); models = new TreeMap<String, TabModel>(); } - protected JComponent addTabHeader(final JTabbedPane container, final String tabName, final TabContentConfig config, final JComponent comp) { + protected JComponent addTabHeader(final JTabbedPane container, final String tabName, final TabContentConfig config, final JAXXTab comp) { // by default, no tab header return null; } - protected void registerTab(final JTabbedPane container, final String tabName, final TabContentConfig config, final JComponent comp) { + protected void registerTab(final JTabbedPane container, final String tabName, final TabContentConfig config, final JAXXTab comp) { container.addTab(tabName, comp); @@ -177,7 +178,7 @@ } @SuppressWarnings({"unchecked"}) - protected void initJAXXTab(TabContentConfig config, JComponent instance) throws NoSuchFieldException, IllegalAccessException { + protected void initJAXXTab(TabContentConfig config, JAXXTab instance) throws NoSuchFieldException, IllegalAccessException { if (instance instanceof JAXXObject) { JAXXObject ui = (JAXXObject) instance; for (String dynamicField : config.dynamicFields()) {