Author: sletellier Date: 2012-02-07 15:47:08 +0100 (Tue, 07 Feb 2012) New Revision: 45 Url: http://forge.codelutin.com/repositories/revision/jmexico/45 Log: [#1561] [Option] Plus la possibilit?\195?\169 d'?\195?\169diter des options Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellEditor.java trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java trunk/jmexico-editor/src/main/resources/log4j.properties Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java 2012-02-07 14:25:32 UTC (rev 44) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java 2012-02-07 14:47:08 UTC (rev 45) @@ -39,8 +39,6 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; import java.util.LinkedList; import java.util.List; import java.util.Map; Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellEditor.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellEditor.java 2012-02-07 14:25:32 UTC (rev 44) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellEditor.java 2012-02-07 14:47:08 UTC (rev 45) @@ -26,8 +26,12 @@ import fr.reseaumexico.model.Factor; import jaxx.runtime.JAXXContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import javax.swing.*; +import javax.swing.event.CellEditorListener; +import javax.swing.event.ChangeEvent; import javax.swing.table.TableCellEditor; import java.awt.*; import java.awt.event.ActionEvent; @@ -47,6 +51,11 @@ private static final long serialVersionUID = 1L; + /** + * Logger + */ + private static Log log = LogFactory.getLog(FactorValueCellEditor.class); + protected JTable table; protected Factor factor; protected Object currentValue; @@ -73,6 +82,7 @@ if (isEditing) { currentValue = defaultInlineEditor.getText(); isEditing = false; + fireEditingStopped(); } if (specificEditor != null) { currentValue = specificEditor.getValue(); @@ -103,19 +113,6 @@ }); } - component.addFocusListener(new FocusListener() { - - @Override - public void focusGained(FocusEvent e) { - // do nothing - } - - @Override - public void focusLost(FocusEvent e) { - fireEditingStopped(); - } - }); - return component; } defaultInlineEditor.setText(currentValue == null ? "" : String.valueOf(currentValue)); Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java 2012-02-07 14:25:32 UTC (rev 44) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/factorValue/FactorValueCellRenderer.java 2012-02-07 14:47:08 UTC (rev 45) @@ -51,7 +51,6 @@ } delegate = new DefaultTableCellRenderer(); - } @Override Modified: trunk/jmexico-editor/src/main/resources/log4j.properties =================================================================== --- trunk/jmexico-editor/src/main/resources/log4j.properties 2012-02-07 14:25:32 UTC (rev 44) +++ trunk/jmexico-editor/src/main/resources/log4j.properties 2012-02-07 14:47:08 UTC (rev 45) @@ -30,5 +30,5 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n -# mexicos +# mexico log4j.logger.fr.reseaumexico.editor=INFO