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

r796 - trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/provider
by tchemit＠users.labs.libre-entreprise.org 25 Jul '08

25 Jul '08

Author: tchemit Date: 2008-07-25 17:55:55 +0000 (Fri, 25 Jul 2008) New Revision: 796 Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/provider/ActionProvider.java Log: ActionProviderjavadoc Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/provider/ActionProvider.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/provider/ActionProvider.java 2008-07-25 17:55:34 UTC (rev 795) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/provider/ActionProvider.java 2008-07-25 17:55:55 UTC (rev 796) @@ -17,7 +17,9 @@ import org.codelutin.jaxx.action.MyAbstractAction; /** - * Contract to be realized by a provider of Actions + * Contract to be realized by a provider of Actions. + * + * A provider of actions * * @author chemit */

1 0

r795 - trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory
by tchemit＠users.labs.libre-entreprise.org 25 Jul '08

25 Jul '08

Author: tchemit Date: 2008-07-25 17:55:34 +0000 (Fri, 25 Jul 2008) New Revision: 795 Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java Log: ActionFactory javadoc add methode newAction(String) to ActionFactory Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java 2008-07-25 14:00:19 UTC (rev 794) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java 2008-07-25 17:55:34 UTC (rev 795) @@ -219,6 +219,10 @@ return result; } + public A newAction(String actionKey) { + return newAction(actionKey, null); + } + public String[] getActionNames() { return impls.keySet().toArray(new String[impls.size()]); } Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java 2008-07-25 14:00:19 UTC (rev 794) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java 2008-07-25 17:55:34 UTC (rev 795) @@ -41,29 +41,92 @@ */ Map<String, Class<? extends MyAbstractAction>> init(); + /** @return the class of the base action of the factory. */ Class<A> getBaseImpl(); + /** clear the cache of instanciated actions. */ void resetCache(); + /** + * @param actionKey the key of an action + * @return the action with this key from cache, or <code>null</code> if this action is not in cache + */ A get(String actionKey); + /** + * For a given ui, load all actions registred in factory. + * + * The id of the widget in ui is directly mapped to a action key. + * + * @param ui the ui to treate + */ void loadActions(JAXXObject ui); + /** + * Obtain an action instance given his key and widget + * + * @param actionKey the key of action + * @param component the component using the action + * @return the instanciated action (could come from cache if already instanciated {@link #getActionFromCache(String)} + */ A newAction(String actionKey, JComponent component); + /** + * Obtain an action instance given his key (should call {@link #newAction(String, javax.swing.JComponent)} + * + * This is a convinient method when you want to obtain an action with no attached widget. + * + * @param actionKey the key of action + * @return the instanciated action (could come from cache if already instanciated {@link #getActionFromCache(String)} + */ + A newAction(String actionKey); + + /** @return the array of names of all actions known by the factory */ String[] getActionNames(); + /** @return the set of all the action's classes known by the factory. */ Set<Entry<String, Class<? extends MyAbstractAction>>> implsEntrySet(); + /** @return the set of all actions cached in factory indexed by their name */ Set<Entry<String, A>> cacheEntrySet(); + /** + * Fire an action given his key, his source and tthe widget responsible of action + * + * @param actionKey the action's key + * @param source the object source of action + * @param component the component doing the action + */ void fireAction(String actionKey, Object source, JComponent component); + /** + * Fire an action given his key and his source, no widget are involved here + * + * @param actionKey the action's key + * @param source the object source of action + */ void fireAction(String actionKey, Object source); + /** + * Fire an action given his action's key, his source and the reaal action. + * + * This is a convinient method when you need to modified action before fire it. + * + * @param actionKey action's key + * @param source source of action + * @param action real action + */ void fireAction0(String actionKey, Object source, A action); + /** + * @param actionKey the action's key + * @return the action in cache or <code>null</code> if action is not in cache + */ MyAbstractAction getActionFromCache(String actionKey); + /** + * dispose all actions in cache using {@link org.codelutin.jaxx.action.MyAbstractAction#disposeUI()} on each + * action, then {@link #resetCache()} + */ void dispose(); }

