Author: Bavencoff Date: 2013-06-27 16:49:18 +0200 (Thu, 27 Jun 2013) New Revision: 3691 Url: http://chorem.org/projects/lima/repository/revisions/3691 Log: gestion des libell?\195?\169s pour les op?\195?\169randes des filtres sur les transaction Added: trunk/lima-callao/src/main/java/org/chorem/lima/beans/Labeled.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/LabelListCellRenderer.java Modified: trunk/lima-callao/src/main/java/org/chorem/lima/beans/AbstractBigDecimalCondition.java trunk/lima-callao/src/main/java/org/chorem/lima/beans/AbstractStringCondition.java trunk/lima-callao/src/main/java/org/chorem/lima/beans/DateCondition.java trunk/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties trunk/lima-callao/src/main/resources/i18n/lima-callao_fr_FR.properties trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/BigDecimalConditionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx Modified: trunk/lima-callao/src/main/java/org/chorem/lima/beans/AbstractBigDecimalCondition.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/beans/AbstractBigDecimalCondition.java 2013-06-27 13:37:16 UTC (rev 3690) +++ trunk/lima-callao/src/main/java/org/chorem/lima/beans/AbstractBigDecimalCondition.java 2013-06-27 14:49:18 UTC (rev 3691) @@ -34,9 +34,9 @@ this.operand = operand; } - public static enum Operand { + public static enum Operand implements Labeled { EQUAL(_("lima.enum.BigDecimal.operand.equal")), - NOT_EQUAL(_("lima.BigDecimal.date.operand.notequal")), + NOT_EQUAL(_("lima.enum.BigDecimal.operand.notequal")), LOWER(_("lima.enum.BigDecimal.operand.lower")), LOWER_OR_EQUAL(_("lima.enum.BigDecimal.operand.lowerorequal")), UPPER(_("lima.enum.BigDecimal.operand.upper")), @@ -48,6 +48,7 @@ this.label = label; } + @Override public String getLabel() { return label; } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/beans/AbstractStringCondition.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/beans/AbstractStringCondition.java 2013-06-27 13:37:16 UTC (rev 3690) +++ trunk/lima-callao/src/main/java/org/chorem/lima/beans/AbstractStringCondition.java 2013-06-27 14:49:18 UTC (rev 3691) @@ -44,7 +44,7 @@ this.sensitiveCase = sensitiveCase; } - public static enum Operand { + public static enum Operand implements Labeled { EQUAL(_("lima.enum.string.operand.equal")), NOT_EQUAL(_("lima.string.date.operand.notequal")), BEGIN(_("lima.enum.string.operand.begin")), @@ -57,6 +57,7 @@ this.label = label; } + @Override public String getLabel() { return label; } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/beans/DateCondition.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/beans/DateCondition.java 2013-06-27 13:37:16 UTC (rev 3690) +++ trunk/lima-callao/src/main/java/org/chorem/lima/beans/DateCondition.java 2013-06-27 14:49:18 UTC (rev 3691) @@ -39,7 +39,7 @@ v.visitDateCondition(this); } - public static enum Operand { + public static enum Operand implements Labeled { SAME(_("lima.enum.date.operand.same")), AFTER(_("lima.enum.date.operand.after")), PREVIOUS(_("lima.enum.date.operand.previous")), @@ -51,7 +51,7 @@ this.label = label; } - + @Override public String getLabel() { return label; } Added: trunk/lima-callao/src/main/java/org/chorem/lima/beans/Labeled.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/beans/Labeled.java (rev 0) +++ trunk/lima-callao/src/main/java/org/chorem/lima/beans/Labeled.java 2013-06-27 14:49:18 UTC (rev 3691) @@ -0,0 +1,9 @@ +package org.chorem.lima.beans; + +/** + * @author Sylvain Bavencoff <bavencoff@codelutin.com> + */ +public interface Labeled { + + public String getLabel(); +} Modified: trunk/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties =================================================================== --- trunk/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties 2013-06-27 13:37:16 UTC (rev 3690) +++ trunk/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties 2013-06-27 14:49:18 UTC (rev 3691) @@ -2,6 +2,7 @@ lima.enum.BigDecimal.operand.equal= lima.enum.BigDecimal.operand.lower= lima.enum.BigDecimal.operand.lowerorequal= +lima.enum.BigDecimal.operand.notequal= lima.enum.BigDecimal.operand.upper= lima.enum.BigDecimal.operand.upperorequal= lima.enum.comboboxamount.both=All Modified: trunk/lima-callao/src/main/resources/i18n/lima-callao_fr_FR.properties =================================================================== --- trunk/lima-callao/src/main/resources/i18n/lima-callao_fr_FR.properties 2013-06-27 13:37:16 UTC (rev 3690) +++ trunk/lima-callao/src/main/resources/i18n/lima-callao_fr_FR.properties 2013-06-27 14:49:18 UTC (rev 3691) @@ -1,9 +1,9 @@ -lima.BigDecimal.date.operand.notequal= -lima.enum.BigDecimal.operand.equal= -lima.enum.BigDecimal.operand.lower= -lima.enum.BigDecimal.operand.lowerorequal= -lima.enum.BigDecimal.operand.upper= -lima.enum.BigDecimal.operand.upperorequal= +lima.enum.BigDecimal.operand.equal=\= +lima.enum.BigDecimal.operand.lower=< +lima.enum.BigDecimal.operand.lowerorequal=<\= +lima.enum.BigDecimal.operand.notequal=\u2260 +lima.enum.BigDecimal.operand.upper=> +lima.enum.BigDecimal.operand.upperorequal=>\= lima.enum.comboboxamount.both=Tous lima.enum.comboboxamount.credit=Crédit lima.enum.comboboxamount.debit=Débit Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/BigDecimalConditionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/BigDecimalConditionView.jaxx 2013-06-27 13:37:16 UTC (rev 3690) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/BigDecimalConditionView.jaxx 2013-06-27 14:49:18 UTC (rev 3691) @@ -32,6 +32,7 @@ org.chorem.lima.beans.AbstractBigDecimalCondition jaxx.runtime.swing.editor.NumberEditor java.math.BigDecimal + org.chorem.lima.ui.common.LabelListCellRenderer </import> <BigDecimalConditionHandler id="handler" @@ -49,6 +50,7 @@ <cell> <JComboBox id="operandComboBox" model="{new DefaultComboBoxModel(AbstractBigDecimalCondition.Operand.values())}" + renderer="{new LabelListCellRenderer()}" selectedItem="{handler.getOperand()}" onItemStateChanged="handler.operandSelected(event)"/> </cell> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.jaxx 2013-06-27 13:37:16 UTC (rev 3690) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.jaxx 2013-06-27 14:49:18 UTC (rev 3691) @@ -30,6 +30,7 @@ javax.swing.text.Document javax.swing.DefaultComboBoxModel org.chorem.lima.beans.AbstractStringCondition + org.chorem.lima.ui.common.LabelListCellRenderer </import> <StringConditionHandler id="handler" @@ -47,6 +48,7 @@ <cell> <JComboBox id="operandComboBox" model="{new DefaultComboBoxModel(AbstractStringCondition.Operand.values())}" + renderer="{new LabelListCellRenderer()}" selectedItem="{handler.getOperand()}" onItemStateChanged="handler.operandSelected(event)"/> </cell> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx 2013-06-27 13:37:16 UTC (rev 3690) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx 2013-06-27 14:49:18 UTC (rev 3691) @@ -30,6 +30,7 @@ javax.swing.text.Document javax.swing.DefaultComboBoxModel org.chorem.lima.beans.DateCondition + org.chorem.lima.ui.common.LabelListCellRenderer </import> <DateConditionHandler id="handler" javaBean="new DateConditionHandler(this)"/> @@ -46,6 +47,7 @@ <cell> <JComboBox id="operandComboBox" model="{new DefaultComboBoxModel(DateCondition.Operand.values())}" + renderer="{new LabelListCellRenderer()}" selectedItem="{handler.getOperand()}" onItemStateChanged="handler.operandSelected(event)"/> </cell> Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/LabelListCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/LabelListCellRenderer.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/LabelListCellRenderer.java 2013-06-27 14:49:18 UTC (rev 3691) @@ -0,0 +1,26 @@ +package org.chorem.lima.ui.common; + +import org.chorem.lima.beans.Labeled; + +import javax.swing.*; +import javax.swing.plaf.basic.BasicComboBoxRenderer; +import java.awt.*; + +/** + * @author Sylvain Bavencoff <bavencoff@codelutin.com> + */ +public class LabelListCellRenderer extends BasicComboBoxRenderer { + + @Override + public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { + + super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); + + if (value instanceof Labeled) { + setText(((Labeled) value).getLabel()); + } + + return this; + } + +}