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

[Git][ultreiaio/ird-observe][develop] Fix pom version
by Tony CHEMIT 18 Jul '17

18 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f3212497 by Tony Chemit at 2017-07-19T00:04:41+02:00 Fix pom version - - - - - 4 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java - pom.xml Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java @@ -103,15 +103,11 @@ public class ObserveMainUIInitializer { if (source == null || !source.isOpen()) { // no open data source - if (log.isDebugEnabled()) { - log.debug("No open Data source."); - } + log.debug("No open Data source."); return; } if (ui.getNavigation().isSelectionEmpty()) { - if (log.isDebugEnabled()) { - log.debug("No selection, show empty panel..."); - } + log.debug("No selection, show empty panel..."); boolean foundEmptySelection = false; for (Component component : ui.getContent().getComponents()) { @@ -225,9 +221,7 @@ public class ObserveMainUIInitializer { } } if (focusOnNavigation) { - if (log.isInfoEnabled()) { - log.info("Focus on navigation: " + focusOwner); - } + log.debug("Focus on navigation: " + focusOwner); } ContentUI<?, ?> previousSelectedContent = manager.getSelectedContentUI(); ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java @@ -126,9 +126,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U public void beforeInit(U ui) { this.ui = ui; prefix = "[" + ui.getClass().getSimpleName() + "] "; - if (log.isDebugEnabled()) { - log.debug("[" + this + "] for ui " + prefix); - } + log.debug("[" + this + "] Before init " + prefix); } public void afterInit(U ui) { @@ -198,9 +196,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } } - if (log.isDebugEnabled()) { - log.debug("previousUI is in edit mode"); - } + log.debug("previousUI is in edit mode"); boolean wasClosed = true; @@ -247,9 +243,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U t("observe.choice.continue"), t("observe.choice.cancel")}, 0); - if (log.isDebugEnabled()) { - log.debug("response : " + reponse); - } + log.debug("response : " + reponse); switch (reponse) { case JOptionPane.CLOSED_OPTION: case 1: @@ -340,9 +334,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U ValidationContext context = applicationContext.getValidationContext(); context.cleanCache(); - if (log.isDebugEnabled()) { - log.debug("ui " + ui.getClass()); - } + log.debug("Open ui " + ui.getClass()); // suppression des messages de validation removeAllMessages(ui); NavigationTree tree = getNavigationTree(); @@ -373,9 +365,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U treeHelper.reloadSelectedNode(false, true); NavigationTreeNodeSupport parentNode = treeHelper.getSelectedNode().getParent(); - if (log.isDebugEnabled()) { - log.debug("PARENT NODE = " + parentNode); - } + log.debug("PARENT NODE = " + parentNode); treeHelper.addUnsavedNode(parentNode, getBeanType()); } @@ -390,10 +380,8 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U SwingUtilities.invokeLater(() -> { mainUI.getNavigation().requestFocusInWindow(); - if (log.isInfoEnabled()) { - log.info("Focus old owner: " + focusOwner); - log.info("Focus new owner: " + mainUI.getFocusOwner()); - } + log.debug("Focus old owner: " + focusOwner); + log.debug("Focus new owner: " + mainUI.getFocusOwner()); }); } }); @@ -401,9 +389,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U FocusTraversalPolicy focusTraversalPolicy = ui.getFocusTraversalPolicy(); if (focusTraversalPolicy != null) { JComponent firstComponent = (JComponent) focusTraversalPolicy.getFirstComponent(ui); - if (log.isInfoEnabled()) { - log.info("Grab focus on first component: " + firstComponent); - } + log.debug("Grab focus on first component: " + firstComponent); UIHelper.askFocus(firstComponent); } } @@ -492,9 +478,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U // on quite de suite return; } - if (log.isInfoEnabled()) { - log.info(prefix + "Will restart edit " + getUi().getClass().getName()); - } + log.debug(prefix + "Will restart edit " + getUi().getClass().getName()); // on ne peut redemarrer une edition que si la donnee // est exactement une entites (pas possible sur une liste) @@ -531,9 +515,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U final boolean closeUI() { boolean b = checkEdit(ui); - if (log.isDebugEnabled()) { - log.debug("Can close " + ui.getClass() + " : " + b); - } + log.debug("Can close " + ui.getClass() + " : " + b); if (b) { closeSafeUI(); } @@ -609,9 +591,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U ImmutableMap.Builder<String, ReferentialReferenceSet<?>> modelReferentialReferenceSets = ImmutableMap.builder(); - if (log.isInfoEnabled()) { - log.info("Update referential reference sets for: " + requestName); - } + log.info("Update referential reference sets for: " + requestName); // mettre à jour le cache de référentiel ImmutableMap<Class<?>, ReferentialReferenceSet<?>> referentialReferenceSetsByType = getDataSource().updateReferentialReferenceSetsCache(requestName); @@ -640,14 +620,10 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U protected <D extends ReferentialDto> Collection<ReferentialReference<D>> filterReferentialReferences(Class<D> dtoType, String propertyName, LinkedList<ReferentialReference<D>> incomingReferences) { - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), original size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } + log.debug(String.format("Filter referential references (type %s - property %s), original size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); // by default always remove obsolete references List<ReferentialReference<D>> referentialReferences = ReferentialReferences.filterEnabled(incomingReferences); - if (log.isDebugEnabled()) { - log.debug(String.format("Filter referential references (type %s - property %s), without diabled size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); - } + log.debug(String.format("Filter referential references (type %s - property %s), without diabled size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); return referentialReferences; } @@ -811,9 +787,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } AbstractUIAction action = (AbstractUIAction) actionMap.get(actionId); - if (log.isDebugEnabled()) { - log.debug("update common action " + actionId); - } + log.debug("update common action " + actionId); action.updateAction(ui, button); } @@ -968,9 +942,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U if (!"referentialListHeader".equals(propertyName) && (BooleanUtils.isTrue(noLoad) || getModel().getForm() == null)) { - if (log.isInfoEnabled()) { - log.info(String.format("Skip loading of BeanListHeader [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName)); - } + log.debug(String.format("Skip loading of BeanListHeader [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName)); data = Collections.emptyList(); } else { @@ -1000,9 +972,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U if (BooleanUtils.isTrue(noLoad) || getModel().getForm() == null) { - if (log.isInfoEnabled()) { - log.info(String.format("Skip loading of BeanListHeader [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName)); - } + log.debug(String.format("Skip loading of BeanListHeader [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName)); data = Collections.emptyList(); } else { @@ -1031,9 +1001,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U if (BooleanUtils.isNotTrue(forceLoadComboBox) && (BooleanUtils.isTrue(noLoad) || getModel().getForm() == null)) { - if (log.isInfoEnabled()) { - log.info(String.format("Skip loading of comboBox [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName)); - } + log.debug(String.format("Skip loading of comboBox [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName)); data = Collections.emptyList(); } else { @@ -1053,9 +1021,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } - if (log.isInfoEnabled()) { - log.info(String.format("comboBox [%s-%s] : %d", dtoClass.getSimpleName(), propertyName, data.size())); - } + log.debug(String.format("comboBox [%s-%s] : %d", dtoClass.getSimpleName(), propertyName, data.size())); comboBox.setData(data); @@ -1070,9 +1036,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U if (BooleanUtils.isTrue(noLoad) || getModel().getForm() == null) { - if (log.isInfoEnabled()) { - log.info(String.format("Skip loading of comboBox [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName)); - } + log.debug(String.format("Skip loading of comboBox [%s-%s] (listNoLoad property found or form is null)", dtoClass.getSimpleName(), propertyName)); data = Collections.emptyList(); } else { @@ -1090,9 +1054,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } - if (log.isInfoEnabled()) { - log.info(String.format("entity comboBox [%s-%s] : %d", dtoClass.getSimpleName(), propertyName, data.size())); - } + log.debug(String.format("entity comboBox [%s-%s] : %d", dtoClass.getSimpleName(), propertyName, data.size())); comboBox.setData(data); } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java @@ -119,7 +119,7 @@ import static org.nuiton.i18n.I18n.t; /** * To initialize ui. - * + * <p> * Created on 9/26/14. * * @author Tony Chemit - dev(a)tchemit.fr @@ -207,10 +207,6 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> public void initUI() { - if (log.isDebugEnabled()) { - log.debug("ui " + getClass()); - } - ObserveActionMap actionMap = ObserveSwingApplicationContext.get().getActionMap(); InputMap inputMap = ObserveSwingApplicationContext.get().getMainUI().getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); // initialisation des éditeurs @@ -428,9 +424,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> beanList.setI18nPrefix("observe.common."); - if (log.isInfoEnabled()) { - log.info("init list for " + beanList.getBeanType()); - } + log.debug("init list for " + beanList.getBeanType()); Class dtoClass = getDtoClass(beanList); @@ -448,9 +442,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> beanList.getAddButton().setFocusable(false); beanList.getRemoveButton().setFocusable(false); - if (log.isInfoEnabled()) { - log.info("init list for " + beanList.getBeanType()); - } + log.debug("init list for " + beanList.getBeanType()); Class dtoClass = getDtoClass(beanList); @@ -463,9 +455,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> } protected void init(TimeEditor editor) { - if (log.isDebugEnabled()) { - log.debug("init time editor " + editor.getName()); - } + log.debug("init time editor " + editor.getName()); editor.init(); if (isAutoSelectOnFocus(editor)) { @@ -476,9 +466,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> } protected void init(DateTimeEditor editor) { - if (log.isDebugEnabled()) { - log.debug("init date time editor " + editor.getName()); - } + log.debug("init date time editor " + editor.getName()); editor.init(); editor.getSliderHidor().setFocusable(false); if (isAutoSelectOnFocus(editor)) { @@ -500,9 +488,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> Object oldValue = UIHelper.getProperty(editor.getModel().getBean(), editor.getModel().getPropertyDayDate()); if (!Objects.equals(oldValue, newDate)) { editor.getDayDateEditor().commitEdit(); - if (log.isInfoEnabled()) { - log.info("quit date editor, commit value: " + source.getValue()); - } + log.debug("quit date editor, commit value: " + source.getValue()); } } catch (ParseException e1) { // l'édition est valide donc pas de problème ici @@ -520,9 +506,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> } protected void init(CoordinatesEditor editor) { - if (log.isDebugEnabled()) { - log.debug("init coordinates editor " + editor.getName()); - } + log.debug("init coordinates editor " + editor.getName()); editor.setFormat(ObserveSwingApplicationContext.get().getConfig().getCoordinateFormat()); editor.init(); editor.getDmdFormat().setFocusable(false); @@ -614,9 +598,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> } protected void init(BooleanEditor editor) { - if (log.isDebugEnabled()) { - log.debug("init boolean editor " + editor.getName()); - } + log.debug("init boolean editor " + editor.getName()); final String propertyName = (String) editor.getClientProperty(CLIENT_PROPERTY_PROPERTY_NAME); if (propertyName != null) { editor.addItemListener(event -> { @@ -647,9 +629,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> } protected void init(JCheckBox editor) { - if (log.isDebugEnabled()) { - log.debug("init simple boolean editor " + editor.getName()); - } + log.debug("init simple boolean editor " + editor.getName()); final String propertyName = (String) editor.getClientProperty(CLIENT_PROPERTY_PROPERTY_NAME); if (propertyName != null) { editor.addItemListener(event -> { @@ -661,9 +641,8 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> protected void init(JXDatePicker picker) { - if (log.isDebugEnabled()) { - log.debug("init JXDatePicker editor" + picker.getName()); - }picker.setLocale(ObserveSwingApplicationContext.get().getConfig().getLocale()); + log.debug("init JXDatePicker editor" + picker.getName()); + picker.setLocale(ObserveSwingApplicationContext.get().getConfig().getLocale()); JFormattedTextField editor = picker.getEditor(); editor.setEditable(true); JXMonthView monthView = new JXMonthView(); @@ -695,9 +674,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> if (source.isEditValid()) { try { picker.commitEdit(); - if (log.isInfoEnabled()) { - log.info("quit date editor, commit value: " + source.getValue()); - } + log.debug("quit date editor, commit value: " + source.getValue()); } catch (ParseException e1) { // l'édition est valide donc pas de problème ici } @@ -708,9 +685,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> } protected <B extends Enum<B>> void init(EnumEditor<B> editor) { - if (log.isDebugEnabled()) { - log.debug("init enumEditor editor " + editor.getName()); - } + log.debug("init enumEditor editor " + editor.getName()); ImmutableMap.Builder<B, String> labelsBuilder = ImmutableMap.builder(); for (B e : EnumSet.allOf(editor.getType())) { String label = I18nEnumHelper.getLabel(e); @@ -748,9 +723,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> protected <D extends DataDto> void prepareDataFilterableDoubleList(Class<D> dtoClass, FilterableDoubleList<DataReference<D>> list) { DataReferenceDecorator<D> decorator = decoratorService.getDataReferenceDecorator(dtoClass); - if (log.isDebugEnabled()) { - log.debug("Will use decorator " + decorator); - } + log.debug("Will use decorator " + decorator); String entityLabel = t(ObserveI18nDecoratorHelper.getTypeI18nKey(dtoClass)); list.getPopupSortLabel().setText(t("observe.content.type.data", entityLabel)); @@ -777,9 +750,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> protected <D extends ReferentialDto> void prepareReferentialFilterableDoubleList(Class<D> dtoClass, FilterableDoubleList<ReferentialReference<D>> list) { ReferentialReferenceDecorator<D> decorator = decoratorService.getReferentialReferenceDecorator(dtoClass); - if (log.isDebugEnabled()) { - log.debug("Will use decorator " + decorator); - } + log.debug("Will use decorator " + decorator); String entityLabel = t(ObserveI18nDecoratorHelper.getTypeI18nKey(dtoClass)); list.getPopupSortLabel().setText(t("observe.content.type.referential", entityLabel)); @@ -806,9 +777,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> protected <D extends DataDto> void prepareDataEntityList(Class<D> dtoClass, BeanListHeader<DataReference<D>> list) { DataReferenceDecorator<D> decorator = decoratorService.getDataReferenceDecorator(dtoClass); - if (log.isDebugEnabled()) { - log.debug("Will use decorator " + decorator); - } + log.debug("Will use decorator " + decorator); String entityLabel = t(ObserveI18nDecoratorHelper.getTypeI18nKey(dtoClass)); list.setPopupTitleText(t("observe.content.type.data", entityLabel)); @@ -833,9 +802,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> protected <D extends ReferentialDto> void prepareReferentialEntityList(Class<D> dtoClass, BeanListHeader<ReferentialReference<D>> list) { ReferentialReferenceDecorator<D> decorator = decoratorService.getReferentialReferenceDecorator(dtoClass); - if (log.isDebugEnabled()) { - log.debug("Will use decorator " + decorator); - } + log.debug("Will use decorator " + decorator); String entityLabel = t(ObserveI18nDecoratorHelper.getTypeI18nKey(dtoClass)); list.setPopupTitleText(t("observe.content.type.referential", entityLabel)); @@ -869,9 +836,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> ListCellRenderer<DataReference<D>> toolTipRenderer = new ComboBoxListCellRenderer<>(combobox.getRenderer()); combobox.setRenderer(toolTipRenderer); - if (log.isDebugEnabled()) { - log.debug("combo list [" + dtoClass.getName() + "] : " + comboBox.getData().size()); - } + log.debug("combo list [" + dtoClass.getName() + "] : " + comboBox.getData().size()); } @@ -894,9 +859,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> ListCellRenderer<ReferentialReference<D>> toolTipRenderer = new ComboBoxListCellRenderer<>(combobox.getRenderer()); combobox.setRenderer(toolTipRenderer); - if (log.isDebugEnabled()) { - log.debug("combo list [" + dtoClass.getName() + "] : " + comboBox.getData().size()); - } + log.debug("combo list [" + dtoClass.getName() + "] : " + comboBox.getData().size()); } ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>15-SNAPSHOT</version> + <version>15</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f3212497b06c7b4b9ab8c922f8d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f3212497b06c7b4b9ab8c922f8d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Update some libraries
by Tony CHEMIT 18 Jul '17

18 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 80fcfee9 by Tony Chemit at 2017-07-18T16:04:14+02:00 Update some libraries - - - - - caf7b294 by Tony Chemit at 2017-07-18T23:53:38+02:00 Review design of ReferenceSetDefinition and FormRequestDefinition (Closes #793) - - - - - 30 changed files: - CONTRIBUTING.md - application-swing/pom.xml - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java - application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java - application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceRestApi.java - application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceRestApi.java - application-web/src/main/java/fr/ird/observe/application/web/injector/ObserveDtoInjector.java - application-web/src/test/java/fr/ird/observe/application/web/controller/v1/ClassMappingRestApiTest.java - pom.xml - services-binder/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java - services-binder/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java - services-binder/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java - services-rest/pom.xml - services-rest/src/main/java/fr/ird/observe/services/rest/DataSourceServiceRestClient.java - + services-rest/src/main/java/fr/ird/observe/services/rest/ObserveRequestBuilder.java - + services-rest/src/main/java/fr/ird/observe/services/rest/ObserveRequestBuilderFactory.java - services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceFactoryRest.java - services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestClientContext.java - services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceRestClientSupport.java - services-rest/src/test/java/fr/ird/observe/services/rest/ClassMappingRestClientTest.java - services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferenceValuesSetServiceRestTest.java - services-topia/src/main/java/fr/ird/observe/services/topia/ObserveJdbcHelper.java - services-topia/src/main/java/fr/ird/observe/services/topia/ObserveSecurityHelper.java - services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaApplicationContextFactory.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/da4d7785bb46b080f35ea2956e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/da4d7785bb46b080f35ea2956e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Add maven best config
by Tony CHEMIT 18 Jul '17

18 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: da4d7785 by Tony Chemit at 2017-07-18T16:00:24+02:00 Add maven best config - - - - - 2 changed files: - + .mvn/jvm.config - + .mvn/maven.config Changes: ===================================== .mvn/jvm.config ===================================== --- /dev/null +++ b/.mvn/jvm.config @@ -0,0 +1 @@ +-Xmx4096m \ No newline at end of file ===================================== .mvn/maven.config ===================================== --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1 @@ +-Dmaven.artifact.threads=10 -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.http.ssl.ignore.validity.dates=true \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/da4d7785bb46b080f35ea2956eb… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/da4d7785bb46b080f35ea2956eb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Correction validation sur WeightCategory (le code n'est pas unique)
by Tony CHEMIT 16 Jul '17

16 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a604a5de by Tony CHEMIT at 2017-07-16T22:34:27+02:00 Correction validation sur WeightCategory (le code n'est pas unique) - - - - - 6414b4df by Tony CHEMIT at 2017-07-16T22:34:51+02:00 Correction du validateur de code (on s'arrête à la première erreur rencontrée) - - - - - c56a2716 by Tony CHEMIT at 2017-07-16T23:13:48+02:00 Remplacer le client REST proxy par des services générés (See #776) - - - - - 30 changed files: - − application-swing-configuration/src/main/resources/validators.xml - application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/ReferentialCodeValidator.java - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-update-error-validation.xml - application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java - application-web/pom.xml - application-web/src/main/filtered-resources/mapping - application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java - application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java - application-web/src/main/java/fr/ird/observe/application/web/ObserveWebMotionFilter.java - application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java - application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java → application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceRestApi.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/LastUpdateDateServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveAuthenticatedServiceControllerSupport.java - application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveServiceControllerSupport.java → application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveServiceRestApiSupport.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java - + application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceRestApi.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/consolidate/ConsolidateDataServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/report/ReportServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/ng/ReferentialSynchronizeServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/validate/ValidateServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/NavigationServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/TripManagementServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLongLineEncounterServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLongLineSensorUsedServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLonglineServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/BranchlineServiceController.java - − application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineCatchServiceController.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f91e98c962ba5982fafe7e0248… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f91e98c962ba5982fafe7e0248… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] create ftl if not exists (for tets purpose only)
by Tony CHEMIT 12 Jul '17

12 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f91e98c9 by Tony CHEMIT at 2017-07-12T21:58:31+02:00 create ftl if not exists (for tets purpose only) - - - - - 1 changed file: - application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java Changes: ===================================== application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java ===================================== --- a/application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java +++ b/application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java @@ -72,6 +72,8 @@ public class LonglineDetailCompositionValidatorServiceTest { config.initConfig(new ObserveResourceManager().getResource(ObserveResourceManager.Resource.application)); + config.getTemplatesDirectory().mkdirs(); + ObserveSwingApplicationContext applicationContext = new ObserveSwingApplicationContext(config); SwingValidator<SectionDto> sectionValidator = new SwingValidator<>(SectionDto.class, "ui-update-table", NuitonValidatorScope.values()); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f91e98c962ba5982fafe7e02483… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f91e98c962ba5982fafe7e02483… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout d'un traducteur dans l'application (See #788) (consolidation intégrité…
by Tony CHEMIT 12 Jul '17

12 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8bc23333 by Tony CHEMIT at 2017-07-12T14:04:51+02:00 Ajout d'un traducteur dans l'application (See #788) (consolidation intégrité bundles + intégration des modifications dans l'application) - - - - - 6 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/TranslateAction.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - pom.xml Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java @@ -380,7 +380,7 @@ public abstract class ObserveRunner extends ApplicationRunner { return config; } - private void initUserDirectories(ObserveSwingApplicationConfig config) throws IOException { + private void initUserDirectories(ObserveSwingApplicationConfig config) throws IOException { // 1 - user data directory @@ -491,6 +491,9 @@ public abstract class ObserveRunner extends ApplicationRunner { @Override protected void createUserI18nLayout(File directory) throws Exception { + if (config.getI18nDefinitionFile().exists()) { + return; + } super.createUserI18nLayout(directory); // add also a archive with all i18n stuff (says i18n bundle + templates) ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/TranslateAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/TranslateAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/TranslateAction.java @@ -26,8 +26,12 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ObserveSwingTechnicalException; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.ObserveUICallback; +import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import java.awt.event.ActionEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; import java.net.URL; @@ -66,12 +70,29 @@ public class TranslateAction extends AbstractUIAction { ObserveSwingApplicationConfig config = ObserveSwingApplicationContext.get().getConfig(); File i18nDefinitionFile = config.getI18nDefinitionFile(); -// URL bundles = Project.class.getClassLoader().getResource("META-INF/observe-i18n-definition.properties"); try { URL bundles = i18nDefinitionFile.toURI().toURL(); Objects.requireNonNull(bundles); - ProjectUI projectUI = new ProjectUI(getMainUI(), new Project(bundles)); + Project model = new Project(bundles); + ProjectUI projectUI = new ProjectUI(getMainUI(), model); projectUI.toggleFilter(); + + projectUI.addWindowListener(new WindowAdapter() { + @Override + public void windowClosed(WindowEvent e) { + if (model.getLastExport() != null) { + File i18nDefinitionFileParentFile = i18nDefinitionFile.getParentFile(); + log.info(String.format("Found existing i18n export, will merge it to user i18n data (%s).", i18nDefinitionFileParentFile)); + try { + model.mergeExport(i18nDefinitionFileParentFile); + } catch (IOException e1) { + throw new ObserveSwingTechnicalException("Can't merge i18n export", e1); + } + UIHelper.displayInfo(t("observe.title.reload.i18n"), t("observe.message.reload.i18n")); + ObserveUICallback.application.run(); + } + } + }); } catch (IOException e) { throw new ObserveSwingTechnicalException("can't open i18n editor", e); } ===================================== application-swing/src/main/resources/i18n/application-swing_en_GB.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -417,6 +417,7 @@ observe.common.length.computed.tip=Length was computed observe.common.length.inf=Length (cm inf.) observe.common.length.observed.tip=Length was observed observe.common.length2=Length (cm) +observe.common.lengthMeasureType=Length measure type observe.common.libelles=Labels observe.common.lowerValueUpperValue=Bounds min-max observe.common.mammalsObservation=Mammals observations @@ -1487,6 +1488,7 @@ observe.message.quit.valid.edit=Data are modified and valid\! observe.message.referentiel.editable=Referential is editable. observe.message.referentiel.home=< Referential > observe.message.referentiel.no.editable=You are not allowed to edit referential. +observe.message.reload.i18n=You have modified i18n, application must be restart. observe.message.select.report=Select a report observe.message.server.info=Local database %1$s is ready in server mode. observe.message.show.usage.for.delete=Referential %1$s "%2$s" can be deleted if you choose a replacement. @@ -1703,6 +1705,7 @@ observe.title.load.remote.db=Load remote database observe.title.need.confirm=Need a confirmation... observe.title.need.confirm.to.desactivate.referentiel=Need a confirmation to disable a referentiel data... observe.title.no.local.db.found=No local database found. +observe.title.reload.i18n=Application need to restart... observe.title.save.localDB=Save local storage to a file observe.title.save.remoteDB=Save remote database to a file observe.title.show.usage=Show usages ===================================== application-swing/src/main/resources/i18n/application-swing_es_ES.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -417,6 +417,7 @@ observe.common.length.computed.tip=Longitud calculada observe.common.length.inf=Longitud (cm inf.) observe.common.length.observed.tip=Longitud observada observe.common.length2=Longitud eslora total (cm) \#TODO +observe.common.lengthMeasureType=Type de mensuration \#TODO observe.common.libelles=Textos observe.common.lowerValueUpperValue=Bornes min-max observe.common.mammalsObservation=Mamiferos @@ -498,8 +499,6 @@ observe.config.category.technical=Técnico observe.config.category.technical.description=Información técnica observe.config.category.ui=GUI observe.config.category.ui.description=Configuración GUI -observe.content.action.activity=Crear una nueva actividad -observe.content.action.activity.tip=Crear una nueva actividad para la ruta actual observe.content.action.closeAndCreate=Cerrar y crear observe.content.action.closeAndCreate.activity=Actividad siguiente observe.content.action.closeAndCreate.activity.tip=Cierre de la actividad actual y creación de una nueva @@ -1489,6 +1488,7 @@ observe.message.quit.valid.edit=¡Los datos han sido modificados y son válidos\ observe.message.referentiel.editable=El referencial es editable. observe.message.referentiel.home=< Referencial > observe.message.referentiel.no.editable=No tiene permisos para editar el referencial. +observe.message.reload.i18n=Vous avez modifié des traductions, le redémarrage de l'application est nécessaire pour les prendre en compte. \#TODO observe.message.select.report=Seleccione informe observe.message.server.info=Información modo servidor observe.message.show.usage.for.delete=El referencial %1$s "%2$s" no se puede eliminar sin hacer una sustitución antes. @@ -1705,6 +1705,7 @@ observe.title.load.remote.db=Cargando una base remota observe.title.need.confirm=Una confirmación se necesita... observe.title.need.confirm.to.desactivate.referentiel=Una confirmación se necesita para désactivar un referencial... observe.title.no.local.db.found=Ninguna base local fue encontrada +observe.title.reload.i18n=Rechargement de l'application nécessaire... \#TODO observe.title.save.localDB=Guardar la base local en un archivo observe.title.save.remoteDB=Guardar la base remota en un archivo observe.title.show.usage=Listas de las utilizaciones de un referencial... ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -17,7 +17,6 @@ observe.action.auto.copy.to.clipboard.tip=Mettre Ã jour automatiquement le cont observe.action.back.to.list=Retour Ã la liste observe.action.back.to.list.tip=Retour Ã la liste des donnÃ©es observe.action.cancel=Annuler -observe.action.cancel.create.tip=Annuler la crÃ©ation de l'objet observe.action.change.storage=Changer la source de donnÃ©es observe.action.change.storage.tip=Pour changer la source de donnÃ©es de l'application observe.action.choose.db.dump=Choisir la sauvegarde @@ -68,9 +67,6 @@ observe.action.copyFloatingObjectPartToLeft.tip=Recopier les valeurs du dÃ©part observe.action.copyFloatingObjectPartToRight=Recopier les valeurs de l'arrivÃ©e vers de dÃ©part observe.action.copyFloatingObjectPartToRight.tip=Recopier les valeurs de l'arrivÃ©e vers de dÃ©part observe.action.create=CrÃ©er -observe.action.db.locale.es.tip=Changer la langue du rÃ©fÃ©rentiel en espagnol -observe.action.db.locale.fr.tip=Changer la langue du rÃ©fÃ©rentiel en franÃ§ais -observe.action.db.locale.uk.tip=Changer la langue du rÃ©fÃ©rentiel en anglais observe.action.delete=Supprimer observe.action.delete.activity.tip=Supprimer l'activitÃ© observe.action.delete.entry.tip=Supprimer l'entrÃ©e en cours d'Ã©dition @@ -117,7 +113,6 @@ observe.action.new.entry.tip=CrÃ©er une nouvelle entrÃ©e observe.action.open.screen=Ouverture de l'Ã©cran <%1$s> observe.action.quit=Quitter observe.action.quit.tip=Quitter le gestionnaire -observe.action.quitHelp.tip=Quitter l'Ã©cran d'aide observe.action.reload.application=RedÃ©marrer l'application observe.action.reload.storage=Recharger la source de donnÃ©es observe.action.reload.storage.tip=Ferme et rouvre la source de donnÃ©es @@ -433,7 +428,6 @@ observe.common.meanLengthComputed.observed.tip=La taille moyenne a Ã©tÃ© observÃ observe.common.meanValues=Valeurs moyennes observe.common.meanWeightComputed.computed.tip=Le poids moyen a Ã©tÃ© calculÃ© (%s) observe.common.meanWeightComputed.observed.tip=Le poids moyen a Ã©tÃ© observÃ© -observe.common.measureType=Type de mensuration observe.common.minLength=Taille minimum (en cm) observe.common.minLengthMax=Taille min-max (en cm) observe.common.minWeight=Poids minimum (en Kg) @@ -1494,6 +1488,7 @@ observe.message.quit.valid.edit=Les donnÃ©es ont Ã©tÃ© modifiÃ©es et sont valide observe.message.referentiel.editable=Le rÃ©fÃ©rentiel est Ã©ditable. observe.message.referentiel.home=< RÃ©fÃ©rentiel > observe.message.referentiel.no.editable=Vous n'Ãªtes pas autorisÃ© Ã Ã©diter le rÃ©fÃ©rentiel. +observe.message.reload.i18n=Vous avez modifiÃ© des traductions, le redÃ©marrage de l'application est nÃ©cessaire pour les prendre en compte. observe.message.select.report=Choisissez une requÃªteÂ observe.message.server.info=La base locale %1$s est dÃ©marrÃ©e en mode serveur. observe.message.show.usage.for.delete=Le rÃ©fÃ©rentiel %1$s "%2$s" ne peut pas Ãªtre supprimÃ© sans effectuer au prÃ©alable un remplacement. @@ -1710,6 +1705,7 @@ observe.title.load.remote.db=Chargement d'une base distante observe.title.need.confirm=Une confirmation de votre part est requise... observe.title.need.confirm.to.desactivate.referentiel=Une confirmation de votre part est requise pour dÃ©sactiver un rÃ©fÃ©rentiel... observe.title.no.local.db.found=Aucune base locale trouvÃ©e +observe.title.reload.i18n=Rechargement de l'application nÃ©cessaire... observe.title.save.localDB=Sauver la base locale vers une fichier observe.title.save.remoteDB=Sauver la base distante vers un fichier observe.title.show.usage=Listes des utilisations d'un rÃ©fÃ©rentiel... ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ <processorPluginVersion>1.3</processorPluginVersion> <jaxxVersion>3.0-alpha-8-SNAPSHOT</jaxxVersion> - <nuitonI18nVersion>4.0-alpha-2</nuitonI18nVersion> + <nuitonI18nVersion>4.0-alpha-3-SNAPSHOT</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8bc23333a1d7e6f368f2bd88ff8… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8bc23333a1d7e6f368f2bd88ff8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Consolidation des traductions (convergence - intégrité) (See #792)
by Tony CHEMIT 12 Jul '17

12 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 67c15827 by Tony CHEMIT at 2017-07-12T02:52:44+02:00 Consolidation des traductions (convergence - intégrité) (See #792) - - - - - 12 changed files: - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties - application-swing/pom.xml - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-web/pom.xml - pom.xml - services-validation/src/main/resources/i18n/services-validation_en_GB.properties - services-validation/src/main/resources/i18n/services-validation_es_ES.properties - services-validation/src/main/resources/i18n/services-validation_fr_FR.properties Changes: ===================================== application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties ===================================== --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties @@ -89,4 +89,4 @@ observe.config.validation.lengthWeightEnable=Forcer la validation des bormes min observe.config.validation.speedEnable=Force validation of activities speedTODO observe.config.validation.speedMaxValue=Max speed value used in activities speed validationTODO observe.message.save.configuration=Guardar la configuración en el archivo %1$s -observe.model.version=Versión del modelo de datos +observe.model.version=Versión del modelo ===================================== application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties ===================================== --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties @@ -59,16 +59,8 @@ observe.config.observation.mammiferes=Observation des mammifères observe.config.observation.mensurations=Observation des mensurations observe.config.observation.oiseaux=Observation des oiseaux observe.config.observation.rejetsThons=Observation des rejets thon -observe.config.obstuna.login.description=Le nom d'utilisateur pour se connecter à la base Obstuna -observe.config.obstuna.password.description=Le mot de passe pour se connecter à la base Obstuna -observe.config.obstuna.url.description=L’URL de connexion à la base Obstuna -observe.config.obstuna.useSsl.description=Drapeau pour permettre l'utilisation du mode ssl pour la connexion à Obstuna observe.config.pg.can.migrate.description=Autoriser la mise à jour des bases distantes (il faut être propriétaire de la base) observe.config.remoteDataSourceConfigurations.description=connexions à des sources distantes -observe.config.server.dataBaseName.description=Le nom optionnel de la base cible sur le serveur -observe.config.server.login.description=Identifiant de l'utilisateur -observe.config.server.password.description=Le mot de passe de l'utilisateur -observe.config.server.url.description=L’URL du serveur observe.config.serverDataSourceConfigurations.description=connexions à des serveursdistantes observe.config.showMigrationProgression=Afficher dans les logs la progression de la mise à jour d'une base observe.config.showMigrationSql=Afficher dans les logs les requêtes jouées lors de la mise à jour d'une base ===================================== application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties ===================================== --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties @@ -120,7 +120,7 @@ observe.common.observer=Observed observe.common.ocean=Ocean observe.common.organism=Organism observe.common.outputInputFormula=Output to Input formula -observe.common.outputSizeMeasureType=Ouput size measure type +observe.common.outputSizeMeasureType=Output size measure type observe.common.power=Power observe.common.previousFpaZone=Previous Fpa zone observe.common.proportion=Proportion ===================================== application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties ===================================== --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties @@ -68,11 +68,11 @@ observe.common.haulingBreaks=Número de cortes observe.common.haulingDirectionSameAsSetting=Sentido del arrastre idéntico a lo de la calada observe.common.haulingEndLatitude=Arrastre Latitud observe.common.haulingEndLongitude=Arrastre Longitud -observe.common.haulingEndQuadrant=Arrastre quadrant +observe.common.haulingEndQuadrant=Arrastre Quadrant observe.common.haulingEndTimeStamp=Timestamp de fin observe.common.haulingStartLatitude=Arrastre Latitud observe.common.haulingStartLongitude=Arrastre Longitud -observe.common.haulingStartQuadrant=Arrastre quadrant +observe.common.haulingStartQuadrant=Arrastre Quadrant observe.common.haulingStartTimeStamp=Timestamp del inicio observe.common.hookOffset=Offset anzuelo (°) observe.common.hookPosition=Posición del anzuelo @@ -168,7 +168,7 @@ observe.common.startLogValue=Corredera de mañana (millas) observe.common.startTime=Fecha - Heuro de inicio de validez observe.common.status=Estado observe.common.stomacFullness=Nivel de llenado del estomago -observe.common.supportVesselName=Nombre del supply +observe.common.supportVesselName=Nombre del macicero observe.common.surroundingActivity=Actividad circundante observe.common.swivelWeight=Peso de el destorcedor (kg) observe.common.targetCatch=Captura de atún @@ -188,8 +188,8 @@ observe.common.tripType=Tipo de marea observe.common.type=Type \#TODO observe.common.uri=URI observe.common.vessel=Barco -observe.common.vesselActivityLongline=Actividad del barco -observe.common.vesselActivitySeine=Actividad del barco +observe.common.vesselActivityLongline=Actividad buque +observe.common.vesselActivitySeine=Actividad buque observe.common.vesselSizeCategory=Capacidad observe.common.vesselSpeed=Velocidad del barco (nd) observe.common.vesselType=Pesquería ===================================== application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties ===================================== --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties @@ -66,9 +66,9 @@ observe.common.gearUseFeaturesSeine=Équipements observe.common.gonadeWeight=Poids des gonades (g) observe.common.haulingBreaks=Nombre de coupures observe.common.haulingDirectionSameAsSetting=Sens du virage identique à celui du filage -observe.common.haulingEndLatitude=Latitude de fin virage -observe.common.haulingEndLongitude=Longitude de fin virage -observe.common.haulingEndQuadrant=Quand de fin de virage +observe.common.haulingEndLatitude=Latitude de fin de virage +observe.common.haulingEndLongitude=Longitude de fin de virage +observe.common.haulingEndQuadrant=Quadrant de fin de virage observe.common.haulingEndTimeStamp=Horodatage fin observe.common.haulingStartLatitude=Latitude de début de virage observe.common.haulingStartLongitude=Longitude de début de virage @@ -148,7 +148,7 @@ observe.common.settingEndQuadrant=Quadrant de fin de filage observe.common.settingEndTimeStamp=Horodatage fin observe.common.settingShape=Forme du filage observe.common.settingStartLatitude=Latitude de début de filage -observe.common.settingStartLongitude=\=Longitude de début de filage +observe.common.settingStartLongitude=Longitude de début de filage observe.common.settingStartQuadrant=Quadrant de début de filage observe.common.settingStartTimeStamp=Horodatage début observe.common.settingVesselSpeed=Vitesse bateau (nd) ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -689,6 +689,12 @@ </configuration> </execution> <execution> + <id>check-convergence</id> + <goals> + <goal>check-i18n-artifacts</goal> + </goals> + </execution> + <execution> <id>scan-sources</id> <goals> <goal>parserJava</goal> ===================================== application-swing/src/main/resources/i18n/application-swing_en_GB.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -852,9 +852,9 @@ observe.content.hooksComposition.table.proportion=Proportion observe.content.hooksComposition.table.proportion.tip=Proportion observe.content.hooksComposition.title=Hooks observe.content.label.coefficients.info=Coefficients of relations msut follow the syntax name\=value and are separated by \: (example \: a\=1\:b\=2\:c\=3) -observe.content.label.inputOutputFormula.info=Input to Ouput formula permits to compute output length from the input length, must contains variable I +observe.content.label.inputOutputFormula.info=Input to Output formula permits to compute output length from the input length, must contains variable I observe.content.label.lengthWeightFormula.info=Length weight formula permits to compute weight from the length, must contains variable L -observe.content.label.outputInputFormula.info=Ouput to Input formula permits to compute input length from the output length, must contains variable O +observe.content.label.outputInputFormula.info=Output to Input formula permits to compute input length from the output length, must contains variable O observe.content.label.usage.data.title=Data '%1$s' (%2$d occurrences) observe.content.label.usage.referentiel.title=Referentiel '%1$s' (%2$d occurrences) observe.content.label.weightLengthFormula.info=Weight length formula permits to compute length from the weight, must contains variable P ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -181,6 +181,12 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> + <id>check-convergence</id> + <goals> + <goal>check-i18n-artifacts</goal> + </goals> + </execution> + <execution> <id>make-bundle</id> <goals> <goal>bundle</goal> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ <processorPluginVersion>1.3</processorPluginVersion> <jaxxVersion>3.0-alpha-8-SNAPSHOT</jaxxVersion> - <nuitonI18nVersion>4.0-alpha-2-SNAPSHOT</nuitonI18nVersion> + <nuitonI18nVersion>4.0-alpha-2</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> ===================================== services-validation/src/main/resources/i18n/services-validation_en_GB.properties ===================================== --- a/services-validation/src/main/resources/i18n/services-validation_en_GB.properties +++ b/services-validation/src/main/resources/i18n/services-validation_en_GB.properties @@ -80,7 +80,7 @@ observe.common.hooksComposition=hooks composition observe.common.hooksCompositionProportionSum=hooks composition proportion sum observe.common.individualSize=Individual size observe.common.individualWeight=Individual weight -observe.common.inputOutputFormula=Input to Ouput formula +observe.common.inputOutputFormula=Input to Output formula observe.common.iso2Code=Iso 2 code observe.common.iso3Code=Iso 3 code observe.common.itemHorizontalPosition=Item horizontal position @@ -119,7 +119,7 @@ observe.common.observedSystemDistance=Observed system distance observe.common.observer=Observed observe.common.ocean=Ocean observe.common.organism=Organism -observe.common.outputInputFormula=Ouput to Input formula +observe.common.outputInputFormula=Output to Input formula observe.common.power=Power observe.common.proportion=Proportion observe.common.quadrant=Quadrant ===================================== services-validation/src/main/resources/i18n/services-validation_es_ES.properties ===================================== --- a/services-validation/src/main/resources/i18n/services-validation_es_ES.properties +++ b/services-validation/src/main/resources/i18n/services-validation_es_ES.properties @@ -63,11 +63,11 @@ observe.common.gearUseFeaturesSeine=Equipamiento observe.common.gonadeWeight=Peso de las gonadas (g) observe.common.haulingBreaks=Número de cortes observe.common.haulingDirectionSameAsSetting=Sentido del arrastre idéntico a lo de la calada -observe.common.haulingEndLatitude=Arrastre Latitude +observe.common.haulingEndLatitude=Arrastre Latitud observe.common.haulingEndLongitude=Arrastre Longitud observe.common.haulingEndQuadrant=Arrastre Quadrant observe.common.haulingEndTimeStamp=Timestamp de fin -observe.common.haulingStartLatitude=Arrastre Latitude +observe.common.haulingStartLatitude=Arrastre Latitud observe.common.haulingStartLongitude=Arrastre Longitud observe.common.haulingStartQuadrant=Arrastre Quadrant observe.common.haulingStartTimeStamp=Timestamp del inicio @@ -126,7 +126,7 @@ observe.common.quadrant=Quadrant observe.common.reasonForDiscard=Razón de descarte observe.common.reasonForNoFishing=Razón de no pesca Senne observe.common.reasonForNullSet=Causa de lance nulo -observe.common.releaseTime=Heure de libération ~TODO +observe.common.releaseTime=Heure de libération \#TODO observe.common.reportsUrl=URL del informe observe.common.route=Ruta observe.common.schoolEstimate=Estimación del banco @@ -141,13 +141,13 @@ observe.common.sensorBrand=Marca de sensor observe.common.sensorDataFormat=Formato de los datos del sensor observe.common.sensorSerialNo=Número de serie observe.common.sensorType=Tipo de sensor -observe.common.settingEndLatitude=Calada latitude +observe.common.settingEndLatitude=Calada Latitud observe.common.settingEndLongitude=Calada longitud observe.common.settingEndQuadrant=Calada quadrant observe.common.settingEndTimeStamp=Timestamp de fin observe.common.settingIdentifier=Calada observe.common.settingShape=Forma de la calada -observe.common.settingStartLatitude=Calada latitude +observe.common.settingStartLatitude=Calada Latitud observe.common.settingStartLongitude=Calada longitud observe.common.settingStartQuadrant=Calada quadrant observe.common.settingStartTimeStamp=Timestamp de inicio ===================================== services-validation/src/main/resources/i18n/services-validation_fr_FR.properties ===================================== --- a/services-validation/src/main/resources/i18n/services-validation_fr_FR.properties +++ b/services-validation/src/main/resources/i18n/services-validation_fr_FR.properties @@ -63,9 +63,9 @@ observe.common.gearUseFeaturesSeine=Équipements observe.common.gonadeWeight=Poids des gonades (g) observe.common.haulingBreaks=Nombre de coupures observe.common.haulingDirectionSameAsSetting=Sens du virage identique à celui du filage -observe.common.haulingEndLatitude=Latitude de fin virage -observe.common.haulingEndLongitude=Longitude de fin virage -observe.common.haulingEndQuadrant=Quadrant de fin virage +observe.common.haulingEndLatitude=Latitude de fin de virage +observe.common.haulingEndLongitude=Longitude de fin de virage +observe.common.haulingEndQuadrant=Quadrant de fin de virage observe.common.haulingEndTimeStamp=Horodatage fin observe.common.haulingStartLatitude=Latitude de début de virage observe.common.haulingStartLongitude=Longitude de début de virage View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/67c158278e180529b37c54908ff… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/67c158278e180529b37c54908ff… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Consolidation des traductions (Closes #792)
by Tony CHEMIT 11 Jul '17

11 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9d402b83 by Tony CHEMIT at 2017-07-12T00:29:05+02:00 Consolidation des traductions (Closes #792) - - - - - 11 changed files: - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - pom.xml - services-validation/src/main/resources/i18n/services-validation_es_ES.properties - services-validation/src/main/resources/i18n/services-validation_fr_FR.properties Changes: ===================================== application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties ===================================== --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties @@ -5,21 +5,21 @@ observe.common.haulingIdentifier=Arrastre observe.common.homeId=Identificador observe.common.inconnu=desconocido observe.common.inputOutputFormula=Formule Entrée vers Sortie \#TODO -observe.common.label=Título -observe.common.lengthWeightFormula=Relación Peso +observe.common.label=Texto +observe.common.lengthWeightFormula=Relación de peso observe.common.nocode=codigo ausente observe.common.none=Ninguno observe.common.observerLabel=Observador -observe.common.ocean/label1=Oceano -observe.common.ocean/label2=Oceano -observe.common.ocean/label3=Oceano -observe.common.ocean/label4=Oceano -observe.common.ocean/label5=Oceano -observe.common.ocean/label6=Oceano -observe.common.ocean/label7=Oceano -observe.common.ocean/label8=Oceano +observe.common.ocean/label1=Océano +observe.common.ocean/label2=Océano +observe.common.ocean/label3=Océano +observe.common.ocean/label4=Océano +observe.common.ocean/label5=Océano +observe.common.ocean/label6=Océano +observe.common.ocean/label7=Océano +observe.common.ocean/label8=Océano observe.common.program=Programa -observe.common.scientificLabel=Título científico +observe.common.scientificLabel=Texto científico observe.common.settingIdentifier=Calada observe.common.sex=Sexo observe.common.species/scientificLabel=Especie @@ -165,8 +165,8 @@ observe.type.objectType=Tipo de objeto observe.type.objectTypes=Tipos de objeto observe.type.observedSystem=Sistema observado observe.type.observedSystems=Sistemas observados -observe.type.ocean=Oceano -observe.type.oceans=Oceanos +observe.type.ocean=Océano +observe.type.oceans=Océanos observe.type.organism=Organismo observe.type.organisms=Organismos observe.type.person=Persona ===================================== application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties ===================================== --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties @@ -4,7 +4,7 @@ observe.common.gps.gpsPoint=Point GPS observe.common.haulingIdentifier=Virage observe.common.homeId=Identifiant observe.common.inconnu=inconnu -observe.common.inputOutputFormula=Formule Entrée vers Sortie +observe.common.inputOutputFormula=Formule entrée -> sortie observe.common.label=Libellé observe.common.lengthWeightFormula=Relation Poids observe.common.nocode=code absent ===================================== application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties ===================================== --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties @@ -45,7 +45,6 @@ observe.common.endPursingDate=End pursing date observe.common.endPursingTimeStamp=End pursing timestamp observe.common.endSetDate=End set date observe.common.endSetTimeStamp=End set timestamp -observe.common.faoCode=Fao code observe.common.firstName=First name observe.common.fishingEnd=Fishing end observe.common.fishingStart=Fishing start @@ -75,7 +74,6 @@ observe.common.haulingStartLatitude=Hauling start latitude observe.common.haulingStartLongitude=Hauling start longitude observe.common.haulingStartQuadrant=Hauling start quadrant observe.common.haulingStartTimeStamp=Hauling start timeStamp -observe.common.homeId=Home id observe.common.hookOffset=Hook offset observe.common.hookPosition=Hook position observe.common.hookSize=Hook size @@ -84,14 +82,12 @@ observe.common.hooksComposition=hooks composition observe.common.hooksCompositionProportionSum=hooks composition proportion sum observe.common.individualSize=Individual size observe.common.individualWeight=Individual weight -observe.common.inputOutputFormula=Input to Output formula observe.common.inputSizeMeasureType=Input size measure type observe.common.iso2Code=Iso 2 code observe.common.iso3Code=Iso 3 code observe.common.itemHorizontalPosition=Item horizontal position observe.common.itemVerticalPosition=Item vertical position observe.common.keelCode=Keel code -observe.common.label=Label observe.common.label1=English label observe.common.label2=French label observe.common.label3=Spanish label @@ -99,7 +95,6 @@ observe.common.landingHarbour=Landing harbour observe.common.lastName=Last name observe.common.latitude=Latitude observe.common.length=Length -observe.common.lengthWeightFormula=Length weight formula observe.common.lightsticksColor=Lightsticks color observe.common.lightsticksPerBasketCount=Lightsticks per basket count observe.common.lightsticksType=Lightsticks type @@ -140,7 +135,6 @@ observe.common.schoolEstimate=School estimate observe.common.schoolMeanDepth=School mean depth observe.common.schoolThickness=School thickness observe.common.schoolTopDepth=School top depth -observe.common.scientificLabel=Scientific label observe.common.seaSurfaceTemperature=Sea surface temperature observe.common.searchMaximum=Search maximum observe.common.section=Section @@ -152,14 +146,12 @@ observe.common.settingEndLatitude=Setting end latitude observe.common.settingEndLongitude=Setting end longitude observe.common.settingEndQuadrant=Setting end quadrant observe.common.settingEndTimeStamp=Setting end timeStamp -observe.common.settingIdentifier=Setting observe.common.settingShape=Setting shape observe.common.settingStartLatitude=Setting start latitude observe.common.settingStartLongitude=Setting start longitude observe.common.settingStartQuadrant=Setting start quadrant observe.common.settingStartTimeStamp=Setting start timeStamp observe.common.settingVesselSpeed=Setting vessel speed -observe.common.sex=Sex observe.common.shipOwner=Ship owner observe.common.shooterSpeed=Shooter speed observe.common.sizeMeasureType=Size measure type ===================================== application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties ===================================== --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties @@ -45,11 +45,10 @@ observe.common.endPursingDate=Fecha de fin de calado de la red observe.common.endPursingTimeStamp=Fecha - Hora de fin de calado de la red observe.common.endSetDate=Fecha de fin de calado de la red observe.common.endSetTimeStamp=Fecha - Hora de fin de validez -observe.common.faoCode=Codigo FAO observe.common.firstName=Número observe.common.fishingEnd=Fin de pesca observe.common.fishingStart=Inicio de pesca -observe.common.flagCountry=Badera +observe.common.flagCountry=Bandera observe.common.fleetCountry=País observe.common.floatingObjectEmpty=Objeto flotante vacía observe.common.floatline1Length=Orinque 1 (m) @@ -75,7 +74,6 @@ observe.common.haulingStartLatitude=Arrastre Latitud observe.common.haulingStartLongitude=Arrastre Longitud observe.common.haulingStartQuadrant=Arrastre quadrant observe.common.haulingStartTimeStamp=Timestamp del inicio -observe.common.homeId=Id de negocio observe.common.hookOffset=Offset anzuelo (°) observe.common.hookPosition=Posición del anzuelo observe.common.hookSize=Tamaño @@ -84,14 +82,12 @@ observe.common.hooksComposition=Anzuelos observe.common.hooksCompositionProportionSum=Suma de los proporciónes de anzuelos (%) observe.common.individualSize=Tamaño (cm) observe.common.individualWeight=Peso (kg) -observe.common.inputOutputFormula=Formule Entrée vers Sortie \#TODO observe.common.inputSizeMeasureType=Type de mensuration d'entrée \#TODO observe.common.iso2Code=Código ISO-2 observe.common.iso3Code=Código ISO-3 observe.common.itemHorizontalPosition=Localización del elemento sobre la línea principal observe.common.itemVerticalPosition=Localización del elemento sobre el arponcillo observe.common.keelCode=Código de Quilla -observe.common.label=Texto observe.common.label1=Texto en inglés observe.common.label2=Texto en francés observe.common.label3=Nombre @@ -99,7 +95,6 @@ observe.common.landingHarbour=Puerto de desembarque observe.common.lastName=Nombre observe.common.latitude=Latitud observe.common.length=Longitud eslora total -observe.common.lengthWeightFormula=Relación Peso observe.common.lightsticksColor=Color de barrita de luz observe.common.lightsticksPerBasketCount=Número de barrita de luz por cesta observe.common.lightsticksType=Tipo de barrita de luz @@ -116,13 +111,13 @@ observe.common.nextFpaZone=Zona FPA penetrada observe.common.nonTargetCatch=Fauna accesoria conservada o descartada observe.common.nonTargetCatchReleaseStatus=État à la libération \#TODO observe.common.number=Número -observe.common.objectFate=Futuro del objeto -observe.common.objectOperation=Operación sobre el objeto +observe.common.objectFate=Devenir de objeto +observe.common.objectOperation=Operación sobre la baliza observe.common.objectType=Tipo de objeto -observe.common.observedSystem=Système observé +observe.common.observedSystem=Sistema observado observe.common.observedSystemDistance=Distancia al sistema observado (millas con 1 decimal) observe.common.observer=Observador -observe.common.ocean=Oceano +observe.common.ocean=Océano observe.common.organism=Organismo observe.common.outputInputFormula=Formule Sortie vers Entrée \#TODO observe.common.outputSizeMeasureType=Type de mensuration de sortie \#TODO @@ -136,11 +131,10 @@ observe.common.reasonForNullSet=Causa de lance nulo observe.common.releaseTime=Heure de libération \#TODO observe.common.reportsUrl=URL del informe observe.common.route=Ruta -observe.common.schoolEstimate=Estimación banco +observe.common.schoolEstimate=Estimación del banco observe.common.schoolMeanDepth=Profundidad media (m) observe.common.schoolThickness=Grossor del banco (m) observe.common.schoolTopDepth=Profundidad de la cumbre (m) -observe.common.scientificLabel=Título científico observe.common.seaSurfaceTemperature=Temperatura en superficie (°) observe.common.searchMaximum=Velocidad máxima de prospección observe.common.section=Sección @@ -152,24 +146,22 @@ observe.common.settingEndLatitude=Calada Latitud observe.common.settingEndLongitude=Calada longitud observe.common.settingEndQuadrant=Calada quadrant observe.common.settingEndTimeStamp=Timestamp de fin -observe.common.settingIdentifier=Calada observe.common.settingShape=Forma de la calada observe.common.settingStartLatitude=Calada Latitud observe.common.settingStartLongitude=Calada longitud observe.common.settingStartQuadrant=Calada quadrant observe.common.settingStartTimeStamp=Timestamp de inicio observe.common.settingVesselSpeed=Velocidad del barco (nd) -observe.common.sex=Sexo observe.common.shipOwner=Armateur \#TODO observe.common.shooterSpeed=Velocidad shooter (nd) -observe.common.sizeMeasureType=Size measure type \#TODO +observe.common.sizeMeasureType=Tipo de medida observe.common.snapWeight=Peso snap (kg) observe.common.species=Especie observe.common.speciesCatch=Especie -observe.common.speciesFate=Futuro de la especie -observe.common.speciesGroup=Grupo de especie +observe.common.speciesFate=Devenir de fauna +observe.common.speciesGroup=Grupo de especie de fauna observe.common.speciesGroupReleaseMode=Mode de libération \#TODO -observe.common.speciesStatus=Estatuto de la fauna observada +observe.common.speciesStatus=Estado de especie observe.common.speedRange=Texto velocidad del viento observe.common.startDate=Fecha de comienzo observe.common.startLogValue=Corredera de mañana (millas) @@ -190,23 +182,23 @@ observe.common.totalSectionsCount=Número total de secciones observe.common.totalWeight=Peso observe.common.tracelineLength=Parte baja (m) observe.common.tracelineType=Tipo bajo de línea -observe.common.transmittingBuoyOperation=Operación baliza +observe.common.transmittingBuoyOperation=Operación sobre baliza observe.common.transmittingBuoyType=Tipo de baliza observe.common.tripType=Tipo de marea observe.common.type=Type \#TODO observe.common.uri=URI -observe.common.vessel=Buque -observe.common.vesselActivityLongline=Actividad buque -observe.common.vesselActivitySeine=Actividad buque -observe.common.vesselSizeCategory=Categoría de buque +observe.common.vessel=Barco +observe.common.vesselActivityLongline=Actividad del barco +observe.common.vesselActivitySeine=Actividad del barco +observe.common.vesselSizeCategory=Capacidad observe.common.vesselSpeed=Velocidad del barco (nd) -observe.common.vesselType=Tipo de pesquería +observe.common.vesselType=Pesquería observe.common.waveHeight=Texto descriptivo de «altura media de la ola» observe.common.weight=Peso (en t) observe.common.weightCategory=Categoría de peso observe.common.weightLengthFormula=Relación de tallas -observe.common.well=Tanque -observe.common.wind=Viento Beaufort +observe.common.well=Cuba +observe.common.wind=Fuerza del viento observe.common.wormsId=Worms observe.common.yearService=año de entrada en servicio validator.ui.activity.bound.latitude=La latitud dada debe estar comprendida entre %1$s y %2$s. ===================================== application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties ===================================== --- a/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties +++ b/application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties @@ -22,13 +22,13 @@ observe.common.catchWeight=Poids estimé (en t) observe.common.changeDate=Date changement pavillon observe.common.code=Identifiant observe.common.coefficients=Coefficients -observe.common.comment=Seules les espèces montées sur le pont pourront être échantillonnées +observe.common.comment=Commentaire observe.common.count=Nombre -observe.common.country=Nationalité +observe.common.country=Pays observe.common.currentDirection=Direction du courant (°) -observe.common.currentFpaZone=zone Fpa courante +observe.common.currentFpaZone=Zone FPA actuelle observe.common.currentSpeed=Vitesse du courant (nd) -observe.common.dataEntryOperator=Opérateur de saisie +observe.common.dataEntryOperator=Saisisseur observe.common.date=Jour d'observation observe.common.daysAtSeaCount=Nombre de jours à l'eau observe.common.departureHarbour=Port de départ @@ -39,13 +39,12 @@ observe.common.detectionTime=Heure de détection observe.common.discardHealthness=Santé au rejet observe.common.distance=Distance (m) observe.common.encounterType=Type -observe.common.endDate=Date fin +observe.common.endDate=Fin de validité observe.common.endLogValue=Loch du soir (milles) observe.common.endPursingDate=Date de fin coulissage observe.common.endPursingTimeStamp=Date - Heure de fin coulissage observe.common.endSetDate=Date fin calée observe.common.endSetTimeStamp=Date - Heure de fin de validité -observe.common.faoCode=Code FAO observe.common.firstName=Prénom observe.common.fishingEnd=Fin pêche observe.common.fishingStart=Début pêche @@ -61,7 +60,7 @@ observe.common.fpaZone=Zone FPA observe.common.gaugeLabel=Libellé jauge observe.common.gear=Equipement observe.common.gearCaracteristicType=Type de caractéristique -observe.common.gearType=Type d'équipement +observe.common.gearType=Type d'engin observe.common.gearUseFeaturesLongline=Équipements observe.common.gearUseFeaturesSeine=Équipements observe.common.gonadeWeight=Poids des gonades (g) @@ -75,7 +74,6 @@ observe.common.haulingStartLatitude=Latitude de début de virage observe.common.haulingStartLongitude=Longitude de début de virage observe.common.haulingStartQuadrant=Quadrant de début de virage observe.common.haulingStartTimeStamp=Horodatage début -observe.common.homeId=Id métier observe.common.hookOffset=Offset hameçon (°) observe.common.hookPosition=Position de l'hameçon observe.common.hookSize=Taille d'hameçon @@ -84,22 +82,19 @@ observe.common.hooksComposition=Hameçons observe.common.hooksCompositionProportionSum=Somme des proportions d'hameçons (%) observe.common.individualSize=Taille (cm) observe.common.individualWeight=Poids (kg) -observe.common.inputOutputFormula=Formule Entrée vers Sortie observe.common.inputSizeMeasureType=Type de mensuration d'entrée observe.common.iso2Code=code ISO-2 observe.common.iso3Code=Code ISO-3 observe.common.itemHorizontalPosition=Position sur la ligne observe.common.itemVerticalPosition=Position verticale observe.common.keelCode=Code quille -observe.common.label=Libellé observe.common.label1=Libellé anglais observe.common.label2=Libellé français observe.common.label3=Libellé espagnol observe.common.landingHarbour=Port d'arrivée observe.common.lastName=Nom observe.common.latitude=Latitude -observe.common.length=Longueur (m) -observe.common.lengthWeightFormula=Relation Poids +observe.common.length=Longueur hors tout observe.common.lightsticksColor=Couleur de cyalumes observe.common.lightsticksPerBasketCount=Nombre de cyalumes par panier observe.common.lightsticksType=Type de cyalumes @@ -112,8 +107,8 @@ observe.common.maxGearDepth=Profondeur maximum (m) observe.common.meanLength=Taille moyenne (en cm) observe.common.meanWeight=Poids moyen (en Kg) observe.common.name=Nom -observe.common.nextFpaZone=zone Fpa suivante -observe.common.nonTargetCatch=Capture non ciblé +observe.common.nextFpaZone=Zone FPA pénétrée +observe.common.nonTargetCatch=Faune accessoire conservée ou rejetée observe.common.nonTargetCatchReleaseStatus=État à la libération observe.common.number=Nombre observe.common.objectFate=Devenir de l'objet @@ -124,7 +119,7 @@ observe.common.observedSystemDistance=Distance système observé (en milles avec observe.common.observer=Observateur observe.common.ocean=Océan observe.common.organism=Organisme -observe.common.outputInputFormula=Formule Sortie vers Entrée +observe.common.outputInputFormula=Formule sortie -> entrée observe.common.outputSizeMeasureType=Type de mensuration de sortie observe.common.power=Puissance moteur principal observe.common.previousFpaZone=Zone FPA quittée @@ -136,11 +131,10 @@ observe.common.reasonForNullSet=Cause coup nul observe.common.releaseTime=Heure de libération observe.common.reportsUrl=URL de rapport observe.common.route=Route -observe.common.schoolEstimate=Estimation de banc +observe.common.schoolEstimate=Estimation banc observe.common.schoolMeanDepth=Profondeur moyenne (m) observe.common.schoolThickness=Épaisseur du banc (m) observe.common.schoolTopDepth=Profondeur sommet (m) -observe.common.scientificLabel=Libellé scientifique observe.common.seaSurfaceTemperature=Température surface (°) observe.common.searchMaximum=Vitesse maximale observe.common.section=Section @@ -152,26 +146,24 @@ observe.common.settingEndLatitude=Latitude de fin de filage observe.common.settingEndLongitude=Longitude de fin de filage observe.common.settingEndQuadrant=Quadrant de fin de filage observe.common.settingEndTimeStamp=Horodatage fin -observe.common.settingIdentifier=Filage observe.common.settingShape=Forme du filage observe.common.settingStartLatitude=Latitude de début de filage observe.common.settingStartLongitude=\=Longitude de début de filage observe.common.settingStartQuadrant=Quadrant de début de filage observe.common.settingStartTimeStamp=Horodatage début observe.common.settingVesselSpeed=Vitesse bateau (nd) -observe.common.sex=Sexe observe.common.shipOwner=Armateur observe.common.shooterSpeed=Vitesse shooter (nd) -observe.common.sizeMeasureType=Type de mesure +observe.common.sizeMeasureType=Type de mensuration observe.common.snapWeight=Poids snap (kg) -observe.common.species=Espèces +observe.common.species=Espèce observe.common.speciesCatch=Espèce observe.common.speciesFate=Devenir espèce observe.common.speciesGroup=Groupe espèce observe.common.speciesGroupReleaseMode=Mode de libération observe.common.speciesStatus=Statut faune observée observe.common.speedRange=Libellé vitesse vent -observe.common.startDate=Date début +observe.common.startDate=Début de validité observe.common.startLogValue=Loch du matin (milles) observe.common.startTime=Date - Heure de début de validité observe.common.status=Statut @@ -187,7 +179,7 @@ observe.common.totalBasketsCount=Nombre de paniers observe.common.totalCount=Nombre estimé observe.common.totalHooksCount=Nombre total d'avançons observe.common.totalSectionsCount=Nombre total de sections -observe.common.totalWeight=Poids total +observe.common.totalWeight=Poids observe.common.tracelineLength=Partie basse (m) observe.common.tracelineType=Type bas de ligne observe.common.transmittingBuoyOperation=Opération balise @@ -195,7 +187,7 @@ observe.common.transmittingBuoyType=Type de balise observe.common.tripType=Type de marée observe.common.type=Type observe.common.uri=URI -observe.common.vessel=Navire +observe.common.vessel=Bateau observe.common.vesselActivityLongline=Activité bateau observe.common.vesselActivitySeine=Activité bateau observe.common.vesselSizeCategory=Catégorie de bateau ===================================== application-swing/src/main/resources/i18n/application-swing_en_GB.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -1,5 +1,3 @@ -aboutframe.changelog=Changelog -jaxx.common.latitude=Latitude observe.about.translate.title=translate ObServe observe.action.about=About observe.action.about.tip=About ObServe... @@ -377,23 +375,14 @@ observe.common.boolean.false=No observe.common.boolean.null=Undefined observe.common.boolean.true=Yes observe.common.brand=Brand -observe.common.brandName=Brand name observe.common.broughtOnDeck=Brought on deck -observe.common.capacity=Capacity -observe.common.capacityLabel=Capacity label -observe.common.captain=Captain observe.common.caracteristics=Caracteristics -observe.common.catchWeight=Catch weight observe.common.catchWeightComputed.computed.tip=Catch weight was computed (%s) observe.common.catchWeightComputed.observed.tip=Catch weight was observed -observe.common.changeDate=Change date observe.common.childSelectionMandatory=child selection mandatory observe.common.childrenMultiSelectable=children multi selectable -observe.common.code=Code observe.common.codeAndStatus=Code / Status -observe.common.coefficients=Coefficients observe.common.comId=EU Id -observe.common.comment=Comment observe.common.comment.activity=Activity comment observe.common.comment.floatingObject=Floating object comment observe.common.comment.nonTargetCatch=Non target catch comment @@ -403,115 +392,61 @@ observe.common.comment.set=Set comment observe.common.comment.targetCatch=Target catch comment observe.common.comment.targetDiscarded=Target discarded catch comment observe.common.comment.targetSample=Target sample comment -observe.common.count=Count -observe.common.country=Country observe.common.ctoiId=IOTC id -observe.common.currentFpaZone=current Fpa zone -observe.common.dataEntryOperator=Data entry operator -observe.common.date=Date -observe.common.daysAtSeaCount=Days at sea count -observe.common.departureHarbour=Departure harbour -observe.common.description=Description observe.common.detailledActivitiesObservation=detailled activities -observe.common.detectionMode=Detection mode -observe.common.detectionTime=Detection time observe.common.directory=Directory observe.common.discard=Discard ? -observe.common.endDate=end date -observe.common.endLogValue=End log value observe.common.equation=Equation observe.common.ersId=Ers id observe.common.exist.on.remote=%1$s (already exist) -observe.common.faoCode=Fao code observe.common.file=File -observe.common.firstName=first name -observe.common.flagCountry=flag country -observe.common.formsUrl=Forms url -observe.common.gaugeLabel=Gauge label -observe.common.gearType=Gear caracteristic type observe.common.generateReport=Generate validation report observe.common.global.progression.description=Global progression observe.common.heureobservation=Observation time -observe.common.homeId=Home id observe.common.homeIdFAOWormsId=Home id / Fao / Worms observe.common.iattcId=ICCAT Id observe.common.imoId=IMO Id -observe.common.inputOutputFormula=Input to Output formula -observe.common.inputSizeMeasureType=Input size measure type -observe.common.iso2Code=Iso 2 code -observe.common.iso3Code=Iso 3 code observe.common.keelCodeFlotte=Keel / Flotte -observe.common.label=Label -observe.common.label1=English label -observe.common.label2=French label -observe.common.label3=Spanish label observe.common.label4=Label 4 observe.common.label5=Label 5 observe.common.label6=Label 6 observe.common.label7=Label 7 observe.common.label8=Label 8 -observe.common.landingHarbour=Landing harbour -observe.common.lastName=Last name observe.common.lastUpdateDate=Last update date -observe.common.latitude=Latitude -observe.common.length=Length observe.common.length.computed.tip=Length was computed observe.common.length.inf=Length (cm inf.) observe.common.length.observed.tip=Length was observed observe.common.length2=Length (cm) -observe.common.lengthWeightFormula=Length weight formula observe.common.libelles=Labels -observe.common.longitude=Longitude observe.common.lowerValueUpperValue=Bounds min-max observe.common.mammalsObservation=Mammals observations observe.common.maxLength=Max length observe.common.maxWeight=Max weight -observe.common.meanLength=Mean length observe.common.meanLengthComputed.computed.tip=Mean lenght was computed (%s) observe.common.meanLengthComputed.observed.tip=Mean weight was observed observe.common.meanValues=Mean values -observe.common.meanWeight=Mean weight observe.common.meanWeightComputed.computed.tip=Mean weight was computed (%s) observe.common.meanWeightComputed.observed.tip=Mean weight was observed observe.common.minLength=Min length observe.common.minLengthMax=Min length maximum observe.common.minWeight=Min weight observe.common.minWeightMax=Min weight maximum -observe.common.name=Name observe.common.nationalId=National id observe.common.needComment=Need comment -observe.common.nextFpaZone=Next Fpa zone observe.common.no.balise=No buoy observe.common.nonCoupSenne=No Fishing -observe.common.nonTargetCatch=Non target catch observe.common.nonTargetCatchRelease=non target catch released observe.common.nonTargetObservation=Non target observation observe.common.nonTargetSample=Non target sample -observe.common.objectFate=Object fate -observe.common.objectMaterialType=Type observe.common.objectObservedSpecies=Object observed species -observe.common.objectOperation=Object operation -observe.common.objectType=Object type observe.common.objectsObservation=Floating objects -observe.common.observedSystem=Observed system -observe.common.observedSystemDistance=Observed system distance -observe.common.observer=Observed observe.common.obsolete.entity=Referential %s is disabled. -observe.common.ocean=Ocean observe.common.oceanForSpecies=oceans list observe.common.operation.resume=Summary of operations -observe.common.organism=Organism -observe.common.outputInputFormula=Ouput to Input formula -observe.common.outputSizeMeasureType=output size measure type observe.common.ownership=Ownership observe.common.parentCode=Parent observe.common.picturesReferences=Pictures references -observe.common.power=Power -observe.common.previousFpaZone=Previous Fpa zone observe.common.radioCallSignId=Radio call signal -observe.common.reasonForDiscard=Reason for discad -observe.common.releaseTime=Release time -observe.common.reportsUrl=Reports url observe.common.resume=Summary observe.common.routes.list=List of routes observe.common.samplesObservation=Samples observations @@ -519,36 +454,17 @@ observe.common.saveFile.overwrite=file alreayd exists, would you like to overwri observe.common.saveFile.overwrite.cancel=Cancel observe.common.saveFile.overwrite.ok=Replace observe.common.saveFile.overwrite.title=Be ware\! -observe.common.schoolEstimate=School estimate observe.common.schoolType=School type -observe.common.scientificLabel=Scientific label -observe.common.seaSurfaceTemperature=Sea surface temperature -observe.common.searchMaximum=Search maximum observe.common.selectable=Selectable -observe.common.sex=Sex -observe.common.shipOwner=Ship owner -observe.common.sizeMeasureType=Measure type observe.common.source=Source -observe.common.species=Species -observe.common.speciesFate=Species fate observe.common.speciesFaune=Fauna species -observe.common.speciesGroup=Species group -observe.common.speciesGroupReleaseMode=Species group release mode -observe.common.speciesGroupReleaseStatus=Species group release state -observe.common.speciesStatus=Species status observe.common.speciesThon=Thuna species -observe.common.speedRange=Speed range -observe.common.startDate=Start date observe.common.startDateFinProgram=Start - end of program observe.common.startDateFinValidite=Start - end of validity -observe.common.startLogValue=Start log value -observe.common.status=Status observe.common.step.description=Step description observe.common.storage.not.valid=Data source not configured -observe.common.surroundingActivity=Surrounding activity observe.common.taille=Length observe.common.taillePoids.caracteristics=Length-Weight caracteristics -observe.common.targetCatch=Target catch observe.common.targetDiscarded=Target discarded observe.common.targetDiscardsObservation=Target discarded observation observe.common.targetSample=Target sample @@ -556,37 +472,18 @@ observe.common.targetSampleCapture=Target sample catch observe.common.topiaCreateDate=Create date observe.common.topiaId=Technical id observe.common.topiaVersion=Version -observe.common.totalCount=Count observe.common.totalCountComputed.computed.tip=Count was computed (%s) observe.common.totalCountComputed.observed.tip=Count was observed -observe.common.totalWeight=Total weight -observe.common.transmittingBuoyOperation=Transmitting buoy operation -observe.common.transmittingBuoyType=Transmitting buoy type observe.common.trips.list=List of trips observe.common.tuviId=TUVI Id -observe.common.type=Type observe.common.typeTransmittingBuoyOperation=Transmitting buoy operation type -observe.common.uri=Uri observe.common.usedInDetailledForm=used in detailled form observe.common.usedInSimpleForm=used in simple form observe.common.validation=Validation script -observe.common.vessel=Boat -observe.common.vesselActivitySeine=Boat Activity observe.common.vesselActivitySeine.comment=Only activity of type %s allows you to fill a set. -observe.common.vesselSizeCategory=Vessel size category -observe.common.vesselSpeed=Vessel spped -observe.common.vesselType=Vessel type -observe.common.waveHeight=Wave weight -observe.common.weight=Weight observe.common.weight.computed.tip=Weight was computed (%s) observe.common.weight.ind=Individual weight (kg) observe.common.weight.observed.tip=Weight was observed -observe.common.weightCategory=Weight category -observe.common.weightLengthFormula=Weight length formula -observe.common.well=Well -observe.common.wind=Wind -observe.common.wormsId=Worms id -observe.common.yearService=Year service observe.config.category.application=Application observe.config.category.application.description=Application options observe.config.category.expert=Expert ===================================== application-swing/src/main/resources/i18n/application-swing_es_ES.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -1,5 +1,3 @@ -aboutframe.changelog=Changelog \#TODO -jaxx.common.latitude=Latitud observe.about.translate.title=Traducir ObServe observe.action.about=A cerca de observe.action.about.tip=A cerca de ObServe... @@ -377,23 +375,14 @@ observe.common.boolean.false=No observe.common.boolean.null=Indeterminado observe.common.boolean.true=Si observe.common.brand=Marca -observe.common.brandName=Marca observe.common.broughtOnDeck=Izado a bordo -observe.common.capacity=Capacidad de transporte -observe.common.capacityLabel=Texto capacidad -observe.common.captain=Patrón observe.common.caracteristics=Características -observe.common.catchWeight=Peso estimado (en t) observe.common.catchWeightComputed.computed.tip=Peso estimado calculado observe.common.catchWeightComputed.observed.tip=Peso estimado observado -observe.common.changeDate=Fecha de carga observe.common.childSelectionMandatory=Sélection d'un fils obligatoire \#TODO observe.common.childrenMultiSelectable=Sélection multiple des fils \#TODO -observe.common.code=Identificación observe.common.codeAndStatus=Código -observe.common.coefficients=Coeficientes observe.common.comId=Id EU -observe.common.comment=Comentarios observe.common.comment.activity=Comentario de la actividad observe.common.comment.floatingObject=Comentarios de objeto observe.common.comment.nonTargetCatch=Comentarios de otras especies @@ -403,115 +392,61 @@ observe.common.comment.set=Comentarios del lance observe.common.comment.targetCatch=Comentarios de captura observe.common.comment.targetDiscarded=Comentarios de descarte observe.common.comment.targetSample=Comentarios de muestreo de atún -observe.common.count=Número -observe.common.country=País observe.common.ctoiId=Id IOTC -observe.common.currentFpaZone=Zona FPA actual -observe.common.dataEntryOperator=Operador de captación de datos -observe.common.date=Día de observación -observe.common.daysAtSeaCount=Numero de días en el mar -observe.common.departureHarbour=Puerto de embarque -observe.common.description=Descripción observe.common.detailledActivitiesObservation=Actividades detalladas -observe.common.detectionMode=Modo de detección -observe.common.detectionTime=Heure de détection \#TODO observe.common.directory=Carpeta observe.common.discard=Rejeté ? \#TODO -observe.common.endDate=Fecha de fin -observe.common.endLogValue=Corredera de tarde (millas) observe.common.equation=Relación talla-peso observe.common.ersId=Id ERS observe.common.exist.on.remote=%1$s (ya existe) -observe.common.faoCode=Codigo FAO observe.common.file=Archivo -observe.common.firstName=Número -observe.common.flagCountry=Bandera -observe.common.formsUrl=URL de los formularios -observe.common.gaugeLabel=Texto «Capacidad» -observe.common.gearType=Tipo de arte de pesca observe.common.generateReport=Generar un informe de validación observe.common.global.progression.description=Progresión global observe.common.heureobservation=Hora de la observación -observe.common.homeId=Identificador observe.common.homeIdFAOWormsId=Código 3L / FAO / Worms observe.common.iattcId=Id CICAA observe.common.imoId=Id IMO -observe.common.inputOutputFormula=Formule entrée -> sortie \#TODO -observe.common.inputSizeMeasureType=Type de mensuration d'entrée \#TODO -observe.common.iso2Code=Código ISO-2 -observe.common.iso3Code=Código ISO-3 observe.common.keelCodeFlotte=Código de Quilla / Flota -observe.common.label=Texto -observe.common.label1=Texto en inglés -observe.common.label2=Texto en francés -observe.common.label3=Nombre observe.common.label4=Texto 4 observe.common.label5=Texto 5 observe.common.label6=Texto 6 observe.common.label7=Texto 7 observe.common.label8=Texto 8 -observe.common.landingHarbour=Puerto de desembarque -observe.common.lastName=Nombre observe.common.lastUpdateDate=Last update date -observe.common.latitude=Latitud -observe.common.length=Longitud eslora total observe.common.length.computed.tip=Longitud calculada observe.common.length.inf=Longitud (cm inf.) observe.common.length.observed.tip=Longitud observada observe.common.length2=Longitud eslora total (cm) \#TODO -observe.common.lengthWeightFormula=Relación de peso observe.common.libelles=Textos -observe.common.longitude=Longitude observe.common.lowerValueUpperValue=Bornes min-max observe.common.mammalsObservation=Mamiferos observe.common.maxLength=Talla maxima (en cm) observe.common.maxWeight=Peso maximo (en kg) -observe.common.meanLength=Talla media (en cm) observe.common.meanLengthComputed.computed.tip=La talla media se calculó observe.common.meanLengthComputed.observed.tip=La talla media se observó observe.common.meanValues=Valores medios -observe.common.meanWeight=Peso medio (en Kg) observe.common.meanWeightComputed.computed.tip=El peso medio se calculó observe.common.meanWeightComputed.observed.tip=El peso medio se observó observe.common.minLength=Talla mínima (en cm) observe.common.minLengthMax=Talla min-max (en cm) observe.common.minWeight=Peso mínimo observe.common.minWeightMax=Peso min-max (en Kg) -observe.common.name=Nom \#TODO observe.common.nationalId=id nacional observe.common.needComment=Se requiere un comentario -observe.common.nextFpaZone=Zona FPA penetrada observe.common.no.balise=Ninguna baliza observe.common.nonCoupSenne=Razón de no lance -observe.common.nonTargetCatch=Fauna accesoria conservada o descartada observe.common.nonTargetCatchRelease=Fauna accesoria libérée \#TODO observe.common.nonTargetObservation=Fauna asociada observe.common.nonTargetSample=Muestreo fauna asociada -observe.common.objectFate=Devenir de objeto -observe.common.objectMaterialType=Type \#TODO observe.common.objectObservedSpecies=Fauna observada -observe.common.objectOperation=Operación sobre la baliza -observe.common.objectType=Tipo de objeto observe.common.objectsObservation=Objeto flotante -observe.common.observedSystem=Sistema observado -observe.common.observedSystemDistance=Distancia al sistema observado (millas con 1 decimal) -observe.common.observer=Observador observe.common.obsolete.entity=El referencial %1$s está desactivado. -observe.common.ocean=Océano observe.common.oceanForSpecies=Lista de los oceanos observe.common.operation.resume=Resumen de operaciones -observe.common.organism=Organismo -observe.common.outputInputFormula=Formule sortie -> entrée \#TODO -observe.common.outputSizeMeasureType=Type de mensuration de sortie \#TODO observe.common.ownership=Pertenece a observe.common.parentCode=Parent \#TODO observe.common.picturesReferences=Referencia de foto -observe.common.power=Potencia del motor principal -observe.common.previousFpaZone=La zona FPA de que se salió observe.common.radioCallSignId=Indicativo radio -observe.common.reasonForDiscard=Razon de descarte -observe.common.releaseTime=Heure de libération \#TODO -observe.common.reportsUrl=URL del informe observe.common.resume=Resumen de la configuración observe.common.routes.list=Lista de rutas observe.common.samplesObservation=Medidas @@ -519,36 +454,17 @@ observe.common.saveFile.overwrite=El archivo ya existe. Quiere reemplazar lo ? observe.common.saveFile.overwrite.cancel=Cancelar observe.common.saveFile.overwrite.ok=Reemplazar observe.common.saveFile.overwrite.title=Cuidado -observe.common.schoolEstimate=Estimación del banco observe.common.schoolType=Tipo de banco -observe.common.scientificLabel=Texto científico -observe.common.seaSurfaceTemperature=Temperatura en superficie (°) -observe.common.searchMaximum=Velocidad máxima de prospección observe.common.selectable=Sélectionnable \#TODO -observe.common.sex=Sexo -observe.common.shipOwner=Armateur \#TODO -observe.common.sizeMeasureType=Tipo de medida observe.common.source=Source \#TODO -observe.common.species=Especie -observe.common.speciesFate=Devenir de fauna observe.common.speciesFaune=Especie de fauna -observe.common.speciesGroup=Grupo de especie de fauna -observe.common.speciesGroupReleaseMode=Mode de libération \#TODO -observe.common.speciesGroupReleaseStatus=État à la libération \#TODO -observe.common.speciesStatus=Estado de especie observe.common.speciesThon=Especie -observe.common.speedRange=Texto velocidad del viento -observe.common.startDate=Fecha de comienzo observe.common.startDateFinProgram=Comienzo - Fin de programa observe.common.startDateFinValidite=Comienzo - Fin de validez -observe.common.startLogValue=Corredera de mañana (millas) -observe.common.status=Estado observe.common.step.description=Descripción de la etapa observe.common.storage.not.valid=Fuente de datos no configurada -observe.common.surroundingActivity=Actividad circundante observe.common.taille=Talla (cm) observe.common.taillePoids.caracteristics=Características Talla-Peso -observe.common.targetCatch=Captura de atún observe.common.targetDiscarded=Descarte de atún observe.common.targetDiscardsObservation=Descartes de atún observe.common.targetSample=Muestreo atún descartado @@ -556,37 +472,18 @@ observe.common.targetSampleCapture=Muestreo atún capturado observe.common.topiaCreateDate=Fecha de creación observe.common.topiaId=Técnicas de identificación observe.common.topiaVersion=Versión -observe.common.totalCount=Número estimado observe.common.totalCountComputed.computed.tip=El número estimado se calculo observe.common.totalCountComputed.observed.tip=El número estimado se observo -observe.common.totalWeight=Peso -observe.common.transmittingBuoyOperation=Operación sobre baliza -observe.common.transmittingBuoyType=Tipo de baliza observe.common.trips.list=Lista de mareas observe.common.tuviId=TUVI id -observe.common.type=Type \#TODO observe.common.typeTransmittingBuoyOperation=Tipo de operación sobre baliza -observe.common.uri=URI observe.common.usedInDetailledForm=Utilisé dans le formulaire détaillé \#TODO observe.common.usedInSimpleForm=Utilisé dans le formulaire simple \#TODO observe.common.validation=Validation scrip \#TODO -observe.common.vessel=Barco -observe.common.vesselActivitySeine=Actividad del barco observe.common.vesselActivitySeine.comment=Solo la actividad %1$s permite introducir un lance -observe.common.vesselSizeCategory=Capacidad -observe.common.vesselSpeed=Velocidad del barco (nd) -observe.common.vesselType=Pesquería -observe.common.waveHeight=Texto descriptivo de «altura media de la ola» -observe.common.weight=Peso (en t) observe.common.weight.computed.tip=Peso calculado observe.common.weight.ind=Peso del ejemplar (en Kg) observe.common.weight.observed.tip=Peso observado -observe.common.weightCategory=Categoría de peso -observe.common.weightLengthFormula=Relación de tallas -observe.common.well=Cuba -observe.common.wind=Fuerza del viento -observe.common.wormsId=Worms -observe.common.yearService=año de entrada en servicio observe.config.category.application=Aplicación observe.config.category.application.description=Opciones de la aplicación observe.config.category.expert=Experto @@ -1243,8 +1140,8 @@ observe.content.setSeine.tab.measurements=Parámetros observe.content.setSeine.targetDiscarded=Descarte de atún observe.content.setSeine.title=Lance observe.content.sizeMeasure.delete.message=Confirmar la eliminación de la medida del tamaño seleccionado. -observe.content.species.availableOcean=Oceanos disponibles -observe.content.species.selectedOcean=Oceanos seleccionados +observe.content.species.availableOcean=Océanos disponibles +observe.content.species.selectedOcean=Océanos seleccionados observe.content.species.tab.general=Características generales observe.content.species.tab.other=Otras características observe.content.speciesGroup.availableSpeciesGroupReleaseMode=Modes de libération disponibles \#TODO @@ -1365,7 +1262,7 @@ observe.content.tripLongline.message.no.active.found=Ninguna marea está abierta observe.content.tripLongline.message.not.open=La marea actual no está abierta, no se puede modificar. observe.content.tripLongline.message.updating=La marea está en proceso de modificación. observe.content.tripLongline.observer=Observador -observe.content.tripLongline.ocean=Oceano +observe.content.tripLongline.ocean=Océano observe.content.tripLongline.startDate=Fecha de inicio observe.content.tripLongline.tab.general=Características observe.content.tripLongline.tab.map=Mapa ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -1,5 +1,3 @@ -aboutframe.changelog=Historique -jaxx.common.latitude=Latitude observe.about.translate.title=Traduire ObServe observe.action.about=À propos observe.action.about.tip=À propos d'ObServe... @@ -382,23 +380,14 @@ observe.common.boolean.false=Non observe.common.boolean.null=Indéterminé observe.common.boolean.true=Oui observe.common.brand=Marque -observe.common.brandName=Marque observe.common.broughtOnDeck=Monté sur le pont -observe.common.capacity=Capacité transport (m³) -observe.common.capacityLabel=Libellé capacité -observe.common.captain=Capitaine observe.common.caracteristics=Caractéristiques -observe.common.catchWeight=Poids estimé (en t) observe.common.catchWeightComputed.computed.tip=Le poids estimé a été calculé (%s) observe.common.catchWeightComputed.observed.tip=Le poids estimé a été observé -observe.common.changeDate=Date changement pavillon observe.common.childSelectionMandatory=Sélection d'un fils obligatoire observe.common.childrenMultiSelectable=Sélection multiple des fils -observe.common.code=Identifiant observe.common.codeAndStatus=Code / Statut -observe.common.coefficients=Coefficients observe.common.comId=Id EU -observe.common.comment=Commentaire observe.common.comment.activity=Commentaire de l'activité observe.common.comment.floatingObject=Commentaire sur l'objet flottant observe.common.comment.nonTargetCatch=Commentaire de la faune accessoire @@ -408,75 +397,40 @@ observe.common.comment.set=Commentaire de la calée observe.common.comment.targetCatch=Commentaire de la capture observe.common.comment.targetDiscarded=Commentaire du rejet observe.common.comment.targetSample=Commentaire de l’échantillonnage thon -observe.common.count=Nombre -observe.common.country=Pays observe.common.ctoiId=Id CTOI -observe.common.currentFpaZone=Zone FPA actuelle -observe.common.dataEntryOperator=Saisisseur -observe.common.date=Jour d'observation -observe.common.daysAtSeaCount=Nombre de jours à l'eau -observe.common.departureHarbour=Port de départ -observe.common.description=Description observe.common.detailledActivitiesObservation=Activités détaillées -observe.common.detectionMode=Mode détection -observe.common.detectionTime=Heure de détection observe.common.directory=Répertoire observe.common.discard=Rejeté ? -observe.common.endDate=Fin de validité -observe.common.endLogValue=Loch du soir (milles) observe.common.equation=Relation Taille-Poids observe.common.ersId=Id ERS observe.common.exist.on.remote=%1$s (déjà existante) -observe.common.faoCode=Code FAO observe.common.file=Fichier -observe.common.firstName=Prénom -observe.common.flagCountry=Pavillon -observe.common.formsUrl=URL des formulaires -observe.common.gaugeLabel=Libellé jauge -observe.common.gearType=Type d'engin observe.common.generateReport=Générer un rapport de validation observe.common.global.progression.description=Progression globale observe.common.heureobservation=Heure d'observation -observe.common.homeId=Identifiant observe.common.homeIdFAOWormsId=Code 3L / FAO / Worms observe.common.iattcId=Id CICTA observe.common.imoId=Id IMO -observe.common.inputOutputFormula=Formule entrée -> sortie -observe.common.inputSizeMeasureType=Type de mensuration d'entrée -observe.common.iso2Code=code ISO-2 -observe.common.iso3Code=Code ISO-3 observe.common.keelCodeFlotte=Code quille /Code flotte -observe.common.label=Libellé -observe.common.label1=Libellé anglais -observe.common.label2=Libellé français -observe.common.label3=Libellé espagnol observe.common.label4=Libellé 4 observe.common.label5=Libellé 5 observe.common.label6=Libellé 6 observe.common.label7=Libellé 7 observe.common.label8=Libellé 8 -observe.common.landingHarbour=Port d'arrivée -observe.common.lastName=Nom observe.common.lastUpdateDate=Date de dernière mise à jour -observe.common.latitude=Latitude -observe.common.length=Longueur hors tout observe.common.length.computed.tip=La longueur a été calculée observe.common.length.inf=Longueur (cm inf.) observe.common.length.observed.tip=La longueur a été observée observe.common.length2=Taille (cm) observe.common.lengthMeasureType=Type de mensuration -observe.common.lengthWeightFormula=Relation Poids observe.common.libelles=Libellés -observe.common.longitude=Longitude observe.common.lowerValueUpperValue=Borne min-max observe.common.mammalsObservation=Mammifères observe.common.maxLength=Taille maximum (en cm) observe.common.maxWeight=Poids maximum (en Kg) -observe.common.meanLength=Taille moyenne (en cm) observe.common.meanLengthComputed.computed.tip=La taille moyenne a été calculée (%s) observe.common.meanLengthComputed.observed.tip=La taille moyenne a été observée observe.common.meanValues=Valeurs moyennes -observe.common.meanWeight=Poids moyen (en Kg) observe.common.meanWeightComputed.computed.tip=Le poids moyen a été calculé (%s) observe.common.meanWeightComputed.observed.tip=Le poids moyen a été observé observe.common.measureType=Type de mensuration @@ -484,41 +438,22 @@ observe.common.minLength=Taille minimum (en cm) observe.common.minLengthMax=Taille min-max (en cm) observe.common.minWeight=Poids minimum (en Kg) observe.common.minWeightMax=Poids min-max (en Kg) -observe.common.name=Nom observe.common.nationalId=Id national observe.common.needComment=Nécessite un commentaire -observe.common.nextFpaZone=Zone FPA pénétrée observe.common.no.balise=Aucune balise lue observe.common.nonCoupSenne=Non coup de senne -observe.common.nonTargetCatch=Faune accessoire conservée ou rejetée observe.common.nonTargetCatchRelease=Faune accessoire sensible libérée observe.common.nonTargetObservation=Faune associée observe.common.nonTargetSample=Echantillon faune accessoire -observe.common.objectFate=Devenir de l'objet -observe.common.objectMaterialType=Type observe.common.objectObservedSpecies=Faune observée -observe.common.objectOperation=Opération sur l'objet -observe.common.objectType=Type d'objet observe.common.objectsObservation=Objet flottants -observe.common.observedSystem=Système observé -observe.common.observedSystemDistance=Distance système observé (en milles avec 1 décimale) -observe.common.observer=Observateur observe.common.obsolete.entity=Le référentiel %1$s est désactivé. -observe.common.ocean=Océan observe.common.oceanForSpecies=Liste des océans observe.common.operation.resume=Résumé des opérations -observe.common.organism=Organisme -observe.common.outputInputFormula=Formule sortie -> entrée -observe.common.outputSizeMeasureType=Type de mensuration de sortie observe.common.ownership=Appartenance observe.common.parentCode=Parent observe.common.picturesReferences=Référence Photo -observe.common.power=Puissance moteur principal -observe.common.previousFpaZone=Zone FPA quittée observe.common.radioCallSignId=Indicatif radio -observe.common.reasonForDiscard=Raison rejet -observe.common.releaseTime=Heure de libération -observe.common.reportsUrl=URL de rapport observe.common.resume=Résumé de la configuration observe.common.routes.list=Liste des routes observe.common.samplesObservation=Mensurations @@ -526,36 +461,17 @@ observe.common.saveFile.overwrite=Le fichier existe déjà. Voulez-vous le rempl observe.common.saveFile.overwrite.cancel=Annuler observe.common.saveFile.overwrite.ok=Remplacer observe.common.saveFile.overwrite.title=Attention -observe.common.schoolEstimate=Estimation banc observe.common.schoolType=Type de banc -observe.common.scientificLabel=Libellé scientifique -observe.common.seaSurfaceTemperature=Température surface (°) -observe.common.searchMaximum=Vitesse maximale observe.common.selectable=Sélectionnable -observe.common.sex=Sexe -observe.common.shipOwner=Armateur -observe.common.sizeMeasureType=Type de mensuration observe.common.source=Source -observe.common.species=Espèce -observe.common.speciesFate=Devenir espèce observe.common.speciesFaune=Espèce de faune -observe.common.speciesGroup=Groupe espèce -observe.common.speciesGroupReleaseMode=Mode de libération -observe.common.speciesGroupReleaseStatus=État à la libération -observe.common.speciesStatus=Statut faune observée observe.common.speciesThon=Espèce de thon -observe.common.speedRange=Libellé vitesse vent -observe.common.startDate=Début de validité observe.common.startDateFinProgram=Début - Fin du programme observe.common.startDateFinValidite=Début - fin de validité -observe.common.startLogValue=Loch du matin (milles) -observe.common.status=Statut observe.common.step.description=Description de l'étape observe.common.storage.not.valid=Source de données non configurée -observe.common.surroundingActivity=Activité environnante observe.common.taille=Taille (cm) observe.common.taillePoids.caracteristics=Caractéristiques Taille-Poids -observe.common.targetCatch=Capture cible observe.common.targetDiscarded=Rejet de thon observe.common.targetDiscardsObservation=Rejets thon observe.common.targetSample=Echantillon thon rejeté @@ -563,37 +479,18 @@ observe.common.targetSampleCapture=Echantillon thon capturé observe.common.topiaCreateDate=Date de création observe.common.topiaId=Identifiant technique observe.common.topiaVersion=Version -observe.common.totalCount=Nombre estimé observe.common.totalCountComputed.computed.tip=Le nombre estimé a été calculé (%s) observe.common.totalCountComputed.observed.tip=Le nombre estimé a été observé -observe.common.totalWeight=Poids -observe.common.transmittingBuoyOperation=Opération balise -observe.common.transmittingBuoyType=Type de balise observe.common.trips.list=Liste des marées observe.common.tuviId=Id TUVI -observe.common.type=Type observe.common.typeTransmittingBuoyOperation=Type d'opération sur balise -observe.common.uri=URI observe.common.usedInDetailledForm=Utilisé dans le formulaire détaillé observe.common.usedInSimpleForm=Utilisé dans le formulaire simple observe.common.validation=Script de validation -observe.common.vessel=Bateau -observe.common.vesselActivitySeine=Activité bateau observe.common.vesselActivitySeine.comment=Seule l'activité %1$s permet de saisir une calée. -observe.common.vesselSizeCategory=Catégorie de bateau -observe.common.vesselSpeed=Vitesse bateau (nd) -observe.common.vesselType=Type de pêcherie -observe.common.waveHeight=Libellé Hauteur moyenne vagues -observe.common.weight=Poids (en t) observe.common.weight.computed.tip=Le poids a été calculé observe.common.weight.ind=Poids ind. (en Kg) observe.common.weight.observed.tip=Le poids a été observé -observe.common.weightCategory=Catégorie de poids -observe.common.weightLengthFormula=Relation Taille -observe.common.well=Cuve -observe.common.wind=Vent Beaufort -observe.common.wormsId=Worms -observe.common.yearService=Année de mise en service observe.config.category.application=Application observe.config.category.application.description=Options applicatives observe.config.category.expert=Avancé ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -173,8 +173,8 @@ <eugenePluginVersion>3.0-alpha-11</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <jaxxVersion>3.0-alpha-7</jaxxVersion> - <nuitonI18nVersion>4.0-alpha-1</nuitonI18nVersion> + <jaxxVersion>3.0-alpha-8-SNAPSHOT</jaxxVersion> + <nuitonI18nVersion>4.0-alpha-2-SNAPSHOT</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> @@ -197,10 +197,11 @@  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> - <i18n.silent>true</i18n.silent> +  <i18n.failsIfAnyKeyMissingValue>true</i18n.failsIfAnyKeyMissingValue> <i18n.checkBundle>true</i18n.checkBundle> <i18n.showEmpty>true</i18n.showEmpty> + <i18n.failsIfDuplicatedKeys>true</i18n.failsIfDuplicatedKeys>  <config.useNuitonI18n>true</config.useNuitonI18n> ===================================== services-validation/src/main/resources/i18n/services-validation_es_ES.properties ===================================== --- a/services-validation/src/main/resources/i18n/services-validation_es_ES.properties +++ b/services-validation/src/main/resources/i18n/services-validation_es_ES.properties @@ -47,7 +47,7 @@ observe.common.faoCode=Codigo FAO observe.common.firstName=Número observe.common.fishingEnd=Fin de pesca observe.common.fishingStart=Inicio de pesca -observe.common.flagCountry=Badera +observe.common.flagCountry=Bandera observe.common.fleetCountry=País observe.common.floatingObject=Objeto flotante observe.common.floatline1Length=Orinque 1 (m) @@ -71,7 +71,7 @@ observe.common.haulingStartLatitude=Arrastre Latitude observe.common.haulingStartLongitude=Arrastre Longitud observe.common.haulingStartQuadrant=Arrastre Quadrant observe.common.haulingStartTimeStamp=Timestamp del inicio -observe.common.homeId=Id de negocio +observe.common.homeId=Identificador observe.common.hookOffset=Offset anzuelo (°) observe.common.hookPosition=Posición del anzuelo observe.common.hookSize=Tamaño @@ -94,7 +94,7 @@ observe.common.landingHarbour=Puerto de desembarque observe.common.lastName=Nombre observe.common.latitude=Latitud observe.common.length=Longitud eslora total -observe.common.lengthWeightFormula=Relación Peso +observe.common.lengthWeightFormula=Relación de peso observe.common.lightsticksColor=Color de barrita de luz observe.common.lightsticksPerBasketCount=Número de barrita de luz por cesta observe.common.lightsticksType=Tipo de barrita de luz @@ -110,14 +110,14 @@ observe.common.name=Nombre observe.common.nonTargetCatch=Fauna accesoria conservada o descartada observe.common.nonTargetCatchReleaseStatusType=État à la libération \#TODO observe.common.number=Número -observe.common.objectFate=Futuro del objeto +observe.common.objectFate=Devenir de objeto observe.common.objectMaterialType=Type \#TODO -observe.common.objectOperation=Operación sobre el objeto +observe.common.objectOperation=Operación sobre la baliza observe.common.objectType=Tipo de objeto -observe.common.observedSystem=Système observé +observe.common.observedSystem=Sistema observado observe.common.observedSystemDistance=Distancia al sistema observado (millas con 1 decimal) observe.common.observer=Observador -observe.common.ocean=Oceano +observe.common.ocean=Océano observe.common.organism=Organismo observe.common.outputInputFormula=Formule Sortie vers Entrée \#TODO observe.common.power=Potencia del motor principal @@ -129,11 +129,11 @@ observe.common.reasonForNullSet=Causa de lance nulo observe.common.releaseTime=Heure de libération ~TODO observe.common.reportsUrl=URL del informe observe.common.route=Ruta -observe.common.schoolEstimate=Estimación banco +observe.common.schoolEstimate=Estimación del banco observe.common.schoolMeanDepth=Profundidad media (m) observe.common.schoolThickness=Grossor del banco (m) observe.common.schoolTopDepth=Profundidad de la cumbre (m) -observe.common.scientificLabel=Título científico +observe.common.scientificLabel=Texto científico observe.common.seaSurfaceTemperature=Temperatura en superficie (°) observe.common.searchMaximum=Velocidad máxima de prospección observe.common.section=Sección @@ -155,15 +155,15 @@ observe.common.settingVesselSpeed=Velocidad del barco (nd) observe.common.sex=Sexo observe.common.shipOwner=Armateur \#TODO observe.common.shooterSpeed=Velocidad shooter (nd) -observe.common.sizeMeasureType=Type de mesure de taille \#TODO +observe.common.sizeMeasureType=Tipo de medida observe.common.snapWeight=Peso snap (kg) observe.common.species=Especie observe.common.speciesCatch=Especie -observe.common.speciesFate=Futuro de la especie -observe.common.speciesGroup=Grupo de especie +observe.common.speciesFate=Devenir de fauna +observe.common.speciesGroup=Grupo de especie de fauna observe.common.speciesGroupReleaseMode=Mode de libération \#TODO observe.common.speciesGroupReleaseStatus=État à la libération \#TODO -observe.common.speciesStatus=Estatuto de la fauna observada +observe.common.speciesStatus=Estado de especie observe.common.speedRange=Texto velocidad del viento observe.common.startDate=Fecha de comienzo observe.common.startLogValue=Corredera de mañana (millas) @@ -184,22 +184,22 @@ observe.common.totalSectionsCount=Número total de secciones observe.common.totalWeight=Peso observe.common.tracelineLength=Parte baja (m) observe.common.tracelineType=Tipo bajo de línea -observe.common.transmittingBuoyOperation=Operación baliza +observe.common.transmittingBuoyOperation=Operación sobre baliza observe.common.transmittingBuoyType=Tipo de baliza observe.common.tripType=Tipo de marea observe.common.type=Type \#TODO observe.common.uri=URI -observe.common.vessel=Buque +observe.common.vessel=Barco observe.common.vesselActivityLongline=Actividad buque -observe.common.vesselSizeCategory=Categoría de buque +observe.common.vesselSizeCategory=Capacidad observe.common.vesselSpeed=Velocidad del barco (nd) -observe.common.vesselType=Tipo de pesquería +observe.common.vesselType=Pesquería observe.common.waveHeight=Texto descriptivo de «altura media de la ola» observe.common.weight=Peso (en t) observe.common.weightCategory=Categoría de peso observe.common.weightLengthFormula=Relación de tallas -observe.common.well=Tanque -observe.common.wind=Viento Beaufort +observe.common.well=Cuba +observe.common.wind=Fuerza del viento observe.common.wormsId=Worms observe.common.yearService=año de entrada en servicio validator.service.activity.bound.latitude=La latitud dada debe estar comprendida entre %1$s y %2$s. ===================================== services-validation/src/main/resources/i18n/services-validation_fr_FR.properties ===================================== --- a/services-validation/src/main/resources/i18n/services-validation_fr_FR.properties +++ b/services-validation/src/main/resources/i18n/services-validation_fr_FR.properties @@ -21,12 +21,12 @@ observe.common.catchWeight=Poids estimé (en t) observe.common.changeDate=Date changement pavillon observe.common.code=Identifiant observe.common.coefficients=Coefficients -observe.common.comment=Seules les espèces montées sur le pont pourront être échantillonnées +observe.common.comment=Commentaire observe.common.count=Nombre -observe.common.country=Nationalité +observe.common.country=Pays observe.common.currentDirection=Direction du courant (°) observe.common.currentSpeed=Vitesse du courant (nd) -observe.common.dataEntryOperator=Opérateur de saisie +observe.common.dataEntryOperator=Saisisseur observe.common.date=Jour d'observation observe.common.daysAtSeaCount=Nombre de jours à l'eau observe.common.departureHarbour=Port de départ @@ -37,7 +37,7 @@ observe.common.detectionTime=Heure de détection observe.common.discardHealthness=Santé au rejet observe.common.distance=Distance (m) observe.common.encounterType=Type -observe.common.endDate=Date fin +observe.common.endDate=Fin de validité observe.common.endLogValue=Loch du soir (milles) observe.common.endPursingDate=Date de fin coulissage observe.common.endPursingTimeStamp=Date - Heure de fin coulissage @@ -71,7 +71,7 @@ observe.common.haulingStartLatitude=Latitude de début de virage observe.common.haulingStartLongitude=Longitude de début de virage observe.common.haulingStartQuadrant=Quadrant de début de virage observe.common.haulingStartTimeStamp=Horodatage début -observe.common.homeId=Id métier +observe.common.homeId=Identifiant observe.common.hookOffset=Offset hameçon (°) observe.common.hookPosition=Position de l'hameçon observe.common.hookSize=Taille d'hameçon @@ -80,7 +80,7 @@ observe.common.hooksComposition=Hameçons observe.common.hooksCompositionProportionSum=Somme des proportions d'hameçons (%) observe.common.individualSize=Taille (cm) observe.common.individualWeight=Poids (kg) -observe.common.inputOutputFormula=Formule Entrée vers Sortie +observe.common.inputOutputFormula=Formule entrée -> sortie observe.common.iso2Code=code ISO-2 observe.common.iso3Code=Code ISO-3 observe.common.itemHorizontalPosition=Position sur la ligne @@ -93,7 +93,7 @@ observe.common.label3=Libellé espagnol observe.common.landingHarbour=Port d'arrivée observe.common.lastName=Nom observe.common.latitude=Latitude -observe.common.length=Longueur (m) +observe.common.length=Longueur hors tout observe.common.lengthWeightFormula=Relation Poids observe.common.lightsticksColor=Couleur de cyalumes observe.common.lightsticksPerBasketCount=Nombre de cyalumes par panier @@ -107,7 +107,7 @@ observe.common.maxGearDepth=Profondeur maximum (m) observe.common.meanLength=Taille moyenne (en cm) observe.common.meanWeight=Poids moyen (en Kg) observe.common.name=Nom -observe.common.nonTargetCatch=Capture non ciblé +observe.common.nonTargetCatch=Faune accessoire conservée ou rejetée observe.common.nonTargetCatchReleaseStatusType=État à la libération observe.common.number=Nombre observe.common.objectFate=Devenir de l'objet @@ -119,7 +119,7 @@ observe.common.observedSystemDistance=Distance système observé (en milles avec observe.common.observer=Observateur observe.common.ocean=Océan observe.common.organism=Organisme -observe.common.outputInputFormula=Formule Sortie vers Entrée +observe.common.outputInputFormula=Formule sortie -> entrée observe.common.power=Puissance moteur principal observe.common.proportion=Proportion (%) observe.common.quadrant=Quadrant @@ -129,7 +129,7 @@ observe.common.reasonForNullSet=Cause coup nul observe.common.releaseTime=Heure de libération observe.common.reportsUrl=URL de rapport observe.common.route=Route -observe.common.schoolEstimate=Estimation de banc +observe.common.schoolEstimate=Estimation banc observe.common.schoolMeanDepth=Profondeur moyenne (m) observe.common.schoolThickness=Épaisseur du banc (m) observe.common.schoolTopDepth=Profondeur sommet (m) @@ -155,9 +155,9 @@ observe.common.settingVesselSpeed=Vitesse bateau (nd) observe.common.sex=Sexe observe.common.shipOwner=Armateur observe.common.shooterSpeed=Vitesse shooter (nd) -observe.common.sizeMeasureType=Type de mesure de taille +observe.common.sizeMeasureType=Type de mensuration observe.common.snapWeight=Poids snap (kg) -observe.common.species=Espèces +observe.common.species=Espèce observe.common.speciesCatch=Espèce observe.common.speciesFate=Devenir espèce observe.common.speciesGroup=Groupe espèce @@ -165,7 +165,7 @@ observe.common.speciesGroupReleaseMode=Mode de libération observe.common.speciesGroupReleaseStatus=État à la libération observe.common.speciesStatus=Statut faune observée observe.common.speedRange=Libellé vitesse vent -observe.common.startDate=Date début +observe.common.startDate=Début de validité observe.common.startLogValue=Loch du matin (milles) observe.common.startTime=Date - Heure de début de validité observe.common.status=Statut @@ -181,7 +181,7 @@ observe.common.totalBasketsCount=Nombre de paniers observe.common.totalCount=Nombre estimé observe.common.totalHooksCount=Nombre total d'avançons observe.common.totalSectionsCount=Nombre total de sections -observe.common.totalWeight=Poids total +observe.common.totalWeight=Poids observe.common.tracelineLength=Partie basse (m) observe.common.tracelineType=Type bas de ligne observe.common.transmittingBuoyOperation=Opération balise @@ -189,7 +189,7 @@ observe.common.transmittingBuoyType=Type de balise observe.common.tripType=Type de marée observe.common.type=Type observe.common.uri=URI -observe.common.vessel=Navire +observe.common.vessel=Bateau observe.common.vesselActivityLongline=Activité bateau observe.common.vesselSizeCategory=Catégorie de bateau observe.common.vesselSpeed=Vitesse bateau (nd) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9d402b839c0bcc60f0161e6022a… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9d402b839c0bcc60f0161e6022a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Limiter le Zoom- de la carte (See #642)
by Tony CHEMIT 10 Jul '17

10 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 12f75a5c by Tony CHEMIT at 2017-07-10T20:21:04+02:00 Limiter le Zoom- de la carte (See #642) - - - - - 1 changed file: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java @@ -30,16 +30,6 @@ import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.common.TripMapPoint; import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.TripMapDto; -import org.nuiton.jaxx.runtime.spi.UIHandler; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.geotools.geometry.DirectPosition2D; -import org.geotools.geometry.jts.ReferencedEnvelope; -import org.geotools.swing.JMapPane; -import org.geotools.swing.event.MapPaneEvent; -import org.geotools.swing.event.MapPaneListener; - -import javax.imageio.ImageIO; import java.awt.CardLayout; import java.awt.Point; import java.awt.event.MouseEvent; @@ -53,6 +43,16 @@ import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; import java.util.List; +import javax.imageio.ImageIO; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.geotools.geometry.DirectPosition2D; +import org.geotools.geometry.jts.ReferencedEnvelope; +import org.geotools.swing.JMapPane; +import org.geotools.swing.event.MapPaneEvent; +import org.geotools.swing.event.MapPaneListener; +import org.nuiton.jaxx.runtime.spi.UIHandler; + import static org.nuiton.i18n.I18n.t; @@ -208,8 +208,10 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { displayArea.getMaxY() + deltaBottom, displayArea.getCoordinateReferenceSystem() ); - - mapPane.setDisplayArea(newDisplayArea); + // -230 is the good value (don't ask me why ?) + if (newDisplayArea.getLowerCorner().getOrdinate(0) > -230) { + mapPane.setDisplayArea(newDisplayArea); + } zoomRatio = 1; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/12f75a5c7073a4af9af9b889aec… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/12f75a5c7073a4af9af9b889aec… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Mise à jour des librairies (Closes #790) (retour sur yamlbeans qui ne fonctionne…
by Tony CHEMIT 10 Jul '17

10 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 03ca7425 by Tony CHEMIT at 2017-07-10T16:48:14+02:00 Mise à jour des librairies (Closes #790) (retour sur yamlbeans qui ne fonctionne toujours pas en version audessus de la 1.08... - - - - - 4e0f3a1e by Tony CHEMIT at 2017-07-10T16:49:04+02:00 Utilisation des templates dans le répertoires des ressources (Closes #791) - - - - - e6fbec99 by Tony CHEMIT at 2017-07-10T19:38:48+02:00 Régression dur l'écran de configuration (See #789) - - - - - 5 changed files: - application-swing-configuration/pom.xml - application-swing-validation/pom.xml - application-swing/pom.xml - application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java - pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -91,7 +91,7 @@ <artifactId>nuiton-config</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> </dependency> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -77,7 +77,7 @@ <artifactId>nuiton-decorator</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> </dependency> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -357,63 +357,63 @@  <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime-swing-application</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime-swing-session</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime-swing-wizard</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-validator</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-error</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-hidor</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-datetime</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-file</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-status</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-select</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-number</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-about</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-config</artifactId> </dependency> @@ -623,7 +623,7 @@ <plugins> <plugin> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-maven-plugin</artifactId> <executions> <execution> ===================================== application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java ===================================== --- a/application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java +++ b/application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java @@ -23,29 +23,30 @@ package fr.ird.observe.application.swing.ui.content.impl.longline; */ import com.google.common.collect.Iterables; +import fr.ird.observe.application.swing.ObserveResourceManager; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.SectionDto; -import org.nuiton.jaxx.validator.swing.SwingValidator; -import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Locale; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.nuiton.config.ArgumentsParserException; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.ClassPathI18nInitializer; +import org.nuiton.jaxx.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.simple.SimpleBeanValidatorMessage; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Locale; - /** * Created on 3/18/15. * @@ -60,14 +61,18 @@ public class LonglineDetailCompositionValidatorServiceTest { protected LonglineDetailCompositionValidatorService service; @Before - public void setUp() throws IOException { + public void setUp() throws IOException, ArgumentsParserException { if (ObserveSwingApplicationContext.isInit()) { ObserveSwingApplicationContext.get().close(); } - ObserveSwingApplicationContext applicationContext = new ObserveSwingApplicationContext(new ObserveSwingApplicationConfig()); + ObserveSwingApplicationConfig config = new ObserveSwingApplicationConfig(); + + config.initConfig(new ObserveResourceManager().getResource(ObserveResourceManager.Resource.application)); + + ObserveSwingApplicationContext applicationContext = new ObserveSwingApplicationContext(config); SwingValidator<SectionDto> sectionValidator = new SwingValidator<>(SectionDto.class, "ui-update-table", NuitonValidatorScope.values()); SwingValidator<BasketDto> basketValidator = new SwingValidator<>(BasketDto.class, "ui-update-table", NuitonValidatorScope.values()); ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -173,8 +173,8 @@ <eugenePluginVersion>3.0-alpha-11</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <jaxxVersion>3.0-alpha-6</jaxxVersion> - <nuitonI18nVersion>4.0-alpha-1-SNAPSHOT</nuitonI18nVersion> + <jaxxVersion>3.0-alpha-7</jaxxVersion> + <nuitonI18nVersion>4.0-alpha-1</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> @@ -389,11 +389,21 @@ <artifactId>i18n-editor</artifactId> <version>${nuitonI18nVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + </exclusion> + <exclusion> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-file</artifactId> + </exclusion> + </exclusions> </dependency>  <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -405,19 +415,19 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime-swing-application</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime-swing-session</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime-swing-wizard</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -429,7 +439,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-validator</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -441,7 +451,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-error</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -453,7 +463,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-hidor</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -465,7 +475,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -477,7 +487,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-datetime</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -489,7 +499,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-select</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -501,7 +511,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-about</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -513,7 +523,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-number</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -525,7 +535,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-file</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -537,7 +547,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-status</artifactId> <version>${jaxxVersion}</version> <exclusions> @@ -548,7 +558,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-config</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -705,7 +715,8 @@ <dependency> <groupId>com.esotericsoftware.yamlbeans</groupId> <artifactId>yamlbeans</artifactId> - <version>1.12</version> +  + <version>1.08</version> </dependency>  @@ -883,7 +894,7 @@ <artifactId>maven-site-plugin</artifactId> <dependencies> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> <version>${jaxxVersion}</version> </dependency> @@ -949,7 +960,7 @@ </plugin> <plugin> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-maven-plugin</artifactId> <version>${jaxxVersion}</version> </plugin> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/55d1f1279e4e9c8cda8a5d5e0a… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/55d1f1279e4e9c8cda8a5d5e0a… You're receiving this email because of your account on gitlab.com.

1 0