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

r2740 - in trunk: jaxx-compiler/src/main/java/jaxx/compiler/finalizers jaxx-compiler/src/main/java/jaxx/compiler/tags/validator jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok jaxx-validator/src/main/java/jaxx/runtime/validator/swing jaxx-validator/src/main/java/jaxx/runtime/validator/swing/meta
by tchemit＠users.nuiton.org 17 Oct '13

17 Oct '13

Author: tchemit Date: 2013-10-17 17:49:11 +0200 (Thu, 17 Oct 2013) New Revision: 2740 Url: http://nuiton.org/projects/jaxx/repository/revisions/2740 Log: refs #2878: Validate more than one bean property with one editor Added: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/FieldComponentDuplicated.jaxx Removed: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldComponentDuplicated.jaxx Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerValidatorTest.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/meta/ValidatorField.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java 2013-10-11 13:04:20 UTC (rev 2739) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java 2013-10-17 15:49:11 UTC (rev 2740) @@ -25,6 +25,8 @@ package jaxx.compiler.finalizers; +import com.google.common.base.Joiner; +import com.google.common.collect.Lists; import jaxx.compiler.CompiledObject; import jaxx.compiler.CompiledObject.ChildRef; import jaxx.compiler.CompilerException; @@ -47,8 +49,8 @@ import java.lang.reflect.Modifier; import java.util.ArrayList; +import java.util.Collection; import java.util.List; -import java.util.Map; /** * To finalize validators fields. @@ -206,24 +208,38 @@ String validatorAnnotation = type + "( validatorId = " + validatorId + ")"; validatorField.addAnnotation(validatorAnnotation); - Map<String, String> fields = validator.getFields(); +// Map<String, String> fields = validator.getFields(); - for (Map.Entry<String, String> entry : fields.entrySet()) { - String propertyName = entry.getKey(); - String component = entry.getValue(); + for (String component : validator.getFieldEditors()) { - if (!validator.checkBeanProperty(compiler, propertyName)) { - // property not find on bean + Collection<String> propertyNames = validator.getFieldPropertyNames(component); + List<String> keyCodes = + Lists.newArrayListWithCapacity(propertyNames.size()); + for (String propertyName : propertyNames) { + if (!validator.checkBeanProperty(compiler, propertyName)) { + // property not find on bean + continue; + } + String keyCode = TypeManager.getJavaCode(propertyName); + keyCodes.add(keyCode); + } + + if (keyCodes.isEmpty()) { + // no property continue; } + String keyCode = Joiner.on(", ").join(keyCodes); + if (keyCodes.size()>1) { + keyCode = "{ " + keyCode+" }"; + } - String keyCode = TypeManager.getJavaCode(propertyName); +// String keyCode = TypeManager.getJavaCode(propertyName); String editorCode = TypeManager.getJavaCode(component); JavaElement editor = javaFile.getField(component); if (editor == null) { if (log.isDebugEnabled()) { String message = "Could not find editor [" + component + - "] for property [" + propertyName + + "] for property(ies) [" + propertyNames + "] for file " + javaFile.getName(); log.debug(message); } @@ -239,7 +255,7 @@ String errorMessage = "Could not find editor [" + component + - "] for property [" + propertyName + + "] for property(ies) [" + propertyNames + "] for file " + javaFile.getName(); throw new CompilerException(errorMessage); Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java 2013-10-11 13:04:20 UTC (rev 2739) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java 2013-10-17 15:49:11 UTC (rev 2740) @@ -25,6 +25,10 @@ package jaxx.compiler.tags.validator; +import com.google.common.base.Joiner; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Lists; +import com.google.common.collect.Multimap; import jaxx.compiler.CompiledObject; import jaxx.compiler.CompilerException; import jaxx.compiler.JAXXCompiler; @@ -48,10 +52,11 @@ import java.io.IOException; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; +import java.util.Set; import java.util.TreeMap; public class BeanValidatorHandler extends DefaultObjectHandler { @@ -217,8 +222,18 @@ */ public static class CompiledBeanValidator extends CompiledObject { - protected Map<String, String> fields; + /** + * Map of field to add into validator. + * + * Keys are editors, Values are bean properties. + */ + protected Multimap<String, String> fields; + /** + * Map of field to exclude. + * + * Keys are bean properties, Values are editors. + */ protected Map<String, String> excludeFields; protected String bean; @@ -252,7 +267,7 @@ //TC-20090524 otherwise can not override the validator class while generation //super(id, objectClass, compiler); super(id, getDescriptor(objectClass, compiler), compiler); - fields = new TreeMap<String, String>(); + fields = ArrayListMultimap.create(); excludeFields = new TreeMap<String, String>(); if (log.isDebugEnabled()) { log.debug("validator objectClass " + getObjectClass()); @@ -269,22 +284,77 @@ return result; } - public Map<String, String> getFields() { + public Multimap<String, String> getFields() { return fields; } - public Map<String, String> getExcludeFields() { - return excludeFields; + public boolean containsFieldEditor(String editorName) { + return fields.containsKey(editorName); } - public void setFields(Map<String, String> fields) { - this.fields = fields; + public boolean containsFieldPropertyName(String propertyName) { + return fields.containsValue(propertyName); } - public void setExcludeFields(Map<String, String> excludeFields) { - this.excludeFields = excludeFields; + public Set<String> getFieldEditors() { + return fields.keySet(); } +// public Set<String> getFieldIds() { +// return fields.values(); +// } + + public boolean containsExcludeFieldEditor(String editorName) { + return excludeFields.containsValue(editorName); + } + + protected boolean containsExcludeFieldPropertyName(String editorName) { + return excludeFields.containsKey(editorName); + } + +// public Map<String, String> getExcludeFields() { +// return excludeFields; +// } + +// public Set<String> getExcludeFieldEditors() { +// return new HashSet<String>(excludeFields.values()); +// } + + public Set<String> getExcludeFieldPropertyNames() { + return excludeFields.keySet(); + } + + protected void removeFieldPropertyName(String propertyName) { + //must find the editor for this property + for (String editor : fields.keySet()) { + if (fields.containsEntry(editor, propertyName)) { + + fields.remove(editor, propertyName); + break; + } + } + } + + public void addField(String propertyName, String editor) { + fields.put(editor, propertyName); + } + + public void addExcludeField(String propertyName, String editor) { + excludeFields.put(propertyName, editor); + } + + public Collection<String> getFieldPropertyNames(String editor) { + return fields.get(editor); + } + +// public void setFields(Map<String, String> fields) { +// this.fields = fields; +// } + +// public void setExcludeFields(Map<String, String> excludeFields) { +// this.excludeFields = excludeFields; +// } + @Override public void addProperty(String property, String value) { @@ -418,7 +488,7 @@ public JAXXBeanInfo getBeanDescriptor(JAXXCompiler compiler) { if (beanDescriptor == null && foundBean()) { - String beanClassName = null; +// String beanClassName = null; try { //TC-20090111 beanClass is mandatory // get the real bean class name (from bean or beanClass) @@ -438,7 +508,7 @@ } catch (Exception e) { compiler.reportError( - "could not load class " + beanClassName); + "could not load class " + beanClass); } } return beanDescriptor; @@ -809,52 +879,70 @@ ids = new ArrayList<String>(); validatedComponents.put(compiler, ids); } - ids.addAll(compiledBeanValidator.getFields().values()); +// ids.addAll(compiledBeanValidator.getFields().values()); + ids.addAll(compiledBeanValidator.getFieldEditors()); } - /** - * Register in buffer all field representation to init (and to record in method {@link JAXXValidator#registerValidatorFields()} - * - * @param compiler the compiler used - * @param javaFile generated file - * @param buffer the buffer where to add code - * @since 2.2.1 - */ - public void addFieldRepresentations(JAXXCompiler compiler, - JavaFile javaFile, - StringBuilder buffer) { - for (Entry<String, String> entry : fields.entrySet()) { - String propertyName = entry.getKey(); - String component = entry.getValue(); - if (!checkBeanProperty(compiler, propertyName)) { - // property not find on bean - continue; - } - String validatorId = TypeManager.getJavaCode(getId()); - String keyCode = TypeManager.getJavaCode(propertyName); - String editorCode = TypeManager.getJavaCode(component); - JavaField editor = javaFile.getField(component); - String annotation = ValidatorField.class.getSimpleName() + - "( validatorId = " + validatorId + "," + - " propertyName = " + keyCode + "," + - " editorName = " + editorCode + "" + - ")"; - editor.addAnnotation(annotation); - -// if (!compiler.checkReference(tag, component, true, null)) { -// // editor component not find on ui +// /** +// * Register in buffer all field representation to init (and to record in method {@link JAXXValidator#registerValidatorFields()} +// * +// * @param compiler the compiler used +// * @param javaFile generated file +// * @param buffer the buffer where to add code +// * @since 2.2.1 +// */ +// public void addFieldRepresentations(JAXXCompiler compiler, +// JavaFile javaFile, +// StringBuilder buffer) { +// for (String component : fields.keySet()) { +//// String component = entry.getKey(); +// Collection<String> propertyNames = fields.get(component); +// List<String> keyCodes = +// Lists.newArrayListWithCapacity(propertyNames.size()); +// for (String propertyName : propertyNames) { +// if (!checkBeanProperty(compiler, propertyName)) { +// // property not find on bean +// continue; +// } +// String keyCode = TypeManager.getJavaCode(propertyName); +// keyCodes.add(keyCode); +// } +// +// if (keyCodes.isEmpty()) { +// // no property // continue; // } +// String keyCode = Joiner.on(", ").join(keyCodes); +// if (keyCodes.size()>1) { +// keyCode = "{ " + keyCode+" }"; +// } +//// String propertyName = entry.getKey(); +// +// String validatorId = TypeManager.getJavaCode(getId()); +// +// String editorCode = TypeManager.getJavaCode(component); +// JavaField editor = javaFile.getField(component); +// String annotation = ValidatorField.class.getSimpleName() + +// "( validatorId = " + validatorId + "," + +// " propertyName = " + keyCode + "," + +// " editorName = " + editorCode + "" + +// ")"; +// editor.addAnnotation(annotation); +// +//// if (!compiler.checkReference(tag, component, true, null)) { +//// // editor component not find on ui +//// continue; +//// } +// +//// buffer.append(getJavaCode()); +//// buffer.append(".setFieldRepresentation("); +//// buffer.append(keyCode); +//// buffer.append(", "); +//// buffer.append(component); +//// buffer.append(");\n"); +// } +// } -// buffer.append(getJavaCode()); -// buffer.append(".setFieldRepresentation("); -// buffer.append(keyCode); -// buffer.append(", "); -// buffer.append(component); -// buffer.append(");\n"); - } - } - protected void registerAutoFieldBean(Element tag, JAXXCompiler compiler, JAXXBeanInfo beanInfo) { @@ -870,11 +958,13 @@ // read-only property continue; } - if (fields.containsKey(descriptionName)) { +// if (fields.containsKey(descriptionName)) { + if (containsFieldPropertyName(descriptionName)) { // already defined in field continue; } - if (excludeFields.containsKey(descriptionName)) { +// if (excludeFields.containsKey(descriptionName)) { + if (containsExcludeFieldPropertyName(descriptionName)) { // exclude field continue; } @@ -889,15 +979,18 @@ registerField(descriptionName, descriptionName, compiler); } - for (Entry<String, String> entry : excludeFields.entrySet()) { - String key = entry.getKey(); - if (fields.containsKey(key)) { +// for (Entry<String, String> entry : excludeFields.entrySet()) { + for (String key : getExcludeFieldPropertyNames()) { +// String key = entry.getKey(); +// if (fields.containsKey(key)) { + if (containsFieldPropertyName(key)) { compiler.reportWarning( "field '" + key + "' can not be used and " + "excluded at same time ! (field is skipped) " + "for validator " + this ); - fields.remove(key); +// fields.remove(key); + removeFieldPropertyName(key); } } } @@ -905,28 +998,33 @@ public void registerField(String id, String component, JAXXCompiler compiler) { - if (fields.containsKey(id)) { +// if (fields.containsKey(id)) { + if (containsFieldPropertyName(id)) { compiler.reportError( "duplicate field '" + id + "' for validator " + this); } else { if (log.isDebugEnabled()) { log.debug("add field <" + id + ":" + component + ">"); } - fields.put(id, component); +// fields.put(id, component); + addField(id, component); + } } public void registerExcludeField(String id, String component, JAXXCompiler compiler) { - if (excludeFields.containsKey(id)) { +// if (excludeFields.containsKey(id)) { + if (containsExcludeFieldPropertyName(id)) { compiler.reportError( "duplicate field '" + id + "' for validator " + this); } else { if (log.isDebugEnabled()) { log.debug("add excludeField <" + id + ":" + component + ">"); } - excludeFields.put(id, component); +// excludeFields.put(id, component); + addExcludeField(id, component); } } @@ -959,7 +1057,7 @@ * @param compiler current compiler to use * @param beanId the bean to test * @return <code>true</code> if the given bean is attached to a validator, - * <code>false</code> otherwise + * <code>false</code> otherwise */ public static boolean isBeanUsedByValidator(JAXXCompiler compiler, String beanId) { @@ -977,7 +1075,7 @@ /** * @param compiler compiler to use * @return <code>true</code> if some validators were detected, - * <code>false</code> otherwise + * <code>false</code> otherwise */ public static boolean hasValidator(JAXXCompiler compiler) { List<CompiledBeanValidator> beanValidatorList = @@ -991,7 +1089,7 @@ * @param compiler compiler to use * @param componentId the compiled object to test * @return <code>true</code> if the given compiled object is attached to - * a validator, <code>false</code> otherwise + * a validator, <code>false</code> otherwise */ public static boolean isComponentUsedByValidator(JAXXCompiler compiler, String componentId) { Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java 2013-10-11 13:04:20 UTC (rev 2739) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java 2013-10-17 15:49:11 UTC (rev 2740) @@ -102,13 +102,15 @@ component = component.trim(); // check component is not already used by this compiled object - if (info.getFields().containsValue(component)) { +// if (info.getFields().containsValue(component)) { + if (info.containsFieldEditor(component)) { compiler.reportError(TAG + " tag found a attribute " + COMPONENT_ATTRIBUTE + " [" + component + "] already used in this validator"); return; } - if (info.getExcludeFields().containsValue(component)) { +// if (info.getExcludeFields().containsValue(component)) { + if (info.containsExcludeFieldEditor(component)) { compiler.reportError(TAG + " tag found a attribute " + COMPONENT_ATTRIBUTE + " [" + component + "] already used in this validator"); Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java 2013-10-11 13:04:20 UTC (rev 2739) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java 2013-10-17 15:49:11 UTC (rev 2740) @@ -116,12 +116,13 @@ } // check component is not already used by this compiled object - if (info.getFields().containsValue(component)) { - compiler.reportError( - TAG + " tag found a attribute " + COMPONENT_ATTRIBUTE + - " [" + component + "] already used in this validator"); - return; - } +// if (info.getFields().containsValue(component)) { +// if (info.containsFieldEditor(component)) { +// compiler.reportError( +// TAG + " tag found a attribute " + COMPONENT_ATTRIBUTE + +// " [" + component + "] already used in this validator"); +// return; +// } if (complexType) { String binding = DataBindingHelper.processDataBindings(component); Modified: trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerValidatorTest.java =================================================================== --- trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerValidatorTest.java 2013-10-11 13:04:20 UTC (rev 2739) +++ trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/CompilerValidatorTest.java 2013-10-17 15:49:11 UTC (rev 2740) @@ -45,7 +45,7 @@ @Test public void ValidatorOk() throws Exception { getMojo().execute(); - assertNumberJaxxFiles(2); + assertNumberJaxxFiles(3); } @@ -56,7 +56,7 @@ GenerateMojo mojo = getMojo(); mojo.init(); String[] files = mojo.files; - assertNumberJaxxFiles(19); + assertNumberJaxxFiles(18); mojo.setLog(new SystemStreamLog() { @Override Deleted: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldComponentDuplicated.jaxx =================================================================== --- trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldComponentDuplicated.jaxx 2013-10-11 13:04:20 UTC (rev 2739) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldComponentDuplicated.jaxx 2013-10-17 15:49:11 UTC (rev 2740) @@ -1,31 +0,0 @@ - -<Application> - <BeanValidator beanClass="org.nuiton.jaxx.plugin.compilerValidatorTest.validator.errors.Model"> - <field name="text2" component="text"/> - <field name="text" component="text"/> - </BeanValidator> - <JTextField id='text'/> -</Application> Copied: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/FieldComponentDuplicated.jaxx (from rev 2737, trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/errors/FieldComponentDuplicated.jaxx) =================================================================== --- trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/FieldComponentDuplicated.jaxx (rev 0) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/validator/ok/FieldComponentDuplicated.jaxx 2013-10-17 15:49:11 UTC (rev 2740) @@ -0,0 +1,31 @@ + +<Application> + <BeanValidator beanClass="org.nuiton.jaxx.plugin.compilerValidatorTest.validator.errors.Model"> + <field name="text2" component="text"/> + <field name="text" component="text"/> + </BeanValidator> + <JTextField id='text'/> +</Application> Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java 2013-10-11 13:04:20 UTC (rev 2739) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java 2013-10-17 15:49:11 UTC (rev 2740) @@ -234,8 +234,7 @@ try { for (String validatorId : ui.getValidatorIds()) { - SwingValidator<?> validator = - (SwingValidator<?>) ui.getValidator(validatorId); + SwingValidator<?> validator = ui.getValidator(validatorId); for (Map.Entry<JComponent, ValidatorField> entry : editors.entrySet()) { @@ -246,13 +245,15 @@ // not good validator, skip this field continue; } - String propertyName = fieldAnnotation.propertyName(); - if (log.isInfoEnabled()) { - log.info("Detects for validator [" + validatorId + - "] property " + propertyName + - " for editor " + fieldAnnotation.editorName()); + String[] propertyNames = fieldAnnotation.propertyName(); + for (String propertyName : propertyNames) { + if (log.isInfoEnabled()) { + log.info("Detects for validator [" + validatorId + + "] property " + propertyName + + " for editor " + fieldAnnotation.editorName()); + } + validator.setFieldRepresentation(propertyName, editor); } - validator.setFieldRepresentation(propertyName, editor); } } Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/meta/ValidatorField.java =================================================================== --- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/meta/ValidatorField.java 2013-10-11 13:04:20 UTC (rev 2739) +++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/meta/ValidatorField.java 2013-10-17 15:49:11 UTC (rev 2740) @@ -46,11 +46,11 @@ String validatorId(); /** - * Obtain the name of the bean property to validate. + * Obtain the name of the bean property(ies) to validate. * - * @return the name of the property to validate + * @return the name of the property(ies) to validate */ - String propertyName(); + String[] propertyName(); /** * Obtain the name of the property editor.

