- Jaxx-commits - mailman.cloud.codelutin.com

r1943 - in trunk: . jaxx-runtime/src/main/java/jaxx/runtime/swing/editor jaxx-runtime/src/main/java/jaxx/runtime/validator jaxx-runtime/src/main/java/jaxx/runtime/validator/field jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model
by tchemit＠users.nuiton.org 01 Jun '10

01 Jun '10

Author: tchemit Date: 2010-06-01 15:38:43 +0200 (Tue, 01 Jun 2010) New Revision: 1943 Url: http://nuiton.org/repositories/revision/jaxx/1943 Log: - Evolution #653: Use nuiton-utils 1.3.1 and his new Converter api Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ClassCellEditor.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidator.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/CategoryModel.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigTableModel.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/OptionModel.java trunk/pom.xml Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ClassCellEditor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ClassCellEditor.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ClassCellEditor.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -25,7 +25,7 @@ package jaxx.runtime.swing.editor; import org.apache.commons.beanutils.Converter; -import org.nuiton.util.ConverterUtil; +import org.nuiton.util.converter.ConverterUtil; import javax.swing.DefaultCellEditor; import javax.swing.JTable; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -28,7 +28,7 @@ import org.apache.commons.beanutils.Converter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.ConverterUtil; +import org.nuiton.util.converter.ConverterUtil; import javax.swing.event.EventListenerList; import java.beans.*; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidator.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidator.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -68,7 +68,7 @@ @Override public void validate(Object object) throws ValidationException { String fieldName = getFieldName(); - Object value = this.getFieldValue(fieldName, object); + Object value = getFieldValue(fieldName, object); if (value==null) { // no value defined addFieldError(fieldName, object); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidator.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidator.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -31,7 +31,7 @@ import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.nuiton.util.ConverterUtil; +import org.nuiton.util.converter.ConverterUtil; /** * Extends {@link FieldExpressionValidator} to add some extra parameters available Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/CategoryModel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/CategoryModel.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/CategoryModel.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -29,6 +29,7 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; +import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -37,22 +38,30 @@ /** * le modele d'une categorie d'options. - * + * <p/> * Une categorie est un ensemble d'options. * * @author tchemit */ -public class CategoryModel implements Iterable<OptionModel> { +public class CategoryModel implements Iterable<OptionModel>, Serializable { + private static final long serialVersionUID = 1L; + public static final String RELOAD_PROPERTY_NAME = "reload"; + public static final String MODIFIED_PROPERTY_NAME = "modified"; + public static final String VALID_PROPERTY_NAME = "valid"; + /** category short name (i18n key) */ protected String category; + /** category long name (i18n key) */ protected String categoryLabel; + /** options of the category */ protected List<OptionModel> entries; + /** suport of modification */ protected PropertyChangeSupport pcs = new PropertyChangeSupport(this); Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigTableModel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigTableModel.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigTableModel.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -25,7 +25,7 @@ package jaxx.runtime.swing.editor.config.model; -import org.nuiton.util.ConverterUtil; +import org.nuiton.util.converter.ConverterUtil; import javax.swing.table.AbstractTableModel; import java.beans.PropertyChangeEvent; Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/OptionModel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/OptionModel.java 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/OptionModel.java 2010-06-01 13:38:43 UTC (rev 1943) @@ -36,6 +36,7 @@ */ public class OptionModel implements OptionDef { + private static final long serialVersionUID = 1L; /** * la definition de l'option ( venant de la config) */ @@ -44,11 +45,11 @@ * un drapeau pour savoir si l'option est valide (n'est pas utilisé actuellement) */ protected boolean valid = true; + /** * un drapeau pour savoir si l'option a été sauvée */ protected boolean saved; - /** * la valeur non modifié de l'option */ @@ -61,6 +62,7 @@ * le nom de la propriété javaBean (peut etre null, si option sans support javaBean) */ protected String propertyName; + /** * l'editeur utilise pour modifier graphiquement l'option */ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-01 01:06:33 UTC (rev 1942) +++ trunk/pom.xml 2010-06-01 13:38:43 UTC (rev 1943) @@ -393,7 +393,8 @@  <projectId>jaxx</projectId> - <lutinutil.version>1.3</lutinutil.version> + <lutinutil.version>1.3.1-SNAPSHOT</lutinutil.version> + <i18n.version>1.2.2</i18n.version> <jxlayer.version>3.0.3</jxlayer.version>

