Author: kmorin Date: 2013-01-02 11:14:19 +0100 (Wed, 02 Jan 2013) New Revision: 140 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/140 Log: refs #1810: [PROTOCOLE] Ecran de saisie debug colonnes des esp?\195?\168ces ordonnables Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 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-02 10:12:53 UTC (rev 139) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-01-02 10:14:19 UTC (rev 140) @@ -41,6 +41,15 @@ import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.TableColumnModelEvent; +import javax.swing.event.TableColumnModelListener; +import javax.swing.table.TableColumn; +import javax.swing.table.TableColumnModel; import jaxx.runtime.swing.editor.bean.BeanDoubleList; import jaxx.runtime.validator.swing.SwingValidatorMessageTableRenderer; import jaxx.runtime.validator.swing.SwingValidatorUtil; @@ -50,17 +59,7 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.TableColumnModelEvent; -import javax.swing.event.TableColumnModelListener; -import javax.swing.table.TableColumn; -import javax.swing.table.TableColumnModel; -import java.util.Collection; -import java.util.List; -import java.util.Map; - /** * TODO * @@ -198,7 +197,26 @@ initUI(ui); EditProtocolUIModel model = getModel(); + + // load protocol if existing + String protocolId = context.getProtocolId(); + TuttiProtocol protocol = null; + if (protocolId == null) { + + // create new protocol + + if (log.isDebugEnabled()) { + log.debug("Will create a new protocol"); + } + } else { + + // load existing protocol + protocol = persistenceService.getProtocol(protocolId); + + model.fromBean(protocol); + } + SwingValidatorUtil.installUI(ui.getErrorTable(), new SwingValidatorMessageTableRenderer()); @@ -261,25 +279,8 @@ List<EditProtocolSpeciesRowModel> rows = Lists.newArrayList(); - // load protocol if existing - - String protocolId = context.getProtocolId(); - if (protocolId == null) { - - // create new protocol - - if (log.isDebugEnabled()) { - log.debug("Will create a new protocol"); - } - } else { - - // load existing protocol - TuttiProtocol protocol = persistenceService.getProtocol(protocolId); - - model.fromBean(protocol); - - // build speciesProtocol rows - + // build speciesProtocol rows + if (protocol != null) { List<SpeciesProtocol> speciesProtocols = protocol.getSpecies(); if (CollectionUtils.isNotEmpty(speciesProtocols)) { for (SpeciesProtocol speciesProtocol : speciesProtocols) {