Author: tchemit Date: 2013-01-19 03:23:42 +0100 (Sat, 19 Jan 2013) New Revision: 229 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/229 Log: do not persist imported protocol Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java 2013-01-19 01:59:45 UTC (rev 228) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportProtocolAction.java 2013-01-19 02:23:42 UTC (rev 229) @@ -102,7 +102,7 @@ " to file: " + file); } - if (file.getName().endsWith(".tuttiProtocol")) { + if (!file.getName().endsWith(".tuttiProtocol")) { file = new File(file.getParentFile(), file.getName() + ".tuttiProtocol"); } // export protocol Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java 2013-01-19 01:59:45 UTC (rev 228) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ImportProtocolAction.java 2013-01-19 02:23:42 UTC (rev 229) @@ -25,11 +25,11 @@ */ import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; -import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.TuttiProtocolImportExportService; import fr.ifremer.tutti.ui.swing.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.TuttiScreen; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import jaxx.runtime.context.JAXXContextEntryDef; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -52,6 +52,8 @@ private static final Log log = LogFactory.getLog(ImportProtocolAction.class); + public static final JAXXContextEntryDef<TuttiProtocol> IMPORT_PROTOCOL_ENTRY = new JAXXContextEntryDef<TuttiProtocol>("importProtocol", TuttiProtocol.class); + private File file; public ImportProtocolAction(SelectCruiseUIHandler handler) { @@ -105,20 +107,12 @@ sendMessage("Protocole [" + protocol.getName() + "] lu depuis le fichier."); + IMPORT_PROTOCOL_ENTRY.setContextValue(getContext().getMainUI(), protocol); + // remove id protocol.setId(null); - // persist protocol - PersistenceService persistenceService = - getContext().getService(PersistenceService.class); - - TuttiProtocol savedProtocol = - persistenceService.createProtocol(protocol); - - if (log.isInfoEnabled()) { - log.info("Edit saved protocol: " + savedProtocol.getId()); - } - getContext().setProtocolId(savedProtocol.getId()); + getContext().setProtocolId(null); getContext().setScreen(TuttiScreen.EDIT_PROTOCOL); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-01-19 01:59:45 UTC (rev 228) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-01-19 02:23:42 UTC (rev 229) @@ -39,6 +39,7 @@ import fr.ifremer.tutti.ui.swing.MainUI; import fr.ifremer.tutti.ui.swing.MainUIHandler; import fr.ifremer.tutti.ui.swing.TuttiUI; +import fr.ifremer.tutti.ui.swing.content.home.ImportProtocolAction; import fr.ifremer.tutti.ui.swing.util.HydrologicCaracteristicUtil; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; @@ -197,27 +198,38 @@ EditProtocolUIModel model = getModel(); - // load protocol if existing + TuttiProtocol protocol = ImportProtocolAction.IMPORT_PROTOCOL_ENTRY.getContextValue(ui); - String protocolId = context.getProtocolId(); - TuttiProtocol protocol = null; - if (protocolId == null) { + if (protocol != null) { - // create new protocol + // import a protocol - if (log.isDebugEnabled()) { - log.debug("Will create a new protocol"); - } + ImportProtocolAction.IMPORT_PROTOCOL_ENTRY.removeContextValue(ui); + + model.fromBean(protocol); + } else { - // load existing protocol - protocol = persistenceService.getProtocol(protocolId); - Boolean mustClone = ui.getContextValue(Boolean.class, MainUIHandler.CLONE_PROTOCOL); + // load protocol if existing - model.fromBean(protocol); - if (mustClone != null && mustClone) { - ui.setContextValue(false, MainUIHandler.CLONE_PROTOCOL); - model.setId(null); + if (context.isProtocolFilled()) { + + // load existing protocol + protocol = persistenceService.getProtocol(context.getProtocolId()); + Boolean mustClone = ui.getContextValue(Boolean.class, MainUIHandler.CLONE_PROTOCOL); + + model.fromBean(protocol); + if (mustClone != null && mustClone) { + ui.setContextValue(false, MainUIHandler.CLONE_PROTOCOL); + model.setId(null); + } + } else { + + // create new protocol + + if (log.isDebugEnabled()) { + log.debug("Will create a new protocol"); + } } } @@ -309,7 +321,7 @@ } } if (log.isDebugEnabled()) { - log.debug("Will edit protocol: " + protocolId + " with " + + log.debug("Will edit protocol with " + rows.size() + " species declared."); } } Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-19 01:59:45 UTC (rev 228) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-19 02:23:42 UTC (rev 229) @@ -21,9 +21,9 @@ tutti.action.editCatches.tip=Saisir des captures tutti.action.editCruise=Éditer tutti.action.editCruise.tip=Éditer la campagne sélectionnée -tutti.action.editProgram=Programme +tutti.action.editProgram=Éditer tutti.action.editProgram.tip=Éditer le programme sélectionné -tutti.action.editProtocol=Protocole +tutti.action.editProtocol=Éditer tutti.action.editProtocol.tip=Éditer le protocol sélectionné tutti.action.editSelectedCruise=Campagne tutti.action.editSelectedCruise.tip=Éditer la campagne sélectionnée