1 0

r1942 - in trunk/maven-jaxx-plugin/src/test: java/org/nuiton/jaxx/plugin resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog
by tchemit＠users.nuiton.org 01 Jun '10

01 Jun '10

Author: tchemit Date: 2010-06-01 03:06:33 +0200 (Tue, 01 Jun 2010) New Revision: 1942 Url: http://nuiton.org/repositories/revision/jaxx/1942 Log: fix test Added: trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog/WithLogTwo.jaxx Removed: trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog/NoLog.jaxx Modified: trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java Modified: trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java 2010-05-30 12:11:41 UTC (rev 1941) +++ trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerTest.java 2010-06-01 01:06:33 UTC (rev 1942) @@ -88,22 +88,15 @@ String[] files = mojo.files; assertNumberJaxxFiles(2); - String withLogFile; - String withnoLogFile; - if (files[0].endsWith("WithLog.jaxx")) { - withLogFile = files[0]; - withnoLogFile = files[1]; - } else { - withLogFile = files[1]; - withnoLogFile = files[0]; - } + String withLogFile = files[0]; checkPattern(mojo, "Log log = LogFactory.getLog(", true, withLogFile); checkPattern(mojo, "import org.apache.commons.logging.Log;", true, withLogFile); checkPattern(mojo, "import org.apache.commons.logging.LogFactory;", true, withLogFile); - checkPattern(mojo, "Log log = LogFactory.getLog(", false, withnoLogFile); - checkPattern(mojo, "import org.apache.commons.logging.Log;", false, withnoLogFile); - checkPattern(mojo, "import org.apache.commons.logging.LogFactory;", false, withnoLogFile); + withLogFile = files[1]; + checkPattern(mojo, "Log log = LogFactory.getLog(", true, withLogFile); + checkPattern(mojo, "import org.apache.commons.logging.Log;", true, withLogFile); + checkPattern(mojo, "import org.apache.commons.logging.LogFactory;", true, withLogFile); } @Test Deleted: trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog/NoLog.jaxx =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog/NoLog.jaxx 2010-05-30 12:11:41 UTC (rev 1941) +++ trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog/NoLog.jaxx 2010-06-01 01:06:33 UTC (rev 1942) @@ -1 +0,0 @@ -<WithLog id='testId' text='test.text'/> \ No newline at end of file Copied: trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog/WithLogTwo.jaxx (from rev 1941, trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog/NoLog.jaxx) =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog/WithLogTwo.jaxx (rev 0) +++ trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog/WithLogTwo.jaxx 2010-06-01 01:06:33 UTC (rev 1942) @@ -0,0 +1 @@ +<WithLog id='testId' text='test.text'/> \ No newline at end of file Property changes on: trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/log/withlog/WithLogTwo.jaxx ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Added: svn:mergeinfo +

1 0

r1941 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard
by tchemit＠users.nuiton.org 30 May '10

30 May '10

Author: tchemit Date: 2010-05-30 14:11:41 +0200 (Sun, 30 May 2010) New Revision: 1941 Url: http://nuiton.org/repositories/revision/jaxx/1941 Log: improve logs Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationModel.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationModel.java 2010-05-30 09:21:32 UTC (rev 1940) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationModel.java 2010-05-30 12:11:41 UTC (rev 1941) @@ -92,7 +92,9 @@ // initialisation du modèle associé à l'opération WizardOperationActionModel<E> model = (WizardOperationActionModel<E>) step.newModel(); - log.info("[" + step + "] Add an operation model " + model); + if (log.isInfoEnabled()) { + log.info("[" + step + "] Add an operation model " + model); + } models.put(step, model); } } @@ -170,7 +172,9 @@ } public boolean[] getAccessibleSteps() { - log.info("compute with steps "+getSteps()); + if (log.isDebugEnabled()) { + log.debug("compute with steps "+getSteps()); + } boolean[] result = new boolean[getSteps().size()]; int index = getSteps().indexOf(getStep()); if (index != -1) { @@ -190,7 +194,9 @@ (!previousStep.isOperation() || getOperationState(previousStep) == WizardOperationState.SUCCESSED); } } - log.info("accessibles steps -------- " + Arrays.toString(result)); + if (log.isDebugEnabled()) { + log.debug("accessibles steps -------- " + Arrays.toString(result)); + } return result; }