1 0

r2739 - trunk/jaxx-runtime/src/main/java/jaxx/runtime
by tchemit＠users.nuiton.org 11 Oct '13

11 Oct '13

Author: tchemit Date: 2013-10-11 15:04:20 +0200 (Fri, 11 Oct 2013) New Revision: 2739 Url: http://nuiton.org/projects/jaxx/repository/revisions/2739 Log: fixes #2874: Add some nice methods to select rows and columns from jtable Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2013-10-08 13:27:38 UTC (rev 2738) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2013-10-11 13:04:20 UTC (rev 2739) @@ -589,8 +589,7 @@ * Try to load the Nimbus look and feel. * * - * @throws UnsupportedLookAndFeelException - * if nimbus is not applicable + * @throws UnsupportedLookAndFeelException if nimbus is not applicable * @throws ClassNotFoundException * @throws InstantiationException * @throws IllegalAccessException @@ -722,6 +721,90 @@ } /** + * Return the selected rows of the table in the model coordinate or empty + * array if selection is empty. + * + * @param table the table to seek + * @return the selected rows of the table in the model coordinate or empty + * array if selection is empty. + * @since 2.5.29 + */ + public static int[] getSelectedModelRows(JTable table) { + int[] selectedRows = table.getSelectedRows(); + int length = selectedRows.length; + int[] result = new int[length]; + for (int i = 0; i < length; i++) { + int selectedRow = selectedRows[i]; + result[i] = table.convertRowIndexToModel(selectedRow); + } + return result; + } + + /** + * Return the selected row of the table in the model coordinate or + * {@code -1} if selection is empty. + * + * @param table the table to seek + * @return the selected row of the table in the model coordinate or + * {@code -1} if selection is empty. + * @since 2.5.29 + */ + public static int getSelectedModelRow(JTable table) { + int result = table.getSelectedRow(); + if (result != -1) { + // can convert to model coordinate + result = table.convertRowIndexToModel(result); + } + return result; + } + + /** + * Return the selected column of the table in the model coordinate or + * {@code -1} if selection is empty. + * + * @param table the table to seek + * @return the selected column of the table in the model coordinate or + * {@code -1} if selection is empty. + * @since 2.5.29 + */ + public static int getSelectedModelColumn(JTable table) { + int result = table.getSelectedColumn(); + if (result != -1) { + // can convert to model coordinate + result = table.convertColumnIndexToModel(result); + } + return result; + } + + /** + * Select the given row index {@code rowIndex} (from the model coordinate) + * in the selection of the given table. + * + * @param table the table where to set the selection + * @param rowIndex the row index in the model coordinate to set as selection + * @since 2.5.29 + */ + public static void setSelectionInterval(JTable table, int rowIndex) { + + int rowViewIndex = table.convertRowIndexToView(rowIndex); + table.getSelectionModel().setSelectionInterval(rowViewIndex, rowViewIndex); + } + + /** + * Add the given row index {@code rowIndex} (from the model coordinate) + * in the selection of the given table. + * + * @param table the table where to set the selection + * @param rowIndex the row index in the model coordinate to add to selection + * @since 2.5.29 + */ + public static void addRowSelectionInterval(JTable table, int rowIndex) { + + int rowViewIndex = table.convertRowIndexToView(rowIndex); + table.getSelectionModel().addSelectionInterval(rowViewIndex, rowViewIndex); + } + + /** * A simple iterator on a {@link JTabbedPane}. * * Implements the method {@link #get(int, Component)} to obtain @@ -1298,7 +1381,7 @@ * @param row row index of cell to editing * @param colummn column index of cell to editing * @return {@code false} if for any reason the cell cannot be edited, - * or if the indices are invalid + * or if the indices are invalid */ public static boolean editCell(JTable table, int row, int colummn) {

