Author: kmorin Date: 2014-08-18 17:13:24 +0200 (Mon, 18 Aug 2014) New Revision: 574 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/574 Log: correction affichage champs historique Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryItemModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-18 14:45:36 UTC (rev 573) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-18 15:13:24 UTC (rev 574) @@ -573,8 +573,6 @@ Email.PROPERTY_CLIENT, Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, Email.PROPERTY_ETAT_ATTENTE, -// Email.PROPERTY_ETAT_ATTENTE + "." + EtatAttente.PROPERTY_INVALID_FORM_DISABLED_ACTIONS, -// Email.PROPERTY_ETAT_ATTENTE + "." + EtatAttente.PROPERTY_VALID_FORM_DISABLED_ACTIONS, Email.PROPERTY_TAKEN_BY, Email.PROPERTY_REPLIES, Email.PROPERTY_ATTACHMENT, Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-08-18 14:45:36 UTC (rev 573) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-08-18 15:13:24 UTC (rev 574) @@ -29,6 +29,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.Closeable; +import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Locale; @@ -238,8 +239,11 @@ Map<Class, State> additionalStates = Maps.newHashMap(); additionalStates.put(BeanFilterableComboBox.class, new BeanFilterableComboBoxState()); additionalStates.put(BeanDoubleList.class, new BeanDoubleListState()); - this.swingSession = new SwingSession(getConfig().getUIConfigFile(), false, additionalStates); - swingSession.loadSafeStates(); + File uiConfigFile = getConfig().getUIConfigFile(); + this.swingSession = new SwingSession(uiConfigFile, false, additionalStates); + if (!uiConfigFile.exists()) { + swingSession.loadSafeStates(); + } this.errorHelper = new ApplicationErrorHelper(this) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryItemModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryItemModel.java 2014-08-18 14:45:36 UTC (rev 573) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryItemModel.java 2014-08-18 15:13:24 UTC (rev 574) @@ -33,8 +33,8 @@ import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; -import java.util.Collection; import java.util.Date; +import java.util.Set; /** * @author Kevin Morin (Code Lutin) @@ -65,12 +65,12 @@ firePropertyChanged(History.PROPERTY_TYPE, oldValue, type); } - public void setFields(Collection<String> fields) { - editObject.setFields(Sets.newLinkedHashSet(fields)); + public void setFields(Set<String> fields) { + editObject.setFields(fields != null ? Sets.newLinkedHashSet(fields) : null); firePropertyChanged(History.PROPERTY_FIELDS, null, fields); } - public Collection<String> getFields() { + public Set<String> getFields() { return editObject.getFields(); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java 2014-08-18 14:45:36 UTC (rev 573) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java 2014-08-18 15:13:24 UTC (rev 574) @@ -180,7 +180,7 @@ return null; } - public String decorateFields(Collection<String> fields) { + public String decorateFields(Set<String> fields) { List<String> fieldLabels = new ArrayList<String>(); if (fields != null) { for (String field : fields) {