- Tutti-commits - mailman.cloud.codelutin.com

r199 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/protocol resources/i18n
by tchemit＠users.forge.codelutin.com 15 Jan '13

15 Jan '13

Author: tchemit Date: 2013-01-15 08:18:44 +0100 (Tue, 15 Jan 2013) New Revision: 199 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/199 Log: add new tabs to protocol Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 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/protocol/EditProtocolUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-01-14 22:19:32 UTC (rev 198) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-01-15 07:18:44 UTC (rev 199) @@ -80,7 +80,7 @@ <JMenuItem id='removeSpeciesMenu' onActionPerformed='handler.removeSpecies()'/> </JPopupMenu> - + <JTabbedPane constraints='BorderLayout.CENTER'> <tab title='tutti.label.tab.protocol.info'> <Table id='protocolInfoForm' fill='both'> @@ -92,7 +92,7 @@ </cell> <cell weightx='1.0'> <JTextField id='nameField' - onKeyReleased='handler.setText(event, "name")'/> + onKeyReleased='handler.setText(event, "name")'/> </cell> </row> @@ -100,21 +100,41 @@ <row weighty='0.8'> <cell columns='2'> <JScrollPane id='commentPane' - onFocusGained='commentField.requestFocus()'> + onFocusGained='commentField.requestFocus()'> <JTextArea id='commentField' - onKeyReleased='handler.setText(event, "comment")'/> + onKeyReleased='handler.setText(event, "comment")'/> </JScrollPane> </cell> </row> </Table> </tab> + <tab title='tutti.label.tab.protocol.fishingOperation'> + <Table fill='both' weightx='1'> + <row fill='both' weighty='1'> + <cell fill='both'> + <BeanDoubleList id='gearList' genericType='Caracteristic'/> + </cell> + </row> + <row fill='both' weighty='1'> + <cell fill='both'> + <BeanDoubleList id='environmentList' genericType='Caracteristic'/> + </cell> + </row> + <row fill='both' weighty='1'> + <cell fill='both'> + <BeanDoubleList id='hydrologyList' genericType='Caracteristic'/> + </cell> + </row> + </Table> + </tab> + <tab title='tutti.label.tab.protocol.species'> <Table fill='both'> <row fill='both'> <cell fill='both' weightx='1'> <BeanComboBox id='speciesComboBox' constructorParams='this' - genericType='Species'/> + genericType='Species'/> </cell> <cell fill='both'> <JButton id='addRow' onActionPerformed='handler.addRow()'/> @@ -123,33 +143,27 @@ <row fill='both' weighty='1'> <cell fill='both' columns='2'> <JScrollPane> - <JXTable id='speciesTable' onMouseClicked='handler.autoSelectRowInTable(event, tablePopup)'/> + <JXTable id='speciesTable' + onMouseClicked='handler.autoSelectRowInTable(event, tablePopup)'/> </JScrollPane> </cell> </row> </Table> </tab> + <tab title='tutti.label.tab.protocol.benthos'> + <JLabel text='tutti.to.be.done' enabled='false' + horizontalAlignment="{JLabel.CENTER}"/> + </tab> + <tab title='tutti.label.tab.protocol.plankton'> + <JLabel text='tutti.to.be.done' enabled='false' + horizontalAlignment="{JLabel.CENTER}"/> + </tab> + <tab title='tutti.label.tab.protocol.accidental'> + <JLabel text='tutti.to.be.done' enabled='false' + horizontalAlignment="{JLabel.CENTER}"/> + </tab> - <tab title='tutti.label.tab.protocol.pmfm'> - <Table fill='both' weightx='1'> - <row fill='both' weighty='1'> - <cell fill='both'> - <BeanDoubleList id='gearList' genericType='Caracteristic'/> - </cell> - </row> - <row fill='both' weighty='1'> - <cell fill='both'> - <BeanDoubleList id='environmentList' - genericType='Caracteristic'/> - </cell> - </row> - <row fill='both' weighty='1'> - <cell fill='both'> - <BeanDoubleList id='hydrologyList' genericType='Caracteristic'/> - </cell> - </row> - </Table> - </tab> + </JTabbedPane> <JPanel layout='{new GridLayout(1, 0)}' constraints='BorderLayout.SOUTH'> 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-14 22:19:32 UTC (rev 198) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-15 07:18:44 UTC (rev 199) @@ -158,8 +158,11 @@ tutti.label.tab.macroDechet=Macro déchets tutti.label.tab.observationIndividuel=Observations individuelles tutti.label.tab.plancton=Plancton +tutti.label.tab.protocol.accidental=Accidental +tutti.label.tab.protocol.benthos=Benthos +tutti.label.tab.protocol.fishingOperation=Trait tutti.label.tab.protocol.info=Informations générales -tutti.label.tab.protocol.pmfm=PMFM +tutti.label.tab.protocol.plankton=Plancton tutti.label.tab.protocol.species=Espèces tutti.label.tab.species=Espèces tutti.label.traitReminder=Trait \: %s

1 0

r198 - in trunk: tutti-persistence/src/main/xmi tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split
by tchemit＠users.forge.codelutin.com 14 Jan '13

14 Jan '13

Author: tchemit Date: 2013-01-14 23:19:32 +0100 (Mon, 14 Jan 2013) New Revision: 198 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/198 Log: refs #1805: [Onglet Poisson] Assistance ?\195?\160 la saisie des lots de poissons Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel.java Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-01-14 21:43:11 UTC (rev 197) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-01-14 22:19:32 UTC (rev 198) @@ -145,7 +145,7 @@ SpeciesBatchUIModel model = getModel(); - Multimap<CaracteristicQualitativeValue, Species> availableSpecies = + Multimap<CaracteristicQualitativeValue, Species> speciesUsed = ArrayListMultimap.create(); List<SpeciesBatchRowModel> rows; @@ -162,8 +162,6 @@ if (!TuttiEntities.isNew(bean)) { - Set<Species> speciesUsed = Sets.newHashSet(); - // get all batch species root (says the one with only a species sample category) List<SpeciesBatch> catches = persistenceService.getAllRootSpeciesBatch(bean.getId()); @@ -173,18 +171,17 @@ // root batch sample categroy is species Preconditions.checkState( aBatch.getSampleCategoryType() == SampleCategoryEnum.sortedUnsorted, - "Root species batch must be a species sample " + + "Root species batch must be a sortedUnsorted sample " + "category but was:" + aBatch.getSampleCategoryType()); SpeciesBatchRowModel rootRow = loadSpeciesBatch(aBatch, null, rows); - speciesUsed.add(rootRow.getSpecies()); + speciesUsed.put(rootRow.getSortedUnsortedCategoryValue(), rootRow.getSpecies()); } - availableSpecies.removeAll(speciesUsed); } } - model.setSpeciesUsed(availableSpecies); + model.setSpeciesUsed(speciesUsed); model.setRows(rows); recomputeBatchActionEnable(); } @@ -604,7 +601,6 @@ // update species used map getModel().getSpeciesUsed().put(sortedUnsortedCategory, species); - } // reset create ui @@ -759,8 +755,6 @@ table.getCellEditor().stopCellEditing(); } } - - } public void removeSpeciesSubBatch() { @@ -867,6 +861,7 @@ FishingOperation fishingOperation = getModel().getFishingOperation(); Preconditions.checkNotNull(fishingOperation); + Preconditions.checkNotNull(row.getSpecies()); SampleCategory<?> sampleCategory = row.getSampleCategory(); Preconditions.checkNotNull(sampleCategory); Preconditions.checkNotNull(sampleCategory.getCategoryType()); @@ -1090,6 +1085,7 @@ // copy back parent data (mainly other sample categories) + newRow.setSpecies(parentRow.getSpecies()); newRow.setSpeciesToConfirm(parentRow.getSpeciesToConfirm()); newRow.setBatchParent(parentRow); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel.java 2013-01-14 21:43:11 UTC (rev 197) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel.java 2013-01-14 22:19:32 UTC (rev 198) @@ -30,7 +30,6 @@ import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import java.util.List; -import java.util.Set; /** * Model of {@link CreateSpeciesBatchUI}. @@ -146,24 +145,6 @@ public boolean isSpeciesAndCategoryAvailable(Species species, CaracteristicQualitativeValue sortedUnsortedCategory) { boolean result = !speciesUsed.containsEntry(sortedUnsortedCategory, species); - - if (result) { - - // species - category still no used - - Set<CaracteristicQualitativeValue> categories = speciesUsed.keySet(); - result = categories.isEmpty(); - for (CaracteristicQualitativeValue category : categories) { - - if (!speciesUsed.containsEntry(category, species)) { - - // ok found a category available - result = true; - break; - } - } - - } return result; } } \ No newline at end of file

1 0

r197 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/service tutti-service/src/main/java/fr/ifremer/tutti/service tutti-ui-swing
by tchemit＠users.forge.codelutin.com 14 Jan '13

14 Jan '13