1 0

r1940 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard
by tchemit＠users.nuiton.org 30 May '10

30 May '10

Author: tchemit Date: 2010-05-30 11:21:32 +0200 (Sun, 30 May 2010) New Revision: 1940 Url: http://nuiton.org/repositories/revision/jaxx/1940 Log: introduce model for each operation (WizardOperationActionModel) Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationActionModel.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationAction.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationActionThread.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationModel.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationAction.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationAction.java 2010-05-30 09:20:57 UTC (rev 1939) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationAction.java 2010-05-30 09:21:32 UTC (rev 1940) @@ -28,7 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.*; +import javax.swing.SwingWorker; /** * La classe de base a implanter pour definir l'action d'une operation dans un @@ -39,46 +39,63 @@ * @param <M> le type de modèle * @since 1.3 */ -public abstract class WizardOperationAction<E extends WizardOperationStep, M extends WizardOperationModel<E>> extends SwingWorker<WizardOperationState, String> { +public abstract class WizardOperationAction<E extends WizardOperationStep, M extends WizardOperationModel<E>, O extends WizardOperationActionModel<E>> extends SwingWorker<WizardOperationState, String> { - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static final Log log = - LogFactory.getLog(WizardOperationAction.class); + /** Logger */ + private static final Log log = LogFactory.getLog(WizardOperationAction.class); - E operation; + protected O operationModel; - WizardOperationState operationState; + public WizardOperationAction(O operationModel) { + this.operationModel = operationModel; + } - Exception error; + public E getOperation() { + return operationModel.getOperation(); + } - public WizardOperationAction(E operation) { - if (!operation.isOperation()) { - throw new IllegalArgumentException( - "the step " + operation + " has no operation defined"); - } - this.operation = operation; + public O getOperationModel() { + return operationModel; } - public E getOperation() { - return operation; + public WizardOperationState getOperationState() { + return operationModel.getOperationState(); } public Exception getError() { - return error; + return operationModel.getError(); } + /** + * @param e the error to set + * @deprecated since 2.1 prefer use the {@link WizardOperationActionModel#setError(Exception)} + */ + @Deprecated public void setError(Exception e) { - error = e; + operationModel.setError(e); } public void sendMessage(String msg) { firePropertyChange("message", null, msg); } + /** + * Recopie les états d'une action vers une nouvelle action. + * <p/> + * Cette méthode est appellé quand une action se déroule en plusieurs + * étapes. Du fait que les {@link SwingWorker} ne sont utilisable qu'une + * seule fois, on recopie les états de l'action courante vers la nouvelle + * action à exécuter. + * + * @param newAction la nouvelle action + */ + public void copyTo(WizardOperationAction<?, ?, ?> newAction) { + ((WizardOperationAction<?, ?, O>)newAction).operationModel = operationModel; + } + public abstract void start(JAXXContext context); - public abstract void beforeAction(JAXXContext context, - M model) throws Exception; + public abstract void beforeAction(JAXXContext context, M model) throws Exception; public abstract WizardOperationState doAction(M model) throws Exception; @@ -88,15 +105,11 @@ protected abstract M getModel(); - public WizardOperationState getOperationState() { - return operationState; - } - protected abstract JAXXContext getContext(); @Override public String toString() { - return super.toString() + " < operation: " + operation + ", state: " + + return super.toString() + " < operation: " + getOperation() + ", state: " + getState() + " >"; } @@ -109,7 +122,7 @@ beforeAction(getContext(), model); result = doAction(model); } catch (Exception e) { - error = e; + operationModel.setError(e); result = onError(model, e); } return result; @@ -122,18 +135,35 @@ try { if (isCancelled()) { - result = onCancel(getModel(), error); + result = onCancel(getModel(), operationModel.getError()); } else { result = get(); } } catch (Exception e) { result = WizardOperationState.FAILED; - error = e; + operationModel.setError(e); // ne devrait jamais arrivé ? log.error(e.getMessage(), e); } finally { // on enregistre le resultat de l'opération - operationState = result; + operationModel.setOperationState(result); + getModel().setBusy(false); } } + + public void destroy() { + if (operationModel != null) { + operationModel.destroy(); + operationModel = null; + } + } + + @Override + protected void finalize() throws Throwable { + super.finalize(); + if (log.isDebugEnabled()) { + log.debug("Will destroy " + this); + } + destroy(); + } } Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationActionModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationActionModel.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationActionModel.java 2010-05-30 09:21:32 UTC (rev 1940) @@ -0,0 +1,98 @@ +package jaxx.runtime.swing.wizard; + +import jaxx.runtime.JAXXUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; + +/** + * Abstract model of {@link WizardOperationAction}. + * + * @author tchemit <chemit(a)codelutin.com> + * @see WizardOperationAction + * @since 2.1 + */ +public abstract class WizardOperationActionModel<E extends WizardOperationStep> { + + /** Logger */ + private static final Log log = + LogFactory.getLog(WizardOperationActionModel.class); + + /** pour propager les changements dans le modèle vers l'ui */ + private final PropertyChangeSupport pcs; + + protected final E operation; + + protected WizardOperationState operationState; + + protected Exception error; + + protected WizardOperationActionModel(E operation) { + this.operation = operation; + pcs = new PropertyChangeSupport(this); + } + + public final E getOperation() { + return operation; + } + + public final WizardOperationState getOperationState() { + return operationState; + } + + public final Exception getError() { + return error; + } + + public void setError(Exception error) { + this.error = error; + } + + public void setOperationState(WizardOperationState operationState) { + this.operationState = operationState; + } + + public final void addPropertyChangeListener(PropertyChangeListener listener) { + pcs.addPropertyChangeListener(listener); + } + + public final void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.addPropertyChangeListener(propertyName, listener); + } + + + public final void removePropertyChangeListener(PropertyChangeListener listener) { + pcs.removePropertyChangeListener(listener); + } + + public final void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.removePropertyChangeListener(propertyName, listener); + } + + public void destroy() { + if (log.isDebugEnabled()) { + log.debug("will destroy " + this); + } + + // remove all listeners + JAXXUtil.destroy(pcs); + } + + @Override + protected void finalize() throws Throwable { + super.finalize(); + destroy(); + } + + protected final void firePropertyChange(String propertyName, + Object oldValue, + Object newValue) { + pcs.firePropertyChange(propertyName, oldValue, newValue); + } + + protected final void firePropertyChange(String propertyName, Object newValue) { + pcs.firePropertyChange(propertyName, null, newValue); + } +} Property changes on: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationActionModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationActionThread.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationActionThread.java 2010-05-30 09:20:57 UTC (rev 1939) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationActionThread.java 2010-05-30 09:21:32 UTC (rev 1940) @@ -48,7 +48,7 @@ * @param <A> le type d'action d'operation * @since 1.3 */ -public abstract class WizardOperationActionThread<E extends WizardOperationStep, M extends WizardOperationModel<E>, A extends WizardOperationAction<E, M>> extends Thread implements PropertyChangeListener { +public abstract class WizardOperationActionThread<E extends WizardOperationStep, M extends WizardOperationModel<E>, A extends WizardOperationAction<E, M,?>> extends Thread implements PropertyChangeListener { /** to use log facility, just put in your code: log.info(\"...\"); */ private static final Log log = LogFactory.getLog(WizardOperationActionThread.class); @@ -89,7 +89,7 @@ @SuppressWarnings("unchecked") public A launchOperation(E operation) { - if (currentAction != null && (!currentAction.isDone() || currentAction.operationState == WizardOperationState.RUNNING)) { + if (currentAction != null && (!currentAction.isDone() || currentAction.getOperationModel().getOperationState() == WizardOperationState.RUNNING)) { // on ne peut traiter qu'une seule opération à la fois throw new IllegalStateException("can not add a operation when thread is busy, or has another operation to be done"); } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationModel.java 2010-05-30 09:20:57 UTC (rev 1939) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationModel.java 2010-05-30 09:21:32 UTC (rev 1940) @@ -24,8 +24,16 @@ */ package jaxx.runtime.swing.wizard; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import javax.swing.SwingWorker.StateValue; -import java.util.*; +import java.util.Arrays; +import java.util.EnumMap; +import java.util.EnumSet; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * Un modèle de wizard avec des opérations. @@ -36,6 +44,12 @@ */ public class WizardOperationModel<E extends WizardOperationStep> extends WizardModel<E> { + + /** Logger */ + private static final Log log = LogFactory.getLog(WizardOperationModel.class); + + public static final String BUSY_PROPERTY_NAME = "busy"; + public static final String OPERATIONS_PROPERTY_NAME = "operations"; public static final String OPERATION_STATE_PROPERTY_NAME = "operationState"; @@ -47,10 +61,13 @@ /** La liste des opérations à effectuer */ protected Set<E> operations; + /** le dictionnaire des modèles d'opération */ + protected final Map<E, WizardOperationActionModel<E>> models; + /** Pour conserver les états des opérations */ protected Map<E, WizardOperationState> operationStates; - protected Map<E, WizardOperationAction<E, ? extends WizardOperationModel<E>>> operationActions; + protected Map<E, WizardOperationAction<?, ? extends WizardOperationModel<E>, ? extends WizardOperationActionModel<E>>> operationActions; /** L'état générale du modèle */ protected WizardOperationState modelState; @@ -58,6 +75,9 @@ /** un drapeau pour savoir siune opération a été lancée */ protected boolean wasStarted; + /** un drapeau pour savoir si le modèle est occupé. */ + protected boolean busy; + @SuppressWarnings("unchecked") public <T extends Enum<T>> WizardOperationModel(Class<E> stepClass, E... steps) { super(stepClass, steps); @@ -65,6 +85,17 @@ operationStates = new EnumMap(k); operations = (Set<E>) EnumSet.noneOf(k); operationActions = new EnumMap(k); + models = (Map<E, WizardOperationActionModel<E>>) new EnumMap(k); + for (T o : EnumSet.allOf(k)) { + E step = (E) o; + if (step.isOperation()) { + + // initialisation du modèle associé à l'opération + WizardOperationActionModel<E> model = (WizardOperationActionModel<E>) step.newModel(); + log.info("[" + step + "] Add an operation model " + model); + models.put(step, model); + } + } } public Set<E> getOperations() { @@ -79,6 +110,16 @@ return wasStarted; } + public boolean isBusy() { + return busy; + } + + public void setBusy(boolean busy) { + boolean oldValue = this.busy; + this.busy = busy; + firePropertyChange(BUSY_PROPERTY_NAME, oldValue, busy); + } + public boolean containsOperation(E step) { return getOperations().contains(step); } @@ -97,12 +138,16 @@ return operationStates.get(operation); } - public WizardOperationAction<E, ? extends WizardOperationModel<E>> getOperationAction(E operation) { - WizardOperationAction<E, ? extends WizardOperationModel<E>> action = operationActions.get(operation); + public WizardOperationAction<?, ?, ?> getOperationAction(E operation) { + if (operation==null || !operation.isOperation()) { + return null; + } + WizardOperationAction<?, ?, ?> action = operationActions.get(operation); if (action == null) { try { - action = (WizardOperationAction<E, ? extends WizardOperationModel<E>>) operation.getActionClass().newInstance(); - operationActions.put(operation, action); + WizardOperationActionModel<?> operationModel = getOperationModel(operation); + action = operation.newAction(operationModel); + operationActions.put(operation, (WizardOperationAction<E, ? extends WizardOperationModel<E>, ? extends WizardOperationActionModel<E>>) action); } catch (Exception ex) { throw new RuntimeException(ex); } @@ -118,12 +163,14 @@ public void setOperationState(E operation, WizardOperationState operationState) { WizardOperationState oldValue = getOperationState(operation); operationStates.put(operation, operationState); + getOperationModel(operation).setOperationState(operationState); fireIndexedPropertyChange(OPERATION_STATE_PROPERTY_NAME, getSteps().indexOf(operation), oldValue, operationState); updateModelState(operation, operationState); validate(); } public boolean[] getAccessibleSteps() { + log.info("compute with steps "+getSteps()); boolean[] result = new boolean[getSteps().size()]; int index = getSteps().indexOf(getStep()); if (index != -1) { @@ -143,15 +190,16 @@ (!previousStep.isOperation() || getOperationState(previousStep) == WizardOperationState.SUCCESSED); } } - //System.out.println("accessibles steps -------- " + java.util.Arrays.toString(result)); + log.info("accessibles steps -------- " + Arrays.toString(result)); return result; } @Override public void start() { super.start(); + + // update universe of steps and actions updateUniverse(); - //setSteps(steps.toArray((E[]) Array.newInstance(stepClass, steps.size()))); // le modèle n'est pas démarré setModelState(WizardOperationState.PENDING); @@ -167,7 +215,7 @@ } setModelState(WizardOperationState.CANCELED); if (getStep() != null && getStep().isOperation()) { - WizardOperationAction<E, ? extends WizardOperationModel<E>> action = getOperationAction(getStep()); + WizardOperationAction<?, ?, ?> action = getOperationAction(getStep()); if (action != null) { if (!action.isCancelled() && !action.isDone() && action.getState() == StateValue.STARTED) { // on annule l'action @@ -203,6 +251,16 @@ updateOperationStates(Arrays.asList(steps)); } + public WizardOperationActionModel<E> getOperationModel(E operation) { + if (operation==null) { + return null; + } + if (!operation.isOperation()) { + throw new IllegalStateException("step [" + operation + "] is not an operation."); + } + return models.get(operation); + } + public void updateOperationStates(List<E> steps) { int index = 0; for (E e : steps) { @@ -211,9 +269,9 @@ firePropertyChange(MODEL_STATE_PROPERTY_NAME, null, modelState); } - public WizardOperationAction<E, ? extends WizardOperationModel<E>> reloadOperation(E operation) { + public WizardOperationAction<?, ?, ?> reloadOperation(E operation) { operationActions.remove(operation); - WizardOperationAction<E, ? extends WizardOperationModel<E>> newOp = getOperationAction(operation); + WizardOperationAction<?, ?, ?> newOp = getOperationAction(operation); return newOp; } @@ -277,6 +335,35 @@ setSteps(newSteps); } + @Override + public void destroy() { + super.destroy(); + Set<E> operations = getOperations(); + for (E op : operations) { + WizardOperationAction<?, ?, ?> action = getOperationAction(op); + if (log.isDebugEnabled()) { + log.debug("destroy action " + action); + } + action.destroy(); + } + } + + @Override + protected E[] updateStepUniverse() { + // on met a jour les opérations + for (E op : operations) { + if (!operationStates.containsKey(op)) { + operationStates.put(op, WizardOperationState.PENDING); + } + } + for (E op : operationStates.keySet()) { + if (!operations.contains(op)) { + operationStates.remove(op); + } + } + return null; + } + protected int getOperationIndex(E operation) { int index = 0; for (E o : operations) {

