- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] 2 commits: Problème affichage navire et observateur dans arbre de navigation (See #867)
by Tony CHEMIT 10 Sep '17

10 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7e7eb06e by Tony CHEMIT at 2017-09-10T09:38:26+00:00 Problème affichage navire et observateur dans arbre de navigation (See #867) - - - - - 93ecc2b2 by Tony CHEMIT at 2017-09-10T09:40:12+00:00 fix some rest problems = loading form - - - - - 11 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineDetailCompositionUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineGlobalCompositionUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - server/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java - services-client/src/test/java/fr/ird/observe/services/client/service/ReferenceValuesSetServiceClientTest.java - services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java - services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java - services/src/main/java/fr/ird/observe/services/service/referential/ReferenceSetsRequest.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java @@ -656,12 +656,19 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } - protected void loadReferentialReferenceSetsInModel(FormDefinition<E> formDefinition) { + public <E extends IdDto> void loadReferentialReferenceSetsInModel(FormDefinition<E> formDefinition) { + loadReferentialReferenceSetsInModel(formDefinition, true); + } + protected <E extends IdDto> void loadReferentialReferenceSetsInModel(FormDefinition<E> formDefinition, boolean clear) { Class<E> dtoType = formDefinition.getType(); ImmutableMap.Builder<String, ReferentialDtoReferenceSet<?>> modelReferentialReferenceSets = ImmutableMap.builder(); + if (!clear) { + modelReferentialReferenceSets.putAll(getModel().getReferentialReferenceSets()); + } + log.debug("Update referential reference sets for: " + dtoType); // mettre à jour le cache de référentiel ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java @@ -36,9 +36,6 @@ import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.client.ui.tree.navigation.nodes.longline.TripLonglineNavigationTreeNode; import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.client.ui.util.table.AutotSelectRowAndShowPopupActionSupport; -import fr.ird.observe.dto.decoration.DecoratorService; -import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; -import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.data.longline.BasketReference; import fr.ird.observe.dto.data.longline.BranchlineDto; import fr.ird.observe.dto.data.longline.BranchlineHelper; @@ -50,6 +47,10 @@ import fr.ird.observe.dto.data.longline.SetLonglineCatchHelper; import fr.ird.observe.dto.data.longline.SizeMeasureDto; import fr.ird.observe.dto.data.longline.TripLonglineReference; import fr.ird.observe.dto.data.longline.WeightMeasureDto; +import fr.ird.observe.dto.decoration.DecoratorService; +import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; +import fr.ird.observe.dto.form.Form; +import fr.ird.observe.dto.form.FormDefinition; import fr.ird.observe.dto.reference.DtoReferenceCollection; import fr.ird.observe.dto.referential.SizeMeasureTypeReference; import fr.ird.observe.dto.referential.SpeciesDto; @@ -58,12 +59,14 @@ import fr.ird.observe.dto.referential.WeightMeasureTypeReference; import fr.ird.observe.dto.referential.longline.CatchFateLonglineReference; import fr.ird.observe.dto.referential.longline.HealthnessReference; import fr.ird.observe.dto.result.SaveResultDto; +import fr.ird.observe.spi.DtoModelHelper; import java.beans.PropertyChangeListener; import java.util.Calendar; import java.util.Collections; import java.util.Date; import java.util.HashSet; import java.util.List; +import java.util.Optional; import java.util.Set; import javax.swing.JComponent; import javax.swing.JOptionPane; @@ -651,6 +654,9 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat loadReferentialReferenceSetsInModel(form); + Optional<FormDefinition<BranchlineDto>> optionalFormDefinition = DtoModelHelper.getOptionalFormDefinition(BranchlineDto.class); + optionalFormDefinition.ifPresent(branchlineDtoFormDefinition -> loadReferentialReferenceSetsInModel(branchlineDtoFormDefinition, false)); + model.setForm(form); LonglinePositionHelper<CatchLonglineDto> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineDetailCompositionUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineDetailCompositionUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineDetailCompositionUIHandler.java @@ -35,6 +35,7 @@ import fr.ird.observe.client.ui.content.ContentUIHandler; import fr.ird.observe.client.ui.content.ContentUIModel; import fr.ird.observe.client.ui.content.list.ContentListUIModel; import fr.ird.observe.client.ui.util.JVetoableTabbedPane; +import fr.ird.observe.dto.data.longline.BaitsCompositionDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.data.longline.ActivityLonglineDto; import fr.ird.observe.dto.data.longline.BasketDto; @@ -45,13 +46,16 @@ import fr.ird.observe.dto.data.longline.SectionWithTemplate; import fr.ird.observe.dto.data.longline.SectionWithTemplateHelper; import fr.ird.observe.dto.data.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.dto.data.longline.SetLonglineDetailCompositionHelper; +import fr.ird.observe.dto.form.FormDefinition; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.SetLonglineDetailCompositionService; +import fr.ird.observe.spi.DtoModelHelper; import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; import javax.swing.JComboBox; import javax.swing.JOptionPane; @@ -378,7 +382,11 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong Form<BranchlineDto> branchlineDtoForm = Form.newFormDto(BranchlineDto.class, null); BranchlineUIModel branchlineUIModel = getUi().getBranchlineDetailUI().getModel(); - branchlineUIModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); +// branchlineUIModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); + + Optional<FormDefinition<BranchlineDto>> optionalFormDefinition = DtoModelHelper.getOptionalFormDefinition(BranchlineDto.class); + optionalFormDefinition.ifPresent(getUi().getBranchlineDetailUI().getHandler()::loadReferentialReferenceSetsInModel); + branchlineUIModel.setForm(branchlineDtoForm); //FIXME Validate this default date ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineGlobalCompositionUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineGlobalCompositionUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineGlobalCompositionUIHandler.java @@ -27,11 +27,18 @@ import fr.ird.observe.client.db.ObserveSwingDataSource; import fr.ird.observe.client.db.constants.DataContextType; import fr.ird.observe.client.ui.content.ContentMode; import fr.ird.observe.client.ui.content.ContentUIHandler; -import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.data.longline.ActivityLonglineDto; +import fr.ird.observe.dto.data.longline.BaitsCompositionDto; +import fr.ird.observe.dto.data.longline.BranchlinesCompositionDto; +import fr.ird.observe.dto.data.longline.FloatlinesCompositionDto; +import fr.ird.observe.dto.data.longline.HooksCompositionDto; import fr.ird.observe.dto.data.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.dto.data.longline.SetLonglineGlobalCompositionHelper; +import fr.ird.observe.dto.form.Form; +import fr.ird.observe.dto.form.FormDefinition; import fr.ird.observe.dto.result.SaveResultDto; +import fr.ird.observe.spi.DtoModelHelper; +import java.util.Optional; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.spi.UIHandler; @@ -147,7 +154,11 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong { // open floatlinesComposition tab FloatlinesCompositionUIModel floatlinesCompositionModel = getUi().getFloatlinesCompositionModel(); - floatlinesCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); +// floatlinesCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); + + Optional<FormDefinition<FloatlinesCompositionDto>> optionalFormDefinition = DtoModelHelper.getOptionalFormDefinition(FloatlinesCompositionDto.class); + optionalFormDefinition.ifPresent(getUi().getFloatlinesCompositionUI().getHandler()::loadReferentialReferenceSetsInModel); + floatlinesCompositionModel.setForm(form); SetLonglineGlobalCompositionHelper.copySetLonglineGlobalCompositionDto(form.getObject(), floatlinesCompositionModel.getBean()); @@ -159,7 +170,12 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong { // open branchlinesComposition tab BranchlinesCompositionUIModel branchlinesCompositionModel = getUi().getBranchlinesCompositionModel(); - branchlinesCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); + +// branchlinesCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); + + Optional<FormDefinition<BranchlinesCompositionDto>> optionalFormDefinition = DtoModelHelper.getOptionalFormDefinition(BranchlinesCompositionDto.class); + optionalFormDefinition.ifPresent(getUi().getBranchlinesCompositionUI().getHandler()::loadReferentialReferenceSetsInModel); + branchlinesCompositionModel.setForm(form); SetLonglineGlobalCompositionHelper.copySetLonglineGlobalCompositionDto(form.getObject(), branchlinesCompositionModel.getBean()); @@ -171,7 +187,10 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong { // open hooksComposition tab HooksCompositionUIModel hooksCompositionModel = getUi().getHooksCompositionModel(); - hooksCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); +// hooksCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); + Optional<FormDefinition<HooksCompositionDto>> optionalFormDefinition = DtoModelHelper.getOptionalFormDefinition(HooksCompositionDto.class); + optionalFormDefinition.ifPresent(getUi().getHooksCompositionUI().getHandler()::loadReferentialReferenceSetsInModel); + hooksCompositionModel.setForm(form); SetLonglineGlobalCompositionHelper.copySetLonglineGlobalCompositionDto(form.getObject(), hooksCompositionModel.getBean()); @@ -183,7 +202,10 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong { // open baitsComposition tab BaitsCompositionUIModel baitsCompositionModel = getUi().getBaitsCompositionModel(); - baitsCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); +// baitsCompositionModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); + Optional<FormDefinition<BaitsCompositionDto>> optionalFormDefinition = DtoModelHelper.getOptionalFormDefinition(BaitsCompositionDto.class); + optionalFormDefinition.ifPresent(getUi().getBaitsCompositionUI().getHandler()::loadReferentialReferenceSetsInModel); + baitsCompositionModel.setForm(form); SetLonglineGlobalCompositionHelper.copySetLonglineGlobalCompositionDto(form.getObject(), baitsCompositionModel.getBean()); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java @@ -226,7 +226,9 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto, U Dimension preferredSize = ui.getPreferredSize(); JSplitPane parentContainer = ui.getParentContainer(JSplitPane.class); - ui.setMinimumSize(new Dimension(preferredSize.width, parentContainer.getPreferredSize().height-200)); + if (parentContainer!=null) { + ui.setMinimumSize(new Dimension(preferredSize.width, parentContainer.getPreferredSize().height-200)); + } // parentContainer.getRightComponent().setMinimumSize(new Dimension(preferredSize.width, 200)); } ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java +++ b/dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java @@ -491,7 +491,7 @@ public class DecoratorService extends DecoratorProvider { public void initTripLonglineDto() { registerDecorator(new TripLonglineDecorator()); registerDataReferenceDecorator(TripLonglineReference.class, - "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel}$s##${observer}$s"); + "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vesselLabel}$s##${observerLabel}$s"); } @Override ===================================== server/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java ===================================== --- a/server/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java +++ b/server/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java @@ -32,6 +32,7 @@ import org.apache.commons.logging.LogFactory; import org.debux.webmotion.server.call.Call; import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler; import org.debux.webmotion.server.mapping.Mapping; +import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl; /** * Cet injecteur a été mis en place pour permettre la conversion des immutableSet arrivant dans une requete. @@ -70,8 +71,17 @@ public class ImmutableSetInjector implements ExecutorParametersInjectorHandler.I Objects.requireNonNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!"); String[] values = (String[]) parameterTree.getValue(); - Collection o = gson.fromJson(values[0], generic); - builder.addAll(o); + String value = values[0]; + if (!value.isEmpty() && !value.contains("[")) { + if (((ParameterizedTypeImpl) generic).getActualTypeArguments()[0].equals(String.class)) { + value = "\"" + value + "\""; + } + value = "[" + value + "]"; + } + Collection o = gson.fromJson(value, generic); + if (o != null) { + builder.addAll(o); + } } result = builder.build(); ===================================== services-client/src/test/java/fr/ird/observe/services/client/service/ReferenceValuesSetServiceClientTest.java ===================================== --- a/services-client/src/test/java/fr/ird/observe/services/client/service/ReferenceValuesSetServiceClientTest.java +++ b/services-client/src/test/java/fr/ird/observe/services/client/service/ReferenceValuesSetServiceClientTest.java @@ -33,6 +33,7 @@ import fr.ird.observe.services.service.referential.ReferenceSetsRequest; import fr.ird.observe.services.service.referential.ReferentialService; import fr.ird.observe.spi.DtoModelHelper; import fr.ird.observe.spi.map.ImmutableDtoMap; +import fr.ird.observe.spi.map.ImmutableDtoMapDtoSimplifiedName; import java.util.Date; import org.junit.Assert; import org.junit.Before; @@ -67,7 +68,7 @@ public class ReferenceValuesSetServiceClientTest extends ServiceClientTestSuppor //FIXME ReferenceSetsRequest<TripSeineDto> request = new ReferenceSetsRequest<>(); request.setRequestName(requestName); - request.setLastUpdateDates(ImmutableDtoMap.<Date>builder().build()); + request.setLastUpdateDates(ImmutableDtoMapDtoSimplifiedName.<Date>builder().build()); ImmutableSet<ReferentialDtoReferenceSet<?>> referenceSetResult = service.getReferentialReferenceSets(request); Assert.assertNotNull(referenceSetResult); ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java ===================================== --- a/services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java +++ b/services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java @@ -61,7 +61,7 @@ import fr.ird.observe.spi.DtoModelHelper; import fr.ird.observe.spi.context.ReferentialDtoEntityContext; import fr.ird.observe.spi.context.ReferentialEntityContext; import fr.ird.observe.spi.context.ReferentialReferenceEntityContext; -import fr.ird.observe.spi.map.ImmutableDtoMap; +import fr.ird.observe.spi.map.ImmutableDtoMapDtoSimplifiedName; import fr.ird.observe.spi.map.ImmutableSetDtoMap; import java.util.Arrays; import java.util.Collections; @@ -143,7 +143,7 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe FormDefinition<D> requestDefinition = optionalRequestDefinition.get(); - ImmutableDtoMap<Date> lastUpdateDates = request.getLastUpdateDates(); + ImmutableDtoMapDtoSimplifiedName<Date> lastUpdateDates = request.getLastUpdateDates(); Objects.requireNonNull(lastUpdateDates); for (Class propertyType : requestDefinition.getPropertiesTypes()) { ===================================== services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java +++ b/services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java @@ -30,6 +30,7 @@ import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.spi.DtoModelHelper; import fr.ird.observe.spi.map.ImmutableDtoMap; +import fr.ird.observe.spi.map.ImmutableDtoMapDtoSimplifiedName; import fr.ird.observe.spi.map.MutableDtoMap; import java.io.Closeable; import java.io.Serializable; @@ -93,7 +94,7 @@ public class ObserveReferentialCache implements Closeable, Serializable { FormDefinition<D> formDefinition = optionalRequestDefinition.get(); log.info(String.format("Loading %d referential dependencies for: %s", formDefinition.getProperties().size(), dtoType.getName())); - ImmutableDtoMap<Date> lastUpdateDates = getLastUpdateDates(formDefinition); + ImmutableDtoMapDtoSimplifiedName<Date> lastUpdateDates = getLastUpdateDates(formDefinition); ReferenceSetsRequest<D> request = new ReferenceSetsRequest<>(); request.setRequestName(dtoType); @@ -125,9 +126,9 @@ public class ObserveReferentialCache implements Closeable, Serializable { * @param formDefinition la définition de requète * @return le dictionnaire des dates de dernières mises à jour pour chaque ensemble de référentiels */ - private ImmutableDtoMap<Date> getLastUpdateDates(FormDefinition<?> formDefinition) { + private ImmutableDtoMapDtoSimplifiedName<Date> getLastUpdateDates(FormDefinition<?> formDefinition) { - ImmutableDtoMap.Builder<Date> builder = ImmutableDtoMap.builder(); + ImmutableDtoMapDtoSimplifiedName.Builder<Date> builder = ImmutableDtoMapDtoSimplifiedName.builder(); for (Class type : formDefinition.getPropertiesTypes()) { ===================================== services/src/main/java/fr/ird/observe/services/service/referential/ReferenceSetsRequest.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/referential/ReferenceSetsRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/referential/ReferenceSetsRequest.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.service.referential; import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.ObserveDto; -import fr.ird.observe.spi.map.ImmutableDtoMap; +import fr.ird.observe.spi.map.ImmutableDtoMapDtoSimplifiedName; import java.util.Date; /** @@ -39,7 +39,7 @@ public class ReferenceSetsRequest<D extends IdDto> implements ObserveDto { private Class<D> requestName; - private ImmutableDtoMap<Date> lastUpdateDates; + private ImmutableDtoMapDtoSimplifiedName<Date> lastUpdateDates; public Class<D> getDtoType() { return requestName; @@ -49,11 +49,11 @@ public class ReferenceSetsRequest<D extends IdDto> implements ObserveDto { this.requestName = requestName; } - public ImmutableDtoMap<Date> getLastUpdateDates() { + public ImmutableDtoMapDtoSimplifiedName<Date> getLastUpdateDates() { return lastUpdateDates; } - public void setLastUpdateDates(ImmutableDtoMap<Date> lastUpdateDates) { + public void setLastUpdateDates(ImmutableDtoMapDtoSimplifiedName<Date> lastUpdateDates) { this.lastUpdateDates = lastUpdateDates; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/85d9ecc9582ea6a62595354ad2… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/85d9ecc9582ea6a62595354ad2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] La connexion à un serveur distant ne fonctionne plus (See #871)
by Tony CHEMIT 10 Sep '17

10 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 85d9ecc9 by Tony CHEMIT at 2017-09-10T10:15:43+02:00 La connexion à un serveur distant ne fonctionne plus (See #871) - - - - - 1 changed file: - services-client/src/main/java/fr/ird/observe/services/client/ObserveServiceFactoryClient.java Changes: ===================================== services-client/src/main/java/fr/ird/observe/services/client/ObserveServiceFactoryClient.java ===================================== --- a/services-client/src/main/java/fr/ird/observe/services/client/ObserveServiceFactoryClient.java +++ b/services-client/src/main/java/fr/ird/observe/services/client/ObserveServiceFactoryClient.java @@ -38,6 +38,7 @@ import fr.ird.observe.services.service.ObserveService; import io.ultreia.java4all.http.HResponseBuilder; import java.io.IOException; import java.util.Objects; +import org.apache.commons.lang3.StringUtils; /** * Created on 16/08/15. @@ -61,6 +62,8 @@ public class ObserveServiceFactoryClient extends ObserveServiceFactorySupport im }); private final static ClassMappingClient CLASS_MAPPING = ClassMappingClient.get(); + private final static int LOCATE_PREFIX_LENGTH = ObserveServiceClientSupport.class.getPackage().getName().length(); + @Override public <S extends ObserveService> boolean accept(ObserveDataSourceConfiguration dataSourceConfiguration, Class<S> serviceType) { @@ -110,8 +113,8 @@ public class ObserveServiceFactoryClient extends ObserveServiceFactorySupport im throw new IllegalStateException("Can't get service " + implementationType, e); } - String serviceLocation = implementationType.getCanonicalName().replace(serviceType.getName(), ""); - serviceLocation = serviceLocation.substring(0, serviceLocation.length() - "Client".length()); + String serviceLocation = implementationType.getCanonicalName().substring(LOCATE_PREFIX_LENGTH).replaceAll("\\.", "/"); + serviceLocation = StringUtils.removeEnd(serviceLocation, "Client"); ObserveServiceClientContext serviceRestApiContext = new ObserveServiceClientContext( observeServiceInitializer, View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/85d9ecc9582ea6a62595354ad26… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/85d9ecc9582ea6a62595354ad26… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [PS] Sur le formulaire Echantillon non cible, afficher dans le tableau la…
by Tony CHEMIT 06 Sep '17

06 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 959062c7 by Tony CHEMIT at 2017-09-06T22:06:16+00:00 [PS] Sur le formulaire Echantillon non cible, afficher dans le tableau la propriété 'devenir' (See #866) - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIModel.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java @@ -194,6 +194,7 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS UIHelper.fixTableColumnWidth(table, 4, 75); UIHelper.fixTableColumnWidth(table, 4, 75); UIHelper.fixTableColumnWidth(table, 5, 150); + UIHelper.fixTableColumnWidth(table, 6, 200); UIHelper.setI18nTableHeaderRenderer( table, @@ -209,6 +210,8 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS n("observe.common.NonTargetLengthDto.table.count.tip"), n("observe.common.NonTargetLengthDto.table.gender"), n("observe.common.NonTargetLengthDto.table.gender.tip"), + n("observe.common.NonTargetLengthDto.speciesFate"), + n("observe.common.NonTargetLengthDto.speciesFate"), n("observe.common.NonTargetLengthDto.table.picturesReferences"), n("observe.common.NonTargetLengthDto.table.picturesReferences.tip")); @@ -218,7 +221,8 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 4, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 5, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SexReference.class)); - UIHelper.setTableColumnRenderer(table, 6, renderer); + UIHelper.setTableColumnRenderer(table, 6, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SpeciesFateReference.class)); + UIHelper.setTableColumnRenderer(table, 7, renderer); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIModel.java @@ -90,6 +90,7 @@ public class NonTargetSampleUIModel extends ContentTableUIModel<NonTargetSampleD return bean.getSex() != null; } }, + ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_SPECIES_FATE, false), ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_PICTURES_REFERENCES, false)); initModel(ui, metas); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/959062c7b939e9d3d6589f6fe16… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/959062c7b939e9d3d6589f6fe16… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [PS] Unicité des enregistrements des rejets de thons à modifier (See #443)
by Tony CHEMIT 06 Sep '17

06 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2bdf7bee by Tony CHEMIT at 2017-09-06T21:56:32+00:00 [PS] Unicité des enregistrements des rejets de thons à modifier (See #443) - - - - - 4 changed files: - validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineTargetCatchDto-update-targetDiscarded-error-validation.xml - validation/src/main/resources/i18n/validation_en_GB.properties - validation/src/main/resources/i18n/validation_es_ES.properties - validation/src/main/resources/i18n/validation_fr_FR.properties Changes: ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineTargetCatchDto-update-targetDiscarded-error-validation.xml ===================================== --- a/validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineTargetCatchDto-update-targetDiscarded-error-validation.xml +++ b/validation/src/main/resources/fr/ird/observe/dto/data/seine/SetSeineTargetCatchDto-update-targetDiscarded-error-validation.xml @@ -28,11 +28,9 @@ <field name="targetCatch"> -  - <field-validator type="collectionFieldExpression"> <param name="mode">UNIQUE_KEY</param> - <param name="keys">weightCategory.id,reasonForDiscard.id,broughtOnDeck</param> + <param name="keys">species.id,weightCategory.id,reasonForDiscard.id,broughtOnDeck</param> <message>observe.validation.targetDiscarded.uniqueKey</message> </field-validator> ===================================== validation/src/main/resources/i18n/validation_en_GB.properties ===================================== --- a/validation/src/main/resources/i18n/validation_en_GB.properties +++ b/validation/src/main/resources/i18n/validation_en_GB.properties @@ -687,7 +687,7 @@ observe.validation.targetDiscarded.required.reasonForDiscard=Reason for discard observe.validation.targetDiscarded.required.species=Species must be filled. observe.validation.targetDiscarded.required.weight=Weight must be filled. observe.validation.targetDiscarded.required.weightCategory=Weight category must be filled. -observe.validation.targetDiscarded.uniqueKey=Tuple (category - reasonForDiscard - brought on deck) must be unique. +observe.validation.targetDiscarded.uniqueKey=Tuple (species - category - reasonForDiscard - brought on deck) must be unique. observe.validation.targetLength.bound.length=Length must be bound between %s and %s. observe.validation.targetLength.bound.weight=Weight must be bound between %s and %s. observe.validation.targetLength.desactivated.sex=Selected sex is disabled. ===================================== validation/src/main/resources/i18n/validation_es_ES.properties ===================================== --- a/validation/src/main/resources/i18n/validation_es_ES.properties +++ b/validation/src/main/resources/i18n/validation_es_ES.properties @@ -687,7 +687,7 @@ observe.validation.targetDiscarded.required.reasonForDiscard=Es obligatoria sele observe.validation.targetDiscarded.required.species=Es obligatorio seleccionar una especie de atún. observe.validation.targetDiscarded.required.weight=El peso es obligatorio. observe.validation.targetDiscarded.required.weightCategory=Es obligatorio seleccionar una categoría de peso. -observe.validation.targetDiscarded.uniqueKey=El par (categoria - causa del descarte - izado a bordo) debe ser única. +observe.validation.targetDiscarded.uniqueKey=El par (especie - categoria - causa del descarte - izado a bordo) debe ser única. observe.validation.targetLength.bound.length=La talla para esta especie debe estar comprendida entre %1$s y %2$s. observe.validation.targetLength.bound.weight=La peso para esta especie debe estar comprendida entre %1$s y %2$s. observe.validation.targetLength.desactivated.sex=El sexo está desactivado. ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties ===================================== --- a/validation/src/main/resources/i18n/validation_fr_FR.properties +++ b/validation/src/main/resources/i18n/validation_fr_FR.properties @@ -687,7 +687,7 @@ observe.validation.targetDiscarded.required.reasonForDiscard=La sélection d'une observe.validation.targetDiscarded.required.species=La sélection d'une espèce de thon est obligatoire. observe.validation.targetDiscarded.required.weight=Le poids est obligatoire. observe.validation.targetDiscarded.required.weightCategory=La sélection d'une catégorie poids est obligatoire. -observe.validation.targetDiscarded.uniqueKey=Le couple (catégorie - raison rejet) doit être unique. +observe.validation.targetDiscarded.uniqueKey=Le tuple (espèce - catégorie - raison rejet - monté sur le pont) doit être unique. observe.validation.targetLength.bound.length=La longueur pour cette espèce doit être comprise entre %1$s et %2$s. observe.validation.targetLength.bound.weight=Le poids individuel de l'échantillon doit être compris entre %1$s et %2$s. observe.validation.targetLength.desactivated.sex=Le sexe sélectionné est désactivé. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2bdf7beece94a83e35f33b08501… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2bdf7beece94a83e35f33b08501… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ne pas afficher le formulaire des faune accessoire sensibles libérées si aucune espèce ne convient
by Tony CHEMIT 06 Sep '17

06 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: daec5f00 by Tony CHEMIT at 2017-09-06T23:46:08+02:00 Ne pas afficher le formulaire des faune accessoire sensibles libérées si aucune espèce ne convient - - - - - 8 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/FormManager.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java @@ -372,7 +372,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U return ObserveSwingApplicationContext.get().getDecoratorService(); } - public void destroyUI() { + void destroyUI() { UIHelper.removeAllDataBindings(getUi()); getModel().destroy(); UIHelper.destroy(getUi()); @@ -411,9 +411,13 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U grabFocusOnForm(); + fixFormSize(); + } + + protected void fixFormSize() { + // we want to see the hole form on screen ui.setMinimumSize(ui.getPreferredSize()); - } /** @@ -1000,7 +1004,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U list.putClientProperty("data", data); } - protected <R extends ReferentialDtoReference> void updateReferentialBeanListHeader(Class<R> dtoClass, BeanListHeader<R> list) { + private <R extends ReferentialDtoReference> void updateReferentialBeanListHeader(Class<R> dtoClass, BeanListHeader<R> list) { Boolean noLoad = (Boolean) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_NO_LOAD); @@ -1057,7 +1061,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } - protected <R extends ReferentialDtoReference> void updateReferentialBeanComboBox(Class<R> dtoClass, BeanComboBox<R> comboBox) { + private <R extends ReferentialDtoReference> void updateReferentialBeanComboBox(Class<R> dtoClass, BeanComboBox<R> comboBox) { Boolean noLoad = (Boolean) comboBox.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_NO_LOAD); Boolean forceLoadComboBox = (Boolean) comboBox.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_FORCE_LOAD); @@ -1193,7 +1197,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U boolean isReferential = ReferentialDto.class.isAssignableFrom(getBeanType()); if (isReferential) { content.add(new JLabel(t("observe.common.Dto.topiaCreateDate"))); - JTextField comp =(JTextField) new JTextField(dateFormat.format(bean.getCreateDate())); + JTextField comp = new JTextField(dateFormat.format(bean.getCreateDate())); comp.setEditable(false); comp.addFocusListener(l); content.add(comp); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/FormManager.java ===================================== --- /dev/null +++ b/client/src/main/java/fr/ird/observe/client/ui/content/FormManager.java @@ -0,0 +1,17 @@ +package fr.ird.observe.client.ui.content; + +/** + * Created by tchemit on 06/09/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 7.0 + * TODO + */ +public class FormManager { + + + public void loadForm(ContentUIModel model) { + + + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jcss @@ -20,6 +20,10 @@ * #L% */ +#hideFormInformation { + text:"observe.common.NonTargetCatchReleaseDto.message.cantAdd"; +} + #statesContent { border:{new TitledBorder(t("observe.common.NonTargetCatchReleaseDto.status"))}; } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java @@ -23,10 +23,15 @@ package fr.ird.observe.client.ui.content.data.seine; import fr.ird.observe.client.constants.AcquisitionMode; import fr.ird.observe.client.db.constants.DataContextType; +import fr.ird.observe.client.ui.content.ContentMode; import fr.ird.observe.client.ui.content.table.ContentTableUIHandler; import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.client.ui.util.table.AutotSelectRowAndShowPopupActionSupport; +import fr.ird.observe.dto.data.seine.NonTargetCatchReleaseDto; import fr.ird.observe.dto.data.seine.NonTargetCatchReleaseStatus; +import fr.ird.observe.dto.data.seine.SetSeineDto; +import fr.ird.observe.dto.data.seine.SetSeineNonTargetCatchReleaseDto; +import fr.ird.observe.dto.data.seine.SetSeineNonTargetCatchReleaseHelper; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; import fr.ird.observe.dto.referential.SexReference; @@ -34,9 +39,6 @@ import fr.ird.observe.dto.referential.SpeciesGroupDto; import fr.ird.observe.dto.referential.SpeciesGroupReleaseModeReference; import fr.ird.observe.dto.referential.SpeciesReference; import fr.ird.observe.dto.result.SaveResultDto; -import fr.ird.observe.dto.data.seine.NonTargetCatchReleaseDto; -import fr.ird.observe.dto.data.seine.SetSeineNonTargetCatchReleaseDto; -import fr.ird.observe.dto.data.seine.SetSeineNonTargetCatchReleaseHelper; import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Collections; @@ -56,9 +58,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.widgets.hidor.HidorButton; +import org.nuiton.validator.NuitonValidatorScope; import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -90,7 +94,6 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei addReferentialFilter(NonTargetCatchReleaseDto.PROPERTY_SPECIES, incomingReferences -> { ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getNonTargetCatchReleaseService().getSampleSpecies(getSelectedParentId()); return new LinkedList<>(sampleSpecies.toSet()); -// return ReferentialDtoReferences.filterEnabled(result); }); } @@ -258,6 +261,21 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei getModel().setForm(form); SetSeineNonTargetCatchReleaseHelper.copySetSeineNonTargetCatchReleaseDto(form.getObject(), getBean()); + boolean showData = !getModel().getReferentialReferences(NonTargetCatchReleaseDto.PROPERTY_SPECIES).isEmpty(); + + getModel().setShowData(showData); + + if (getModel().isUpdatingMode() && !showData) { + + getModel().setMode(ContentMode.READ); + + removeAllMessages(ui); + + addMessage(getUi(), + NuitonValidatorScope.INFO, + getTypeI18nKey(SetSeineDto.class), + t("observe.common.SetSeineDto.message.no.nonTargetCatchRelease")); + } } public void moveCatchLonglineUp() { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java @@ -40,6 +40,7 @@ import fr.ird.observe.dto.data.seine.ActivitySeineDto; import fr.ird.observe.dto.data.seine.TargetCatchDto; import fr.ird.observe.dto.referential.SpeciesReference; import fr.ird.observe.dto.referential.seine.WeightCategoryReference; +import java.awt.Dimension; import java.awt.Rectangle; import java.beans.PropertyChangeListener; import java.io.Serializable; @@ -49,6 +50,7 @@ import javax.swing.JButton; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import javax.swing.JScrollPane; +import javax.swing.JSplitPane; import javax.swing.JTable; import javax.swing.ListSelectionModel; import javax.swing.SwingUtilities; @@ -214,6 +216,23 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto, U protected abstract void loadEditBean(String beanId); @Override + protected void fixFormSize() { + + if (getModel().isShowData()) { + super.fixFormSize(); + } else { + + // we want to see the hole form on screen + Dimension preferredSize = ui.getPreferredSize(); + + JSplitPane parentContainer = ui.getParentContainer(JSplitPane.class); + ui.setMinimumSize(new Dimension(preferredSize.width, parentContainer.getPreferredSize().height-200)); + +// parentContainer.getRightComponent().setMinimumSize(new Dimension(preferredSize.width, 200)); + } + } + + @Override public void afterInit(U ui) { ContentTableUIInitializer<E, D, U> uiInitializer = new ContentTableUIInitializer<>(ui); @@ -276,6 +295,8 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto, U } updateSaveAction(false); + + fixFormSize(); } @Override ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== --- a/client/src/main/resources/i18n/client_en_GB.properties +++ b/client/src/main/resources/i18n/client_en_GB.properties @@ -746,6 +746,7 @@ observe.common.NonTargetCatchDto.table.well.tip=Well observe.common.NonTargetCatchDto.totalCountComputed.computed.tip=Count was computed (%s) observe.common.NonTargetCatchDto.totalCountComputed.observed.tip=Count was observed observe.common.NonTargetCatchDto.well=Well +observe.common.NonTargetCatchReleaseDto.message.cantAdd=<html><body>Can not add non target catch release(no sensible non target catch)</body></html> observe.common.NonTargetCatchReleaseDto.table.comment=Com observe.common.NonTargetCatchReleaseDto.table.comment.tip=Comment observe.common.NonTargetCatchReleaseDto.table.deleteExtraMessage=Blablah @@ -933,6 +934,7 @@ observe.common.SetSeineDto.generalTab=General caracteristics observe.common.SetSeineDto.measurementsTab=Measurements observe.common.SetSeineDto.message.creating=Set in in editing mode. observe.common.SetSeineDto.message.information.schoolType=School type +observe.common.SetSeineDto.message.no.nonTargetCatchRelease=No non target catch released. "TODO observe.common.SetSeineDto.message.no.nonTargetDiscarded=Set has no non target discarded catches. observe.common.SetSeineDto.message.no.targetCatch=To sample target catches, you need at least one catch. observe.common.SetSeineDto.message.no.targetDiscarded=To sample discarded target catches, you need at least one discarded catch brought on deck. ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== --- a/client/src/main/resources/i18n/client_es_ES.properties +++ b/client/src/main/resources/i18n/client_es_ES.properties @@ -746,6 +746,7 @@ observe.common.NonTargetCatchDto.table.well.tip=Cuba observe.common.NonTargetCatchDto.totalCountComputed.computed.tip=El número estimado se calculo observe.common.NonTargetCatchDto.totalCountComputed.observed.tip=El número estimado se observo observe.common.NonTargetCatchDto.well=Cuba +observe.common.NonTargetCatchReleaseDto.message.cantAdd=<html><body>Impossible d'ajouter des libération(pas de faune accessoire sensible)</body></html> \#TODO observe.common.NonTargetCatchReleaseDto.table.comment=Com \#TODO observe.common.NonTargetCatchReleaseDto.table.comment.tip=Commentaire \#TODO observe.common.NonTargetCatchReleaseDto.table.deleteExtraMessage=Blabla \#TODO @@ -933,6 +934,7 @@ observe.common.SetSeineDto.generalTab=Características generales observe.common.SetSeineDto.measurementsTab=Parámetros observe.common.SetSeineDto.message.creating=Lance en proceso de creación. observe.common.SetSeineDto.message.information.schoolType=Tipo de banco calculado a partir de los sistemas observados de su actividad. +observe.common.SetSeineDto.message.no.nonTargetCatchRelease=Aucune faune accessoire sensible renseignée dans les faunes accessoires capturées. \#TODO observe.common.SetSeineDto.message.no.nonTargetDiscarded=El lance no tiene descarte de fauna. observe.common.SetSeineDto.message.no.targetCatch=Para los muestreos de atunes capturados, se necesita al menos una captura. observe.common.SetSeineDto.message.no.targetDiscarded=Para muestreos de atunes, se necesita al menos un descarte de atún izado a bordo. ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== --- a/client/src/main/resources/i18n/client_fr_FR.properties +++ b/client/src/main/resources/i18n/client_fr_FR.properties @@ -746,6 +746,7 @@ observe.common.NonTargetCatchDto.table.well.tip=Numéro de cuve observe.common.NonTargetCatchDto.totalCountComputed.computed.tip=Le nombre estimé a été calculé (%s) observe.common.NonTargetCatchDto.totalCountComputed.observed.tip=Le nombre estimé a été observé observe.common.NonTargetCatchDto.well=Cuve +observe.common.NonTargetCatchReleaseDto.message.cantAdd=<html><body>Impossible d'ajouter des libération(pas de faune accessoire sensible)</body></html> observe.common.NonTargetCatchReleaseDto.table.comment=Com observe.common.NonTargetCatchReleaseDto.table.comment.tip=Commentaire observe.common.NonTargetCatchReleaseDto.table.deleteExtraMessage=Blabla @@ -933,6 +934,7 @@ observe.common.SetSeineDto.generalTab=Caractéristiques générales observe.common.SetSeineDto.measurementsTab=Mesures observe.common.SetSeineDto.message.creating=La calée est en cours de création. observe.common.SetSeineDto.message.information.schoolType=Type de banc +observe.common.SetSeineDto.message.no.nonTargetCatchRelease=Aucune faune accessoire sensible renseignée dans les faunes accessoires capturées. observe.common.SetSeineDto.message.no.nonTargetDiscarded=La calée n'a pas de rejet de faune observe.common.SetSeineDto.message.no.targetCatch=Pour échantilloner les thons capturés, il faut au moins une capture. observe.common.SetSeineDto.message.no.targetDiscarded=Pour échantilloner les thons, il faut au moins un rejet de thon monté sur le pont. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/daec5f008e259bfaa09de50ce8f… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/daec5f008e259bfaa09de50ce8f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] remove redundant casts
by Tony CHEMIT 06 Sep '17

06 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 73eff307 by Tony CHEMIT at 2017-09-06T21:51:45+02:00 remove redundant casts - - - - - 19 changed files: - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ChangeStorageAction.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesMeasurementLonglinesTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglinePositionHelper.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesMeasurementSeinesTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java - dto/src/main/java/fr/ird/observe/dto/data/seine/FloatingObjectTransmittingBuoyDto.java - dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ObserveDecorator.java - dto/src/main/java/fr/ird/observe/dto/referential/seine/VesselActivitySeineHelper.java - dto/src/main/java/fr/ird/observe/dto/referential/seine/WeightCategoryHelper.java - services/src/main/java/fr/ird/observe/services/validation/validators/QuadrantFieldDtoValidator.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ChangeStorageAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ChangeStorageAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ChangeStorageAction.java @@ -58,7 +58,7 @@ public class ChangeStorageAction extends MenuActionSupport { private final String title; public ChangeStorageAction(ObserveMainUI ui) { - this(ui, (Set<DbMode>)null, null); + this(ui, null, null); } public ChangeStorageAction(ObserveMainUI ui, String actionName,char keyStroke) { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java @@ -1193,7 +1193,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U boolean isReferential = ReferentialDto.class.isAssignableFrom(getBeanType()); if (isReferential) { content.add(new JLabel(t("observe.common.Dto.topiaCreateDate"))); - JTextField comp = new JTextField(dateFormat.format(((ReferentialDto) bean).getCreateDate())); + JTextField comp =(JTextField) new JTextField(dateFormat.format(bean.getCreateDate())); comp.setEditable(false); comp.addFocusListener(l); content.add(comp); @@ -1209,7 +1209,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U if (isReferential) { content.add(new JLabel(t("observe.common.Dto.topiaVersion"))); - JTextField comp = new JTextField(String.valueOf(((ReferentialDto) bean).getVersion())); + JTextField comp = new JTextField(String.valueOf(bean.getVersion())); comp.setEditable(false); comp.addFocusListener(l); content.add(comp); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java @@ -440,7 +440,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat selectedNode = selectedNode.getParent(); } TripLonglineReference tripReference = ((TripLonglineNavigationTreeNode) selectedNode).getData(); - String tripTypeId = (String) tripReference.getTripTypeId(); + String tripTypeId = tripReference.getTripTypeId(); if (log.isInfoEnabled()) { log.info("Use tripId: " + tripTypeId); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java @@ -199,7 +199,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip .map(input -> { GearUseFeaturesMeasurementLonglineDto measurementLonglineDto = new GearUseFeaturesMeasurementLonglineDto(); measurementLonglineDto.setGearCaracteristic(input); - String gearCaracterisiticTypeId = (String) input.getGearCaracteristicTypeId(); + String gearCaracterisiticTypeId = input.getGearCaracteristicTypeId(); if (GearCaracteristicTypeHelper.isBoolean(gearCaracterisiticTypeId)) { measurementLonglineDto.setMeasurementValue(Boolean.FALSE.toString()); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesMeasurementLonglinesTableModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesMeasurementLonglinesTableModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesMeasurementLonglinesTableModel.java @@ -101,7 +101,7 @@ public class GearUseFeaturesMeasurementLonglinesTableModel extends EditableTable switch (columnIndex) { case 0: measure.setGearCaracteristic((GearCaracteristicReference) aValue); - String gearCaracteristicTypeId = (String) measure.getGearCaracteristic().getGearCaracteristicTypeId(); + String gearCaracteristicTypeId = measure.getGearCaracteristic().getGearCaracteristicTypeId(); if (GearCaracteristicTypeHelper.isBoolean(gearCaracteristicTypeId)) { // on force à avoir false par défaut measure.setMeasurementValue("false"); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglinePositionHelper.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglinePositionHelper.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglinePositionHelper.java @@ -270,7 +270,7 @@ public class LonglinePositionHelper<D extends LonglinePositionAwareDto> { protected SectionReference getSection(BasketReference basket) { - String sectionId = (String) ((BasketWithSectionIdReference) basket).getSectionId(); + String sectionId = ((BasketWithSectionIdReference) basket).getSectionId(); return sectionUniverse.stream() .filter(s -> sectionId.equals(s.getId())) @@ -281,7 +281,7 @@ public class LonglinePositionHelper<D extends LonglinePositionAwareDto> { protected BasketReference getBasket(BranchlineReference branchline) { - String basketId = (String) ((BranchlineWithBasketIdReference) branchline).getBasketId(); + String basketId = ((BranchlineWithBasketIdReference) branchline).getBasketId(); return basketUniverse.stream() .filter(b -> basketId.equals(b.getId())) ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java @@ -210,9 +210,9 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, FloatingObjectUIModel model = getModel(); for (FloatingObjectPartReference p : partsSet) { - String objectMaterialId = (String) p.getObjectMaterialId(); - String whenArriving = (String) p.getWhenArriving(); - String whenLeaving = (String) p.getWhenLeaving(); + String objectMaterialId = p.getObjectMaterialId(); + String whenArriving = p.getWhenArriving(); + String whenLeaving = p.getWhenLeaving(); if (whenArriving != null && !Objects.equals("false", whenArriving)) { model.setWhenArriving(objectMaterialId, whenArriving); } @@ -360,8 +360,8 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, getModel().setArriving(false); getModel().setLeaving(false); } else { - getModel().setArriving((Boolean) operation.isWhenArriving()); - getModel().setLeaving((Boolean) operation.isWhenLeaving()); + getModel().setArriving(operation.isWhenArriving()); + getModel().setLeaving(operation.isWhenLeaving()); } FloatingObjectPartsTreeTableModel treeModel = (FloatingObjectPartsTreeTableModel) getUi().getTable().getTreeTableModel(); treeModel.reset(); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesMeasurementSeinesTableModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesMeasurementSeinesTableModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesMeasurementSeinesTableModel.java @@ -101,7 +101,7 @@ public class GearUseFeaturesMeasurementSeinesTableModel extends EditableTableWit switch (columnIndex) { case 0: measure.setGearCaracteristic((GearCaracteristicReference) aValue); - String gearCaracteristicTypeId = (String) measure.getGearCaracteristic().getGearCaracteristicTypeId(); + String gearCaracteristicTypeId = measure.getGearCaracteristic().getGearCaracteristicTypeId(); if (GearCaracteristicTypeHelper.isBoolean(gearCaracteristicTypeId)) { // on force à avoir false par défaut measure.setMeasurementValue("false"); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineUIHandler.java @@ -198,7 +198,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei return gearDto.getGearCaracteristic().stream() .map(input -> { GearUseFeaturesMeasurementSeineDto measurementSeineDto = new GearUseFeaturesMeasurementSeineDto(); - String gearCaracterisiticTypeId = (String) input.getGearCaracteristicTypeId(); + String gearCaracterisiticTypeId = input.getGearCaracteristicTypeId(); if (GearCaracteristicTypeHelper.isBoolean(gearCaracterisiticTypeId)) { measurementSeineDto.setMeasurementValue(Boolean.FALSE.toString()); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jaxx @@ -84,6 +84,8 @@ <ButtonGroup id='acquisitionModeGroup' onStateChanged='getHandler().updateModeSaisie((AcquisitionMode) acquisitionModeGroup.getSelectedValue())'/> + <JLabel id='hideFormInformation' styleClass="skipI18n"/> + <Table id='editorPanel' fill='both' insets='1' onFocusGained='species.requestFocus()'>  ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java @@ -101,7 +101,7 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei UIHelper.askFocus(getUi().getSpecies()); return; } - String speciesGroupId = (String) species.getSpeciesGroupId(); + String speciesGroupId = species.getSpeciesGroupId(); SpeciesGroupDto speciesGroupDto = speciesGroupDtoMap.get(speciesGroupId); Objects.requireNonNull(speciesGroupDto); log.info("Will use speciesGroup: " + speciesGroupDto.getLabel2()); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java @@ -340,7 +340,7 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS Optional<SizeMeasureTypeReference> result = Optional.empty(); if (species != null) { - String sizeMeasureId = (String) species.getSizeMeasureTypeId(); + String sizeMeasureId = species.getSizeMeasureTypeId(); result = getUi().getSizeMeasureType().getData().stream() .filter(s -> s.getId().equals(sizeMeasureId)).findFirst(); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableUIHandler.java @@ -356,7 +356,7 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto, U */ protected Optional<SpeciesReference> getWeightCategorySpecies(WeightCategoryReference weightCategory) { - String speciesId = (String) weightCategory.getSpeciesId(); + String speciesId = weightCategory.getSpeciesId(); return getModel().tryGetReferentialReferenceById(TargetCatchDto.PROPERTY_SPECIES, speciesId); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java @@ -90,7 +90,7 @@ public class GearUseFeatureMeasurementCellRenderer implements TableCellRenderer tableCellRenderer = table.getDefaultRenderer(Object.class); } else { - String gearCaracteristicTypeId = (String) caracteristicRef.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); + String gearCaracteristicTypeId = caracteristicRef.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); tableCellRenderer = renderersByCaracteristicTypeId.get(gearCaracteristicTypeId); ===================================== dto/src/main/java/fr/ird/observe/dto/data/seine/FloatingObjectTransmittingBuoyDto.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/data/seine/FloatingObjectTransmittingBuoyDto.java +++ b/dto/src/main/java/fr/ird/observe/dto/data/seine/FloatingObjectTransmittingBuoyDto.java @@ -49,7 +49,7 @@ public class FloatingObjectTransmittingBuoyDto extends GeneratedFloatingObjectTr // - pose d'une nouvelle balise TransmittingBuoyDto balise = Iterables.get(transmittingBuoy, 0); TransmittingBuoyOperationReference objectOperation = balise.getTransmittingBuoyOperation(); - String code = (String) objectOperation.getCode(); + String code = objectOperation.getCode(); switch (Integer.valueOf(code)) { case 1: ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ObserveDecorator.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ObserveDecorator.java +++ b/dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ObserveDecorator.java @@ -114,7 +114,7 @@ public class ObserveDecorator<E> extends MultiJXPathDecorator<E> implements Clon String lastToken = tokens[tokens.length - 1]; if (referenceBean.getPropertyNames().contains(lastToken)) { - value = (Comparable<Comparable<?>>) referenceBean.getPropertyValue(lastToken); + value = referenceBean.getPropertyValue(lastToken); } return value; ===================================== dto/src/main/java/fr/ird/observe/dto/referential/seine/VesselActivitySeineHelper.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/referential/seine/VesselActivitySeineHelper.java +++ b/dto/src/main/java/fr/ird/observe/dto/referential/seine/VesselActivitySeineHelper.java @@ -43,7 +43,7 @@ public class VesselActivitySeineHelper extends GeneratedVesselActivitySeineHelpe public static boolean isDcpOperation(VesselActivitySeineReference reference) { boolean result = reference != null; if (result) { - result = (boolean) reference.isAllowFad(); + result = reference.isAllowFad(); } return result; } ===================================== dto/src/main/java/fr/ird/observe/dto/referential/seine/WeightCategoryHelper.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/referential/seine/WeightCategoryHelper.java +++ b/dto/src/main/java/fr/ird/observe/dto/referential/seine/WeightCategoryHelper.java @@ -59,7 +59,7 @@ public class WeightCategoryHelper extends GeneratedWeightCategoryHelper { @Override public boolean test(WeightCategoryReference input) { - String inputSpeciesId = (String) input.getSpeciesId(); + String inputSpeciesId = input.getSpeciesId(); return speciesId.equals(inputSpeciesId); } ===================================== services/src/main/java/fr/ird/observe/services/validation/validators/QuadrantFieldDtoValidator.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/validation/validators/QuadrantFieldDtoValidator.java +++ b/services/src/main/java/fr/ird/observe/services/validation/validators/QuadrantFieldDtoValidator.java @@ -57,7 +57,7 @@ public class QuadrantFieldDtoValidator extends FieldValidatorSupport { return; } - Integer code = Integer.valueOf((String) ocean.getCode()); + Integer code = Integer.valueOf(ocean.getCode()); boolean valid = code == 3 || (code == 1 && (quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) || (code == 2 && (quadrant == 1 || quadrant == 2)); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/73eff3076662f9384f305074658… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/73eff3076662f9384f305074658… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] fix i18n
by Tony CHEMIT 06 Sep '17

06 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7ef7c4b6 by Tony CHEMIT at 2017-09-06T18:59:59+00:00 fix i18n - - - - - 4 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUI.jaxx - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUI.jaxx @@ -115,7 +115,7 @@ public String getLengthDataTip(boolean computed) {  <row> <cell> - <JLabel id='speciesLabel'/> + <JLabel id='speciesLabel' styleClass="i18n"/> </cell> <cell weightx='1' anchor='east'> <BeanComboBox id='species' genericType='SpeciesReference' constructorParams='this'/> @@ -125,7 +125,7 @@ public String getLengthDataTip(boolean computed) {  <row> <cell> - <JLabel id='sexLabel'/> + <JLabel id='sexLabel' styleClass="i18n"/> </cell> <cell weightx='1' anchor='east'> <BeanComboBox id='sex' genericType='SexReference' constructorParams='this'/> @@ -135,7 +135,7 @@ public String getLengthDataTip(boolean computed) {  <row> <cell> - <JLabel id='lengthLabel'/> + <JLabel id='lengthLabel' styleClass="i18n"/> </cell> <cell weightx='1' anchor='east'> <NumberEditor id='length' constructorParams='this' styleClass="float1"/> @@ -150,7 +150,7 @@ public String getLengthDataTip(boolean computed) {  <row> <cell> - <JLabel id='weightLabel'/> + <JLabel id='weightLabel' styleClass="i18n"/> </cell> <cell weightx='1' anchor='east'> <NumberEditor id='weight' constructorParams='this' styleClass="float2"/> @@ -165,7 +165,7 @@ public String getLengthDataTip(boolean computed) {  <row> <cell> - <JLabel id='countLabel'/> + <JLabel id='countLabel' styleClass="i18n"/> </cell> <cell weightx='1' anchor='east'> <NumberEditor id='count' constructorParams='this' styleClass="int6"/> @@ -175,7 +175,7 @@ public String getLengthDataTip(boolean computed) {  <row> <cell anchor='west'> - <JLabel id='tagNumberLabel'/> + <JLabel id='tagNumberLabel' styleClass="i18n"/> </cell> <cell anchor='east' weightx="1" fill="both"> <JPanel layout='{new BorderLayout()}'> ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== --- a/client/src/main/resources/i18n/client_en_GB.properties +++ b/client/src/main/resources/i18n/client_en_GB.properties @@ -1013,6 +1013,7 @@ observe.common.TargetLengthDto.table.speciesThon=Species observe.common.TargetLengthDto.table.speciesThon.tip=Target sample species observe.common.TargetLengthDto.table.totalWeight=Total weight (in t) observe.common.TargetLengthDto.table.totalWeight.tip=Total weight (in t) +observe.common.TargetLengthDto.tagNumber=Tag number observe.common.TargetSampleCaptureDto.action.create=Insert this sample observe.common.TargetSampleCaptureDto.action.create.tip=Insert this target sample observe.common.TargetSampleCaptureDto.title=Target sample catch ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== --- a/client/src/main/resources/i18n/client_es_ES.properties +++ b/client/src/main/resources/i18n/client_es_ES.properties @@ -1013,6 +1013,7 @@ observe.common.TargetLengthDto.table.speciesThon=Especie de atún observe.common.TargetLengthDto.table.speciesThon.tip=Especie de atún observe.common.TargetLengthDto.table.totalWeight=Peso tot. observe.common.TargetLengthDto.table.totalWeight.tip=Peso total (en t) +observe.common.TargetLengthDto.tagNumber=Numéro échantillon \#TODO observe.common.TargetSampleCaptureDto.action.create=Insertar muestreo observe.common.TargetSampleCaptureDto.action.create.tip=Insertar muestreo de atún capturado observe.common.TargetSampleCaptureDto.title=Muestreo atún capturado ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== --- a/client/src/main/resources/i18n/client_fr_FR.properties +++ b/client/src/main/resources/i18n/client_fr_FR.properties @@ -1013,6 +1013,7 @@ observe.common.TargetLengthDto.table.speciesThon=Espèce de thon observe.common.TargetLengthDto.table.speciesThon.tip=Espèce de thon observe.common.TargetLengthDto.table.totalWeight=Poids tot. observe.common.TargetLengthDto.table.totalWeight.tip=Poids total (en t) +observe.common.TargetLengthDto.tagNumber=Numéro échantillon observe.common.TargetSampleCaptureDto.action.create=Insérer cet échantillon observe.common.TargetSampleCaptureDto.action.create.tip=Insérer cet échantillon de thon capturé observe.common.TargetSampleCaptureDto.title=Echantillon thon capturé View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7ef7c4b6b22b165601cf8b580f5… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7ef7c4b6b22b165601cf8b580f5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: improve commons api
by Tony CHEMIT 06 Sep '17

06 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3415bc25 by Tony CHEMIT at 2017-09-06T15:17:49+00:00 improve commons api - - - - - 323a1e9c by Tony CHEMIT at 2017-09-06T17:06:36+00:00 improve form api - - - - - abbd7661 by Tony CHEMIT at 2017-09-06T17:29:51+00:00 use last pom - - - - - 2c74b496 by Tony CHEMIT at 2017-09-06T18:01:11+00:00 rethink ui packages - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/db/ClientDataContext.java - client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddFloatingObjectPresetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseAndCreateUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseOpenUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CopyFloatingObjectPartToLeftAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CopyFloatingObjectPartToRightAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/EditFloatingObjectPresetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglinesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivitySeinesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveMultipleDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveRoutesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripLonglinesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripSeinesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/ReOpenUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/RemoveFloatingObjectPresetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/SelectNodeUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/GotoOpenActivityAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/GotoOpenProgramAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/GotoOpenRouteAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/GotoOpenSetAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/GotoOpenTripAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/tripMap/TripMapActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/export/TripEntry.java - client/src/main/java/fr/ird/observe/client/ui/admin/export/TripToExportTableModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/5cfa0e28523b7a776157bbe118… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/5cfa0e28523b7a776157bbe118… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update license header [skip ci]
by Tony CHEMIT 06 Sep '17

06 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5cfa0e28 by Tony CHEMIT at 2017-09-06T13:57:51+02:00 update license header [skip ci] - - - - - 2 changed files: - server-configuration/src/test/java/fr/ird/observe/server/configuration/db/ObserveWebDatabasesHelperTest.java - server-configuration/src/test/java/fr/ird/observe/server/configuration/user/ObserveWebUsersHelperTest.java Changes: ===================================== server-configuration/src/test/java/fr/ird/observe/server/configuration/db/ObserveWebDatabasesHelperTest.java ===================================== --- a/server-configuration/src/test/java/fr/ird/observe/server/configuration/db/ObserveWebDatabasesHelperTest.java +++ b/server-configuration/src/test/java/fr/ird/observe/server/configuration/db/ObserveWebDatabasesHelperTest.java @@ -2,7 +2,7 @@ package fr.ird.observe.server.configuration.db; /* * #%L - * ObServe :: Server + * ObServe :: Server configuration * %% * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io * %% ===================================== server-configuration/src/test/java/fr/ird/observe/server/configuration/user/ObserveWebUsersHelperTest.java ===================================== --- a/server-configuration/src/test/java/fr/ird/observe/server/configuration/user/ObserveWebUsersHelperTest.java +++ b/server-configuration/src/test/java/fr/ird/observe/server/configuration/user/ObserveWebUsersHelperTest.java @@ -2,7 +2,7 @@ package fr.ird.observe.server.configuration.user; /* * #%L - * ObServe :: Server + * ObServe :: Server configuration * %% * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io * %% View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5cfa0e28523b7a776157bbe118e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5cfa0e28523b7a776157bbe118e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] move some constants and begin to use nice generated i18n keys
by Tony CHEMIT 06 Sep '17

06 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 62ebe1a0 by Tony CHEMIT at 2017-09-06T13:54:34+02:00 move some constants and begin to use nice generated i18n keys - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - client/pom.xml - client/src/main/java/fr/ird/observe/client/ObserveRunner.java - client/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripLonglineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripLonglinesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripSeineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripSeinesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripsUIAction.java - client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/report/ReportConfigUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/admin/report/ReportModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/report/ReportUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/CountryUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/FpaZoneUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearCaracteristicTypeUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearCaracteristicUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/HarbourUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthLengthParameterUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/62ebe1a0e34fefe462f9b8ad654… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/62ebe1a0e34fefe462f9b8ad654… You're receiving this email because of your account on gitlab.com.

1 0