1 0

r794 - in trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action: . factory
by tchemit＠users.labs.libre-entreprise.org 25 Jul '08

25 Jul '08

Author: tchemit Date: 2008-07-25 14:00:19 +0000 (Fri, 25 Jul 2008) New Revision: 794 Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/MyAbstractAction.java trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java Log: add fireAction0 in ActionFactory contract add setStatus method in MyAbstractAction Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/MyAbstractAction.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/MyAbstractAction.java 2008-07-25 13:58:48 UTC (rev 793) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/MyAbstractAction.java 2008-07-25 14:00:19 UTC (rev 794) @@ -16,6 +16,7 @@ import jaxx.runtime.JAXXObject; import org.apache.commons.logging.LogFactory; +import static org.codelutin.i18n.I18n._; import javax.swing.AbstractAction; import javax.swing.Action; @@ -65,6 +66,7 @@ } if (accepted) { doAction(e); + setStatus(_("jaxx.action.done", getName())); updateUI(); } } catch (Exception e1) { @@ -105,10 +107,21 @@ return delegate != null; } + protected String getName() { + return (String) getValue(NAME); + } + protected String getActionName() { return (String) getValue(ACTION_COMMAND_KEY); } + protected void setStatus(String status) { + // do nothing from here + if (log.isDebugEnabled()) { + log.debug(status); + } + } + protected boolean beforeAction(ActionEvent evt) throws Exception { boolean enabled = isEnabled(); if (enabled && hasDelegate()) { Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java 2008-07-25 13:58:48 UTC (rev 793) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java 2008-07-25 14:00:19 UTC (rev 794) @@ -357,7 +357,7 @@ } } - protected void fireAction0(String actionKey, Object source, A action) { + public void fireAction0(String actionKey, Object source, A action) { if (action == null) { log.warn("could not find action " + actionKey); return; Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java 2008-07-25 13:58:48 UTC (rev 793) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java 2008-07-25 14:00:19 UTC (rev 794) @@ -61,6 +61,8 @@ void fireAction(String actionKey, Object source); + void fireAction0(String actionKey, Object source, A action); + MyAbstractAction getActionFromCache(String actionKey); void dispose();

1 0

r793 - trunk/lutinjaxx/maven/src/main/java
by tchemit＠users.labs.libre-entreprise.org 25 Jul '08

25 Jul '08

Author: tchemit Date: 2008-07-25 13:58:48 +0000 (Fri, 25 Jul 2008) New Revision: 793 Removed: trunk/lutinjaxx/maven/src/main/java/jaxx/ Log: no more use

1 0

r792 - trunk/lutinjaxx/jaxx-swing-action/src/main/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 25 Jul '08

25 Jul '08

Author: tchemit Date: 2008-07-25 13:58:29 +0000 (Fri, 25 Jul 2008) New Revision: 792 Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/resources/i18n/jaxx-swing-action-en_GB.properties trunk/lutinjaxx/jaxx-swing-action/src/main/resources/i18n/jaxx-swing-action-fr_FR.properties Log: i18n Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/resources/i18n/jaxx-swing-action-en_GB.properties =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/resources/i18n/jaxx-swing-action-en_GB.properties 2008-07-24 20:59:46 UTC (rev 791) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/resources/i18n/jaxx-swing-action-en_GB.properties 2008-07-25 13:58:29 UTC (rev 792) @@ -1,3 +1,4 @@ +jaxx.action.done=Action ''{0}'' done. jaxx.error.close.actions.file=Error while closing file of actions jaxx.error.load.actions.class=Error while loading actions jaxx.error.load.actions.file=Error while loading file of actions Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/resources/i18n/jaxx-swing-action-fr_FR.properties =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/resources/i18n/jaxx-swing-action-fr_FR.properties 2008-07-24 20:59:46 UTC (rev 791) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/resources/i18n/jaxx-swing-action-fr_FR.properties 2008-07-25 13:58:29 UTC (rev 792) @@ -1,3 +1,4 @@ +jaxx.action.done=Action ''{0}'' termin\u00E9e. jaxx.error.close.actions.file=Erreur lors de la fermeture du fichier d'actions jaxx.error.load.actions.class=Erreur lors du chargement des actions jaxx.error.load.actions.file=Erreur lors du chargement du fchier d'actions

1 0

r791 - in trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action: . factory
by tchemit＠users.labs.libre-entreprise.org 24 Jul '08

24 Jul '08

Author: tchemit Date: 2008-07-24 20:59:46 +0000 (Thu, 24 Jul 2008) New Revision: 791 Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/MyAbstractAction.java trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactoryFromProvider.java Log: ActionFactory is typed with MyAbstractionAction Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/MyAbstractAction.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/MyAbstractAction.java 2008-07-24 19:18:03 UTC (rev 790) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/MyAbstractAction.java 2008-07-24 20:59:46 UTC (rev 791) @@ -18,8 +18,10 @@ import org.apache.commons.logging.LogFactory; import javax.swing.AbstractAction; +import javax.swing.Action; import javax.swing.JComponent; import java.awt.event.ActionEvent; +import java.beans.PropertyChangeListener; /** @author chemit */ public abstract class MyAbstractAction extends AbstractAction { @@ -38,13 +40,13 @@ super(name); } - protected MyAbstractAction(String name, MyAbstractAction delegate) { - super(name); + protected MyAbstractAction(MyAbstractAction delegate) { + super((String) delegate.getValue(Action.NAME)); this.delegate = delegate; } public void actionPerformed(java.awt.event.ActionEvent e) { - if (delegate != null) { + if (hasDelegate()) { // delegate to real action delegate.actionPerformed(e); return; @@ -75,21 +77,21 @@ } public String getI18nToolTipText() { - if (delegate != null) { + if (hasDelegate()) { return delegate.getI18nToolTipText(); } return getPrefix() + ".action." + getActionName() + ".tooltip"; } public void updateUI() { - if (delegate != null) { + if (hasDelegate()) { delegate.updateUI(); } // nothing by default } public void disposeUI() { - if (delegate != null) { + if (hasDelegate()) { delegate.disposeUI(); } // nothing by default @@ -99,20 +101,24 @@ return delegate; } + public boolean hasDelegate() { + return delegate != null; + } + protected String getActionName() { return (String) getValue(ACTION_COMMAND_KEY); } protected boolean beforeAction(ActionEvent evt) throws Exception { boolean enabled = isEnabled(); - if (enabled && delegate != null) { + if (enabled && hasDelegate()) { return delegate.beforeAction(evt); } return enabled; } protected void doAction(ActionEvent evt) throws Exception { - if (delegate != null) { + if (hasDelegate()) { delegate.doAction(evt); } // nothing by default @@ -126,7 +132,7 @@ } protected void clear() { - if (delegate != null) { + if (hasDelegate()) { delegate.clear(); } // nothing by default @@ -136,4 +142,89 @@ log.error(e); } + // ----------------------------------------------------------------------------- + // --- super classe delegate methods ------------------------------------------- + // ----------------------------------------------------------------------------- + + @Override + public Object getValue(String key) { + if (hasDelegate()) { + return delegate.getValue(key); + } + return super.getValue(key); + } + + @Override + public void putValue(String key, Object newValue) { + if (hasDelegate()) { + delegate.putValue(key, newValue); + } + super.putValue(key, newValue); + } + + @Override + public boolean isEnabled() { + if (hasDelegate()) { + return delegate.isEnabled(); + } + return super.isEnabled(); + } + + @Override + public void setEnabled(boolean newValue) { + if (hasDelegate()) { + delegate.setEnabled(newValue); + } + super.setEnabled(newValue); + } + + @Override + public Object[] getKeys() { + if (hasDelegate()) { + return getKeys(); + } + return super.getKeys(); + } + + @Override + protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { + if (hasDelegate()) { + delegate.firePropertyChange(propertyName, oldValue, newValue); + } + super.firePropertyChange(propertyName, oldValue, newValue); + } + + @Override + public synchronized void addPropertyChangeListener(PropertyChangeListener listener) { + if (hasDelegate()) { + delegate.addPropertyChangeListener(listener); + } + super.addPropertyChangeListener(listener); + } + + @Override + public synchronized void removePropertyChangeListener(PropertyChangeListener listener) { + if (hasDelegate()) { + delegate.removePropertyChangeListener(listener); + } + super.removePropertyChangeListener(listener); + } + + @Override + public synchronized PropertyChangeListener[] getPropertyChangeListeners() { + if (hasDelegate()) { + return delegate.getPropertyChangeListeners(); + } + return super.getPropertyChangeListeners(); + } + + @Override + protected Object clone() throws CloneNotSupportedException { + if (hasDelegate()) { + return clone(); + } + return super.clone(); + } + + } Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java 2008-07-24 19:18:03 UTC (rev 790) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java 2008-07-24 20:59:46 UTC (rev 791) @@ -37,9 +37,9 @@ import javax.swing.JComponent; import java.awt.event.ActionEvent; import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; @@ -67,7 +67,7 @@ private Map<String, Class<? extends MyAbstractAction>> impls; /** dictionary of instanciated actions */ - private Map<String, MyAbstractAction> cache; + private Map<String, A> cache; protected final ActionConfigInitializer actionConfigInitializer; protected final ToggleActionConfigInitializer toggleActionConfigInitializer; @@ -79,7 +79,7 @@ protected AbstractActionFactory(Class<A> baseImpl) { this.baseImpl = baseImpl; this.impls = init(); - this.cache = new TreeMap<String, MyAbstractAction>(); + this.cache = new TreeMap<String, A>(); this.registredInitializers = new java.util.ArrayList<AbstractActionInitializer>(); this.toggleActionConfigInitializer = registerInitializer(ToggleActionConfigInitializer.class); @@ -95,15 +95,15 @@ cache.clear(); } - public MyAbstractAction get(String actionKey) { + public A get(String actionKey) { return cache.get(actionKey); } - public MyAbstractAction[] loadActions(JAXXObject ui) { + public void loadActions(JAXXObject ui) { if (log.isDebugEnabled()) { log.debug("for ui " + ui.getClass()); } - List<MyAbstractAction> result = new ArrayList<MyAbstractAction>(); + //List<A> result = new ArrayList<A>(); for (Map.Entry<String, Class<? extends MyAbstractAction>> entry : implsEntrySet()) { String actionKey = entry.getKey(); Object comp = ui.getObjectById(actionKey); @@ -116,7 +116,7 @@ } if (comp instanceof AbstractButton) { AbstractButton component = (AbstractButton) comp; - MyAbstractAction action = newAction(actionKey, component); + A action = newAction(actionKey, component); component.setAction(action); @@ -142,21 +142,21 @@ Boolean value = (Boolean) action.getValue("hideActionText"); component.setHideActionText(value != null && value); action.setEnabled(true); - result.add(action); + //result.add(action); continue; } // is JComboBox JComboBox component = (JComboBox) comp; - MyAbstractAction action = newAction(actionKey, component); + A action = newAction(actionKey, component); component.setAction(action); Integer val = (Integer) action.getValue("selectedIndex"); if (val != null && val != -1 && val < component.getItemCount() && val != component.getSelectedIndex()) { component.setSelectedIndex(val); } - result.add(action); + //result.add(action); } - return result.toArray(new MyAbstractAction[result.size()]); + //return (A[]) result.toArray(new MyAbstractAction[result.size()]); } /** @@ -165,9 +165,9 @@ * @param component le button o� rattacher l'action * @return une nouvelle instance de l'action associ�e � sa clef. */ - public MyAbstractAction newAction(String actionKey, JComponent component) { + public A newAction(String actionKey, JComponent component) { // try first in cache - MyAbstractAction result = getActionFromCache(actionKey); + A result = getActionFromCache(actionKey); if (result != null) { return result; } @@ -227,12 +227,12 @@ return impls.entrySet(); } - public Set<Map.Entry<String, MyAbstractAction>> cacheEntrySet() { + public Set<Entry<String, A>> cacheEntrySet() { return cache.entrySet(); } public void fireAction(String actionKey, Object source, JComponent component) { - AbstractAction action = newAction(actionKey, component); + A action = newAction(actionKey, component); fireAction0(actionKey, source, action); } @@ -244,14 +244,14 @@ * @param actionKey la clef de l'action * @return l'action deja stockee dans le cache d'action, ou <code>null</code> si non trouv�e. */ - public MyAbstractAction getActionFromCache(String actionKey) { + public A getActionFromCache(String actionKey) { // on v�rifie que l'action existe bien checkRegistredAction(actionKey); // try in cache if (cache.containsKey(actionKey)) { // use cached action - MyAbstractAction action = cache.get(actionKey); + A action = cache.get(actionKey); if (log.isDebugEnabled()) { log.debug("use cache action " + action); } @@ -357,7 +357,7 @@ } } - protected void fireAction0(String actionKey, Object source, AbstractAction action) { + protected void fireAction0(String actionKey, Object source, A action) { if (action == null) { log.warn("could not find action " + actionKey); return; @@ -373,11 +373,16 @@ } - protected MyAbstractAction newActionInstance(String actionKey) throws InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException { + @SuppressWarnings({"unchecked"}) + protected A newActionInstance(String actionKey) throws InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException { Class<? extends MyAbstractAction> klazz = impls.get(actionKey); MyAbstractAction result; result = klazz.getConstructor(String.class).newInstance(actionKey); result.putValue(Action.ACTION_COMMAND_KEY, actionKey); - return result; + if (!getBaseImpl().isAssignableFrom(klazz)) { + // the instanciated action must be boxed in the base Action of the factory + result = getBaseImpl().getConstructor(MyAbstractAction.class).newInstance(result); + } + return (A) result; } } \ No newline at end of file Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java 2008-07-24 19:18:03 UTC (rev 790) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java 2008-07-24 20:59:46 UTC (rev 791) @@ -45,17 +45,17 @@ void resetCache(); - MyAbstractAction get(String actionKey); + A get(String actionKey); - MyAbstractAction[] loadActions(JAXXObject ui); + void loadActions(JAXXObject ui); - MyAbstractAction newAction(String actionKey, JComponent component); + A newAction(String actionKey, JComponent component); String[] getActionNames(); Set<Entry<String, Class<? extends MyAbstractAction>>> implsEntrySet(); - Set<Entry<String, MyAbstractAction>> cacheEntrySet(); + Set<Entry<String, A>> cacheEntrySet(); void fireAction(String actionKey, Object source, JComponent component); Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactoryFromProvider.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactoryFromProvider.java 2008-07-24 19:18:03 UTC (rev 790) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactoryFromProvider.java 2008-07-24 20:59:46 UTC (rev 791) @@ -25,6 +25,7 @@ import java.util.TreeMap; /** + * TODO Do javadoc which is not up to date... * A simple implementation of {@link AbstractActionFactory} using a properties file to * load action mapping. *

1 0

r790 - trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory
by tchemit＠users.labs.libre-entreprise.org 24 Jul '08

24 Jul '08

Author: tchemit Date: 2008-07-24 19:18:03 +0000 (Thu, 24 Jul 2008) New Revision: 790 Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java Log: ActionFactory is typed with MyAbstractionAction Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java 2008-07-24 19:04:53 UTC (rev 789) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java 2008-07-24 19:18:03 UTC (rev 790) @@ -56,7 +56,7 @@ * * @author chemit */ -public abstract class AbstractActionFactory<A extends MyAbstractAction> implements ActionFactory { +public abstract class AbstractActionFactory<A extends MyAbstractAction> implements ActionFactory<A> { protected static Log log = LogFactory.getLog(AbstractActionFactory.class); @@ -87,6 +87,10 @@ this.selectActionConfigInitializer = registerInitializer(SelectActionConfigInitializer.class); } + public Class<A> getBaseImpl() { + return baseImpl; + } + public void resetCache() { cache.clear(); } Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java 2008-07-24 19:04:53 UTC (rev 789) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java 2008-07-24 19:18:03 UTC (rev 790) @@ -32,7 +32,7 @@ * * @author chemit */ -public interface ActionFactory { +public interface ActionFactory<A extends MyAbstractAction> { /** * Method to init the dictionary of knwon action implementations. @@ -41,6 +41,8 @@ */ Map<String, Class<? extends MyAbstractAction>> init(); + Class<A> getBaseImpl(); + void resetCache(); MyAbstractAction get(String actionKey);

1 0

r789 - trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action
by tchemit＠users.labs.libre-entreprise.org 24 Jul '08

24 Jul '08

Author: tchemit Date: 2008-07-24 19:04:53 +0000 (Thu, 24 Jul 2008) New Revision: 789 Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/MyAbstractAction.java Log: introduce delegate mecanism in Action Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/MyAbstractAction.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/MyAbstractAction.java 2008-07-24 18:52:48 UTC (rev 788) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/MyAbstractAction.java 2008-07-24 19:04:53 UTC (rev 789) @@ -30,14 +30,25 @@ protected ActionEvent e; + protected MyAbstractAction delegate; + + protected abstract String getPrefix(); + protected MyAbstractAction(String name) { super(name); } - protected abstract String getPrefix(); + protected MyAbstractAction(String name, MyAbstractAction delegate) { + super(name); + this.delegate = delegate; + } public void actionPerformed(java.awt.event.ActionEvent e) { - + if (delegate != null) { + // delegate to real action + delegate.actionPerformed(e); + return; + } log.debug("------------------------------------------------------------"); log.debug("event : " + e); log.debug("source : " + e.getSource()); @@ -63,39 +74,61 @@ } } - protected String getActionName() { - return (String) getValue(ACTION_COMMAND_KEY); + public String getI18nToolTipText() { + if (delegate != null) { + return delegate.getI18nToolTipText(); + } + return getPrefix() + ".action." + getActionName() + ".tooltip"; } - protected boolean beforeAction(ActionEvent e) throws Exception { - return isEnabled(); + public void updateUI() { + if (delegate != null) { + delegate.updateUI(); + } + // nothing by default } - protected JComponent getUIObject(String name, JAXXObject container) { - if (container == null) { - return null; + public void disposeUI() { + if (delegate != null) { + delegate.disposeUI(); } - return (JComponent) container.getObjectById(name); + // nothing by default } - public String getI18nToolTipText() { - return getPrefix() + ".action." + getActionName() + ".tooltip"; + public MyAbstractAction getDelegate() { + return delegate; } - protected void doAction(ActionEvent e) throws Exception { - // nothing by default + protected String getActionName() { + return (String) getValue(ACTION_COMMAND_KEY); } - public void updateUI() { - // nothing by default + protected boolean beforeAction(ActionEvent evt) throws Exception { + boolean enabled = isEnabled(); + if (enabled && delegate != null) { + return delegate.beforeAction(evt); + } + return enabled; } - public void disposeUI() { + protected void doAction(ActionEvent evt) throws Exception { + if (delegate != null) { + delegate.doAction(evt); + } // nothing by default } + protected JComponent getUIObject(String name, JAXXObject container) { + if (container == null) { + return null; + } + return (JComponent) container.getObjectById(name); + } protected void clear() { + if (delegate != null) { + delegate.clear(); + } // nothing by default }

1 0

r788 - trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory
by tchemit＠users.labs.libre-entreprise.org 24 Jul '08

24 Jul '08

Author: tchemit Date: 2008-07-24 18:52:48 +0000 (Thu, 24 Jul 2008) New Revision: 788 Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactoryFromProvider.java Log: introduction ActionFactory interface Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java 2008-07-24 18:50:12 UTC (rev 787) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java 2008-07-24 18:52:48 UTC (rev 788) @@ -73,13 +73,6 @@ protected final ToggleActionConfigInitializer toggleActionConfigInitializer; protected final SelectActionConfigInitializer selectActionConfigInitializer; - /** - * Method to init the dictionary of knwon action implementations. - * - * @return the dictionary of known action implementations - */ - protected abstract Map<String, Class<? extends MyAbstractAction>> init(); - protected List<AbstractActionInitializer> registredInitializers; @@ -98,13 +91,6 @@ cache.clear(); } - @Override - protected void finalize() throws Throwable { - super.finalize(); - resetCache(); - impls.clear(); - } - public MyAbstractAction get(String actionKey) { return cache.get(actionKey); } @@ -283,6 +269,13 @@ resetCache(); } + @Override + protected void finalize() throws Throwable { + super.finalize(); + resetCache(); + impls.clear(); + } + /** * @param component le button o� rattacher l'action * @param action action Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java 2008-07-24 18:50:12 UTC (rev 787) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactory.java 2008-07-24 18:52:48 UTC (rev 788) @@ -18,11 +18,29 @@ import org.codelutin.jaxx.action.MyAbstractAction; import javax.swing.JComponent; +import java.util.Map; import java.util.Map.Entry; import java.util.Set; -/** @author chemit */ +/** + * Action factory using the ActionConfig annotations to configure the action. + * + * Use after the {@link #loadActions(jaxx.runtime.JAXXObject)} to instanciate + * actions in ui with id equals a known action... + * + * TODO Finish doc + * + * @author chemit + */ public interface ActionFactory { + + /** + * Method to init the dictionary of knwon action implementations. + * + * @return the dictionary of known action implementations + */ + Map<String, Class<? extends MyAbstractAction>> init(); + void resetCache(); MyAbstractAction get(String actionKey); Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactoryFromProvider.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactoryFromProvider.java 2008-07-24 18:50:12 UTC (rev 787) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/ActionFactoryFromProvider.java 2008-07-24 18:52:48 UTC (rev 788) @@ -45,7 +45,7 @@ super(baseClass); } - protected Map<String, Class<? extends MyAbstractAction>> init() { + public Map<String, Class<? extends MyAbstractAction>> init() { if (log.isDebugEnabled()) { log.debug("start loading " + this); }

1 0

r787 - trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory
by tchemit＠users.labs.libre-entreprise.org 24 Jul '08

24 Jul '08

Author: tchemit Date: 2008-07-24 18:50:12 +0000 (Thu, 24 Jul 2008) New Revision: 787 Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java Log: introduction ActionFactory interface Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java 2008-07-24 18:50:03 UTC (rev 786) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/factory/AbstractActionFactory.java 2008-07-24 18:50:12 UTC (rev 787) @@ -56,7 +56,7 @@ * * @author chemit */ -public abstract class AbstractActionFactory<A extends MyAbstractAction> implements IActionFactory { +public abstract class AbstractActionFactory<A extends MyAbstractAction> implements ActionFactory { protected static Log log = LogFactory.getLog(AbstractActionFactory.class);

1 0