1 0

r1939 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard
by tchemit＠users.nuiton.org 30 May '10

30 May '10

Author: tchemit Date: 2010-05-30 11:20:57 +0200 (Sun, 30 May 2010) New Revision: 1939 Url: http://nuiton.org/repositories/revision/jaxx/1939 Log: make WizardOperationStep acts as a objet factory (model, action, ui) Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationStep.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationStep.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationStep.java 2010-05-30 09:20:20 UTC (rev 1938) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationStep.java 2010-05-30 09:20:57 UTC (rev 1939) @@ -39,15 +39,29 @@ /** @return la description de l'opération */ String getOperationDescription(); + /** @return le type du modèle de l'action */ + Class<? extends WizardOperationActionModel<?>> getModelClass(); + /** * @return le type de l'action associée à l'étape ou <code>null</code> si * l'étape n'a pas d'opération associée. */ - Class<? extends WizardOperationAction<?, ?>> getActionClass(); + Class<? extends WizardOperationAction<?, ?, ?>> getActionClass(); + /** @return le type de l'ui de l'opération */ + Class<? extends WizardStepUI<?, ?>> getUiClass(); + /** * @return <code>true</code> si l'étape a une opération associée, * <code>false</code> sinon. */ boolean isOperation(); + + boolean isConfig(); + + WizardOperationActionModel<?> newModel(); + + WizardOperationAction<?, ?, ?> newAction(WizardOperationActionModel<?> operationModel); + + WizardStepUI<?,?> newUI(WizardUI<?,?> ui) ; }