Author: tchemit Date: 2013-01-14 22:43:11 +0100 (Mon, 14 Jan 2013) New Revision: 197 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/197 Log: refs #1805: [Onglet Poisson] Assistance ?\195?\160 la saisie des lots de poissons Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiEnumerationFile.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceDevImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategory.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel.java trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel-error-validation.xml trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-01-14 18:25:01 UTC (rev 196) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-01-14 21:43:11 UTC (rev 197) @@ -35,6 +35,7 @@ import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Country; import fr.ifremer.tutti.persistence.entities.referential.FishingOperationLocation; import fr.ifremer.tutti.persistence.entities.referential.Gear; @@ -143,6 +144,8 @@ Vessel getVessel(String vesselCode); + boolean isSortedQualitativeValue(CaracteristicQualitativeValue value); + //------------------------------------------------------------------------// //-- Program methods --// //------------------------------------------------------------------------// Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-01-14 18:25:01 UTC (rev 196) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-01-14 21:43:11 UTC (rev 197) @@ -27,6 +27,7 @@ import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Country; import fr.ifremer.tutti.persistence.entities.referential.FishingOperationLocation; import fr.ifremer.tutti.persistence.entities.referential.Gear; @@ -126,4 +127,6 @@ Person getPerson(Integer personId); Gear getGear(Integer gearId); + + boolean isSortedQualitativeValue(CaracteristicQualitativeValue value); } Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiEnumerationFile.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiEnumerationFile.java 2013-01-14 18:25:01 UTC (rev 196) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiEnumerationFile.java 2013-01-14 21:43:11 UTC (rev 197) @@ -116,15 +116,18 @@ @Value("${LocationLevelId.RECTANGLE_STATISTIQUE_MED}") public final Integer RECTANGLE_STATISTIQUE_MED = null; + @Value("${QualitativeValueId.VRAC}") + public final Integer QUALITATIVE_VRAC_ID = null; + @Value("${StatusCode.ENABLE}") public final String STATUS_VALID_CODE = null; @Value("${StatusCode.TEMPORARY}") public final String STATUS_TEMPORARY_CODE = null; - + @Value("${PersonId.UNKNOWN_RECORDER_PERSON}") public final Integer PERSON_ID_UNKNOWN_RECORDER_PERSON = null; - + @Value("${QualityFlagCode.NOTQUALIFIED}") public final String QUALITY_FLAG_CODE_NOT_QUALIFIED = null; @@ -160,5 +163,6 @@ Preconditions.checkNotNull(RECTANGLE_STATISTIQUE_MED, "LocationLevelId.RECTANGLE_STATISTIQUE_MED constant not found"); Preconditions.checkNotNull(STATUS_VALID_CODE, "StatusCode.ENABLE constant not found"); Preconditions.checkNotNull(STATUS_TEMPORARY_CODE, "StatusCode.TEMPORARY constant not found"); + Preconditions.checkNotNull(QUALITATIVE_VRAC_ID, "QualitativeValueId.VRAC constant not found"); } } Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java 2013-01-14 18:25:01 UTC (rev 196) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java 2013-01-14 21:43:11 UTC (rev 197) @@ -35,6 +35,7 @@ import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Country; import fr.ifremer.tutti.persistence.entities.referential.FishingOperationLocation; import fr.ifremer.tutti.persistence.entities.referential.Gear; @@ -73,7 +74,7 @@ LogFactory.getLog(TuttiPersistenceAdagioImpl.class); @Autowired(required = true) - protected ReferentialPersistenceService referentielService; + protected ReferentialPersistenceService referentialService; @Autowired(required = true) protected ProgramPersistenceService programService; @@ -130,132 +131,137 @@ @Override public List<Zone> getAllProgramZone() { - return referentielService.getAllProgramZone(); + return referentialService.getAllProgramZone(); } @Override public List<Country> getAllCountry() { - return referentielService.getAllCountry(); + return referentialService.getAllCountry(); } @Override public List<Vessel> getAllScientificVessel() { - return referentielService.getAllScientificVessel(); + return referentialService.getAllScientificVessel(); } @Override public List<Vessel> getAllFishingVessel() { - return referentielService.getAllFishingVessel(); + return referentialService.getAllFishingVessel(); } @Override public List<Species> getAllSpecies() { - return referentielService.getAllSpecies(); + return referentialService.getAllSpecies(); } @Override public List<Species> getAllBenthosSpecies() { - return referentielService.getAllBenthosSpecies(); + return referentialService.getAllBenthosSpecies(); } @Override public List<Species> getAllPlanktonSpecies() { - return referentielService.getAllPlanktonSpecies(); + return referentialService.getAllPlanktonSpecies(); } @Override public Species getSpecies(String speciesId) { - return referentielService.getSpecies(speciesId); + return referentialService.getSpecies(speciesId); } @Override public List<FishingOperationLocation> getAllFishingOperationStrata(String zoneId) { - return referentielService.getAllFishingOperationStrata(zoneId); + return referentialService.getAllFishingOperationStrata(zoneId); } @Override public List<FishingOperationLocation> getAllFishingOperationSubStrata(String locationId) { - return referentielService.getAllFishingOperationSubStrata(locationId); + return referentialService.getAllFishingOperationSubStrata(locationId); } @Override public List<FishingOperationLocation> getAllFishingOperationLocation(String locationId) { - return referentielService.getAllFishingOperationLocation(locationId); + return referentialService.getAllFishingOperationLocation(locationId); } @Override public List<Caracteristic> getAllFishingOperationEnvironmentCaracteristic() { - return referentielService.getAllFishingOperationEnvironmentCaracteristic(); + return referentialService.getAllFishingOperationEnvironmentCaracteristic(); } @Override public List<Caracteristic> getAllFishingOperationGearCaracteristic() { - return referentielService.getAllFishingOperationGearCaracteristic(); + return referentialService.getAllFishingOperationGearCaracteristic(); } @Override public List<Caracteristic> getAllFishingOperationHydrologicCaracteristic() { - return referentielService.getAllFishingOperationHydrologicCaracteristic(); + return referentialService.getAllFishingOperationHydrologicCaracteristic(); } @Override public List<Caracteristic> getAllSpeciesLengthStepCaracteristic() { - return referentielService.getAllSpeciesLengthStepCaracteristic(); + return referentialService.getAllSpeciesLengthStepCaracteristic(); } @Override public Caracteristic getSizeCategoryCaracteristic() { - return referentielService.getSizeCategoryCaracteristic(); + return referentialService.getSizeCategoryCaracteristic(); } @Override public Caracteristic getSexCaracteristic() { - return referentielService.getSexCaracteristic(); + return referentialService.getSexCaracteristic(); } @Override public Caracteristic getSortedUnsortedCaracteristic() { - return referentielService.getSortedUnsortedCaracteristic(); + return referentialService.getSortedUnsortedCaracteristic(); } @Override public Caracteristic getMaturityCaracteristic() { - return referentielService.getMaturityCaracteristic(); + return referentialService.getMaturityCaracteristic(); } @Override public Caracteristic getMacroWasteCategoryCaracteristic() { - return referentielService.getMacroWasteCategoryCaracteristic(); + return referentialService.getMacroWasteCategoryCaracteristic(); } @Override public Caracteristic getMacroWasteSizeCategoryCaracteristic() { - return referentielService.getMacroWasteSizeCategoryCaracteristic(); + return referentialService.getMacroWasteSizeCategoryCaracteristic(); } @Override public List<Gear> getAllScientificGear() { - return referentielService.getAllScientificGear(); + return referentialService.getAllScientificGear(); } @Override public List<Gear> getAllFishingGear() { - return referentielService.getAllFishingGear(); + return referentialService.getAllFishingGear(); } @Override public List<Person> getAllPerson() { - return referentielService.getAllPerson(); + return referentialService.getAllPerson(); } @Override public Vessel getVessel(String vesselCode) { - return referentielService.getVessel(vesselCode); + return referentialService.getVessel(vesselCode); } @Override + public boolean isSortedQualitativeValue(CaracteristicQualitativeValue value) { + return referentialService.isSortedQualitativeValue(value); + } + + @Override public Person getPerson(Integer personId) { - return referentielService.getPerson(personId); + return referentialService.getPerson(personId); } //------------------------------------------------------------------------// Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-01-14 18:25:01 UTC (rev 196) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-01-14 21:43:11 UTC (rev 197) @@ -157,7 +157,7 @@ "refDate", DateType.INSTANCE, new Date(), "statusValidCode", StringType.INSTANCE, enumeration.STATUS_VALID_CODE, "statusTemporaryCode", StringType.INSTANCE, enumeration.STATUS_TEMPORARY_CODE - ); + ); Vessel result = loadVessel(source); return result; } @@ -227,6 +227,12 @@ } @Override + public boolean isSortedQualitativeValue(CaracteristicQualitativeValue value) { + return value != null && + enumeration.QUALITATIVE_VRAC_ID.toString().equals(value.getId()); + } + + @Override public List<Species> getAllSpecies() { TaxonRefTaxVO[] sources = taxonNameDao.getAllTaxonRefTax(); Modified: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java =================================================================== --- trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-01-14 18:25:01 UTC (rev 196) +++ trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-01-14 21:43:11 UTC (rev 197) @@ -49,6 +49,7 @@ import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Country; import fr.ifremer.tutti.persistence.entities.referential.FishingOperationLocation; import fr.ifremer.tutti.persistence.entities.referential.Gear; @@ -244,6 +245,11 @@ } @Override + public boolean isSortedQualitativeValue(CaracteristicQualitativeValue value) { + return referentialPersistenceService.isSortedQualitativeValue(value); + } + + @Override public List<Species> getAllSpecies() { return referentialPersistenceService.getAllSpecies(); } Modified: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceDevImpl.java =================================================================== --- trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceDevImpl.java 2013-01-14 18:25:01 UTC (rev 196) +++ trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceDevImpl.java 2013-01-14 21:43:11 UTC (rev 197) @@ -29,6 +29,7 @@ import fr.ifremer.tutti.persistence.entities.IdAware; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Country; import fr.ifremer.tutti.persistence.entities.referential.FishingOperationLocation; import fr.ifremer.tutti.persistence.entities.referential.Gear; @@ -224,7 +225,12 @@ return getBean(Gear.class.getName(), gearCode.toString()); } + @Override + public boolean isSortedQualitativeValue(CaracteristicQualitativeValue value) { + return value !=null && value.getId().equals("311"); + } + protected <B extends IdAware> List<B> getData(String entityType) { List<B> result = (List<B>) cache.get(entityType); return result; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-01-14 18:25:01 UTC (rev 196) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-01-14 21:43:11 UTC (rev 197) @@ -39,6 +39,7 @@ import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Country; import fr.ifremer.tutti.persistence.entities.referential.FishingOperationLocation; import fr.ifremer.tutti.persistence.entities.referential.Gear; @@ -280,6 +281,11 @@ } @Override + public boolean isSortedQualitativeValue(CaracteristicQualitativeValue value) { + return devDriver.isSortedQualitativeValue(value); + } + + @Override public Person getPerson(Integer personId) { return devDriver.getPerson(personId); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategory.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategory.java 2013-01-14 18:25:01 UTC (rev 196) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SampleCategory.java 2013-01-14 21:43:11 UTC (rev 197) @@ -25,7 +25,6 @@ */ import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; import java.io.Serializable; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2013-01-14 18:25:01 UTC (rev 196) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2013-01-14 21:43:11 UTC (rev 197) @@ -184,7 +184,7 @@ Multimap<Species, SampleCategoryType> speciesSampleCategories) { super(columnModel, false, false); this.speciesSampleCategories = speciesSampleCategories; - setNoneEditableCols(); + setNoneEditableCols(SPECIES); frequencyCols = Sets.newHashSet(); frequencyCols.add(COMPUTED_NUMBER); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-01-14 18:25:01 UTC (rev 196) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-01-14 21:43:11 UTC (rev 197) @@ -25,6 +25,7 @@ */ import com.google.common.base.Preconditions; +import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.HashMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; @@ -144,8 +145,8 @@ SpeciesBatchUIModel model = getModel(); - List<Species> availableSpecies = - Lists.newArrayList(model.getAllSpecies()); + Multimap<CaracteristicQualitativeValue, Species> availableSpecies = + ArrayListMultimap.create(); List<SpeciesBatchRowModel> rows; @@ -183,7 +184,7 @@ } } - model.setAvailableSpecies(availableSpecies); + model.setSpeciesUsed(availableSpecies); model.setRows(rows); recomputeBatchActionEnable(); } @@ -589,7 +590,11 @@ Species species = createModel.getSpecies(); newRow.setSpecies(species); - //TODO Add sortedUnosrtedCategory + CaracteristicQualitativeValue sortedUnsortedCategory = createModel.getSortedUnsortedCategory(); + SampleCategory<CaracteristicQualitativeValue> category = newRow.getSortedUnsortedCategory(); + category.setCategoryValue(sortedUnsortedCategory); + category.setCategoryWeight(createModel.getBatchWeight()); + newRow.setSampleCategory(category); recomputeRowValidState(newRow); @@ -597,8 +602,8 @@ saveRow(newRow); - // update available species list - getModel().getAvailableSpecies().remove(species); + // update species used map + getModel().getSpeciesUsed().put(sortedUnsortedCategory, species); } @@ -957,8 +962,9 @@ int rowIndex = getTable().getSelectedRow(); - boolean enableAdd = - CollectionUtils.isNotEmpty(getModel().getAvailableSpecies()); + //TODO Improve this test + boolean enableAdd = true; +// CollectionUtils.isNotEmpty(getModel().getAvailableSpecies()); boolean enableSplit = false; boolean enableRemove = false; @@ -992,8 +998,8 @@ if (enableRemove) { - // can remove batch if selected batch is not a leaf - enableRemove = !row.isBatchLeaf(); + // can always remove the batch + enableRemove = true; } if (enableRemoveSub) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2013-01-14 18:25:01 UTC (rev 196) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2013-01-14 21:43:11 UTC (rev 197) @@ -24,6 +24,8 @@ * #L% */ +import com.google.common.collect.Multimap; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; @@ -41,7 +43,7 @@ public static final String PROPERTY_TABLE_VIEW_MODE = "tableViewMode"; - public static final String PROPERTY_AVAILABLE_SPECIES = "availableSpecies"; + public static final String PROPERTY_SPECIES_USED = "speciesUsed"; public static final String PROPERTY_ALL_SPECIES = "allSpecies"; @@ -50,8 +52,15 @@ public static final String PROPERTY_SPLIT_SPECIES_BATCH_ENABLED = "splitSpeciesBatchEnabled"; public static final String PROPERTY_REMOVE_SPECIES_SUB_BATCH_ENABLED = "removeSpeciesSubBatchEnabled"; + public static final String PROPERTY_REMOVE_SPECIES_BATCH_ENABLED = "removeSpeciesBatchEnabled"; + public static final String PROPERTY_TABLE_VIEW_MODE_ALL = "tableViewModeAll"; + + public static final String PROPERTY_TABLE_VIEW_MODE_LEAF = "tableViewModeLeaf"; + + public static final String PROPERTY_TABLE_VIEW_MODE_ROOT = "tableViewModeRoot"; + /** * Sampling order (sets by protocol). * @@ -67,11 +76,11 @@ protected List<Species> allSpecies; /** - * All available species (says available species that are not used in any batch). + * Species already used in some batches. * * @since 0.3 */ - protected List<Species> availableSpecies; + protected Multimap<CaracteristicQualitativeValue, Species> speciesUsed; /** * What to show in the table. @@ -164,9 +173,9 @@ Object oldValue = getTableViewMode(); this.tableViewMode = tableViewMode; firePropertyChange(PROPERTY_TABLE_VIEW_MODE, oldValue, tableViewMode); - firePropertyChange("tableViewModeAll", null, isTableViewModeAll()); - firePropertyChange("tableViewModeLeaf", null, isTableViewModeLeaf()); - firePropertyChange("tableViewModeRoot", null, isTableViewModeRoot()); + firePropertyChange(PROPERTY_TABLE_VIEW_MODE_ALL, null, isTableViewModeAll()); + firePropertyChange(PROPERTY_TABLE_VIEW_MODE_LEAF, null, isTableViewModeLeaf()); + firePropertyChange(PROPERTY_TABLE_VIEW_MODE_ROOT, null, isTableViewModeRoot()); } public boolean isTableViewModeAll() { @@ -191,16 +200,16 @@ firePropertyChange(PROPERTY_ALL_SPECIES, oldValue, allSpecies); } - public List<Species> getAvailableSpecies() { - return availableSpecies; + public Multimap<CaracteristicQualitativeValue, Species> getSpeciesUsed() { + return speciesUsed; } - public void setAvailableSpecies(List<Species> availableSpecies) { - Object oldValue = getAvailableSpecies(); - this.availableSpecies = availableSpecies; - firePropertyChange(PROPERTY_AVAILABLE_SPECIES, oldValue, availableSpecies); + public void setSpeciesUsed(Multimap<CaracteristicQualitativeValue, Species> speciesUsed) { + this.speciesUsed = speciesUsed; + firePropertyChange(PROPERTY_SPECIES_USED, null, speciesUsed); } + public boolean isCreateSpeciesBatchEnabled() { return createSpeciesBatchEnabled; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.css 2013-01-14 18:25:01 UTC (rev 196) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.css 2013-01-14 21:43:11 UTC (rev 197) @@ -52,6 +52,16 @@ data: {model.getAvailableSpecies()}; } +#sortedUnsortedCategoryLabel { + text: "tutti.label.createSpeciesBatch.sortedUnsortedCategory"; + labelFor: {sortedUnsortedCategoryComboBox}; +} + +#sortedUnsortedCategoryComboBox { + property: sortedUnsortedCategory; + selectedItem: {model.getSortedUnsortedCategory()}; +} + #batchWeightLabel { text: "tutti.label.createSpeciesBatch.batchWeight"; labelFor: {batchWeightField}; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx 2013-01-14 18:25:01 UTC (rev 196) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.jaxx 2013-01-14 21:43:11 UTC (rev 197) @@ -26,6 +26,7 @@ <import> fr.ifremer.tutti.persistence.entities.referential.Species + fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue fr.ifremer.tutti.ui.swing.content.operation.catches.species.SampleCategoryType fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI @@ -72,6 +73,8 @@ <BeanValidator id='validator' bean='model' errorTableModel='errorTableModel' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> <field name='species' component='speciesComboBox'/> + <field name='sortedUnsortedCategory' + component='sortedUnsortedCategoryComboBox'/> <field name='batchWeight' component='batchWeightField'/> </BeanValidator> @@ -90,6 +93,18 @@ </cell> </row> +  + <row> + <cell anchor='west'> + <JLabel id='sortedUnsortedCategoryLabel'/> + </cell> + <cell weightx='1.0'> + <BeanComboBox id='sortedUnsortedCategoryComboBox' + constructorParams='this' + genericType='CaracteristicQualitativeValue'/> + </cell> + </row> +  <row> <cell anchor='west'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-01-14 18:25:01 UTC (rev 196) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-01-14 21:43:11 UTC (rev 197) @@ -24,8 +24,14 @@ * #L% */ +import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; +import com.google.common.collect.Multimap; +import fr.ifremer.tutti.persistence.TuttiPersistence; +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.service.PersistenceService; import fr.ifremer.tutti.ui.swing.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; @@ -35,6 +41,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.List; /** @@ -56,9 +64,27 @@ */ private final CreateSpeciesBatchUI ui; - public CreateSpeciesBatchUIHandler(SpeciesBatchUI parentUi, CreateSpeciesBatchUI ui) { + private final TuttiPersistence persistenceService; + + private final CaracteristicQualitativeValue sortedValue; + + public CreateSpeciesBatchUIHandler(SpeciesBatchUI parentUi, + CreateSpeciesBatchUI ui) { super(parentUi.getHandler().getContext()); this.ui = ui; + persistenceService = context.getService(PersistenceService.class); + + Caracteristic caracteristic = + persistenceService.getSortedUnsortedCaracteristic(); + + CaracteristicQualitativeValue v = null; + for (CaracteristicQualitativeValue value : caracteristic.getQualitativeValue()) { + if (persistenceService.isSortedQualitativeValue(value)) { + v = value; + break; + } + } + sortedValue = v; } //------------------------------------------------------------------------// @@ -82,6 +108,52 @@ Lists.<Species>newArrayList(), null); + Caracteristic caracteristic = + persistenceService.getSortedUnsortedCaracteristic(); + + initBeanComboBox(ui.getSortedUnsortedCategoryComboBox(), + caracteristic.getQualitativeValue(), + null); + + getModel().addPropertyChangeListener(CreateSpeciesBatchUIModel.PROPERTY_SPECIES, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + + CreateSpeciesBatchUIModel source = + (CreateSpeciesBatchUIModel) evt.getSource(); + Species newValue = (Species) evt.getNewValue(); + + if (log.isInfoEnabled()) { + log.info("New Selected species "+(newValue==null?null:newValue.getCodeMemo())); + } + + if (newValue == null || source.getSpeciesUsed() == null) { + + source.setSortedUnsortedCategory(null); + + } else { + + // look for best value : if sorted is available then use it + + List<CaracteristicQualitativeValue> qualitativeValues = + ui.getSortedUnsortedCategoryComboBox().getData(); + + CaracteristicQualitativeValue newCategory = null; + + for (CaracteristicQualitativeValue qualitativeValue : qualitativeValues) { + if (source.isSpeciesAndCategoryAvailable(newValue, qualitativeValue)) { + newCategory = qualitativeValue; + + if (newCategory.equals(sortedValue)) { + break; + } + } + } + source.setSortedUnsortedCategory(newCategory); + } + } + }); + SwingValidatorUtil.installUI(ui.getErrorTable(), new SwingValidatorMessageTableRenderer()); @@ -135,13 +207,28 @@ ui.getValidator().setBean(model); model.setSpecies(null); + model.setSortedUnsortedCategory(null); model.setBatchWeight(null); List<Species> speciesToUse = Lists.newArrayList(); - if (batchModel != null) { + Multimap<CaracteristicQualitativeValue, Species> speciesUsed; + boolean reset = batchModel == null; + if (reset) { + speciesUsed = ArrayListMultimap.create(); + } else { + speciesUsed = batchModel.getSpeciesUsed(); + } - speciesToUse.addAll(batchModel.getAvailableSpecies()); + model.setSpeciesUsed(speciesUsed); + + if (!reset) { + + // compute which species can still be used + + List<Species> allSpecies = batchModel.getAllSpecies(); + + speciesToUse.addAll(allSpecies); } ui.getSpeciesComboBox().setData(speciesToUse); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel.java 2013-01-14 18:25:01 UTC (rev 196) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel.java 2013-01-14 21:43:11 UTC (rev 197) @@ -24,10 +24,13 @@ * #L% */ +import com.google.common.collect.Multimap; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import java.util.List; +import java.util.Set; /** * Model of {@link CreateSpeciesBatchUI}. @@ -43,6 +46,8 @@ public static final String PROPERTY_SPECIES = "species"; + public static final String PROPERTY_SORTED_UNSORTED_CATEGORY = "sortedUnsortedCategory"; + public static final String PROPERTY_BATCH_WEIGHT = "batchWeight"; /** @@ -60,12 +65,26 @@ protected Species species; /** + * Sorted Unsorted category. + * + * @since 0.3 + */ + protected CaracteristicQualitativeValue sortedUnsortedCategory; + + /** * Incoming batch weight to split. * * @since 0.3 */ protected Float batchWeight; + /** + * Already used species by sortedUnsorted category. + * + * @since 0.3 + */ + protected Multimap<CaracteristicQualitativeValue, Species> speciesUsed; + public CreateSpeciesBatchUIModel() { super(CreateSpeciesBatchUIModel.class, null, null); } @@ -90,6 +109,16 @@ firePropertyChange(PROPERTY_SPECIES, oldSpecies, getSpecies()); } + public CaracteristicQualitativeValue getSortedUnsortedCategory() { + return sortedUnsortedCategory; + } + + public void setSortedUnsortedCategory(CaracteristicQualitativeValue sortedUnsortedCategory) { + Object oldSpecies = getSortedUnsortedCategory(); + this.sortedUnsortedCategory = sortedUnsortedCategory; + firePropertyChange(PROPERTY_SORTED_UNSORTED_CATEGORY, oldSpecies, sortedUnsortedCategory); + } + public Float getBatchWeight() { return batchWeight; } @@ -100,4 +129,41 @@ firePropertyChange(PROPERTY_BATCH_WEIGHT, oldValue, batchWeight); } + public void setSpeciesUsed(Multimap<CaracteristicQualitativeValue, Species> speciesUsed) { + this.speciesUsed = speciesUsed; + } + + public Multimap<CaracteristicQualitativeValue, Species> getSpeciesUsed() { + return speciesUsed; + } + + public boolean isSpeciesAndCategoryAvailable() { + boolean result = species != null && sortedUnsortedCategory != null && + isSpeciesAndCategoryAvailable(species, sortedUnsortedCategory); + return result; + } + + public boolean isSpeciesAndCategoryAvailable(Species species, + CaracteristicQualitativeValue sortedUnsortedCategory) { + boolean result = !speciesUsed.containsEntry(sortedUnsortedCategory, species); + + if (result) { + + // species - category still no used + + Set<CaracteristicQualitativeValue> categories = speciesUsed.keySet(); + result = categories.isEmpty(); + for (CaracteristicQualitativeValue category : categories) { + + if (!speciesUsed.containsEntry(category, species)) { + + // ok found a category available + result = true; + break; + } + } + + } + return result; + } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel-error-validation.xml 2013-01-14 18:25:01 UTC (rev 196) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIModel-error-validation.xml 2013-01-14 21:43:11 UTC (rev 197) @@ -31,8 +31,31 @@ <message>tutti.validator.error.createSpeciesBatch.species.required </message> </field-validator> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ sortedUnsortedCategory == null || speciesAndCategoryAvailable ]]> + </param> + <message> + tutti.validator.error.createSpeciesBatch.speciesAndCategory.notAvailable + </message> + </field-validator> </field> + <field name="sortedUnsortedCategory"> + <field-validator type="required" short-circuit="true"> + <message>tutti.validator.error.createSpeciesBatch.sortedUnsortedCategory.required + </message> + </field-validator> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ species == null || speciesAndCategoryAvailable ]]> + </param> + <message> + tutti.validator.error.createSpeciesBatch.speciesAndCategory.notAvailable + </message> + </field-validator> + </field> + <field name="batchWeight"> <field-validator type="required" short-circuit="true"> 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-14 18:25:01 UTC (rev 196) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-14 21:43:11 UTC (rev 197) @@ -79,6 +79,7 @@ tutti.label.catches.speciesTotalWeight=Poids TOTAL (kg) tutti.label.comment=Commentaire tutti.label.createSpeciesBatch.batchWeight=Poids du lot +tutti.label.createSpeciesBatch.sortedUnsortedCategory=V / HV tutti.label.createSpeciesBatch.species=Espèce du lot tutti.label.cruise=Campagne tutti.label.cruise.beginDate=Date de début @@ -277,7 +278,9 @@ tutti.tooltip.comment.none=Pas de commentaire tutti.validator.error.createSpeciesBatch.batchWeight.invalidValue=Le poids du lot doit être strictement positif tutti.validator.error.createSpeciesBatch.batchWeight.required=Le poids du lot est obligatoire +tutti.validator.error.createSpeciesBatch.sortedUnsortedCategory.required=LA catégorie Vrac / Hors Vrac est obligatoire tutti.validator.error.createSpeciesBatch.species.required=L'espèce est obligatoire +tutti.validator.error.createSpeciesBatch.speciesAndCategory.notAvailable=Couple (espèce - Vrac/Hors Vrac) déjà utilisée tutti.validator.error.cruise.beginDate.required=La date de début est obligatoire tutti.validator.error.cruise.country.required=Le pays est obligatoire tutti.validator.error.cruise.endDate.required=La date de fin est obligatoire

