Author: tchemit Date: 2008-07-24 18:16:34 +0000 (Thu, 24 Jul 2008) New Revision: 780 Added: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/ActionInitializer.java Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ActionFactory.java trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/AbstractActionInitializer.java trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/ActionConfigInitializer.java trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/SelectActionConfigInitializer.java trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/ToggleActionConfigInitializer.java Log: introduce interface ActionInitializer Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ActionFactory.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ActionFactory.java 2008-07-24 18:14:26 UTC (rev 779) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/ActionFactory.java 2008-07-24 18:16:34 UTC (rev 780) @@ -22,6 +22,7 @@ import jaxx.runtime.swing.JAXXToggleButton; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codelutin.jaxx.action.initializer.AbstractActionInitializer; import org.codelutin.jaxx.action.initializer.ActionConfigInitializer; import org.codelutin.jaxx.action.initializer.ActionInitializer; import org.codelutin.jaxx.action.initializer.SelectActionConfigInitializer; @@ -79,14 +80,14 @@ */ protected abstract Map<String, Class<? extends MyAbstractAction>> init(); - protected List<ActionInitializer> registredInitializers; + protected List<AbstractActionInitializer> registredInitializers; protected ActionFactory(Class<A> baseImpl) { this.baseImpl = baseImpl; this.impls = init(); this.cache = new TreeMap<String, MyAbstractAction>(); - this.registredInitializers = new java.util.ArrayList<ActionInitializer>(); + this.registredInitializers = new java.util.ArrayList<AbstractActionInitializer>(); this.toggleActionConfigInitializer = registerInitializer(ToggleActionConfigInitializer.class); this.actionConfigInitializer = registerInitializer(ActionConfigInitializer.class); @@ -358,7 +359,7 @@ return null; } - protected <I extends ActionInitializer> I registerInitializer(Class<I> initizalizer) { + protected <I extends AbstractActionInitializer> I registerInitializer(Class<I> initizalizer) { try { I instance = initizalizer.newInstance(); registredInitializers.add(instance); Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/AbstractActionInitializer.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/AbstractActionInitializer.java 2008-07-24 18:14:26 UTC (rev 779) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/AbstractActionInitializer.java 2008-07-24 18:16:34 UTC (rev 780) @@ -23,7 +23,7 @@ * * @author chemit */ -public abstract class AbstractActionInitializer<A extends java.lang.annotation.Annotation, C extends JComponent> { +public abstract class AbstractActionInitializer<A extends java.lang.annotation.Annotation, C extends JComponent> implements ActionInitializer<A, C> { final Class<A> annotationImpl; final Class<C> componentImpl; Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/ActionConfigInitializer.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/ActionConfigInitializer.java 2008-07-24 18:14:26 UTC (rev 779) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/ActionConfigInitializer.java 2008-07-24 18:16:34 UTC (rev 780) @@ -23,7 +23,7 @@ import javax.swing.Action; /** @author chemit */ -public class ActionConfigInitializer extends ActionInitializer<ActionConfig, AbstractButton> { +public class ActionConfigInitializer extends AbstractActionInitializer<ActionConfig, AbstractButton> { public ActionConfigInitializer() { super(ActionConfig.class, AbstractButton.class); Added: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/ActionInitializer.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/ActionInitializer.java (rev 0) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/ActionInitializer.java 2008-07-24 18:16:34 UTC (rev 780) @@ -0,0 +1,30 @@ +/** + * # #% Copyright (C) 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 org.codelutin.jaxx.action.initializer; + +import javax.swing.AbstractAction; +import javax.swing.JComponent; + +/** @author chemit */ +public interface ActionInitializer<A extends java.lang.annotation.Annotation, C extends JComponent> { + + A getAnnotation(Class<? extends AbstractAction> action); + + A initAction(JComponent component, AbstractAction action); + + Class<A> getAnnotationImpl(); + + Class<C> getComponentImpl(); +} Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/SelectActionConfigInitializer.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/SelectActionConfigInitializer.java 2008-07-24 18:14:26 UTC (rev 779) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/SelectActionConfigInitializer.java 2008-07-24 18:16:34 UTC (rev 780) @@ -22,7 +22,7 @@ import javax.swing.JComboBox; /** @author chemit */ -public class SelectActionConfigInitializer extends ActionInitializer<SelectActionConfig, JComboBox> { +public class SelectActionConfigInitializer extends AbstractActionInitializer<SelectActionConfig, JComboBox> { public SelectActionConfigInitializer() { super(SelectActionConfig.class, JComboBox.class); Modified: trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/ToggleActionConfigInitializer.java =================================================================== --- trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/ToggleActionConfigInitializer.java 2008-07-24 18:14:26 UTC (rev 779) +++ trunk/lutinjaxx/jaxx-swing-action/src/main/java/org/codelutin/jaxx/action/initializer/ToggleActionConfigInitializer.java 2008-07-24 18:16:34 UTC (rev 780) @@ -23,7 +23,7 @@ import javax.swing.Action; /** @author chemit */ -public class ToggleActionConfigInitializer extends ActionInitializer<ToggleActionConfig, AbstractButton> { +public class ToggleActionConfigInitializer extends AbstractActionInitializer<ToggleActionConfig, AbstractButton> { public ToggleActionConfigInitializer() { super(ToggleActionConfig.class, AbstractButton.class);