1 0

r1938 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard
by tchemit＠users.nuiton.org 30 May '10

30 May '10

Author: tchemit Date: 2010-05-30 11:20:20 +0200 (Sun, 30 May 2010) New Revision: 1938 Url: http://nuiton.org/repositories/revision/jaxx/1938 Log: reformat Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java 2010-05-27 14:58:42 UTC (rev 1937) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java 2010-05-30 09:20:20 UTC (rev 1938) @@ -188,7 +188,7 @@ public boolean containsStep(E step) { return getSteps().contains(step); } - + public boolean isValueAdjusting() { return valueAdjusting; } @@ -270,8 +270,7 @@ // la propriete nextStep peut avoir changee firePropertyChange(NEXT_STEP_PROPERTY_NAME, null, getNextStep()); // la propriete previousStep peut avoir changee - firePropertyChange(PREVIOUS_STEP_PROPERTY_NAME, null, - getPreviousStep()); + firePropertyChange(PREVIOUS_STEP_PROPERTY_NAME, null, getPreviousStep()); validate(); }

1 0

r1937 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard
by tchemit＠users.nuiton.org 27 May '10

27 May '10

Author: tchemit Date: 2010-05-27 16:58:42 +0200 (Thu, 27 May 2010) New Revision: 1937 Url: http://nuiton.org/repositories/revision/jaxx/1937 Log: add usefull methods Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationModel.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java 2010-05-27 14:18:54 UTC (rev 1936) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java 2010-05-27 14:58:42 UTC (rev 1937) @@ -185,6 +185,10 @@ return steps; } + public boolean containsStep(E step) { + return getSteps().contains(step); + } + public boolean isValueAdjusting() { return valueAdjusting; } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationModel.java 2010-05-27 14:18:54 UTC (rev 1936) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardOperationModel.java 2010-05-27 14:58:42 UTC (rev 1937) @@ -79,6 +79,10 @@ return wasStarted; } + public boolean containsOperation(E step) { + return getOperations().contains(step); + } + @SuppressWarnings("unchecked") public E getOperation() { return getStep() != null && getStep().isOperation() ? getStep() : null;