1 0

r196 - trunk
by tchemit＠users.forge.codelutin.com 14 Jan '13

14 Jan '13

Author: tchemit Date: 2013-01-14 19:25:01 +0100 (Mon, 14 Jan 2013) New Revision: 196 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/196 Log: updates to stable adagio version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-01-14 17:46:19 UTC (rev 195) +++ trunk/pom.xml 2013-01-14 18:25:01 UTC (rev 196) @@ -136,7 +136,7 @@ <slf4jVersion>1.7.2</slf4jVersion> - <adagioVersion>3.3.1-SNAPSHOT</adagioVersion> + <adagioVersion>3.3.1-rev-401</adagioVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion>

1 0

r195 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing: environment gearshooting hydrology
by kmorin＠users.forge.codelutin.com 14 Jan '13

14 Jan '13

Author: kmorin Date: 2013-01-14 18:46:19 +0100 (Mon, 14 Jan 2013) New Revision: 195 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/195 Log: debug NPE Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java 2013-01-14 17:40:34 UTC (rev 194) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java 2013-01-14 17:46:19 UTC (rev 195) @@ -230,9 +230,11 @@ TuttiProtocol protocol = ui.getContextValue(TuttiProtocol.class); List<String> environmentPmfmIds = Lists.newArrayList(); - List<String> protocolEnvironmentPmfmId = protocol.getEnvironmentPmfmId(); - if (protocol != null && protocolEnvironmentPmfmId != null) { - environmentPmfmIds.addAll(protocolEnvironmentPmfmId); + if (protocol != null) { + List<String> protocolEnvironmentPmfmId = protocol.getEnvironmentPmfmId(); + if (protocolEnvironmentPmfmId != null) { + environmentPmfmIds.addAll(protocolEnvironmentPmfmId); + } } List<EnvironmentRowModel> rows = Lists.newArrayList(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java 2013-01-14 17:40:34 UTC (rev 194) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java 2013-01-14 17:46:19 UTC (rev 195) @@ -233,9 +233,11 @@ TuttiProtocol protocol = ui.getContextValue(TuttiProtocol.class); List<String> gearPmfmIds = Lists.newArrayList(); - List<String> protocolGearPmfmId = protocol.getGearPmfmId(); - if (protocol != null && protocolGearPmfmId != null) { - gearPmfmIds.addAll(protocolGearPmfmId); + if (protocol != null) { + List<String> protocolGearPmfmId = protocol.getGearPmfmId(); + if (protocolGearPmfmId != null) { + gearPmfmIds.addAll(protocolGearPmfmId); + } } List<GearShootingRowModel> rows = Lists.newArrayList(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java 2013-01-14 17:40:34 UTC (rev 194) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java 2013-01-14 17:46:19 UTC (rev 195) @@ -286,7 +286,10 @@ TuttiProtocol protocol = ui.getContextValue(TuttiProtocol.class); List<String> gearPmfmIds = Lists.newArrayList(); if (protocol != null) { - gearPmfmIds.addAll(protocol.getHydrologyPmfmId()); + List<String> protocolHydrologyPmfmId = protocol.getHydrologyPmfmId(); + if (protocolHydrologyPmfmId != null) { + gearPmfmIds.addAll(protocolHydrologyPmfmId); + } } List<HydrologyRowModel> rows = Lists.newArrayList();

1 0

r194 - in trunk: tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence-adagio/src/main/resources tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service tutti-service/src/main/java/fr/ifremer/tutti/service tutti-service/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 14 Jan '13

14 Jan '13

Author: tchemit Date: 2013-01-14 18:40:34 +0100 (Mon, 14 Jan 2013) New Revision: 194 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/194 Log: fix decorator of referentiel Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-01-14 16:35:12 UTC (rev 193) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-01-14 17:40:34 UTC (rev 194) @@ -24,7 +24,6 @@ * #L% */ -import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.adagio.core.dao.referential.StatusDao; import fr.ifremer.adagio.core.dao.referential.taxon.TaxonNameExtendDao; @@ -90,8 +89,8 @@ Object[] source = list.next(); Zone target = new Zone(); target.setId(String.valueOf(source[0])); - target.setName((String) source[1]); - target.setDescription((String) source[2]); + target.setLabel((String) source[1]); + target.setName((String) source[2]); setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[3], target); result.add(target); } @@ -423,29 +422,6 @@ //-- Internal methods --// //------------------------------------------------------------------------// - protected void loadCaracteristicQualitativeValues(Caracteristic caracteristic, - Integer pmfmId) { - Preconditions.checkNotNull(caracteristic, "Caracteristic can not be null"); - Preconditions.checkNotNull(pmfmId, "pmfmId can not be null"); - Preconditions.checkArgument(caracteristic.isQualitativeType(), - "Caracteristic must be a qualitativeValue type"); - - Iterator<Object[]> sources = queryListWithStatus( - "pmfmQualitativeValues", - "pmfmId", IntegerType.INSTANCE, pmfmId); - - List<CaracteristicQualitativeValue> values = Lists.newArrayList(); - while (sources.hasNext()) { - Object[] source = sources.next(); - CaracteristicQualitativeValue target = new CaracteristicQualitativeValue(); - target.setId(String.valueOf(source[0])); - target.setName(String.valueOf(source[1])); - setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[2], target); - values.add(target); - } - caracteristic.setQualitativeValue(values); - } - protected Caracteristic loadCaracteristic(Integer pmfmId) { Object[] source = queryUniqueWithStatus("pmfmById", @@ -453,38 +429,52 @@ "unitIdNone", IntegerType.INSTANCE, enumeration.UNIT_ID_NONE); Caracteristic target = loadCaracteristic(source); - - if (target.isQualitativeType()) { - - // load qualititative values - loadCaracteristicQualitativeValues(target, pmfmId); - } return target; } protected Caracteristic loadCaracteristic(Object[] source) { - Caracteristic target = new Caracteristic(); - target.setId(String.valueOf(source[0])); - target.setParameterName((String) source[1]); - target.setMatrixName((String) source[2]); - target.setFractionName((String) source[3]); - target.setMethodName((String) source[4]); - target.setNumberType((Boolean) source[5]); - target.setQualitativeType((Boolean) source[6]); - target.setSignifFiguresNumber((Integer) source[7]); - target.setMaximumNumberDecimals((Integer) source[8]); - target.setPrecision((Float) source[9]); - target.setUnit((String) source[10]); - setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[11], target); - return target; + Integer pmfmId = (Integer) source[0]; + + Caracteristic result = new Caracteristic(); + result.setId(pmfmId.toString()); + result.setParameterName((String) source[1]); + result.setMatrixName((String) source[2]); + result.setFractionName((String) source[3]); + result.setMethodName((String) source[4]); + result.setNumberType((Boolean) source[5]); + result.setQualitativeType((Boolean) source[6]); + result.setSignifFiguresNumber((Integer) source[7]); + result.setMaximumNumberDecimals((Integer) source[8]); + result.setPrecision((Float) source[9]); + result.setUnit((String) source[10]); + setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[11], result); + + if (result.isQualitativeType()) { + + Iterator<Object[]> sources = queryListWithStatus( + "pmfmQualitativeValues", + "pmfmId", IntegerType.INSTANCE, pmfmId); + + List<CaracteristicQualitativeValue> values = Lists.newArrayList(); + while (sources.hasNext()) { + Object[] source2 = sources.next(); + CaracteristicQualitativeValue target2 = new CaracteristicQualitativeValue(); + target2.setId(String.valueOf(source2[0])); + target2.setName(String.valueOf(source2[1])); + setStatus((fr.ifremer.adagio.core.dao.referential.Status) source2[2], target2); + values.add(target2); + } + result.setQualitativeValue(values); + } + return result; } protected FishingOperationLocation loadFishingOperationLocation(Object[] source) { FishingOperationLocation target = new FishingOperationLocation(); target.setId(String.valueOf(source[0])); - target.setName((String) source[1]); - target.setLabel((String) source[2]); + target.setLabel((String) source[1]); + target.setName((String) source[2]); // target.setDescription((String)source[3]); target.setLocationLevel((Integer) source[3]); @@ -525,8 +515,8 @@ protected Gear loadGear(Object[] source) { Gear result = new Gear(); result.setId(String.valueOf(source[0])); - result.setName((String) source[1]); - result.setLabel((String) source[2]); + result.setLabel((String) source[1]); + result.setName((String) source[2]); setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[3], result); return result; } @@ -534,8 +524,8 @@ protected Iterator<Object[]> queryListWithStatus(String queryName, Object... params) { Query query = createQuery(queryName, params); - query.setString("statusValidCode", enumeration.STATUS_VALID_CODE.toString()); - query.setString("statusTemporaryCode", enumeration.STATUS_TEMPORARY_CODE.toString()); + query.setString("statusValidCode", enumeration.STATUS_VALID_CODE); + query.setString("statusTemporaryCode", enumeration.STATUS_TEMPORARY_CODE); Iterator result = query.iterate(); return result; @@ -544,8 +534,8 @@ protected Object[] queryUniqueWithStatus(String queryName, Object... params) { Query query = createQuery(queryName, params); - query.setString("statusValidCode", enumeration.STATUS_VALID_CODE.toString()); - query.setString("statusTemporaryCode", enumeration.STATUS_TEMPORARY_CODE.toString()); + query.setString("statusValidCode", enumeration.STATUS_VALID_CODE); + query.setString("statusTemporaryCode", enumeration.STATUS_TEMPORARY_CODE); Object result = query.uniqueResult(); return (Object[]) result; Modified: trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml =================================================================== --- trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml 2013-01-14 16:35:12 UTC (rev 193) +++ trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml 2013-01-14 17:40:34 UTC (rev 194) @@ -279,6 +279,8 @@ AND l.status.code IN (:statusValidCode, :statusTemporaryCode) ]]> <query-param name="locationLevelId" type="java.lang.Integer"/> + <query-param name="statusValidCode" type="java.lang.String"/> + <query-param name="statusTemporaryCode" type="java.lang.String"/> </query>  @@ -295,6 +297,8 @@ AND l.status.code IN (:statusValidCode, :statusTemporaryCode) ]]> <query-param name="locationLevelId" type="java.lang.Integer"/> + <query-param name="statusValidCode" type="java.lang.String"/> + <query-param name="statusTemporaryCode" type="java.lang.String"/> </query>  Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java 2013-01-14 16:35:12 UTC (rev 193) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java 2013-01-14 17:40:34 UTC (rev 194) @@ -89,6 +89,7 @@ Assert.assertNotNull(result); } + @Ignore @Test public void createCruise(/*Cruise bean*/) { String programCode = dbResource.getFixtures().programCode(); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-01-14 16:35:12 UTC (rev 193) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-01-14 17:40:34 UTC (rev 194) @@ -103,18 +103,18 @@ registerMultiJXPathDecorator(Cruise.class, "${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(TuttiProtocol.class, "${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(FishingOperation.class, "${stationNumber}$s#${fishingOperationNumber}$s#${date}$td/%3$tm/%3$tY", SEPARATOR, " - "); - registerMultiJXPathDecorator(Zone.class, "${name}$s", SEPARATOR, " - "); - registerMultiJXPathDecorator(Vessel.class, "${name}$s", SEPARATOR, " - "); - registerMultiJXPathDecorator(Country.class, "${name}$s", SEPARATOR, " - "); - registerMultiJXPathDecorator(Gear.class, "${name}$s", SEPARATOR, " - "); - registerMultiJXPathDecorator(Person.class, "${firstName}$s#${lastName}$s", SEPARATOR, " "); - registerMultiJXPathDecorator(FishingOperationLocation.class, "${name}$s", SEPARATOR, " - "); - registerMultiJXPathDecorator(Caracteristic.class, "${name}$s", SEPARATOR, " - "); - registerMultiJXPathDecorator(Caracteristic.class, CARACTERISTIC_WITH_UNIT, "${name}$s (${unit}$s)", SEPARATOR, " - "); + registerMultiJXPathDecorator(Zone.class, "${label}$s#${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Vessel.class, "${name}$s#${internalRegistrationCode}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Country.class, "${label}$s#${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Gear.class, "${label}$s#${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Person.class, "${firstName}$s#${lastName}$s#${department}$s", SEPARATOR, " "); + registerMultiJXPathDecorator(FishingOperationLocation.class, "${label}$s#${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Caracteristic.class, "${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Caracteristic.class, CARACTERISTIC_WITH_UNIT, "${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s (${unit}$s)", SEPARATOR, " - "); registerMultiJXPathDecorator(CaracteristicQualitativeValue.class, "${name}$s", SEPARATOR, " - "); - registerMultiJXPathDecorator(Species.class, "${codeMemo}$s#${genusSpecies}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Species.class, "${codeMemo}$s#${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(Species.class, SPECIES_BY_CODE, "${codeMemo}$s", SEPARATOR, " - "); - registerMultiJXPathDecorator(Species.class, SPECIES_BY_GENUS, "${genusSpecies}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Species.class, SPECIES_BY_GENUS, "${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(SpeciesProtocol.class, "${speciesId}", SEPARATOR, " - "); registerMultiJXPathDecorator(Attachment.class, "${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(LabelAware.class, "${label}$s", SEPARATOR, " - "); @@ -132,12 +132,19 @@ static { n_("tutti.property.protocol"); + n_("tutti.property.label"); n_("tutti.property.name"); n_("tutti.property.firstName"); n_("tutti.property.lastName"); + n_("tutti.property.department"); n_("tutti.property.stationNumber"); + n_("tutti.property.internalRegistrationCode"); n_("tutti.property.date"); n_("tutti.property.program"); + n_("tutti.property.parameterName"); + n_("tutti.property.matrixName"); + n_("tutti.property.fractionName"); + n_("tutti.property.methodName"); n_("tutti.property.cruise"); n_("tutti.property.fishingOperation"); n_("tutti.property.zone"); Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-01-14 16:35:12 UTC (rev 193) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-01-14 17:40:34 UTC (rev 194) @@ -8,13 +8,20 @@ tutti.property.country=Pays tutti.property.cruise=Campagne tutti.property.date=Date +tutti.property.department=Département tutti.property.firstName=Prénom tutti.property.fishingOperation=Trait +tutti.property.fractionName=Fraction tutti.property.gear=Engin tutti.property.genusSpecies=Nom scientifique +tutti.property.internalRegistrationCode=Immatriculation internationale +tutti.property.label=Code tutti.property.lastName=Nom de Famille tutti.property.macroWasteCategory=Type de macro déchet +tutti.property.matrixName=Support +tutti.property.methodName=Méthode tutti.property.name=Nom +tutti.property.parameterName=Paramètre tutti.property.program=Série de campagne tutti.property.protocol=Protocol de saisie tutti.property.sortedUnsortedCategory=Vrac / Hors Vrac

1 0

r193 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting java/fr/ifremer/tutti/ui/swing/content/protocol java/fr/ifremer/tutti/ui/swing/util resources/i18n
by kmorin＠users.forge.codelutin.com 14 Jan '13

14 Jan '13

Author: kmorin Date: 2013-01-14 17:35:12 +0100 (Mon, 14 Jan 2013) New Revision: 193 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/193 Log: * [PROTOCOL] add columns to species * [FISHING OPERATION] check model validity before saving on operation change * [FISHING OPERATION] save on tab change (not only edit fishing operation tab change) * [FISHING OPERATION] update combo when data change Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TabHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 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/EditProtocolUIModel.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/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-01-14 16:21:51 UTC (rev 192) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-01-14 16:35:12 UTC (rev 193) @@ -41,7 +41,9 @@ import fr.ifremer.tutti.ui.swing.content.operation.fishing.gearshooting.GearShootingTabUIModel; import fr.ifremer.tutti.ui.swing.content.operation.fishing.hydrology.HydrologyTabUI; import fr.ifremer.tutti.ui.swing.content.operation.fishing.hydrology.HydrologyTabUIModel; +import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; import fr.ifremer.tutti.ui.swing.util.CustomTab; +import fr.ifremer.tutti.ui.swing.util.TabHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import java.awt.BorderLayout; import java.beans.PropertyChangeEvent; @@ -63,7 +65,8 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public class EditFishingOperationUIHandler extends AbstractTuttiUIHandler<EditFishingOperationUIModel> { +public class EditFishingOperationUIHandler extends AbstractTuttiTabContainerUIHandler<EditFishingOperationUIModel> + implements TabHandler { /** Logger. */ private static final Log log = @@ -251,36 +254,6 @@ hydrologyModel.setAvailableCaracteristics(persistenceService.getAllFishingOperationHydrologicCaracteristic()); tabPanel.setTabComponentAt(3, new CustomTab(hydrologyModel)); - tabPanel.setModel(new DefaultSingleSelectionModel() { - - @Override - public void setSelectedIndex(int index) { - int currentIndex = tabPanel.getSelectedIndex(); - boolean mustSelectIndex = true; - - if (currentIndex >= 0) { - CustomTab currentTab = (CustomTab) tabPanel.getTabComponentAt(currentIndex); - AbstractTuttiBeanUIModel model = currentTab.getModel(); - - if (TuttiUIContext.VALIDATION_CONTEXT_EDIT.equals(getModel().getValidationContext()) - || model.isValid()) { - if (!model.isCreate() && model.isModify()) { - save(); - } - super.setSelectedIndex(index); - - } else { - mustSelectIndex = false; - } - } - - if (mustSelectIndex) { - super.setSelectedIndex(index); - } - } - - }); - MainUI main = ui.getContextValue(MainUI.class, MainUI.class.getName()); main.clearValidators(); main.registerValidator(ui.getValidator()); @@ -303,6 +276,43 @@ } @Override + protected JTabbedPane getTabPanel() { + return ui.getFishingOperationTabPane(); + } + + @Override + protected boolean onTabChanged(int currentIndex, int newIndex) { + boolean result = super.onTabChanged(currentIndex, newIndex); + if (result && currentIndex != newIndex && currentIndex >= 0) { + CustomTab currentTab = (CustomTab) getTabPanel().getTabComponentAt(currentIndex); + AbstractTuttiBeanUIModel model = currentTab.getModel(); + result = TuttiUIContext.VALIDATION_CONTEXT_EDIT.equals(getModel().getValidationContext()) + || model.isValid(); + + if (result && !model.isCreate() && model.isModify()) { + save(); + } + } + return result; + } + + @Override + public boolean onHideTab() { + AbstractTuttiBeanUIModel model = getModel(); + boolean result = TuttiUIContext.VALIDATION_CONTEXT_EDIT.equals(getModel().getValidationContext()) + || model.isValid(); + if (result && !model.isCreate() && model.isModify()) { + save(); + } + return result; + } + + @Override + public void onShowTab() { + log.info("show tab"); + } + + @Override protected EditFishingOperationUIModel getModel() { return ui.getModel(); } @@ -399,7 +409,7 @@ if (log.isWarnEnabled()) { log.warn("Won't save new fishing operation, use explicit save button instead..."); } - } else { + } else if (beanToSave.isValid()) { if (beanToSave.isUseSexagecimalFormat()) { beanToSave.convertGearShootingCoordinatesDMSToDD(); } @@ -525,4 +535,5 @@ ui.getLocationComboBox().setData(location); } } + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-01-14 16:21:51 UTC (rev 192) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-01-14 16:35:12 UTC (rev 193) @@ -33,6 +33,8 @@ import fr.ifremer.tutti.ui.swing.MainUI; import fr.ifremer.tutti.ui.swing.TuttiUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; +import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; +import fr.ifremer.tutti.ui.swing.util.TabHandler; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,6 +44,8 @@ import java.beans.PropertyChangeListener; import java.util.Date; import java.util.List; +import javax.swing.DefaultSingleSelectionModel; +import javax.swing.JTabbedPane; import static org.nuiton.i18n.I18n._; @@ -51,7 +55,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public class FishingOperationsUIHandler extends AbstractTuttiUIHandler<FishingOperationsUIModel> { +public class FishingOperationsUIHandler extends AbstractTuttiTabContainerUIHandler<FishingOperationsUIModel> { /** Logger. */ private static final Log log = @@ -166,6 +170,11 @@ protected FishingOperationsUIModel getModel() { return ui.getModel(); } + + @Override + protected JTabbedPane getTabPanel() { + return ui.getTabPane(); + } public void createNewFishingOperation() { @@ -238,6 +247,7 @@ if (create) { savedFishingOperation = persistenceService.createFishingOperation(toSave); model.addFishingOperation(savedFishingOperation); + model.setSelectedFishingOperation(savedFishingOperation); } else { savedFishingOperation = persistenceService.saveFishingOperation(toSave); @@ -247,16 +257,7 @@ FishingOperation existingFishingOperation = TuttiEntities.findById(data, savedFishingOperation.getId()); - if (existingFishingOperation != null) { - data.remove(existingFishingOperation); - } - data.add(savedFishingOperation); - - // update model fishingOperation list - model.setFishingOperation(data); + model.updateFishingOperation(existingFishingOperation, savedFishingOperation); } - - // update model selected fishingOperation - model.setSelectedFishingOperation(savedFishingOperation); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java 2013-01-14 16:21:51 UTC (rev 192) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java 2013-01-14 16:35:12 UTC (rev 193) @@ -72,6 +72,24 @@ firePropertyChange(PROPERTY_FISHING_OPERATION, oldValue, this.fishingOperation); } + public void removeFishingOperation(FishingOperation fishingOperation) { + Object oldValue = Lists.newArrayList(getFishingOperation()); + this.fishingOperation.remove(fishingOperation); + firePropertyChange(PROPERTY_FISHING_OPERATION, oldValue, this.fishingOperation); + } + + public void updateFishingOperation(FishingOperation oldFishingOperation, + FishingOperation newFishingOperation) { + int oldFishingOperationIndex = fishingOperation.indexOf(oldFishingOperation); + fishingOperation.remove(oldFishingOperation); + if (oldFishingOperationIndex >= 0) { + fishingOperation.add(oldFishingOperationIndex, newFishingOperation); + } else { + fishingOperation.add(newFishingOperation); + } + firePropertyChange(PROPERTY_FISHING_OPERATION, null, fishingOperation); + } + public FishingOperation getSelectedFishingOperation() { return selectedFishingOperation; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java 2013-01-14 16:21:51 UTC (rev 192) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java 2013-01-14 16:35:12 UTC (rev 193) @@ -230,8 +230,9 @@ TuttiProtocol protocol = ui.getContextValue(TuttiProtocol.class); List<String> environmentPmfmIds = Lists.newArrayList(); - if (protocol != null) { - environmentPmfmIds.addAll(protocol.getEnvironmentPmfmId()); + List<String> protocolEnvironmentPmfmId = protocol.getEnvironmentPmfmId(); + if (protocol != null && protocolEnvironmentPmfmId != null) { + environmentPmfmIds.addAll(protocolEnvironmentPmfmId); } List<EnvironmentRowModel> rows = Lists.newArrayList(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java 2013-01-14 16:21:51 UTC (rev 192) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java 2013-01-14 16:35:12 UTC (rev 193) @@ -233,8 +233,9 @@ TuttiProtocol protocol = ui.getContextValue(TuttiProtocol.class); List<String> gearPmfmIds = Lists.newArrayList(); - if (protocol != null) { - gearPmfmIds.addAll(protocol.getGearPmfmId()); + List<String> protocolGearPmfmId = protocol.getGearPmfmId(); + if (protocol != null && protocolGearPmfmId != null) { + gearPmfmIds.addAll(protocolGearPmfmId); } List<GearShootingRowModel> rows = Lists.newArrayList(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java 2013-01-14 16:21:51 UTC (rev 192) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java 2013-01-14 16:35:12 UTC (rev 193) @@ -38,7 +38,7 @@ public class EditProtocolSpeciesRowModel extends AbstractTuttiBeanUIModel<SpeciesProtocol, EditProtocolSpeciesRowModel> { private static final long serialVersionUID = 1L; - + public static final String PROPERTY_SPECIES = "species"; public static final String PROPERTY_SIZE_ENABLED = "sizeEnabled"; @@ -51,8 +51,12 @@ public static final String PROPERTY_LENGTH_STEP_PMFM = "lengthStepPmfm"; - public static final String PROPERTY_SORTED_UNSORTED = "sortedUnsorted"; + public static final String PROPERTY_WEIGHT_ENABLED = "weightEnabled"; + public static final String PROPERTY_COUNT_IF_NO_FREQUENCY_ENABLED = "countIfNoFrequencyEnabled"; + + public static final String PROPERTY_CALCIFY_SAMPLE_ENABLED = "calcifySampleEnabled"; + protected Species species; protected boolean sizeEnabled; @@ -63,10 +67,14 @@ protected boolean ageEnabled; - protected boolean sortedUnsorted; - protected Caracteristic lengthStepPmfm; + protected boolean weightEnabled; + + protected boolean countIfNoFrequencyEnabled; + + protected boolean calcifySampleEnabled; + protected static final Binder<SpeciesProtocol, EditProtocolSpeciesRowModel> fromBeanBinder = BinderFactory.newBinder(SpeciesProtocol.class, EditProtocolSpeciesRowModel.class); @@ -133,16 +141,6 @@ firePropertyChange(PROPERTY_AGE_ENABLED, oldValue, ageEnabled); } - public boolean isSortedUnsorted() { - return sortedUnsorted; - } - - public void setSortedUnsorted(boolean sortedUnsorted) { - Object oldValue = isSortedUnsorted(); - this.sortedUnsorted = sortedUnsorted; - firePropertyChange(PROPERTY_SORTED_UNSORTED, oldValue, sortedUnsorted); - } - public String getLengthStepPmfmId() { return lengthStepPmfm != null ? lengthStepPmfm.getId() : null; } @@ -156,4 +154,35 @@ this.lengthStepPmfm = lengthStepPmfm; firePropertyChange(PROPERTY_LENGTH_STEP_PMFM, oldValue, lengthStepPmfm); } + + public boolean isWeightEnabled() { + return weightEnabled; + } + + public void setWeightEnabled(boolean weightEnabled) { + Object oldValue = isWeightEnabled(); + this.weightEnabled = weightEnabled; + firePropertyChange(PROPERTY_WEIGHT_ENABLED, oldValue, weightEnabled); + } + + public boolean isCountIfNoFrequencyEnabled() { + return countIfNoFrequencyEnabled; + } + + public void setCountIfNoFrequencyEnabled(boolean countIfNoFrequencyEnabled) { + Object oldValue = isCountIfNoFrequencyEnabled(); + this.countIfNoFrequencyEnabled = countIfNoFrequencyEnabled; + firePropertyChange(PROPERTY_COUNT_IF_NO_FREQUENCY_ENABLED, oldValue, countIfNoFrequencyEnabled); + } + + public boolean isCalcifySampleEnabled() { + return calcifySampleEnabled; + } + + public void setCalcifySampleEnabled(boolean calcifySampleEnabled) { + Object oldValue = isCalcifySampleEnabled(); + this.calcifySampleEnabled = calcifySampleEnabled; + firePropertyChange(PROPERTY_CALCIFY_SAMPLE_ENABLED, oldValue, calcifySampleEnabled); + } + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2013-01-14 16:21:51 UTC (rev 192) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2013-01-14 16:35:12 UTC (rev 193) @@ -67,10 +67,21 @@ n_("tutti.table.protocol.species.header.lengthStep"), n_("tutti.table.protocol.species.header.lengthStep")); - public static final ColumnIdentifier<EditProtocolSpeciesRowModel> SORTED_UNSORTED = ColumnIdentifier.newId( - EditProtocolSpeciesRowModel.PROPERTY_SORTED_UNSORTED, - n_("tutti.table.protocol.species.header.sortedUnsorted"), - n_("tutti.table.protocol.species.header.sortedUnsorted")); + public static final ColumnIdentifier<EditProtocolSpeciesRowModel> WEIGHT_ENABLED = ColumnIdentifier.newId( + EditProtocolSpeciesRowModel.PROPERTY_WEIGHT_ENABLED, + n_("tutti.table.protocol.species.header.weight"), + n_("tutti.table.protocol.species.header.weight")); + + public static final ColumnIdentifier<EditProtocolSpeciesRowModel> COUNT_IF_NO_FREQUENCY_ENABLED = ColumnIdentifier.newId( + EditProtocolSpeciesRowModel.PROPERTY_COUNT_IF_NO_FREQUENCY_ENABLED, + n_("tutti.table.protocol.species.header.countIfNoFrequency"), + n_("tutti.table.protocol.species.header.countIfNoFrequency")); + + public static final ColumnIdentifier<EditProtocolSpeciesRowModel> CALCIFY_SAMPLE_ENABLED = ColumnIdentifier.newId( + EditProtocolSpeciesRowModel.PROPERTY_CALCIFY_SAMPLE_ENABLED, + n_("tutti.table.protocol.species.header.calcifySample"), + n_("tutti.table.protocol.species.header.calcifySample")); + private static final long serialVersionUID = 1L; @@ -87,6 +98,9 @@ result.setSizeEnabled(true); result.setSexEnabled(true); result.setAgeEnabled(true); + result.setWeightEnabled(true); + result.setCountIfNoFrequencyEnabled(true); + result.setCalcifySampleEnabled(true); result.setValid(false); return result; } 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-14 16:21:51 UTC (rev 192) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-01-14 16:35:12 UTC (rev 193) @@ -54,8 +54,6 @@ import javax.swing.table.TableColumnModel; import jaxx.runtime.swing.editor.bean.BeanDoubleList; import jaxx.runtime.validator.swing.SwingValidator; -import jaxx.runtime.validator.swing.SwingValidatorMessageTableRenderer; -import jaxx.runtime.validator.swing.SwingValidatorUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -104,7 +102,9 @@ columToSampleCategory.put(EditProtocolSpeciesTableModel.SEX_ENABLED, SampleCategoryEnum.sex); columToSampleCategory.put(EditProtocolSpeciesTableModel.MATURITY_ENABLED, SampleCategoryEnum.maturity); columToSampleCategory.put(EditProtocolSpeciesTableModel.AGE_ENABLED, SampleCategoryEnum.age); - columToSampleCategory.put(EditProtocolSpeciesTableModel.SORTED_UNSORTED, SampleCategoryEnum.sortedUnsorted); + columToSampleCategory.put(EditProtocolSpeciesTableModel.WEIGHT_ENABLED, SampleCategoryEnum.weight); + columToSampleCategory.put(EditProtocolSpeciesTableModel.COUNT_IF_NO_FREQUENCY_ENABLED, SampleCategoryEnum.countIfNoFrequency); + columToSampleCategory.put(EditProtocolSpeciesTableModel.CALCIFY_SAMPLE_ENABLED, SampleCategoryEnum.calcifySample); } //------------------------------------------------------------------------// @@ -248,7 +248,9 @@ for (SampleCategoryEnum sampleOrder : model.getSampleCategoryOrder()) { ColumnIdentifier<EditProtocolSpeciesRowModel> columnIdentifier = sampleCategoryToColumn.get(sampleOrder); - addBooleanColumnToModel(columnModel, columnIdentifier, table); + if (columnIdentifier != null) { + addBooleanColumnToModel(columnModel, columnIdentifier, table); + } } columnModel.addColumnModelListener(new TableColumnModelListener() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2013-01-14 16:21:51 UTC (rev 192) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java 2013-01-14 16:35:12 UTC (rev 193) @@ -72,7 +72,10 @@ SampleCategoryEnum.size, SampleCategoryEnum.sex, SampleCategoryEnum.maturity, - SampleCategoryEnum.age); + SampleCategoryEnum.age, + SampleCategoryEnum.weight, + SampleCategoryEnum.countIfNoFrequency, + SampleCategoryEnum.calcifySample); /** * Can user remove a selected species? Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java 2013-01-14 16:35:12 UTC (rev 193) @@ -0,0 +1,74 @@ + +package fr.ifremer.tutti.ui.swing.util; + +import fr.ifremer.tutti.ui.swing.AbstractTuttiUIHandler; +import fr.ifremer.tutti.ui.swing.TuttiUI; +import fr.ifremer.tutti.ui.swing.TuttiUIContext; +import java.awt.Component; +import javax.swing.DefaultSingleSelectionModel; +import javax.swing.JTabbedPane; + +/** + * + * @author kmorin <kmorin(a)codelutin.com> + * @since 0.3 + */ +public abstract class AbstractTuttiTabContainerUIHandler<M> extends AbstractTuttiUIHandler<M> { + + protected AbstractTuttiTabContainerUIHandler(TuttiUIContext context) { + super(context); + } + + protected abstract JTabbedPane getTabPanel(); + + protected boolean onTabChanged(int currentIndex, int newIndex) { + boolean result = true; + if (currentIndex != newIndex) { + TabHandler handler = getTabHandler(currentIndex); + if (handler != null) { + result = handler.onHideTab(); + } + + handler = getTabHandler(newIndex); + if (handler != null) { + handler.onShowTab(); + } + } + return result; + } + + protected TabHandler getTabHandler(int index) { + TabHandler tabHandler = null; + JTabbedPane tabPanel = getTabPanel(); + if (index >= 0 && index < tabPanel.getTabCount()) { + Component tab = tabPanel.getComponentAt(index); + if (TuttiUI.class.isInstance(tab)) { + TuttiUI tuttiTab = (TuttiUI) tabPanel.getComponentAt(index); + AbstractTuttiUIHandler handler = tuttiTab.getHandler(); + if (TabHandler.class.isInstance(handler)) { + tabHandler = (TabHandler) handler; + } + } + } + return tabHandler; + } + + protected void initUI(TuttiUI ui) { + super.initUI(ui); + + final JTabbedPane tabPanel = getTabPanel(); + tabPanel.setModel(new DefaultSingleSelectionModel() { + + @Override + public void setSelectedIndex(int index) { + int currentIndex = tabPanel.getSelectedIndex(); + boolean mustChangeTab = onTabChanged(currentIndex, index); + + if (mustChangeTab) { + super.setSelectedIndex(index); + } + } + + }); + } +} Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TabHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TabHandler.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TabHandler.java 2013-01-14 16:35:12 UTC (rev 193) @@ -0,0 +1,14 @@ + +package fr.ifremer.tutti.ui.swing.util; + +/** + * + * @author kmorin <kmorin(a)codelutin.com> + * @since 0.3 + */ +public interface TabHandler { + + boolean onHideTab(); + + void onShowTab(); +} 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-14 16:21:51 UTC (rev 192) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-14 16:35:12 UTC (rev 193) @@ -224,12 +224,14 @@ tutti.table.plankton.batch.header.toConfirm=A Confirmer tutti.table.plankton.batch.header.weight=Poids tutti.table.protocol.species.header.age=Age -tutti.table.protocol.species.header.lengthStep=Classe de Taille +tutti.table.protocol.species.header.calcifySample=Prélèvement de pièces calcifiées +tutti.table.protocol.species.header.countIfNoFrequency=Dénombrement +tutti.table.protocol.species.header.lengthStep=Classe de Taille tutti.table.protocol.species.header.maturity=Maturité tutti.table.protocol.species.header.sex=Sexe tutti.table.protocol.species.header.size=Catégorie Tri -tutti.table.protocol.species.header.sortedUnsorted=Vrac / Hors Vrac tutti.table.protocol.species.header.speciesId=Espèce +tutti.table.protocol.species.header.weight=Pesée tutti.table.species.batch.header.ageCategory=Age tutti.table.species.batch.header.comment=Commentaire tutti.table.species.batch.header.computedNumber=Nombre

1 0

r192 - trunk/tutti-persistence/src/main/xmi
by kmorin＠users.forge.codelutin.com 14 Jan '13

14 Jan '13

Author: kmorin Date: 2013-01-14 17:21:51 +0100 (Mon, 14 Jan 2013) New Revision: 192 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/192 Log: add SampleCategories Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ)

1 0

r191 - in trunk/tutti-persistence-adagio/src: main/java/fr/ifremer/tutti/persistence main/java/fr/ifremer/tutti/persistence/service test/java/fr/ifremer/tutti/persistence/service
by blavenier＠users.forge.codelutin.com 14 Jan '13

14 Jan '13

Author: blavenier Date: 2013-01-14 16:35:44 +0100 (Mon, 14 Jan 2013) New Revision: 191 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/191 Log: fix vessel loading (and query param statusValid, statusTemporary) fix cruise loading to pass Unit test change enumeration on Status into String (= code but not an id) Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiEnumerationFile.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiEnumerationFile.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiEnumerationFile.java 2013-01-14 13:55:40 UTC (rev 190) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiEnumerationFile.java 2013-01-14 15:35:44 UTC (rev 191) @@ -117,10 +117,10 @@ public final Integer RECTANGLE_STATISTIQUE_MED = null; @Value("${StatusCode.ENABLE}") - public final Integer STATUS_VALID_CODE = null; + public final String STATUS_VALID_CODE = null; @Value("${StatusCode.TEMPORARY}") - public final Integer STATUS_TEMPORARY_CODE = null; + public final String STATUS_TEMPORARY_CODE = null; @Value("${PersonId.UNKNOWN_RECORDER_PERSON}") public final Integer PERSON_ID_UNKNOWN_RECORDER_PERSON = null; Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-01-14 13:55:40 UTC (rev 190) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-01-14 15:35:44 UTC (rev 191) @@ -45,10 +45,13 @@ import org.hibernate.type.IntegerType; import org.hibernate.type.StringType; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataRetrievalFailureException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; + +import java.sql.Timestamp; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -119,6 +122,9 @@ "cruiseId", IntegerType.INSTANCE, Integer.valueOf(id), "countryLocationLevelId", IntegerType.INSTANCE, enumeration.LOCATION_LEVEL_ID_COUNTRY); + if (source == null) { + throw new DataRetrievalFailureException("Could not retrieve cruise with id=" + id); + } Cruise result = new Cruise(); result.setId(id); @@ -138,45 +144,95 @@ c.setLabel(countryLabel); result.setCountry(c); - result.setBeginDate((Date) source[6]); + Timestamp beginDate = (Timestamp) source[6]; + if (beginDate != null && result.getYear() != null) { + calendar.setTimeInMillis(0); + calendar.set(Calendar.YEAR, result.getYear()); + calendar.add(Calendar.MILLISECOND, 1); + // Comparison with getTime() is need, to keep millisecond precision + if (beginDate.getTime() == calendar.getTimeInMillis()) { + // if BeginDate is fake : set to null (see createCruise for details) + result.setBeginDate(null); + } + else { + result.setBeginDate(new Date(beginDate.getTime())); + } + } + result.setEndDate((Date) source[7]); - - List<Vessel> vessels = Lists.newArrayList(); - + String vesselCode = (String) source[8]; Vessel vessel = referentielService.getVessel(vesselCode); - vessels.add(vessel); + result.setVessel(Lists.newArrayList(vessel)); Integer managerId = (Integer) source[9]; - Person manager = referentielService.getPerson(managerId); - result.setHeadOfMission(Lists.newArrayList(manager)); + if (managerId != null && managerId.equals(enumeration.PERSON_ID_UNKNOWN_RECORDER_PERSON)) { + result.setHeadOfMission(null); + } + else { + Person manager = referentielService.getPerson(managerId); + result.setHeadOfMission(Lists.newArrayList(manager)); + } + result.setComment((String) source[10]); - - // get gears - Iterator<Integer> gearIds = queryListTyped( - "allCruiseGears", - "cruiseId", IntegerType.INSTANCE, Integer.valueOf(id)); - - List<Gear> gears = Lists.newArrayList(); - while (gearIds.hasNext()) { - Integer gearCode = gearIds.next(); - Gear target = referentielService.getGear(gearCode); - gears.add(target); + + String miscData = (String) source[11]; + if (miscData != null && miscData.length() > 0) { + + // Retrieve gears : + int gearTagIndex = miscData.indexOf(CRUISE_MISC_DATA_GEARS_TAG); + if (gearTagIndex == -1) { + result.setGear(null); + } + else { + String gearIdsStr = miscData.substring(gearTagIndex + CRUISE_MISC_DATA_GEARS_TAG.length()).trim(); + miscData = miscData.substring(0, gearTagIndex); + if (gearIdsStr.isEmpty()) { + result.setGear(null); + } + else { + List<Gear> gears = Lists.newArrayList(); + String[] gearIds = gearIdsStr.split(","); + for (int i = 0; i < gearIds.length; i++) { + Integer gearId = Integer.valueOf(gearIds[i]); + gears.add(referentielService.getGear(gearId)); + } + result.setGear(gears); + } + } + + // Retrieve secondary vessels : + int vesselTagIndex = miscData.indexOf(CRUISE_MISC_DATA_VESSELS_TAG); + if (vesselTagIndex != -1) { + String vesselCodesStr = miscData.substring(vesselTagIndex + CRUISE_MISC_DATA_VESSELS_TAG.length()).trim(); + if (!vesselCodesStr.isEmpty()) { + String[] vesselCodes = vesselCodesStr.split(","); + for (int i = 0; i < vesselCodes.length; i++) { + vesselCode = vesselCodes[i]; + result.addVessel(referentielService.getVessel(vesselCode)); + } + } + } } - - // get secondary vessels - Iterator<String> vesselIds = queryListTyped( - "allCruiseSecondaryVessels", - "cruiseId", IntegerType.INSTANCE, Integer.valueOf(id)); - - while (vesselIds.hasNext()) { - String vesselId = vesselIds.next(); - vessel = referentielService.getVessel(vesselId); - vessels.add(vessel); + + // get secondary gears from fishingOperation (first load from Allegro DB only) + if (result.getGear() == null) { + Iterator<Object[]> list = queryList( + "cruiseGears", + "cruiseId", StringType.INSTANCE, id); + + List<Gear> gears = Lists.newArrayList(); + while (list.hasNext()) { + Object[] zoneSource = list.next(); + Gear target = new Gear(); + target.setId(String.valueOf(zoneSource[0])); + target.setLabel((String) zoneSource[1]); + target.setName((String) zoneSource[2]); + gears.add(target); + } + result.setGear(gears); } - - result.setVessel(vessels); return result; } Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-01-14 13:55:40 UTC (rev 190) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-01-14 15:35:44 UTC (rev 191) @@ -155,7 +155,10 @@ Object[] source = queryUniqueWithStatus( "vessel", "vesselCode", StringType.INSTANCE, vesselCode, - "refDate", DateType.INSTANCE, new Date()); + "refDate", DateType.INSTANCE, new Date(), + "statusValidCode", StringType.INSTANCE, enumeration.STATUS_VALID_CODE, + "statusTemporaryCode", StringType.INSTANCE, enumeration.STATUS_TEMPORARY_CODE + ); Vessel result = loadVessel(source); return result; } Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java 2013-01-14 13:55:40 UTC (rev 190) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java 2013-01-14 15:35:44 UTC (rev 191) @@ -89,7 +89,6 @@ Assert.assertNotNull(result); } - @Ignore @Test public void createCruise(/*Cruise bean*/) { String programCode = dbResource.getFixtures().programCode();

1 0

r190 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence-adagio tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence-adagio/src/main/resources tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/service
by tchemit＠users.forge.codelutin.com 14 Jan '13

14 Jan '13

Author: tchemit Date: 2013-01-14 14:55:40 +0100 (Mon, 14 Jan 2013) New Revision: 190 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/190 Log: add ReferentialPersistenceService#getGear method fix Cruise loading fix somes tests add svn missing properties and license header Modified: trunk/tutti-persistence-adagio/README.txt trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceDevImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceService.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceService.java 2013-01-14 13:55:40 UTC (rev 190) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence API + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import java.util.List; Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceService.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java 2013-01-14 13:55:40 UTC (rev 190) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence API + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import java.util.List; Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java 2013-01-14 13:55:40 UTC (rev 190) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence API + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.Cruise; import java.util.List; Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java 2013-01-14 13:55:40 UTC (rev 190) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence API + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import java.util.List; Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceService.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceService.java 2013-01-14 13:55:40 UTC (rev 190) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence API + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.MacroWasteBatch; import java.util.List; Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceService.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceService.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceService.java 2013-01-14 13:55:40 UTC (rev 190) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence API + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.PlanktonBatch; import java.util.List; Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceService.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceService.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceService.java 2013-01-14 13:55:40 UTC (rev 190) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence API + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.Program; import java.util.List; Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceService.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java 2013-01-14 13:55:40 UTC (rev 190) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence API + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import java.util.List; Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-01-14 13:55:40 UTC (rev 190) @@ -125,4 +125,5 @@ Person getPerson(Integer personId); + Gear getGear(Integer gearId); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java 2013-01-14 13:55:40 UTC (rev 190) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence API + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence-adagio/README.txt =================================================================== --- trunk/tutti-persistence-adagio/README.txt 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence-adagio/README.txt 2013-01-14 13:55:40 UTC (rev 190) @@ -4,7 +4,6 @@ java -jar ~/.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar --inlineRC URL=jdbc:hsqldb:file:src/test/db/allegro,USER=sa -(cd src/test ; ./connectDb.sh) Pour lancer la base en mode serveur ----------------------------------- @@ -13,7 +12,6 @@ On peut ensuite accéder à la base via l'url jdbc:hsqldb://localhost/allegro - Se connecter à une superbe ui swing de requétage ------------------------------------------------ Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java 2013-01-14 13:55:40 UTC (rev 190) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence Adagio (impl) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Preconditions; import fr.ifremer.adagio.core.dao.administration.programStrategy.ProgramDao; import fr.ifremer.tutti.persistence.TuttiEnumerationFile; @@ -63,6 +87,14 @@ return result; } + protected <T> Iterator<T> queryListTyped(String queryName, Object... params) { + + Query query = createQuery(queryName, params); + + Iterator result = query.iterate(); + return result; + } + protected Query createQuery(String queryName, Object... params) { Query query = getCurrentSession().getNamedQuery(queryName); Property changes on: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java 2013-01-14 13:55:40 UTC (rev 190) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence Adagio (impl) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Property changes on: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-01-14 13:55:40 UTC (rev 190) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence Adagio (impl) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Property changes on: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-01-14 13:55:40 UTC (rev 190) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence Adagio (impl) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.Lists; import fr.ifremer.adagio.core.dao.administration.user.PersonDao; import fr.ifremer.adagio.core.dao.data.survey.fishingTrip.FishingTrip; @@ -130,29 +154,25 @@ result.setComment((String) source[10]); // get gears - Iterator<Object[]> list = queryList( + Iterator<Integer> gearIds = queryListTyped( "allCruiseGears", "cruiseId", IntegerType.INSTANCE, Integer.valueOf(id)); List<Gear> gears = Lists.newArrayList(); - while (list.hasNext()) { - Object[] zoneSource = list.next(); - Gear target = new Gear(); - target.setId((String) zoneSource[0]); - target.setLabel((String) zoneSource[1]); - target.setName((String) zoneSource[2]); + while (gearIds.hasNext()) { + Integer gearCode = gearIds.next(); + Gear target = referentielService.getGear(gearCode); gears.add(target); } // get secondary vessels - list = queryList( + Iterator<String> vesselIds = queryListTyped( "allCruiseSecondaryVessels", "cruiseId", IntegerType.INSTANCE, Integer.valueOf(id)); - while (list.hasNext()) { - Object[] zoneSource = list.next(); - vesselCode = (String) zoneSource[0]; - vessel = referentielService.getVessel(vesselCode); + while (vesselIds.hasNext()) { + String vesselId = vesselIds.next(); + vessel = referentielService.getVessel(vesselId); vessels.add(vessel); } Property changes on: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-01-14 13:55:40 UTC (rev 190) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence Adagio (impl) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Property changes on: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceServiceImpl.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceServiceImpl.java 2013-01-14 13:55:40 UTC (rev 190) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence Adagio (impl) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.MacroWasteBatch; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Property changes on: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/MacroWasteBatchPersistenceServiceImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java 2013-01-14 13:55:40 UTC (rev 190) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence Adagio (impl) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.PlanktonBatch; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Property changes on: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/PlanktonBatchPersistenceServiceImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java 2013-01-14 13:55:40 UTC (rev 190) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence Adagio (impl) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.referential.Zone; Property changes on: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java 2013-01-14 13:55:40 UTC (rev 190) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence Adagio (impl) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Property changes on: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-01-14 13:55:40 UTC (rev 190) @@ -216,6 +216,15 @@ } @Override + public Gear getGear(Integer gearId) { + Object[] source = queryUnique( + "gear", + "gearId", IntegerType.INSTANCE, gearId); + Gear result = loadGear(source); + return result; + } + + @Override public List<Species> getAllSpecies() { TaxonRefTaxVO[] sources = taxonNameDao.getAllTaxonRefTax(); @@ -411,13 +420,6 @@ //-- Internal methods --// //------------------------------------------------------------------------// - protected <E extends AbstractTuttiReferentialEntity> void setStatus(fr.ifremer.adagio.core.dao.referential.Status status, E entity) { - Status newStatus = new Status(); - newStatus.setId(status.getCode()); - newStatus.setName(status.getName()); - entity.setStatus(newStatus); - } - protected void loadCaracteristicQualitativeValues(Caracteristic caracteristic, Integer pmfmId) { Preconditions.checkNotNull(caracteristic, "Caracteristic can not be null"); @@ -507,15 +509,6 @@ return target; } - protected Gear loadGear(Object[] source) { - Gear result = new Gear(); - result.setId(String.valueOf(source[0])); - result.setName((String) source[1]); - result.setLabel((String) source[2]); - setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[3], result); - return result; - } - protected Person loadPerson(Object[] source) { Person target = new Person(); target.setId(String.valueOf(source[0])); @@ -526,6 +519,15 @@ return target; } + protected Gear loadGear(Object[] source) { + Gear result = new Gear(); + result.setId(String.valueOf(source[0])); + result.setName((String) source[1]); + result.setLabel((String) source[2]); + setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[3], result); + return result; + } + protected Iterator<Object[]> queryListWithStatus(String queryName, Object... params) { Query query = createQuery(queryName, params); @@ -546,5 +548,11 @@ return (Object[]) result; } + protected <E extends AbstractTuttiReferentialEntity> void setStatus(fr.ifremer.adagio.core.dao.referential.Status status, E entity) { + Status newStatus = new Status(); + newStatus.setId(status.getCode()); + newStatus.setName(status.getName()); + entity.setStatus(newStatus); + } } Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-01-14 13:55:40 UTC (rev 190) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence Adagio (impl) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; import org.apache.commons.logging.Log; Property changes on: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml =================================================================== --- trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml 2013-01-14 13:55:40 UTC (rev 190) @@ -129,9 +129,7 @@ <query cacheable="true" name="allCruiseGears"> <![CDATA[ SELECT - gpf.gear.id AS gearId, - gpf.gear.label AS gearLabel, - gpf.gear.name AS gearName + gpf.gear.id AS gearId FROM ScientificCruiseImpl sc JOIN sc.fishingTrips ft @@ -146,7 +144,7 @@ <query cacheable="true" name="allCruiseSecondaryVessels"> <![CDATA[ SELECT - va.operationVesselAssociationPk.vessel.code AS associatedVesselCode, + va.operationVesselAssociationPk.vessel.code AS associatedVesselCode FROM ScientificCruiseImpl sc JOIN sc.fishingTrips ft @@ -395,6 +393,20 @@ <query-param name="statusTemporaryCode" type="java.lang.String"/> </query> + <query cacheable="true" name="gear"> + <![CDATA[ + SELECT + g.id, + g.label, + g.name, + g.status AS status + FROM GearImpl g + WHERE + g.id = :gearId + ]]> + <query-param name="gearId" type="java.lang.Integer"/> + </query> +  <query cacheable="true" name="allPersons"> <![CDATA[ Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceTest.java 2013-01-14 13:55:40 UTC (rev 190) @@ -36,6 +36,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Test; import java.util.Calendar; @@ -88,6 +89,7 @@ Assert.assertNotNull(result); } + @Ignore @Test public void createCruise(/*Cruise bean*/) { String programCode = dbResource.getFixtures().programCode(); @@ -156,6 +158,8 @@ assertEquals(cruise.getName(), createdCruise.getName()); Cruise reloadedCruise = service.getCruise(createdCruise.getId()); + + //TODO-TC This is not working, reloadedCruise is not null,... assertEquals(createdCruise.getBeginDate(), reloadedCruise.getBeginDate()); assertEquals(createdCruise.getEndDate(), reloadedCruise.getEndDate()); assertEquals(createdCruise.getComment(), reloadedCruise.getComment()); Modified: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceDevImpl.java =================================================================== --- trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceDevImpl.java 2013-01-14 13:22:48 UTC (rev 189) +++ trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceDevImpl.java 2013-01-14 13:55:40 UTC (rev 190) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence Dev (impl) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.IdAware; @@ -195,7 +219,12 @@ return getBean(Person.class.getName(), personId.toString()); } + @Override + public Gear getGear(Integer gearCode) { + return getBean(Gear.class.getName(), gearCode.toString()); + } + protected <B extends IdAware> List<B> getData(String entityType) { List<B> result = (List<B>) cache.get(entityType); return result; Property changes on: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceDevImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL

1 0