This is an automated email from the git hooks/post-receive script. New commit to branch feature/7519 in repository observe. See http://git.codelutin.com/observe.git commit 0326efe45bee96aff0b009deb3076fc44582d280 Author: Kevin Morin <morin@codelutin.com> Date: Tue Sep 15 16:45:15 2015 +0200 remplacement de certains dtos par les referencedto --- .../ui/content/impl/seine/ActivitySeineObservedSystemUI.css | 6 ++---- .../content/impl/seine/ActivitySeineObservedSystemUI.jaxx | 3 ++- .../seine/FloatingObjectTransmittingBuoyOperationUI.css | 13 +++++-------- .../seine/FloatingObjectTransmittingBuoyOperationUI.jaxx | 9 +++++---- .../FloatingObjectTransmittingBuoyOperationUIHandler.java | 5 +++-- .../main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css | 6 ++---- .../java/fr/ird/observe/ui/content/ref/impl/GearUI.jaxx | 3 ++- .../fr/ird/observe/ui/content/ref/impl/SpeciesListUI.css | 6 ++---- .../fr/ird/observe/ui/content/ref/impl/SpeciesListUI.jaxx | 3 ++- .../java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.css | 3 +-- .../java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx | 3 ++- .../ui/content/table/impl/longline/CatchLonglineUI.css | 12 ++++-------- .../ui/content/table/impl/longline/CatchLonglineUI.jaxx | 5 +++-- .../fr/ird/observe/ui/content/table/impl/longline/TdrUI.css | 6 ++---- .../ird/observe/ui/content/table/impl/longline/TdrUI.jaxx | 3 ++- 15 files changed, 39 insertions(+), 47 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.css index 19dcf6f..a316ac4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.css @@ -34,10 +34,8 @@ #observedSystem { bean:{bean}; - //FIXME - //property: {ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM}; - //FIXME - //selected:{bean.getObservedSystem()}; + property: {ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM}; + selected:{bean.getObservedSystem()}; _validatorLabel: {t("observe.common.observedSystem")}; showListLabel: true; universeLabel:{t("observe.activityObservedSystem.availableObservedSystem")}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx index 249e37c..5e3bbe9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx @@ -23,6 +23,7 @@ <fr.ird.observe.ui.content.ContentUI superGenericType='ActivitySeineObservedSystemDto' contentTitle='{n("observe.activitySeineObservedSystem.title")}'> <import> + fr.ird.observe.services.dto.referential.ReferentialReferenceDto fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto fr.ird.observe.services.dto.referential.seine.ObservedSystemDto fr.ird.observe.ui.actions.shared.ResetEditUIAction @@ -70,7 +71,7 @@ <row> <cell columns="2" fill="both" weighty="0.7"> <JScrollPane id='observedSystemPane' onFocusGained='observedSystem.requestFocus()'> - <FilterableDoubleList id='observedSystem' genericType='ObservedSystemDto'/> + <FilterableDoubleList id='observedSystem' genericType='ReferentialReferenceDto<ObservedSystemDto>'/> </JScrollPane> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css index d45c93f..0946698 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.css @@ -60,13 +60,11 @@ } #transmittingBuoyOperation1 { - //FIXME - //property:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION}; + property:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION}; bean:{transmittingBuoy1}; enabled:false; showReset:true; - //FIXME - //selectedItem:{transmittingBuoy1.getTransmittingBuoyOperation()}; + selectedItem:{transmittingBuoy1.getTransmittingBuoyOperation()}; } #transmittingBuoyType1Label { @@ -98,6 +96,7 @@ } #country1 { + //FIXME //property:{TransmittingBuoyDto.PROPERTY_COUNTRY}; bean:{transmittingBuoy1}; showReset:true; @@ -128,13 +127,11 @@ } #transmittingBuoyOperation2 { - //FIXME - //property:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION}; + property:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION}; bean:{transmittingBuoy2}; showReset:true; enabled:false; - //FIXME - //selectedItem:{transmittingBuoy2.getTransmittingBuoyOperation()}; + selectedItem:{transmittingBuoy2.getTransmittingBuoyOperation()}; } #transmittingBuoyType2Label { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx index 3d1b063..f83f49f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx @@ -29,6 +29,7 @@ fr.ird.observe.services.dto.constants.seine.Ownership fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation fr.ird.observe.services.dto.referential.CountryDto + fr.ird.observe.services.dto.referential.ReferentialReferenceDto fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto fr.ird.observe.ui.actions.shared.ResetEditUIAction @@ -60,7 +61,7 @@ <!-- validator --> <BeanValidator id='validator' autoField='true' - beanClass='fr.ird.observe.services.dto.seine.FloatingObjectDto' + beanClass='fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto' errorTableModel='{getErrorTableModel()}' context='n1-update-objectOperation'> </BeanValidator> @@ -143,7 +144,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <BeanComboBox id='transmittingBuoyOperation1' constructorParams='this' - genericType='TransmittingBuoyOperationDto'/> + genericType='ReferentialReferenceDto<TransmittingBuoyOperationDto>'/> </cell> </row> <row> @@ -200,7 +201,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <BeanComboBox id='transmittingBuoyOperation2' constructorParams='this' - genericType='TransmittingBuoyOperationDto'/> + genericType='ReferentialReferenceDto<TransmittingBuoyOperationDto>'/> </cell> </row> <row> @@ -209,7 +210,7 @@ </cell> <cell anchor='east' weightx="1" fill="both"> <BeanComboBox id='transmittingBuoyType2' constructorParams='this' - genericType='TransmittingBuoyTypeDto'/> + genericType='ReferentialReferenceDto<TransmittingBuoyTypeDto>'/> </cell> </row> <row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java index 2e250d9..d168510 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java @@ -26,6 +26,7 @@ import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.constants.seine.Ownership; import fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; @@ -39,7 +40,6 @@ import org.nuiton.validator.NuitonValidatorScope; import javax.swing.*; import java.awt.*; -import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.t; @@ -329,7 +329,8 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH editorPanel.removeAll(); String[] codeOperations = typeOperation.getCodeOperation(); - List<TransmittingBuoyOperationDto> operations = ui.getTransmittingBuoyOperation1().getData(); + List<ReferentialReferenceDto<TransmittingBuoyOperationDto>> operations = + ui.getTransmittingBuoyOperation1().getData(); TransmittingBuoyDto transmittingBuoy; TransmittingBuoyOperationDto objectOperation; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css index 72620c4..a19eb2e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.css @@ -40,10 +40,8 @@ } #gearCaracteristic { - //FIXME - //property:{GearDto.PROPERTY_GEAR_CARACTERISTIC}; - //FIXME - //selected:{bean.getGearCaracteristic()}; + property:{GearDto.PROPERTY_GEAR_CARACTERISTIC}; + selected:{bean.getGearCaracteristic()}; _validatorLabel: {t("observe.gear.gearCaracteristic")}; showListLabel: true; universeLabel:{t("observe.gear.availableGearCaracteristic")}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.jaxx index ddb42ff..e1fee30 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/GearUI.jaxx @@ -34,6 +34,7 @@ <style source="I18nReferenceEntity.css"/> <import> + fr.ird.observe.services.dto.referential.ReferentialReferenceDto fr.ird.observe.services.dto.constants.ReferenceStatus fr.ird.observe.services.dto.referential.GearDto fr.ird.observe.services.dto.referential.GearCaracteristicDto @@ -177,7 +178,7 @@ <row> <cell weightx="1" weighty="1"> <JScrollPane id='gearCaracteristicPane' layout='{new GridLayout(1,1)}'> - <FilterableDoubleList id='gearCaracteristic' genericType='GearCaracteristicDto'/> + <FilterableDoubleList id='gearCaracteristic' genericType='ReferentialReferenceDto<GearCaracteristicDto>'/> </JScrollPane> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.css index 0f670ec..1915ed9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.css @@ -40,10 +40,8 @@ } #species { - //FIXME - //property: species; - //FIXME - //selected:{bean.getSpecies()}; + property: species; + selected:{bean.getSpecies()}; _validatorLabel: {t("observe.common.species")}; showListLabel: true; universeLabel:{t("observe.speciesList.availableSpecies")}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.jaxx index 83364be..ae38c9c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesListUI.jaxx @@ -35,6 +35,7 @@ <style source="I18nReferenceEntity.css"/> <import> + fr.ird.observe.services.dto.referential.ReferentialReferenceDto fr.ird.observe.services.dto.constants.ReferenceStatus fr.ird.observe.services.dto.referential.SpeciesListDto fr.ird.observe.services.dto.referential.SpeciesDto @@ -182,7 +183,7 @@ <row> <cell weightx="1" weighty="1"> <JScrollPane id='speciesPane' layout='{new GridLayout(1,1)}'> - <FilterableDoubleList id='species' genericType='SpeciesDto'/> + <FilterableDoubleList id='species' genericType='ReferentialReferenceDto<SpeciesDto>'/> </JScrollPane> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.css index 452a8e4..96c6334 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.css @@ -70,8 +70,7 @@ #ocean { property: ocean; - //FIXME - //selected:{bean.getOcean()}; + selected:{bean.getOcean()}; _validatorLabel: {t("observe.common.ocean")}; showListLabel: true; universeLabel:{t("observe.species.availableOcean")}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx index 761dfe6..3213411 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx @@ -36,6 +36,7 @@ <style source="I18nReferenceEntity.css"/> <import> + fr.ird.observe.services.dto.referential.ReferentialReferenceDto fr.ird.observe.services.dto.constants.ReferenceStatus fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.SpeciesGroupDto @@ -258,7 +259,7 @@ <row> <cell weightx="1"> <JScrollPane id='oceanPane' layout='{new GridLayout(1,1)}'> - <FilterableDoubleList id='ocean' genericType='OceanDto'/> + <FilterableDoubleList id='ocean' genericType='ReferentialReferenceDto<OceanDto>'/> </JScrollPane> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.css index 9fb70f4..b1c0815 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.css @@ -104,10 +104,8 @@ } #speciesCatch { - //FIXME - //property:{CatchLonglineDto.PROPERTY_SPECIES_CATCH}; - //FIXME - //selectedItem:{tableEditBean.getSpeciesCatch()}; + property:{CatchLonglineDto.PROPERTY_SPECIES_CATCH}; + selectedItem:{tableEditBean.getSpeciesCatch()}; _validatorLabel:{t("observe.catchLongline.speciesCatch")}; } @@ -254,10 +252,8 @@ } #predator { - //FIXME - //property: predator; - //FIXME - //selected:{tableEditBean.getPredator()}; + property: predator; + selected:{tableEditBean.getPredator()}; _validatorLabel: {t("observe.catchLongline.predator")}; showListLabel: true; universeLabel:{t("observe.catchLongline.availablePredator")}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.jaxx index c5bb70e..8faffdd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/CatchLonglineUI.jaxx @@ -36,6 +36,7 @@ fr.ird.observe.services.dto.longline.CatchLonglineDto fr.ird.observe.services.dto.longline.SectionDto fr.ird.observe.services.dto.longline.SetLonglineDto + fr.ird.observe.services.dto.referential.ReferentialReferenceDto fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.SexDto fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto @@ -165,7 +166,7 @@ <JLabel id='speciesCatchLabel'/> </cell> <cell weightx='1' anchor='east' columns="3"> - <BeanComboBox id='speciesCatch' genericType='SpeciesDto' constructorParams='this'/> + <BeanComboBox id='speciesCatch' genericType='ReferentialReferenceDto<SpeciesDto>' constructorParams='this'/> </cell> </row> @@ -268,7 +269,7 @@ <row> <cell columns="2" fill="both" weighty="0.7"> <JScrollPane id='predatorPane'> - <FilterableDoubleList id='predator' genericType='SpeciesDto'/> + <FilterableDoubleList id='predator' genericType='ReferentialReferenceDto<SpeciesDto>'/> </JScrollPane> </cell> </row> diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css index acc31e7..d7381c7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.css @@ -369,10 +369,8 @@ } #species { - //FIXME - //property: {TdrDto.PROPERTY_SPECIES}; - //FIXME - //selected:{tableEditBean.getSpecies()}; + property: {TdrDto.PROPERTY_SPECIES}; + selected:{tableEditBean.getSpecies()}; _validatorLabel: {t("observe.tdr.species")}; showListLabel: true; universeLabel:{t("observe.tdr.availableSpecies")}; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.jaxx index 3f4cf75..aaec58e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUI.jaxx @@ -35,6 +35,7 @@ fr.ird.observe.services.dto.longline.TdrDto fr.ird.observe.services.dto.longline.SectionDto fr.ird.observe.services.dto.longline.SetLonglineDto + fr.ird.observe.services.dto.referential.ReferentialReferenceDto fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto @@ -376,7 +377,7 @@ <Table fill='both' constraints='BorderLayout.NORTH'> <row> <cell weighty="1" weightx="1"> - <FilterableDoubleList id='species' genericType='SpeciesDto'/> + <FilterableDoubleList id='species' genericType='ReferentialReferenceDto<SpeciesDto>'/> </cell> </row> </Table> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.