January 2008 - Buix-commits - mailman.cloud.codelutin.com

r193 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 12:00:02 +0000 (Tue, 22 Jan 2008) New Revision: 193 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java Log: le component peut etre null, lors de l'enregistrement d'une action. Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-01-22 11:23:40 UTC (rev 192) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-01-22 12:00:02 UTC (rev 193) @@ -316,7 +316,7 @@ result.putValue("hideActionText", anno.hideActionText()); result.putValue(Action.SELECTED_KEY, anno.selected()); - result.setEnabled(component.isEnabled() || anno.enabled()); + result.setEnabled(component!=null && (component.isEnabled() || anno.enabled())); } return anno;

1 0

r192 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 11:23:40 +0000 (Tue, 22 Jan 2008) New Revision: 192 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java Log: prise en compte de la valeur pr?\195?\169c?\195?\169dente enabled sur les bouttons Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-01-22 06:14:38 UTC (rev 191) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-01-22 11:23:40 UTC (rev 192) @@ -316,7 +316,8 @@ result.putValue("hideActionText", anno.hideActionText()); result.putValue(Action.SELECTED_KEY, anno.selected()); - result.setEnabled(anno.enabled()); + result.setEnabled(component.isEnabled() || anno.enabled()); + } return anno; }

1 0

r191 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 06:14:38 +0000 (Tue, 22 Jan 2008) New Revision: 191 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/SelectActionConfig.java trunk/jaxx/src/main/java/jaxx/runtime/builder/ToggleActionConfig.java Log: supression du container Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/SelectActionConfig.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/SelectActionConfig.java 2008-01-22 02:08:56 UTC (rev 190) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/SelectActionConfig.java 2008-01-22 06:14:38 UTC (rev 191) @@ -18,8 +18,6 @@ * ##% */ package jaxx.runtime.builder; -import jaxx.runtime.JAXXObject; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -82,10 +80,4 @@ */ public abstract boolean enabled() default true; - /** - * @return la class du container jaxx associ� - * @see javax.swing.Action#NAME - */ - public abstract Class<? extends JAXXObject> container(); - } \ No newline at end of file Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ToggleActionConfig.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/ToggleActionConfig.java 2008-01-22 02:08:56 UTC (rev 190) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/ToggleActionConfig.java 2008-01-22 06:14:38 UTC (rev 191) @@ -18,8 +18,6 @@ * ##% */ package jaxx.runtime.builder; -import jaxx.runtime.JAXXObject; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -147,11 +145,4 @@ */ public abstract boolean hideActionText() default false; - - /** - * @return la class du container jaxx associ� - * @see javax.swing.Action#NAME - */ - public abstract Class<? extends JAXXObject> container(); - } \ No newline at end of file

1 0

r190 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 02:08:56 +0000 (Tue, 22 Jan 2008) New Revision: 190 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionConfig.java Log: supression du container Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionConfig.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionConfig.java 2008-01-22 01:48:18 UTC (rev 189) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionConfig.java 2008-01-22 02:08:56 UTC (rev 190) @@ -18,8 +18,6 @@ * ##% */ package jaxx.runtime.builder; -import jaxx.runtime.JAXXObject; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -113,10 +111,4 @@ boolean hideActionText() default false; - /** - * @return la class du container jaxx associ� - * @see javax.swing.Action#NAME - */ - Class<? extends JAXXObject> container(); - } \ No newline at end of file

1 0