1 0

r1936 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers
by tchemit＠users.nuiton.org 27 May '10

27 May '10

Author: tchemit Date: 2010-05-27 16:18:54 +0200 (Thu, 27 May 2010) New Revision: 1936 Url: http://nuiton.org/repositories/revision/jaxx/1936 Log: Evolution #639: Add logger on each generated ui (with inheritance or not) Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java 2010-05-26 15:20:09 UTC (rev 1935) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java 2010-05-27 14:18:54 UTC (rev 1936) @@ -325,21 +325,21 @@ javaFile.addImport(JAXXObjectDescriptor.class); javaFile.addImport(JAXXBinding.class); + // add logger + if (compiler.getConfiguration().isAddLogger()) { + javaFile.addImport(Log.class); + javaFile.addImport(LogFactory.class); + //TC-20091127 : let the logger stays protected + javaFile.addSimpleField(newField( + PRIVATE| STATIC | FINAL, + "Log", + "log", + false, + "LogFactory.getLog(" + fullClassName + ".class)") + ); + } if (!superclassIsJAXXObject) { - // add logger - if (compiler.getConfiguration().isAddLogger()) { - javaFile.addImport(Log.class); - javaFile.addImport(LogFactory.class); - //TC-20091127 : let the logger stays protected - javaFile.addSimpleField(newField( - PROTECTED | STATIC | FINAL, - "Log", - "log", - false, - "LogFactory.getLog(" + fullClassName + ".class)") - ); - } - + // JAXXObject javaFile.addField(OBJECT_MAP_FIELD); javaFile.addMethod(GET_OBJECT_BY_ID_METHOD);

