Author: tchemit Date: 2013-02-04 01:39:54 +0100 (Mon, 04 Feb 2013) New Revision: 319 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/319 Log: improve log (do not log sets with a lot of data + prevent their usage by a if (log.isXXX) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableModel.java 2013-02-04 00:39:02 UTC (rev 318) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableModel.java 2013-02-04 00:39:54 UTC (rev 319) @@ -227,7 +227,9 @@ @Override public final void setValueAt(Object aValue, int rowIndex, int columnIndex) { - log.info("setValueAt " + aValue); + if (log.isDebugEnabled()) { + log.debug("setValueAt " + aValue); + } R entry = getEntry(rowIndex); ColumnIdentifier<R> propertyName = getPropertyName(columnIndex); setValueAt(aValue, rowIndex, columnIndex, propertyName, entry); @@ -253,7 +255,9 @@ int columnIndex, ColumnIdentifier<R> propertyName, R entry) { - log.info("setValueAt " + aValue); + if (log.isDebugEnabled()) { + log.debug("setValueAt " + aValue); + } propertyName.setValue(entry, aValue); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIModel.java 2013-02-04 00:39:02 UTC (rev 318) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIModel.java 2013-02-04 00:39:54 UTC (rev 319) @@ -28,13 +28,13 @@ import com.google.common.collect.Sets; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.content.operation.fishing.environment.EnvironmentRowModel; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.beans.Binder; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.util.HashSet; import java.util.List; import java.util.Set; @@ -68,11 +68,13 @@ @Override public void propertyChange(PropertyChangeEvent evt) { Set<EnvironmentRowModel> rowsInErorr = (Set<EnvironmentRowModel>) evt.getNewValue(); - log.info(PROPERTY_ROWS_IN_ERROR + " changed " + rowsInErorr); - setValid(rowsInErorr == null || rowsInErorr.isEmpty()); + if (log.isDebugEnabled()) { + log.debug(PROPERTY_ROWS_IN_ERROR + " changed " + rowsInErorr.size()); + } + setValid(CollectionUtils.isEmpty(rowsInErorr)); } }); - setRowsInError(new HashSet<R>()); + setRowsInError(Sets.<R>newHashSet()); } public List<R> getRows() { @@ -88,7 +90,7 @@ // always propagates (since empty list will not fire and we want it) firePropertyChange(PROPERTY_ROWS, null, rows); - Set<R> rowsInError = Sets.newHashSet(); + rowsInError.clear(); for (R row : rows) { if (!row.isValid()) { rowsInError.add(row);