1 0

r2738 - in trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config: . model
by tchemit＠users.nuiton.org 08 Oct '13

08 Oct '13

Author: tchemit Date: 2013-10-08 15:27:38 +0200 (Tue, 08 Oct 2013) New Revision: 2738 Url: http://nuiton.org/projects/jaxx/repository/revisions/2738 Log: fixes #2868: [ConfigUI] Improve the shortLabel of an option Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableRenderer.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHelper.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigTableModel.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModelBuilder.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableRenderer.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableRenderer.java 2013-10-07 09:08:10 UTC (rev 2737) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableRenderer.java 2013-10-08 13:27:38 UTC (rev 2738) @@ -47,8 +47,11 @@ public class ConfigTableRenderer extends DefaultTableCellRenderer { private static final long serialVersionUID = 1L; + protected static Color col; + protected static Font font; + protected static Font font2; public ConfigTableRenderer() { @@ -87,7 +90,7 @@ } protected Component getKeyCellRenderer(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column, OptionModel key, boolean isValid, boolean isModified) { - String tooltip = _(key.getDescription()); + String tooltip = _(key.getDescription()) + " (" + key.getKey() + ")"; String originalValue = key.toString(key.getOriginalValue()); boolean isFinal = key.isFinal(); if (isFinal) { Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHelper.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHelper.java 2013-10-07 09:08:10 UTC (rev 2737) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHelper.java 2013-10-08 13:27:38 UTC (rev 2738) @@ -109,6 +109,7 @@ return modelBuilder; } + @Deprecated public ConfigUIModelBuilder addOption(ConfigOptionDef def, String propertyName) throws IllegalStateException, NullPointerException { modelBuilder.addOption(def, propertyName); @@ -121,6 +122,12 @@ return modelBuilder; } + public ConfigUIModelBuilder setOptionShortLabel(String shortLabel) + throws IllegalStateException, NullPointerException { + modelBuilder.setOptionShortLabel(shortLabel); + return modelBuilder; + } + public ConfigUIModelBuilder setOptionEditor(TableCellEditor editor) throws IllegalStateException, NullPointerException { modelBuilder.setOptionEditor(editor); Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigTableModel.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigTableModel.java 2013-10-07 09:08:10 UTC (rev 2737) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigTableModel.java 2013-10-08 13:27:38 UTC (rev 2738) @@ -24,6 +24,7 @@ * #L% */ +import org.apache.commons.lang3.StringUtils; import org.nuiton.util.converter.ConverterUtil; import javax.swing.table.AbstractTableModel; @@ -95,7 +96,13 @@ Object value = null; switch (column) { case 0: - value = key.getKey(); + // try first to use the shortLabel + value = key.getShortLabel(); + if (StringUtils.isBlank((String) value)) { + + // fallback to key + value = key.getKey(); + } break; case 1: value = key.getValue(); @@ -108,10 +115,6 @@ break; } return value; -// if (column == 0) { -// return key.getKey(); -// } -// return key.getValue(); } @Override Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModelBuilder.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModelBuilder.java 2013-10-07 09:08:10 UTC (rev 2737) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModelBuilder.java 2013-10-08 13:27:38 UTC (rev 2738) @@ -251,7 +251,9 @@ * @throws IllegalStateException if there is not a current model, nor * category * @throws NullPointerException if any of parameter is {@code null} + * @deprecated since 2.5.29, prefer use the {@link #setOptionPropertyName(String)} method instead, will be removed soon */ + @Deprecated public ConfigUIModelBuilder addOption(ConfigOptionDef def, String propertyName) throws IllegalStateException, NullPointerException { @@ -279,6 +281,24 @@ } /** + * Set the short label on the current option. + * + * @param shortLabel the propertyName to set in the current option. + * @return the builder + * @throws IllegalStateException if there is not a current option set. + * @throws NullPointerException if any of parameter is {@code null} + * @see OptionModel#setShortLabel(String) + * @since 2.5.29 + */ + public ConfigUIModelBuilder setOptionShortLabel(String shortLabel) + throws IllegalStateException, NullPointerException { + checkCurrent(option, "option"); + checkNotNull(shortLabel, "setShortLabel", "shortLabel"); + option.setShortLabel(shortLabel); + return this; + } + + /** * Set the editor on the current option. * * @param editor the editor to set in the current option. Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java 2013-10-07 09:08:10 UTC (rev 2737) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java 2013-10-08 13:27:38 UTC (rev 2738) @@ -59,6 +59,13 @@ /** le nom de la propriété javaBean (peut etre null, si option sans support javaBean) */ protected String propertyName; + /** + * Une description courte à utiliser à la place de la clef i18n. + * + * @since 2.5.29 + */ + protected String shortLabel; + /** l'editeur utilise pour modifier graphiquement l'option */ protected TableCellEditor editor; @@ -70,6 +77,14 @@ initValue(value); } + public String getShortLabel() { + return shortLabel; + } + + public void setShortLabel(String shortLabel) { + this.shortLabel = shortLabel; + } + @Override public String getKey() { return def.getKey();

