Author: tchemit Date: 2013-01-03 18:52:22 +0100 (Thu, 03 Jan 2013) New Revision: 148 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/148 Log: fix save of ids in user configuration Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-01-03 17:01:03 UTC (rev 147) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-01-03 17:52:22 UTC (rev 148) @@ -205,7 +205,7 @@ this.programId = programId; // always propagate the change - firePropertyChange(PROPERTY_PROGRAM_ID, null, programId); + firePropertyChange(PROPERTY_PROGRAM_ID, -1, programId); firePropertyChange(PROPERTY_CRUISE_CONTEXT_FILLED, oldValue, isCruiseContextFilled()); } @@ -216,7 +216,7 @@ this.cruiseId = cruiseId; // always propagate the change - firePropertyChange(PROPERTY_CRUISE_ID, null, cruiseId); + firePropertyChange(PROPERTY_CRUISE_ID, -1, cruiseId); firePropertyChange(PROPERTY_CRUISE_CONTEXT_FILLED, oldValue, isCruiseContextFilled()); } @@ -226,7 +226,7 @@ this.protocolId = protocolId; // always propagate the change - firePropertyChange(PROPERTY_PROTOCOL_ID, null, protocolId); + firePropertyChange(PROPERTY_PROTOCOL_ID, -1, protocolId); firePropertyChange(PROPERTY_PROTOCOL_FILLED, oldValue, isProtocolFilled()); } @@ -300,17 +300,16 @@ // test cruiseId if (cruiseId != null) { - Cruise campaign = - persistenceService.getCruise(cruiseId); + Cruise cruise = persistenceService.getCruise(cruiseId); - if (campaign != null && - !campaign.getProgram().getId().equals(programId)) { + if (cruise != null && + !cruise.getProgram().getId().equals(programId)) { // not matchin program, reset cruise id - campaign = null; + cruise = null; } - if (campaign == null) { + if (cruise == null) { // not found in this db @@ -372,7 +371,7 @@ protected void saveContextToConfig() { if (log.isInfoEnabled()) { log.info("Save config (programId: " + programId + ", cruiseId: " + - cruiseId + ", protocolId: " + protocolId + ")"); + cruiseId + ", protocolId: " + protocolId + ')'); } config.setProgramId(programId); config.setCruiseId(cruiseId); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java 2013-01-03 17:01:03 UTC (rev 147) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java 2013-01-03 17:52:22 UTC (rev 148) @@ -27,6 +27,7 @@ import com.google.common.base.Throwables; import fr.ifremer.tutti.service.TuttiServiceTechnicalException; import fr.ifremer.tutti.service.config.TuttiServiceConfig; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -39,7 +40,6 @@ import java.io.File; import java.io.IOException; import java.net.URL; -import java.util.Properties; /** * Tutti application config. @@ -123,15 +123,18 @@ } public String getProgramId() { - return applicationConfig.getOption(TuttiConfigOption.PROGRAM_ID.getKey()); + String result = applicationConfig.getOption(TuttiConfigOption.PROGRAM_ID.getKey()); + return StringUtils.isBlank(result) ? null : result; } public String getCruiseId() { - return applicationConfig.getOption(TuttiConfigOption.CRUISE_ID.getKey()); + String result = applicationConfig.getOption(TuttiConfigOption.CRUISE_ID.getKey()); + return StringUtils.isBlank(result) ? null : result; } public String getProtocolId() { - return applicationConfig.getOption(TuttiConfigOption.PROTOCOL_ID.getKey()); + String result = applicationConfig.getOption(TuttiConfigOption.PROTOCOL_ID.getKey()); + return StringUtils.isBlank(result) ? null : result; } public Color getColorRowInvalid() { @@ -178,33 +181,22 @@ public void setProgramId(String programId) { if (programId == null) { - - Properties options = applicationConfig.getOptions(); - options.remove(TuttiConfigOption.PROGRAM_ID.getKey()); - applicationConfig.setOptions(options); - } else { - - applicationConfig.setOption(TuttiConfigOption.PROGRAM_ID.getKey(), programId); + programId = ""; } + applicationConfig.setOption(TuttiConfigOption.PROGRAM_ID.getKey(), programId); } public void setCruiseId(String cruiseId) { if (cruiseId == null) { - Properties options = applicationConfig.getOptions(); - options.remove(TuttiConfigOption.CRUISE_ID.getKey()); - applicationConfig.setOptions(options); - } else { - applicationConfig.setOption(TuttiConfigOption.CRUISE_ID.getKey(), cruiseId); + cruiseId = ""; } + applicationConfig.setOption(TuttiConfigOption.CRUISE_ID.getKey(), cruiseId); } public void setProtocolId(String protocolId) { if (protocolId == null) { - Properties options = applicationConfig.getOptions(); - options.remove(TuttiConfigOption.PROTOCOL_ID.getKey()); - applicationConfig.setOptions(options); - } else { - applicationConfig.setOption(TuttiConfigOption.PROTOCOL_ID.getKey(), protocolId); + protocolId = ""; } + applicationConfig.setOption(TuttiConfigOption.PROTOCOL_ID.getKey(), protocolId); } }