r189 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 01:48:18 +0000 (Tue, 22 Jan 2008) New Revision: 189 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java Log: les mod?\195?\168les sont instanci?\195?\169s ind?\195?\169pendamment des ui (car on peut avoir besoin du mod?\195?\168le avant que l'ui ne soit instanci?\195?\169e) Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java 2008-01-22 01:32:13 UTC (rev 188) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java 2008-01-22 01:48:18 UTC (rev 189) @@ -70,18 +70,17 @@ JComponent instance; try { instance = (JComponent) config.impl().newInstance(); - log.info("new tab : " + instance); + log.info("new tab : " + instance); + cache.put(tabName, instance); + initJAXXTab(config, instance); - initTab(instance, tabName, config); - cache.put(tabName, instance); return instance; } catch (Exception e) { throw new RuntimeException(e); } - } public TabContentConfig getConfig(String tabName) { @@ -94,7 +93,20 @@ } public TabModel getModel(String tabName) { - return models.get(tabName); + + if (models.containsKey(tabName)) { + return models.get(tabName); + } + TabContentConfig config = getConfig(tabName); + TabModel tabModel; + try { + tabModel = config.model().newInstance(); + log.info("new tab model : " + tabModel); + models.put(tabName, tabModel); + } catch (Exception e) { + throw new RuntimeException(e); + } + return tabModel; } public void showTab(final JTabbedPane container, String tabName) { @@ -107,7 +119,7 @@ if (index == -1) { registerTab(container, tabName, config, comp); } - + container.setSelectedComponent(comp); }

1 0

r188 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 01:32:13 +0000 (Tue, 22 Jan 2008) New Revision: 188 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabModel.java Log: plutot utiliser une interface Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabModel.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabModel.java 2008-01-22 01:01:24 UTC (rev 187) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabModel.java 2008-01-22 01:32:13 UTC (rev 188) @@ -18,20 +18,13 @@ * ##% */ package jaxx.runtime.builder; +import java.io.Serializable; + /** @author chemit */ -public class TabModel { +public interface TabModel extends Serializable { - protected String name; + String getName(); - public TabModel(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } + void setName(String name); + }

1 0

r187 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 01:01:24 +0000 (Tue, 22 Jan 2008) New Revision: 187 Added: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java Log: introduction factory de Tab et TabModel Added: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java (rev 0) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabFactory.java 2008-01-22 01:01:24 UTC (rev 187) @@ -0,0 +1,188 @@ +/* +* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* \#\#% */ +package jaxx.runtime.builder; + +import jaxx.runtime.JAXXObject; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.swing.JComponent; +import javax.swing.JTabbedPane; +import java.awt.Component; +import java.lang.reflect.Field; +import java.util.Map; +import java.util.TreeMap; + +/** + * Une usine pour les Tabs, leur configs et leur mod�les + * + * @author tony + * @see jaxx.runtime.builder.TabContentConfig + * @see TabModel + */ + +public abstract class TabFactory { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + protected static Log log = LogFactory.getLog(TabFactory.class); + + /** dictionary of configs */ + protected Map<String, TabContentConfig> configs; + + /** dictionary of instanciated actions */ + protected Map<String, JComponent> 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 JComponent newTab(String tabName) { + + checkRegistredConfig(tabName); + + // try in cache + if (cache.containsKey(tabName)) { + // use cached tab + return cache.get(tabName); + } + + TabContentConfig config = configs.get(tabName); + + JComponent instance; + try { + instance = (JComponent) config.impl().newInstance(); + log.info("new tab : " + instance); + + initJAXXTab(config, instance); + + initTab(instance, tabName, config); + + cache.put(tabName, instance); + return instance; + } catch (Exception e) { + throw new RuntimeException(e); + } + + } + + public TabContentConfig getConfig(String tabName) { + checkRegistredConfig(tabName); + return configs.get(tabName); + } + + public JComponent getUI(String tabName) { + return cache.get(tabName); + } + + public TabModel getModel(String tabName) { + return models.get(tabName); + } + + public void showTab(final JTabbedPane container, String tabName) { + + TabContentConfig config = getConfig(tabName); + + JComponent comp = newTab(tabName); + + int index = getTabIndex(container, comp); + if (index == -1) { + registerTab(container, tabName, config, comp); + } + + container.setSelectedComponent(comp); + } + + public void closeTab(JTabbedPane container, String tabName) { + + TabContentConfig config = getConfig(tabName); + + final JComponent comp = cache.get(tabName); + + int index = getTabIndex(container, comp); + if (index != -1) { + container.removeTabAt(index); + log.debug(config + " index " + index); + } + } + + public int getTabIndex(final JTabbedPane container, JComponent comp) { + if (container != null && comp != null) { + for (int i = 0; i < container.getTabCount(); i++) { + Component o = container.getComponentAt(i); + if (o.equals(comp)) { + return i; + } + } + } + return -1; + } + + public void resetCache() { + cache.clear(); + } + + + protected TabFactory() { + configs = initFactory(); + cache = new TreeMap<String, JComponent>(); + models = new TreeMap<String, TabModel>(); + } + + protected JComponent addTabHeader(final JTabbedPane container, final String tabName, final TabContentConfig config, final JComponent comp) { + // by default, no tab header + return null; + } + + protected void registerTab(final JTabbedPane container, final String tabName, final TabContentConfig config, final JComponent comp) { + + container.addTab(tabName, comp); + + JComponent header = addTabHeader(container, tabName, config, comp); + + if (header != null) { + + container.setTabComponentAt(container.getTabCount() - 1, header); + } + } + + @SuppressWarnings({"unchecked"}) + protected void initJAXXTab(TabContentConfig config, JComponent instance) throws NoSuchFieldException, IllegalAccessException { + if (instance instanceof JAXXObject) { + JAXXObject ui = (JAXXObject) instance; + for (String dynamicField : config.dynamicFields()) { + String dynamciName = dynamicField + '_' + config.name(); + Object obj = ui.getObjectById(dynamicField); + Field m = ui.getClass().getDeclaredField("$objectMap"); + m.setAccessible(true); + Map<Object, Object> map = (Map<Object, Object>) m.get(ui); + map.put(dynamciName, obj); + } + } + } + + protected void checkRegistredConfig(String tabName) { + if (!configs.containsKey(tabName)) { + throw new IllegalStateException("can not find a registered TabContentConfig for tab name " + tabName); + } + } + +} \ No newline at end of file

1 0

r186 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org 22 Jan '08

22 Jan '08

Author: tchemit Date: 2008-01-22 01:00:28 +0000 (Tue, 22 Jan 2008) New Revision: 186 Added: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabModel.java Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java Log: introduction model pour Tab Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java 2008-01-21 22:33:24 UTC (rev 185) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java 2008-01-22 01:00:28 UTC (rev 186) @@ -37,6 +37,8 @@ public @interface TabContentConfig { + Class<? extends TabModel> model(); + Class<? extends JAXXObject> impl(); Class<? extends JTabbedPane> parentImpl(); Added: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabModel.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabModel.java (rev 0) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabModel.java 2008-01-22 01:00:28 UTC (rev 186) @@ -0,0 +1,37 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package jaxx.runtime.builder; + +/** @author chemit */ +public class TabModel { + + protected String name; + + public TabModel(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +}

1 0

r185 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org 21 Jan '08

21 Jan '08

Author: tchemit Date: 2008-01-21 22:33:24 +0000 (Mon, 21 Jan 2008) New Revision: 185 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java Log: ajout accesseur sur action en cache Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-01-21 21:26:07 UTC (rev 184) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/ActionFactory.java 2008-01-21 22:33:24 UTC (rev 185) @@ -81,6 +81,10 @@ impls.clear(); } + public AbstractAction get(String actionKey) { + return cache.get(actionKey); + } + public AbstractAction[] loadActions(JAXXObject ui) { List<AbstractAction> result = new ArrayList<AbstractAction>(); for (Map.Entry<String, Class<? extends AbstractAction>> entry : implsEntrySet()) {

1 0

r184 - trunk/jaxx/src/main/java/jaxx/runtime/builder
by tchemit＠users.labs.libre-entreprise.org 21 Jan '08

21 Jan '08

Author: tchemit Date: 2008-01-21 21:26:07 +0000 (Mon, 21 Jan 2008) New Revision: 184 Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java Log: ajout propri?\195?\169t?\195?\169s ?\195?\160 TabContentConfig Modified: trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java =================================================================== --- trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java 2008-01-21 20:53:22 UTC (rev 183) +++ trunk/jaxx/src/main/java/jaxx/runtime/builder/TabContentConfig.java 2008-01-21 21:26:07 UTC (rev 184) @@ -43,4 +43,10 @@ boolean useToogle() default false; + String name(); + + String shortDescription(); + + String[] dynamicFields() default {}; + }

1 0