1 0

[ANN] - JAXX 2.5.28 released
by nuiton.org Release Notification 07 Oct '13

07 Oct '13

The JAXX team is pleased to announce the jaxx-2.5.28 release! JAXX Project Documentation of the project can be found here: http://maven-site.nuiton.org/jaxx Changes ------- Changes in this version include: New features: o Can stop propagation of events in JaxxListModel Issue: 2865. Thanks to Tony Chemit. Resolved by tchemit. o [BeanDoublieList] Add a beforeFilter zone (to add some stuff from outised) Issue: 2866. Thanks to Tony Chemit. Resolved by tchemit. o [BeanComboBox] Add methods to add and remove multiple items (improve performance) Issue: 2867. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2/ Find us at * http://search.maven.org/#artifactdetails|org.nuiton.jaxx|jaxx-demo|2.5.28|j… Have fun! -JAXX team

1 0

r2737 - in trunk: . jaxx-compiler jaxx-config jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org 07 Oct '13

07 Oct '13

Author: maven-release Date: 2013-10-07 11:08:10 +0200 (Mon, 07 Oct 2013) New Revision: 2737 Url: http://nuiton.org/projects/jaxx/repository/revisions/2737 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-config/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-maven-plugin/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-validator/pom.xml trunk/jaxx-widgets/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2013-10-07 09:08:01 UTC (rev 2736) +++ trunk/jaxx-compiler/pom.xml 2013-10-07 09:08:10 UTC (rev 2737) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.28</version> + <version>2.5.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-config/pom.xml =================================================================== --- trunk/jaxx-config/pom.xml 2013-10-07 09:08:01 UTC (rev 2736) +++ trunk/jaxx-config/pom.xml 2013-10-07 09:08:10 UTC (rev 2737) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.28</version> + <version>2.5.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-10-07 09:08:01 UTC (rev 2736) +++ trunk/jaxx-demo/pom.xml 2013-10-07 09:08:10 UTC (rev 2737) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.28</version> + <version>2.5.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-10-07 09:08:01 UTC (rev 2736) +++ trunk/jaxx-maven-plugin/pom.xml 2013-10-07 09:08:10 UTC (rev 2737) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.28</version> + <version>2.5.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-10-07 09:08:01 UTC (rev 2736) +++ trunk/jaxx-runtime/pom.xml 2013-10-07 09:08:10 UTC (rev 2737) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.28</version> + <version>2.5.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2013-10-07 09:08:01 UTC (rev 2736) +++ trunk/jaxx-validator/pom.xml 2013-10-07 09:08:10 UTC (rev 2737) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.28</version> + <version>2.5.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-10-07 09:08:01 UTC (rev 2736) +++ trunk/jaxx-widgets/pom.xml 2013-10-07 09:08:10 UTC (rev 2737) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.28</version> + <version>2.5.29-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> @@ -49,11 +49,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.28/jaxx-widgets</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.28/jaxx-widgets + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets/tags/jaxx…</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets</url> </scm> <dependencies> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-07 09:08:01 UTC (rev 2736) +++ trunk/pom.xml 2013-10-07 09:08:10 UTC (rev 2737) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.28</version> + <version>2.5.29-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> @@ -135,11 +135,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.28</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.28 + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.28</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r2736 - tags
by maven-release＠users.nuiton.org 07 Oct '13