1 0

r1935 - in trunk/src/site: . rst
by jcouteau＠users.nuiton.org 26 May '10

26 May '10

Author: jcouteau Date: 2010-05-26 17:20:09 +0200 (Wed, 26 May 2010) New Revision: 1935 Url: http://nuiton.org/repositories/revision/jaxx/1935 Log: Add doc about contract programming Added: trunk/src/site/rst/contractProgramming.rst Modified: trunk/src/site/site_fr.xml Added: trunk/src/site/rst/contractProgramming.rst =================================================================== --- trunk/src/site/rst/contractProgramming.rst (rev 0) +++ trunk/src/site/rst/contractProgramming.rst 2010-05-26 15:20:09 UTC (rev 1935) @@ -0,0 +1,72 @@ +========================= +Programmation par contrat +========================= + +Comme tout bon développeur Java, vous utilisez régulièrement la programmation +par contrat et la puissance de Java dans votre code en ajoutant des génériques, +des interfaces,... dès que possible et vous souhaitez retrouver les mêmes +mécanismes dans JAXX. + +Ajout de contrats sur le code généré +------------------------------------ + +Le compilateur JAXX génère des classes à partir de fichiers JAXX mais n'est pas +capable d'ajouter des contrats sur les objets générés, donc interdit en quelque +sorte la programmation par contrat. + +Pour palier à cette limitation, vous pouvez utiliser l'attribut spécial +*implements*. + +Cet attribut ne doit être placé que sur le tag racine d'un fichier JAXX et son +contenu est le nom qualifié d'un ou plusieurs contrats séparés par des virgules. +:: + + <JPanel implements='java.lang.Comparable'> + + <script>public int compareTo(JPanel o) { return getName().compareTo(o.getName()); }</script> + + </JPanel> + +La classe générée aura bien le contrat *java.lang.Comparable*. + +Attention a bien implémenter toutes les méthodes du contrat dans les scripts ou +votre fichier ne compilera pas. + +Générer des classes abstraites +------------------------------ + +En utilisant l'attribut abstract et en le positionnant à true, la classe générée +est abstraite. :: + + <JPanel abstract='true'/> + +Manipuler les types génériques +------------------------------ + +Il est possible d'utiliser les types génériques dans JAXX en utilisant les +attributs *genericType* et *superGenericType*. + +L'attribut genericType précise le type générique d'une classe. Exemple (fichier +Parent.jaxx) : :: + + <JPanel genericType='E' + implements='java.lang.Comparable<E>' + abstract='true' /> + +La classe générée sera de la forme : :: + + public abstract Parent<E> implements java.lang.Comparable<E> { + ... + } + +Pour surcharger une telle classe, on utilise l'attibut *superGenericType* en lui +donnant le type à utiliser. Par exemple (fichier Son.jaxx) : :: + + <Parent superGenericType='String' + abstract='true'/> + +La classe générée sera de la forme : :: + + public Son extends Parent<String> { + ... + } \ No newline at end of file Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-05-26 14:58:33 UTC (rev 1934) +++ trunk/src/site/site_fr.xml 2010-05-26 15:20:09 UTC (rev 1935) @@ -63,9 +63,9 @@ <item name="Fonctionnalités avancées"> <item name="Internationalisation" href="I18n.html"/>  + <item name="Validateurs" href=""/--> + <item name="Programmation par contrat" href="contractProgramming.html"/> +  </item>  <item name="Démo" href="demo.html"/>

