This is an automated email from the git hooks/post-receive script. New commit to branch feature/8087 in repository tutti. See http://git.codelutin.com/tutti.git commit 822c10421a31026629843257b38c1794d688f6c7 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 10 12:15:57 2016 +0100 espèces du protocole : remplacement du du pmfm de type de pieces calcifiées par une caracteristicvalue. On propose donc les valeurs qualitative du psfm de type de piece calcifiée. Comme il n'existe pas, j'ai pris au hasard le psfm d'id 6, il faudra le modifier quand on aura la psfm (fixes #8087) --- .../tutti/persistence/TuttiPersistenceImpl.java | 5 ++ .../persistence/TuttiPersistenceNoDbImpl.java | 5 ++ .../entities/protocol/SpeciesProtocolBean.java | 4 +- .../CaracteristicPersistenceService.java | 2 + .../CaracteristicPersistenceServiceImpl.java | 9 ++++ .../src/main/xmi/tutti-persistence.zargo | Bin 62423 -> 62463 bytes .../ifremer/tutti/service/PersistenceService.java | 5 ++ .../fr/ifremer/tutti/service/TuttiDataContext.java | 13 +++++ .../protocol/EditProtocolSpeciesRowModel.java | 28 ++++------ .../protocol/EditProtocolSpeciesTableModel.java | 2 +- .../content/protocol/EditProtocolUIHandler.java | 59 ++++++++++++--------- 11 files changed, 87 insertions(+), 45 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java index a9bb2aa..e45acb7 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java @@ -436,6 +436,11 @@ public class TuttiPersistenceImpl implements TuttiPersistence { } @Override + public Caracteristic getCpsTypeCaracteristic() { + return getCaracteristicService().getCpsTypeCaracteristic(); + } + + @Override public Caracteristic getPmfmIdCaracteristic() { return getCaracteristicService().getPmfmIdCaracteristic(); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java index 4e06bb6..7c1fb01 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java @@ -309,6 +309,11 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override + public Caracteristic getCpsTypeCaracteristic() { + throw notImplemented(); + } + + @Override public Caracteristic getPmfmIdCaracteristic() { throw notImplemented(); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/SpeciesProtocolBean.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/SpeciesProtocolBean.java index da6f10b..d46bd1e 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/SpeciesProtocolBean.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/SpeciesProtocolBean.java @@ -57,7 +57,7 @@ public class SpeciesProtocolBean extends AbstractSpeciesProtocolBean { } @Override - public boolean withCalcifiedPiecesSamplingTypePmfm() { - return calcifiedPiecesSamplingTypePmfmId != null; + public boolean withCalcifiedPiecesSamplingType() { + return calcifiedPiecesSamplingType != null; } } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceService.java index f335bca..7fd0987 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceService.java @@ -91,6 +91,8 @@ public interface CaracteristicPersistenceService extends TuttiPersistenceService Caracteristic getDeadOrAliveCaracteristic(); + Caracteristic getCpsTypeCaracteristic(); + Caracteristic getPmfmIdCaracteristic(); Caracteristic getWeightMeasuredCaracteristic(); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java index 207d275..7ec511f 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java @@ -65,6 +65,8 @@ public class CaracteristicPersistenceServiceImpl extends ReferentialPersistenceS protected Predicate<SpeciesAbleBatch> batchVracPredicate; + public static final Integer CPS_TYPE_PMFM_ID = 6; + @Override public void init() { super.init(); @@ -218,6 +220,13 @@ public class CaracteristicPersistenceServiceImpl extends ReferentialPersistenceS } @Override + public Caracteristic getCpsTypeCaracteristic() { + //FIXME psfm à larrache en attendant que l'IFREMER nous fournisse le bon + Integer pmfmId = CPS_TYPE_PMFM_ID; + return thisService.getCaracteristic(pmfmId); + } + + @Override public Caracteristic getPmfmIdCaracteristic() { Integer pmfmId = PmfmId.ID_PMFM.getValue(); return thisService.getCaracteristic(pmfmId); diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.zargo b/tutti-persistence/src/main/xmi/tutti-persistence.zargo index 158c0a7..5521b9b 100644 Binary files a/tutti-persistence/src/main/xmi/tutti-persistence.zargo and b/tutti-persistence/src/main/xmi/tutti-persistence.zargo differ diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java index 0c43d42..39c53ee 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java @@ -838,6 +838,11 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } @Override + public Caracteristic getCpsTypeCaracteristic() { + return driver.getCpsTypeCaracteristic(); + } + + @Override public Caracteristic getPmfmIdCaracteristic() { return driver.getPmfmIdCaracteristic(); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java index b496b89..6214e7f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java @@ -138,6 +138,8 @@ public class TuttiDataContext extends AbstractBean implements Closeable { protected List<CaracteristicQualitativeValue> deadOrAliveValues; + protected List<CaracteristicQualitativeValue> cpsTypeValues; + protected List<Person> persons; protected List<Species> species; @@ -697,6 +699,17 @@ public class TuttiDataContext extends AbstractBean implements Closeable { return deadOrAliveValues; } + public List<CaracteristicQualitativeValue> getCpsTypeValues() { + checkOpened(); + if (cpsTypeValues == null) { + if (log.isInfoEnabled()) { + log.info("Loading cpsTypeValues"); + } + cpsTypeValues = service.getCpsTypeCaracteristic().getQualitativeValue(); + } + return cpsTypeValues; + } + public List<Species> getReferentSpeciesWithSurveyCode() { return getReferentSpeciesWithSurveyCode(false); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java index d6be705..8f6bdf5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java @@ -27,6 +27,7 @@ import fr.ifremer.tutti.persistence.entities.protocol.Rtp; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocols; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Speciess; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; @@ -55,7 +56,7 @@ public class EditProtocolSpeciesRowModel extends AbstractTuttiBeanUIModel<Specie public static final String PROPERTY_MATURITY_PMFM = "maturityPmfm"; - public static final String PROPERTY_CALCIFIED_PIECES_SAMPLING_TYPE_PMFM = "calcifiedPiecesSamplingTypePmfm"; + public static final String PROPERTY_CALCIFIED_PIECES_SAMPLING_TYPE = "calcifiedPiecesSamplingType"; public static final String PROPERTY_USE_RTP = "useRtp"; @@ -77,7 +78,7 @@ public class EditProtocolSpeciesRowModel extends AbstractTuttiBeanUIModel<Specie protected Caracteristic maturityPmfm; - protected Caracteristic calcifiedPiecesSamplingTypePmfm; + protected CaracteristicQualitativeValue calcifiedPiecesSamplingType; protected Rtp rtpMale; @@ -150,8 +151,8 @@ public class EditProtocolSpeciesRowModel extends AbstractTuttiBeanUIModel<Specie } @Override - public boolean withCalcifiedPiecesSamplingTypePmfm() { - return calcifiedPiecesSamplingTypePmfm != null; + public boolean withCalcifiedPiecesSamplingType() { + return calcifiedPiecesSamplingType != null; } public Caracteristic getLengthStepPmfm() { @@ -287,22 +288,15 @@ public class EditProtocolSpeciesRowModel extends AbstractTuttiBeanUIModel<Specie } @Override - public String getCalcifiedPiecesSamplingTypePmfmId() { - return calcifiedPiecesSamplingTypePmfm != null ? calcifiedPiecesSamplingTypePmfm.getId() : null; + public CaracteristicQualitativeValue getCalcifiedPiecesSamplingType() { + return calcifiedPiecesSamplingType; } @Override - public void setCalcifiedPiecesSamplingTypePmfmId(String calcifiedPiecesSamplingTypePmfmId) { - } - - public Caracteristic getCalcifiedPiecesSamplingTypePmfm() { - return calcifiedPiecesSamplingTypePmfm; - } - - public void setCalcifiedPiecesSamplingTypePmfm(Caracteristic calcifiedPiecesSamplingTypePmfm) { - Object oldValue = getCalcifiedPiecesSamplingTypePmfm(); - this.calcifiedPiecesSamplingTypePmfm = calcifiedPiecesSamplingTypePmfm; - firePropertyChange(PROPERTY_CALCIFIED_PIECES_SAMPLING_TYPE_PMFM, oldValue, calcifiedPiecesSamplingTypePmfm); + public void setCalcifiedPiecesSamplingType(CaracteristicQualitativeValue calcifiedPiecesSamplingType) { + Object oldValue = getCalcifiedPiecesSamplingType(); + this.calcifiedPiecesSamplingType = calcifiedPiecesSamplingType; + firePropertyChange(PROPERTY_CALCIFIED_PIECES_SAMPLING_TYPE, oldValue, calcifiedPiecesSamplingType); } public boolean isUseRtp() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java index 4619101..4b0e7ee 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java @@ -70,7 +70,7 @@ public class EditProtocolSpeciesTableModel extends AbstractApplicationTableModel n("tutti.editProtocol.table.header.maturity.tip")); public static final ColumnIdentifier<EditProtocolSpeciesRowModel> CALCIFIED_PIECES_SAMPLING_TYPE_PMFM_ID = ColumnIdentifier.newId( - EditProtocolSpeciesRowModel.PROPERTY_CALCIFIED_PIECES_SAMPLING_TYPE_PMFM, + EditProtocolSpeciesRowModel.PROPERTY_CALCIFIED_PIECES_SAMPLING_TYPE, n("tutti.editProtocol.table.header.calcifiedPiecesSamplingType"), n("tutti.editProtocol.table.header.calcifiedPiecesSamplingType.tip")); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java index cd5de7e..e1c2a28 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java @@ -44,6 +44,7 @@ import fr.ifremer.tutti.persistence.entities.protocol.SubStrata; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocols; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Speciess; import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; @@ -384,7 +385,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI addLengthClassesColumnToModel(columnModel, model.getLengthClassesPmfmId()); addMaturityColumnToModel(columnModel, model.getMaturityPmfmId()); - addPmfmColumnToModel(columnModel, EditProtocolSpeciesTableModel.CALCIFIED_PIECES_SAMPLING_TYPE_PMFM_ID); + addCpsPmfmColumnToModel(columnModel, EditProtocolSpeciesTableModel.CALCIFIED_PIECES_SAMPLING_TYPE_PMFM_ID); addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.WEIGHT_ENABLED, table); @@ -447,7 +448,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI addLengthClassesColumnToModel(columnModel, model.getLengthClassesPmfmId()); addMaturityColumnToModel(columnModel, model.getMaturityPmfmId()); - addPmfmColumnToModel(columnModel, EditProtocolSpeciesTableModel.CALCIFIED_PIECES_SAMPLING_TYPE_PMFM_ID); + addCpsPmfmColumnToModel(columnModel, EditProtocolSpeciesTableModel.CALCIFIED_PIECES_SAMPLING_TYPE_PMFM_ID); addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.WEIGHT_ENABLED, table); @@ -1198,32 +1199,40 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI EditProtocolSpeciesTableModel.MATURITY_PMFM_ID); } - protected void addPmfmColumnToModel(TableColumnModel model, - ColumnIdentifier<EditProtocolSpeciesRowModel> column) { + protected void addCpsPmfmColumnToModel(TableColumnModel model, + ColumnIdentifier<EditProtocolSpeciesRowModel> column) { - Decorator<Caracteristic> decorator = - getDecorator(Caracteristic.class, null); + Decorator<CaracteristicQualitativeValue> caracteristicQualitativeValueDecorator = + getDecorator(CaracteristicQualitativeValue.class, null); - final JComboBox comboBox = new JComboBox(); + addComboDataColumnToModel(model, + EditProtocolSpeciesTableModel.CALCIFIED_PIECES_SAMPLING_TYPE_PMFM_ID, + caracteristicQualitativeValueDecorator, + getDataContext().getCpsTypeValues()); - comboBox.setRenderer(newListCellRender(decorator)); - - List<Caracteristic> dataToList = Lists.newArrayList(getModel().getCaracteristics()); - - // add a null value at first position - if (!dataToList.isEmpty() && dataToList.get(0) != null) { - dataToList.add(0, null); - } - SwingUtil.fillComboBox(comboBox, dataToList, null); - - ObjectToStringConverter converter = BeanUIUtil.newDecoratedObjectToStringConverter(decorator); - BeanUIUtil.decorate(comboBox, converter); - ComboBoxCellEditor editor = new ComboBoxCellEditor(comboBox); - - addColumnToModel(model, - editor, - newTableCellRender(decorator), - column); +// Decorator<Caracteristic> decorator = +// getDecorator(Caracteristic.class, null); +// +// final JComboBox comboBox = new JComboBox(); +// +// comboBox.setRenderer(newListCellRender(decorator)); +// +// List<Caracteristic> dataToList = Lists.newArrayList(getModel().getCaracteristics()); +// +// // add a null value at first position +// if (!dataToList.isEmpty() && dataToList.get(0) != null) { +// dataToList.add(0, null); +// } +// SwingUtil.fillComboBox(comboBox, dataToList, null); +// +// ObjectToStringConverter converter = BeanUIUtil.newDecoratedObjectToStringConverter(decorator); +// BeanUIUtil.decorate(comboBox, converter); +// ComboBoxCellEditor editor = new ComboBoxCellEditor(comboBox); +// +// addColumnToModel(model, +// editor, +// newTableCellRender(decorator), +// column); } protected void initTable(final JXTable table, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.