07 Oct '13

Author: maven-release Date: 2013-10-07 11:08:01 +0200 (Mon, 07 Oct 2013) New Revision: 2736 Url: http://nuiton.org/projects/jaxx/repository/revisions/2736 Log: [maven-release-plugin] copy for tag jaxx-2.5.28 Added: tags/jaxx-2.5.28/

1 0

r2735 - in trunk: . jaxx-compiler jaxx-config jaxx-demo jaxx-maven-plugin jaxx-runtime jaxx-validator jaxx-widgets
by maven-release＠users.nuiton.org 07 Oct '13

07 Oct '13

Author: maven-release Date: 2013-10-07 11:07:57 +0200 (Mon, 07 Oct 2013) New Revision: 2735 Url: http://nuiton.org/projects/jaxx/repository/revisions/2735 Log: [maven-release-plugin] prepare release jaxx-2.5.28 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-config/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-maven-plugin/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-validator/pom.xml trunk/jaxx-widgets/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2013-10-04 07:07:21 UTC (rev 2734) +++ trunk/jaxx-compiler/pom.xml 2013-10-07 09:07:57 UTC (rev 2735) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.28-SNAPSHOT</version> + <version>2.5.28</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-config/pom.xml =================================================================== --- trunk/jaxx-config/pom.xml 2013-10-04 07:07:21 UTC (rev 2734) +++ trunk/jaxx-config/pom.xml 2013-10-07 09:07:57 UTC (rev 2735) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.28-SNAPSHOT</version> + <version>2.5.28</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2013-10-04 07:07:21 UTC (rev 2734) +++ trunk/jaxx-demo/pom.xml 2013-10-07 09:07:57 UTC (rev 2735) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.28-SNAPSHOT</version> + <version>2.5.28</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/jaxx-maven-plugin/pom.xml 2013-10-04 07:07:21 UTC (rev 2734) +++ trunk/jaxx-maven-plugin/pom.xml 2013-10-07 09:07:57 UTC (rev 2735) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.28-SNAPSHOT</version> + <version>2.5.28</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2013-10-04 07:07:21 UTC (rev 2734) +++ trunk/jaxx-runtime/pom.xml 2013-10-07 09:07:57 UTC (rev 2735) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.28-SNAPSHOT</version> + <version>2.5.28</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2013-10-04 07:07:21 UTC (rev 2734) +++ trunk/jaxx-validator/pom.xml 2013-10-07 09:07:57 UTC (rev 2735) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.28-SNAPSHOT</version> + <version>2.5.28</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2013-10-04 07:07:21 UTC (rev 2734) +++ trunk/jaxx-widgets/pom.xml 2013-10-07 09:07:57 UTC (rev 2735) @@ -31,7 +31,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.5.28-SNAPSHOT</version> + <version>2.5.28</version> </parent> <groupId>org.nuiton.jaxx</groupId> @@ -49,11 +49,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.28/jaxx-widgets</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk/jaxx-widgets + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.28/jaxx-widgets </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets</url> + <url>http://nuiton.org/projects/jaxx/repository/show/trunkjaxx-widgets/tags/jaxx…</url> </scm> <dependencies> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-04 07:07:21 UTC (rev 2734) +++ trunk/pom.xml 2013-10-07 09:07:57 UTC (rev 2735) @@ -34,7 +34,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.5.28-SNAPSHOT</version> + <version>2.5.28</version> <modules> <module>jaxx-runtime</module> @@ -135,11 +135,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.28</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/jaxx/trunk + scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.5.28 </developerConnection> - <url>http://nuiton.org/projects/jaxx/repository/show/trunk</url> + <url>http://nuiton.org/projects/jaxx/repository/show/tags/jaxx-2.5.28</url> </scm> <distributionManagement>