1 0

r1934 - trunk/src/site/rst
by jcouteau＠users.nuiton.org 26 May '10

26 May '10

Author: jcouteau Date: 2010-05-26 16:58:33 +0200 (Wed, 26 May 2010) New Revision: 1934 Url: http://nuiton.org/repositories/revision/jaxx/1934 Log: Fix exemple code Modified: trunk/src/site/rst/javaBeans.rst Modified: trunk/src/site/rst/javaBeans.rst =================================================================== --- trunk/src/site/rst/javaBeans.rst 2010-05-26 14:19:35 UTC (rev 1933) +++ trunk/src/site/rst/javaBeans.rst 2010-05-26 14:58:33 UTC (rev 1934) @@ -11,13 +11,18 @@ </JPanel> Cela permet de faire du data-binding en ajoutant un attribut *javaBean* sur -l'objet. Exemple :: +l'objet, sa valeur initialisant le bean. Exemple :: <JPanel> - <java.lang.Boolean id='myState' constructorParams='true' javaBean='anyValue'/> + <java.lang.Boolean id='myState' javaBean='true'/> <JLabel text='text' visible='{isMySate()}'/> </JPanel> +ou :: + + <java.lang.String id='myStatus' javaBean='Opening...'/> + + Cela permet d'avoir un mutateur sur la propriété *myState* qui déclenchera l'envoi d'un *PropertyChange* sur la propriété lors de modification de valeur (ce qui n'est pas possible en utilisant une propriété en lecture seule).

1 0