1 0

r2734 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org 04 Oct '13

04 Oct '13

Author: tchemit Date: 2013-10-04 09:07:21 +0200 (Fri, 04 Oct 2013) New Revision: 2734 Url: http://nuiton.org/projects/jaxx/repository/revisions/2734 Log: fixes #2867: [BeanComboBox] Add methods to add and remove multiple items (improve performance) Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx 2013-10-02 23:23:38 UTC (rev 2733) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx 2013-10-04 07:07:21 UTC (rev 2734) @@ -120,8 +120,12 @@ public void addItem(O item) { handler.addItem(item); } +public void addItems(Iterable<O> items) { handler.addItems(items); } + public void removeItem(O item) { handler.removeItem(item); } +public void removeItems(Iterable<O> items) { handler.removeItems(items); } + ]]> </script> <row> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2013-10-02 23:23:38 UTC (rev 2733) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java 2013-10-04 07:07:21 UTC (rev 2734) @@ -48,6 +48,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.lang.reflect.Method; +import java.util.Collections; import java.util.List; /** @@ -202,7 +203,7 @@ /** * @return {@code true} if there is no data in comboBox, - * {@code false} otherwise. + * {@code false} otherwise. * @since 2.5.9 */ public boolean isEmpty() { @@ -211,57 +212,99 @@ } /** - * Add the given item into the comboBox. + * Add the given items into the comboBox. * * Note: The item will be inserted at his correct following * the selected ordering. * - * @param item item to add in comboBox. - * @since 2.5.9 + * @param items items to add in comboBox. + * @since 2.5.28 */ - public void addItem(O item) { + public void addItems(Iterable<O> items) { List<O> data = ui.getData(); + boolean wasEmpty = CollectionUtils.isEmpty(data); - data.add(item); + for (O item : items) { + data.add(item); + } + updateUI(ui.getIndex(), ui.isReverseSort()); fireEmpty(wasEmpty); } /** - * Remove the given item from the comboBox model. + * Remove the given items from the comboBox model. * - * Note: If this item was selected, then selection will - * be cleared. + * Note: If this item was selected, then selection will be + * cleared. * - * @param item the item to remove from the comboBox model - * @since 2.5.9 + * @param items items to remove from the comboBox model + * @since 2.5.28 */ - public void removeItem(O item) { + public void removeItems(Iterable<O> items) { List<O> data = ui.getData(); - boolean remove = data.remove(item); + boolean needUpdate = false; + for (O item : items) { + boolean remove = data.remove(item); - if (remove) { + if (remove) { - // item was found in data + // item was found in data - Object selectedItem = ui.getSelectedItem(); - if (item == selectedItem) { + Object selectedItem = ui.getSelectedItem(); + if (item == selectedItem) { - // item was selected item, reset selected item then - ui.setSelectedItem(null); + // item was selected item, reset selected item then + ui.setSelectedItem(null); + } + + needUpdate = true; + } + } + if (needUpdate) { + updateUI(ui.getIndex(), ui.isReverseSort()); fireEmpty(false); } + } /** + * Add the given item into the comboBox. + * + * Note: The item will be inserted at his correct following + * the selected ordering. + * + * @param item item to add in comboBox. + * @since 2.5.9 + */ + public void addItem(O item) { + + addItems(Collections.singleton(item)); + } + + /** + * Remove the given item from the comboBox model. + * + * Note: If this item was selected, then selection will be + * cleared. + * + * @param item the item to remove from the comboBox model + * @since 2.5.9 + */ + public void removeItem(O item) { + + removeItems(Collections.singleton(item)); + } + + /** * Sort data of the model. * * @since 2.5.10 Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx 2013-10-02 23:23:38 UTC (rev 2733) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBox.jaxx 2013-10-04 07:07:21 UTC (rev 2734) @@ -122,8 +122,12 @@ public void addItem(O item) { handler.addItem(item); } +public void addItems(Iterable<O> items) { handler.addItems(items); } + public void removeItem(O item) { handler.removeItem(item); } +public void removeItems(Iterable<O> items) { handler.removeItems(items); } + public void reset() { handler.reset(); } ]]> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2013-10-02 23:23:38 UTC (rev 2733) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanFilterableComboBoxHandler.java 2013-10-04 07:07:21 UTC (rev 2734) @@ -57,6 +57,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.lang.reflect.Method; +import java.util.Collections; import java.util.List; /** @@ -270,7 +271,7 @@ /** * @return {@code true} if there is no data in comboBox, {@code false} - * otherwise. + * otherwise. */ public boolean isEmpty() { boolean result = CollectionUtils.isEmpty(ui.getData()); @@ -278,54 +279,97 @@ } /** - * Add the given item into the comboBox. + * Add the given items into the comboBox. * * Note: The item will be inserted at his correct following * the selected ordering. * - * @param item item to add in comboBox. + * @param items items to add in comboBox. + * @since 2.5.28 */ - public void addItem(O item) { + public void addItems(Iterable<O> items) { List<O> data = ui.getData(); + boolean wasEmpty = CollectionUtils.isEmpty(data); - data.add(item); + for (O item : items) { + data.add(item); + } + updateUI(ui.getIndex(), ui.isReverseSort()); fireEmpty(wasEmpty); } /** - * Remove the given item from the comboBox model. + * Remove the given items from the comboBox model. * * Note: If this item was selected, then selection will be * cleared. * - * @param item the item to remove from the comboBox model + * @param items items to remove from the comboBox model + * @since 2.5.28 */ - public void removeItem(O item) { + public void removeItems(Iterable<O> items) { List<O> data = ui.getData(); - boolean remove = data.remove(item); + boolean needUpdate = false; + for (O item : items) { + boolean remove = data.remove(item); - if (remove) { + if (remove) { - // item was found in data + // item was found in data - Object selectedItem = ui.getSelectedItem(); - if (item == selectedItem) { + Object selectedItem = ui.getSelectedItem(); + if (item == selectedItem) { - // item was selected item, reset selected item then - ui.setSelectedItem(null); + // item was selected item, reset selected item then + ui.setSelectedItem(null); + } + + needUpdate = true; } + } + if (needUpdate) { + updateUI(ui.getIndex(), ui.isReverseSort()); fireEmpty(false); } + } + /** + * Add the given item into the comboBox. + * + * Note: The item will be inserted at his correct following + * the selected ordering. + * + * @param item item to add in comboBox. + * @since 2.5.9 + */ + public void addItem(O item) { + + addItems(Collections.singleton(item)); + } + + /** + * Remove the given item from the comboBox model. + * + * Note: If this item was selected, then selection will be + * cleared. + * + * @param item the item to remove from the comboBox model + * @since 2.5.9 + */ + public void removeItem(O item) { + + removeItems(Collections.singleton(item)); + } + /** Sort data of the model. */ public void sortData() {

1 0

r2733 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org 02 Oct '13

02 Oct '13

Author: tchemit Date: 2013-10-03 01:23:38 +0200 (Thu, 03 Oct 2013) New Revision: 2733 Url: http://nuiton.org/projects/jaxx/repository/revisions/2733 Log: fixes #2866: [BeanDoublieList] Add a beforeFilter zone (to add some stuff from outised) Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2013-10-02 22:19:14 UTC (rev 2732) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleList.jaxx 2013-10-02 23:23:38 UTC (rev 2733) @@ -102,6 +102,11 @@ <row> <cell columns='3' fill='both'> + <JPanel layout='{new BorderLayout()}' id='beforeFilterPanel'/> + </cell> + </row> + <row> + <cell columns='3' fill='both'> <JPanel layout='{new BorderLayout()}' id='filterPanel'> <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.WEST'> <JLabel id='filterFieldLabel' constraints='BorderLayout.WEST'/>

1 0

r2732 - in trunk: jaxx-runtime/src/main/java/jaxx/runtime/swing/model jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org 02 Oct '13

02 Oct '13

Author: tchemit Date: 2013-10-03 00:19:14 +0200 (Thu, 03 Oct 2013) New Revision: 2732 Url: http://nuiton.org/projects/jaxx/repository/revisions/2732 Log: fixes #2865: Can stop propagation of events in JaxxListModel Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java 2013-09-30 16:00:30 UTC (rev 2731) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultListModel.java 2013-10-02 22:19:14 UTC (rev 2732) @@ -46,6 +46,16 @@ protected ArrayList<E> delegate = new ArrayList<E>(); + protected boolean valueIsAdjusting; + + public boolean isValueIsAdjusting() { + return valueIsAdjusting; + } + + public void setValueIsAdjusting(boolean valueIsAdjusting) { + this.valueIsAdjusting = valueIsAdjusting; + } + public ArrayList<E> toList() { return Lists.newArrayList(delegate); } @@ -312,7 +322,9 @@ */ public void setElementAt(E element, int index) { delegate.set(index, element); - fireContentsChanged(this, index, index); + if (!isValueIsAdjusting()) { + fireContentsChanged(this, index, index); + } } /** @@ -332,7 +344,9 @@ */ public void removeElementAt(int index) { delegate.remove(index); - fireIntervalRemoved(this, index, index); + if (!isValueIsAdjusting()) { + fireIntervalRemoved(this, index, index); + } } /** @@ -355,7 +369,9 @@ */ public void insertElementAt(E element, int index) { delegate.add(index, element); - fireIntervalAdded(this, index, index); + if (!isValueIsAdjusting()) { + fireIntervalAdded(this, index, index); + } } /** @@ -367,7 +383,9 @@ public void addElement(E element) { int index = delegate.size(); delegate.add(element); - fireIntervalAdded(this, index, index); + if (!isValueIsAdjusting()) { + fireIntervalAdded(this, index, index); + } } /** @@ -383,7 +401,9 @@ int index = indexOf(obj); boolean rv = delegate.remove(obj); if (index >= 0) { - fireIntervalRemoved(this, index, index); + if (!isValueIsAdjusting()) { + fireIntervalRemoved(this, index, index); + } } return rv; } @@ -404,7 +424,9 @@ int index1 = delegate.size() - 1; delegate.clear(); if (index1 >= 0) { - fireIntervalRemoved(this, 0, index1); + if (!isValueIsAdjusting()) { + fireIntervalRemoved(this, 0, index1); + } } } @@ -457,7 +479,9 @@ */ public E set(int index, E element) { E rv = delegate.set(index, element); - fireContentsChanged(this, index, index); + if (!isValueIsAdjusting()) { + fireContentsChanged(this, index, index); + } return rv; } @@ -473,7 +497,9 @@ */ public void add(int index, E element) { delegate.add(index, element); - fireIntervalAdded(this, index, index); + if (!isValueIsAdjusting()) { + fireIntervalAdded(this, index, index); + } } public void setAllElements(Collection<E> objects) { @@ -488,7 +514,9 @@ this.delegate.addAll(elements); int lastIndex = delegate.size() - 1; if (lastIndex > -1) { - fireIntervalAdded(this, firstIndex, lastIndex); + if (!isValueIsAdjusting()) { + fireIntervalAdded(this, firstIndex, lastIndex); + } } } } @@ -506,7 +534,9 @@ */ public E remove(int index) { E rv = delegate.remove(index); - fireIntervalRemoved(this, index, index); + if (!isValueIsAdjusting()) { + fireIntervalRemoved(this, index, index); + } return rv; } @@ -518,7 +548,9 @@ int index1 = delegate.size() - 1; delegate.clear(); if (index1 >= 0) { - fireIntervalRemoved(this, 0, index1); + if (!isValueIsAdjusting()) { + fireIntervalRemoved(this, 0, index1); + } } } @@ -544,13 +576,17 @@ for (int i = toIndex; i >= fromIndex; i--) { delegate.remove(i); } - fireIntervalRemoved(this, fromIndex, toIndex); + if (!isValueIsAdjusting()) { + fireIntervalRemoved(this, fromIndex, toIndex); + } } public void refresh() { if (!isEmpty()) { - fireContentsChanged(this, 0, getSize() - 1); + if (!isValueIsAdjusting()) { + fireContentsChanged(this, 0, getSize() - 1); + } } } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java 2013-09-30 16:00:30 UTC (rev 2731) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListModel.java 2013-10-02 22:19:14 UTC (rev 2732) @@ -166,10 +166,24 @@ public void addToSelected(List<O> items) { selected.addAll(items); for (O item : items) { - selectedModel.addElement(item); - if (!useMultiSelect) - universeModel.removeElement(item); + + selectedModel.setValueIsAdjusting(true); + universeModel.setValueIsAdjusting(true); + + try { + selectedModel.addElement(item); + if (!useMultiSelect) { + universeModel.removeElement(item); + } + } finally { + selectedModel.setValueIsAdjusting(false); + universeModel.setValueIsAdjusting(false); + } } + + selectedModel.refresh(); + universeModel.refresh(); + } /** @@ -289,23 +303,24 @@ // the maximum index where we should insert the item is its index // in the list of all the available items int index = universe.indexOf(item); - // if the index is upper than the size of the list of the remaining available items, - // get the size of this list - int insertionIndex = Math.min(index, universeModel.getSize()); + if (index!=-1) { + // if the index is upper than the size of the list of the remaining available items, + // get the size of this list + int insertionIndex = Math.min(index, universeModel.getSize()); - // we decrease the index to insert until we meet an item whose index - // in the list of all the available index is lower than the one of the item - // we want to insert - while (insertionIndex > 0) { - O o = universeModel.get(--insertionIndex); - int oIndex = universe.indexOf(o); - if (oIndex < index) { - insertionIndex++; - break; + // we decrease the index to insert until we meet an item whose index + // in the list of all the available index is lower than the one of the item + // we want to insert + while (insertionIndex > 0) { + O o = universeModel.get(--insertionIndex); + int oIndex = universe.indexOf(o); + if (oIndex < index) { + insertionIndex++; + break; + } } + universeModel.add(insertionIndex, item); } - - universeModel.add(insertionIndex, item); } public int getSelectedListSize() {

1 0