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

[Git][ultreiaio/ird-observe] Pushed new branch release/8.0.2
by Tony CHEMIT 24 Dec '20

24 Dec '20

Tony CHEMIT pushed new branch release/8.0.2 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/8.0.2 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 8.0.3-SNAPSHOT development[skip ci]
by Tony CHEMIT 24 Dec '20

24 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a72a1e7a by Tony Chemit at 2020-12-24T12:18:27+01:00 [jgitflow-maven-plugin]updating poms for 8.0.3-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - models/dto/pom.xml - models/persistence/pom.xml - models/pom.xml - observe/pom.xml - pom.xml - server/configuration/pom.xml - server/core/pom.xml - server/i18n/pom.xml - server/pom.xml - server/runner/pom.xml - services/api/pom.xml - services/client-impl/pom.xml - services/i18n/pom.xml - services/local-impl/pom.xml - services/pom.xml - services/provider/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a72a1e7a46c6e25f559a0b267… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a72a1e7a46c6e25f559a0b267… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Commencer les raccourcis claviers pour changer d'onglet à partir de **shift...
by Tony CHEMIT 24 Dec '20

24 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7c4b88ea by Tony Chemit at 2020-12-24T12:00:36+01:00 Commencer les raccourcis claviers pour changer d'onglet à partir de **shift F1** et plus **shift F5** - Closes #1696 - - - - - 1 changed file: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/GoToTab.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/GoToTab.java ===================================== @@ -56,7 +56,7 @@ public class GoToTab extends ContentUIActionSupport<ContentUI> { int tabCount = tabbedPane.getTabCount(); for (int i = 0; i < tabCount; i++) { String titleAt = tabbedPane.getTitleAt(i); - KeyStroke keyStroke = Objects.requireNonNull(KeyStroke.getKeyStroke(keyStrokePrefix + (i + 6))); + KeyStroke keyStroke = Objects.requireNonNull(KeyStroke.getKeyStroke(keyStrokePrefix + (i + 1))); tabbedPane.setTitleAt(i, titleAt + ObserveKeyStrokesSupport.keyStrokeToStr(keyStroke)); GoToTab action = new GoToTab(tabbedPaneName, i, keyStroke); init(ui, null, action); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7c4b88ead09b289587fdd9923… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7c4b88ead09b289587fdd9923… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Sur les éditeurs de date simple utiliser le même raccourci pour ouvrir la...
by Tony CHEMIT 24 Dec '20

24 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c6b06ad0 by Tony Chemit at 2020-12-24T11:47:38+01:00 Sur les éditeurs de date simple utiliser le même raccourci pour ouvrir la popup de date que pour une liste à sélection multiple (↓) - Closes #1694 - - - - - c95a8b97 by Tony Chemit at 2020-12-24T11:59:04+01:00 Commencer les raccourcis claviers pour changer d'onglet à partir de **shift F1** et plus **shift F5** - Closes #1695 - - - - - 2 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/GoToTab.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java ===================================== @@ -70,6 +70,7 @@ import org.nuiton.jaxx.widgets.text.NormalTextEditor; import org.nuiton.jaxx.widgets.text.UrlEditor; import javax.swing.ActionMap; +import javax.swing.InputMap; import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JLabel; @@ -430,6 +431,8 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup initializerContext.checkFirstPass(); editor.setLocale(getClientConfig().getLocale()); editor.init(); + InputMap pickerInputMap = editor.getDateEditor().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + pickerInputMap.put(KeyStroke.getKeyStroke("pressed DOWN"), "TOGGLE_POPUP"); JTextComponents.addAutoSelect(editor.getDateEditor().getEditor()); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/GoToTab.java ===================================== @@ -56,7 +56,7 @@ public class GoToTab extends ContentUIActionSupport<ContentUI> { int tabCount = tabbedPane.getTabCount(); for (int i = 0; i < tabCount; i++) { String titleAt = tabbedPane.getTitleAt(i); - KeyStroke keyStroke = Objects.requireNonNull(KeyStroke.getKeyStroke(keyStrokePrefix + (i + 6))); + KeyStroke keyStroke = Objects.requireNonNull(KeyStroke.getKeyStroke(keyStrokePrefix + (i + 1))); tabbedPane.setTitleAt(i, titleAt + ObserveKeyStrokesSupport.keyStrokeToStr(keyStroke)); GoToTab action = new GoToTab(tabbedPaneName, i, keyStroke); init(ui, null, action); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/dfc4dea500dfa4125018229b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/dfc4dea500dfa4125018229b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Remove deprecated code
by Tony CHEMIT 24 Dec '20

24 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d8254119 by Tony Chemit at 2020-12-24T09:01:44+01:00 Remove deprecated code - - - - - 3f9b0e7a by Tony Chemit at 2020-12-24T10:04:21+01:00 Amélioration de l'action générer un home id - Closes #1692 - - - - - 08bb3839 by Tony Chemit at 2020-12-24T10:10:37+01:00 Use only JaxxComboBox since the BeanComboBox is deprecated - - - - - 069b8c34 by Tony Chemit at 2020-12-24T10:10:37+01:00 La 1ère liste déroulante de chaque form s'ouvre toute seule à l'affichage d'un onglet - Closes #1684 Ajout auto-sélection sur les champs requis. - - - - - dfc4dea5 by Tony Chemit at 2020-12-24T11:36:55+01:00 Nettoyage des fichiers du client - Closes #1693 - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportConfigUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ResultTableModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialReplaceUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialReplaceUI.jcss - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialReplaceUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateConfigUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/presets/RemotePresetsUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/actions/TripUIGenerateHomeId.java - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - pom.xml - server/configuration/src/main/config/Server.ini - server/configuration/src/main/i18n/getters/config.getter - server/configuration/src/main/java/fr/ird/observe/server/configuration/ServerConfig.java - server/i18n/src/main/i18n/translations/observe_en_GB.properties - server/i18n/src/main/i18n/translations/observe_es_ES.properties - server/i18n/src/main/i18n/translations/observe_fr_FR.properties - toolkit/service/src/main/java/fr/ird/observe/services/service/CleanTemporaryFilesTask.java - toolkit/service/src/main/java/fr/ird/observe/services/service/CleanTemporaryFilesTaskConfiguration.java Changes: ===================================== client/configuration/src/main/config/Client.ini ===================================== @@ -756,11 +756,29 @@ type = fr.ird.observe.dto.validation.SeineBycatchObservedSystemConfig defaultValue = {\"fr.ird.referential.common.Species#1239832684290#0.04680507324710936\": [\"fr.ird.referential.ps.observation.ObservedSystem#0#1.0\",\"fr.ird.referential.ps.observation.ObservedSystem#0#1.1\",\"fr.ird.referential.ps.observation.ObservedSystem#1239832686428#0.9217864901728908\"]} [option temporaryFilesTimeout] -description = observe.config.temporaryFilesTimeout.description -key = observe.config.temporaryFilesTimeout +description = observe.config.client.temporaryFiles.timeout.description +key = observe.config.client.temporaryFilesTimeout type = int defaultValue = 120 +[option logFilesTimeout] +description = observe.config.client.logFiles.timeout.description +key = observe.config.client.logFilesTimeout +type = int +defaultValue = 720 + +[option feedbackFilesTimeout] +description = observe.config.client.feedbackFiles.timeout.description +key = observe.config.client.feedbackFilesTimeout +type = int +defaultValue = 720 + +[option backupFilesTimeout] +description = observe.config.client.backupFiles.timeout.description +key = observe.config.client.backupFilesTimeout +type = int +defaultValue = 2160 + [action help] description = observe.ui.action.commandline.help action = "fr.ird.observe.client.ObserveCLAction#help" ===================================== client/configuration/src/main/i18n/getters/config.getter ===================================== @@ -7,6 +7,10 @@ observe.config.build.date observe.config.build.number observe.config.build.version observe.config.checkServerVersion.description +observe.config.client.backupFiles.timeout.description +observe.config.client.feedbackFiles.timeout.description +observe.config.client.logFiles.timeout.description +observe.config.client.temporaryFiles.timeout.description observe.config.configFileName.description observe.config.coordinate.format observe.config.db.locale @@ -82,7 +86,6 @@ observe.config.speciesList.seine.observation.targetCatch observe.config.swingSessionFile.description observe.config.temperature.format observe.config.temporaryDirectory.description -observe.config.temporaryFilesTimeout.description observe.config.ui.autoPopupNumberEditor observe.config.ui.blockStateColor observe.config.ui.busyStateColor ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.configuration; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.gson.Gson; import fr.ird.observe.client.ObServeSwingSessionConfig; @@ -88,6 +89,7 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.Properties; @@ -633,6 +635,16 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig return new File(directory, String.format(FEED_BACK_PATTERN, getBuildVersion().toString().replaceAll("\\.", "_"), day, time)); } + @Override + public Map<Path, Integer> getTemporaryDirectoriesAndTimeout() { + return ImmutableMap.of( + getTemporaryDirectory().toPath(), getTemporaryFilesTimeout(), + getLogDirectory().toPath(), getLogFilesTimeout(), + getFeedBackDirectoryFile().toPath(), getFeedbackFilesTimeout(), + getBackupDirectory().toPath(), getBackupFilesTimeout() + ); + } + public void saveForUser() { log.info(t("observe.ui.message.save.configuration", get().getUserConfigFile())); get().saveForUser(doNotSave); ===================================== client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java ===================================== @@ -90,7 +90,6 @@ public class ClientUIContext implements Closeable { private final ObserveDataSourcesManager dataSourcesManager; private final BackupsManager backupsManager; private final LocalDatabaseBackupTimer localDatabaseBackupTimer; - private final ObserveExecutorService executorService; private final BusyModel busyModel; private final ObserveDataSourceConfigurationMainFactory dataSourceConfigurationMainFactory; private ObserveMainUI mainUI; @@ -241,8 +240,7 @@ public class ClientUIContext implements Closeable { this.dataSourcesManager = new ObserveDataSourcesManager(clientConfig, dataSourceConfigurationMainFactory, serviceFactory, selectModel, editModel); this.backupsManager = new BackupsManager(clientConfig, dataSourcesManager); this.localDatabaseBackupTimer = new LocalDatabaseBackupTimer(clientConfig, backupsManager, dataSourcesManager); - this.executorService = new ObserveExecutorService(); - this.actionExecutor = new ObserveActionExecutor(executorService); + this.actionExecutor = new ObserveActionExecutor(new ObserveExecutorService()); this.busyModel = new BusyModel(); } @@ -297,10 +295,6 @@ public class ClientUIContext implements Closeable { return localDatabaseBackupTimer; } - public ObserveExecutorService getExecutorService() { - return executorService; - } - public BackupsManager getBackupsManager() { return backupsManager; } @@ -362,7 +356,7 @@ public class ClientUIContext implements Closeable { } /** - * Methode pour initialiser l'ui principale sans l'afficher. + * Methode pour initialiser l'interface graphique principale sans l'afficher. * * @param context le context applicatif * @param config la configuration a utiliser @@ -402,13 +396,6 @@ public class ClientUIContext implements Closeable { if (ui.getMainUIBodyContentManager().getCurrentBody() == null) { ui.changeBodyContent(NoBodyContentComponent.class); } - //FIXME:BodyContent Ceci doit être fait au niveau du DataSourceEditorBodyContent -// // force le redimensionnement du splitpane -// ui.getSplitpane().revalidate(); -// -// // force le redimensionnement du splitpane2 -// ui.getSplitpane2().revalidate(); - // affichage de l'interface graphique SwingUtilities.invokeLater(() -> ui.setVisible(true)); getObserveSwingSessionHelper().addComponent(ui, replace); ===================================== client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java ===================================== @@ -362,7 +362,11 @@ public class ClientConfigUI extends JXTitledPanel { helper.addOption(ClientConfigOption.BACKUP_USE); helper.addOption(ClientConfigOption.BACKUP_DELAY); helper.addOption(ClientConfigOption.BACKUP_AT_CLOSE); - helper.addOption(ClientConfigOption.CHECK_SERVER_VERSION); + + helper.addOption(ClientConfigOption.TEMPORARY_FILES_TIMEOUT); + helper.addOption(ClientConfigOption.LOG_FILES_TIMEOUT); + helper.addOption(ClientConfigOption.FEEDBACK_FILES_TIMEOUT); + helper.addOption(ClientConfigOption.BACKUP_FILES_TIMEOUT); helper.addOption(ClientConfigOption.CHANGE_SYNCHRO_SRC); helper.addOption(ClientConfigOption.H2_CAN_MIGRATE); ===================================== client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java ===================================== @@ -33,12 +33,12 @@ import io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox; import org.apache.commons.lang3.StringUtils; import org.nuiton.jaxx.runtime.JAXXObject; import org.nuiton.jaxx.runtime.init.UIInitializerSupport; +import org.nuiton.jaxx.runtime.swing.JTextComponents; import org.nuiton.jaxx.widgets.BeanUIUtil; import org.nuiton.jaxx.widgets.datetime.DateTimeEditor; import org.nuiton.jaxx.widgets.datetime.TimeEditor; import org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor; import org.nuiton.jaxx.widgets.number.NumberEditor; -import org.nuiton.jaxx.widgets.select.BeanComboBox; import org.nuiton.jaxx.widgets.select.BeanListHeader; import org.nuiton.jaxx.widgets.select.FilterableDoubleList; import org.nuiton.jaxx.widgets.text.BigTextEditor; @@ -152,15 +152,6 @@ public class DefaultUIInitializer<UI extends JComponent & JAXXObject> extends UI editor.init(); } - protected void init(BeanComboBox<?> editor) { - initializerContext.checkFirstPass(); - editor.setI18nPrefix("observe.common."); - editor.setMinimumSize(new Dimension(0, 24)); - if (StringUtils.isEmpty(editor.getProperty())) { - editor.setProperty(editor.getName()); - } - } - @SuppressWarnings({"unchecked", "rawtypes"}) protected void init(JaxxComboBox editor) { initializerContext.checkFirstPass(); @@ -209,6 +200,7 @@ public class DefaultUIInitializer<UI extends JComponent & JAXXObject> extends UI protected void init(NumberEditor editor) { initializerContext.checkFirstPass(); editor.init(); + JTextComponents.addAutoSelect(editor.getTextField()); } protected void init(DateTimeEditor editor) { ===================================== client/datasource/actions/pom.xml ===================================== @@ -136,10 +136,6 @@ <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-validator</artifactId> </dependency> - <dependency> - <groupId>io.ultreia.java4all.jaxx</groupId> - <artifactId>jaxx-widgets-select</artifactId> - </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-combobox</artifactId> ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportConfigUI.jaxx ===================================== @@ -40,12 +40,6 @@ public void destroy() { model = null; stepModel = null; } - -@Override -protected void finalize() throws Throwable { - super.finalize(); - destroy(); -} ]]> </script> ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ResultTableModel.java ===================================== @@ -152,12 +152,6 @@ public class ResultTableModel extends AbstractTableModel { fireTableStructureChanged(); } - @Override - protected void finalize() throws Throwable { - super.finalize(); - clear(); - } - @Override public int getRowCount() { return data == null ? 0 : data.getHeight(); ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialReplaceUI.jaxx ===================================== @@ -17,19 +17,17 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JPanel id="panel" genericType='E extends ReferentialDtoReference'> +<JPanel id="panel" genericType='E extends ReferentialDtoReference' layout="{new BorderLayout()}"> <import> fr.ird.observe.dto.reference.ReferentialDtoReference - - org.nuiton.jaxx.widgets.select.BeanComboBox - + io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox </import> <ReferentialDtoReference id='referenceToReplace' initializer="getContextValue(ReferentialDtoReference.class, ReferentialReplaceUIHandler.CONTEXT_NAME)"/> <ReferentialDtoReference id='replaceReference' javaBean="null"/> <JLabel id='message' constraints='BorderLayout.NORTH'/> - <BeanComboBox id='list' constraints='BorderLayout.CENTER' constructorParams='this' genericType='E'/> + <JaxxComboBox id='list' constraints='BorderLayout.CENTER' constructorParams='this' genericType='E'/> </JPanel> ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialReplaceUI.jcss ===================================== @@ -19,11 +19,6 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -#panel{ - layout:{new BorderLayout()}; - -} - #list { bean: {this}; property:replaceReference; ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialReplaceUIHandler.java ===================================== @@ -24,8 +24,8 @@ package fr.ird.observe.client.datasource.actions.synchronize.referential.ng; import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.dto.reference.ReferentialDtoReference; +import io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox; import org.nuiton.jaxx.runtime.spi.UIHandler; -import org.nuiton.jaxx.widgets.select.BeanComboBox; import java.awt.Dimension; import java.beans.PropertyChangeListener; @@ -53,7 +53,7 @@ public class ReferentialReplaceUIHandler<R extends ReferentialDtoReference> impl @Override public void afterInit(ReferentialReplaceUI<R> ui) { - BeanComboBox<R> beanComboBox = ui.getList(); + JaxxComboBox<R> beanComboBox = ui.getList(); beanComboBox.setI18nPrefix("observe.common."); beanComboBox.setMinimumSize(new Dimension(0, 24)); ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateConfigUI.jaxx ===================================== @@ -48,13 +48,6 @@ public void destroy() { model = null; validateModel = null; } - -@Override -protected void finalize() throws Throwable { - super.finalize(); - destroy(); -} - ]]> </script> ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java ===================================== @@ -50,6 +50,7 @@ import io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox; import org.apache.commons.lang3.StringUtils; import org.nuiton.jaxx.runtime.init.UIInitializerSupport; import org.nuiton.jaxx.runtime.swing.BlockingLayerUI; +import org.nuiton.jaxx.runtime.swing.JTextComponents; import org.nuiton.jaxx.runtime.swing.Table; import org.nuiton.jaxx.validator.JAXXValidator; import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; @@ -243,6 +244,7 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup editor.setConfig(new TemperatureEditorConfig(TemperatureFormat.C, label.getText(), propertyName)); editor.init(label); editor.getModel().addPropertyChangeListener("format", e -> ((EditableContentUI<?>) ui).getValidator().doValidate()); + JTextComponents.addAutoSelect(editor.getEditor().getTextField()); } protected void init(JToolBar editor) { @@ -263,12 +265,14 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup initializerContext.checkFirstPass(); editor.setResetTip(t("observe.ui.action.reset")); editor.init(); + JTextComponents.addAutoSelect(editor.getTextEditor()); } protected void init(UrlEditor editor) { initializerContext.checkFirstPass(); editor.setResetTip(t("observe.ui.action.reset")); editor.init(); + JTextComponents.addAutoSelect(editor.getTextEditor()); } private void init(JLabel editor) { @@ -301,6 +305,7 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup editor.setShowPopupButton(getClientConfig().isShowNumberEditorButton()); editor.setShowReset(true); editor.init(); + JTextComponents.addAutoSelect(editor.getTextField()); } @SuppressWarnings({"unchecked", "rawtypes"}) @@ -425,6 +430,7 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup initializerContext.checkFirstPass(); editor.setLocale(getClientConfig().getLocale()); editor.init(); + JTextComponents.addAutoSelect(editor.getDateEditor().getEditor()); } protected void init(JComponent editor) { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java ===================================== @@ -447,11 +447,14 @@ public class ContentOpen<U extends ContentUI> { String propertyQuadrant = coordinateEditor.getModel().getPropertyQuadrant(); JavaBean bean = (JavaBean) coordinateEditor.getModel().getBean(); // 1. Mise à jour latitude/longitude: - coordinateEditor.setLatitudeAndLongitude(bean.get(propertyLatitude), bean.get(propertyLongitude)); + Float latitude = bean.get(propertyLatitude); + Float longitude = bean.get(propertyLongitude); + Integer quadrant = bean.get(propertyQuadrant); + + coordinateEditor.setLatitudeAndLongitude(latitude, longitude); // 2. Mise à jour du quadrant : // Si le bean de données contient un quadrant, on met simplement à jour le composant de coordonnées pour sélectionner le quadrant voulu // sinon, on réinitialise les quadrants du composant afin qu'aucun d'eux ne soit sélectionné (par exemple dans le cas de la création de la première activité d'une route) - Integer quadrant = bean.get(propertyQuadrant); if (quadrant == null) { coordinateEditor.resetQuadrant(); } else { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/presets/RemotePresetsUI.jaxx ===================================== @@ -22,7 +22,6 @@ <import> fr.ird.observe.dto.presets.RemoteDataSourceConfiguration fr.ird.observe.dto.presets.ServerDataSourceConfiguration - org.nuiton.jaxx.widgets.select.BeanComboBox java.awt.CardLayout </import> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUI.jcss ===================================== @@ -46,6 +46,10 @@ _skipBindingToBean:true; } +#generateHomeId { + focusable:false; +} + #speciesTab { title:{t("observe.data.ll.common.Trip.species")}; } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/actions/TripUIGenerateHomeId.java ===================================== @@ -38,7 +38,7 @@ import static io.ultreia.java4all.i18n.I18n.n; public class TripUIGenerateHomeId extends ContentUIActionSupport<TripUI> { public TripUIGenerateHomeId() { - super(null, n("observe.data.ll.common.Trip.action.generateHomeId.tip"), "generate", ObserveLLKeyStrokes.KEY_STROKE_GENERATE_ID); + super("", n("observe.data.ll.common.Trip.action.generateHomeId.tip"), "generate", ObserveLLKeyStrokes.KEY_STROKE_GENERATE_ID); } @Override ===================================== client/i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -54,6 +54,10 @@ observe.config.category.ui.description=Graphical interface options observe.config.category.ui.navigation=Navigation observe.config.category.ui.navigation.description=Navigation tree configuration observe.config.checkServerVersion.description=Should we check client and server version exact match ? +observe.config.client.backupFiles.timeout.description=Backup files delete (in hours) +observe.config.client.feedbackFiles.timeout.description=Feedback files delete (in hours) +observe.config.client.logFiles.timeout.description=Log files delete (in hours) +observe.config.client.temporaryFiles.timeout.description=Temporary files delete (in hours) observe.config.configFileName.description=Configuration filename observe.config.coordinate.format=Position format (DMD, DD, DMS) observe.config.db.locale=Language of data source @@ -129,7 +133,6 @@ observe.config.speciesList.seine.observation.targetCatch=Species for target catc observe.config.swingSessionFile.description=Swing session file. observe.config.temperature.format=Default temperature format observe.config.temporaryDirectory.description=Default temporary directory used by application and clean at each launch. -observe.config.temporaryFilesTimeout.description=Temporary files delete (in hours) observe.config.ui.autoPopupNumberEditor=Flag sets to true when number editor show automaticly popup observe.config.ui.blockStateColor=Color of block state observe.config.ui.busyStateColor=Color of busy state ===================================== client/i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -54,6 +54,10 @@ observe.config.category.ui.description=Configuración GUI observe.config.category.ui.navigation=Navigation \#TODO observe.config.category.ui.navigation.description=Navigation tree configuration \#TODO observe.config.checkServerVersion.description=Verificar la correspondencia exacta entre las versiones de cliente y servidor REST? +observe.config.client.backupFiles.timeout.description=Backup files delete (in hours) \#TODO +observe.config.client.feedbackFiles.timeout.description=Feedback files delete (in hours) \#TODO +observe.config.client.logFiles.timeout.description=Log files delete (in hours) \#TODO +observe.config.client.temporaryFiles.timeout.description=Temporary files delete (in hours) \#TODO observe.config.configFileName.description=Nombre del archivo de configuración observe.config.coordinate.format=Formato de posición (DMD, DD, DMS) observe.config.db.locale=Idioma del referencial @@ -129,7 +133,6 @@ observe.config.speciesList.seine.observation.targetCatch=Especies par las captur observe.config.swingSessionFile.description=Copia de seguridad del estado del UI. observe.config.temperature.format=Unidad de temperatura observe.config.temporaryDirectory.description=Directorio temporal por defecto -observe.config.temporaryFilesTimeout.description=Temporary files delete (in hours) \#TODO observe.config.ui.autoPopupNumberEditor=Para mostrar automáticamente el editor numérico durante la edición de un número observe.config.ui.blockStateColor=Color of block state \#TODO observe.config.ui.busyStateColor=Color of busy state \#TODO ===================================== client/i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -54,6 +54,10 @@ observe.config.category.ui.description=Configuration des interfaces graphiques observe.config.category.ui.navigation=Navigation observe.config.category.ui.navigation.description=configuration de l'arbre de navigation observe.config.checkServerVersion.description=Vérifier la correspondance exacte entre les versions du client et serveur REST ? +observe.config.client.backupFiles.timeout.description=Nettoyage des fichiers de sauvegarde (en heures) +observe.config.client.feedbackFiles.timeout.description=Nettoyage des fichiers de retour d'expérience (en heures) +observe.config.client.logFiles.timeout.description=Nettoyage des fichiers de log (en heures) +observe.config.client.temporaryFiles.timeout.description=Nettoyage des fichiers temporaires (en heures) observe.config.configFileName.description=Le nom du fichier de configuration observe.config.coordinate.format=Format des positions (DMD, DD, DMS) observe.config.db.locale=La langue du référentiel @@ -129,7 +133,6 @@ observe.config.speciesList.seine.observation.targetCatch=Espèces pour les captu observe.config.swingSessionFile.description=Fichier de sauvegarde des états des UI. observe.config.temperature.format=Unité de température observe.config.temporaryDirectory.description=Le répertoire temporaire par défaut -observe.config.temporaryFilesTimeout.description=Nettoyage des fichiers temporaires (en heures) observe.config.ui.autoPopupNumberEditor=Pour afficher automatiquement l'éditeur numérique lors de l'édition d'un nombre observe.config.ui.blockStateColor=Couleur lorsque l'on bloque une partie de l'application observe.config.ui.busyStateColor=Couleur lorsque l'application est occupée ===================================== pom.xml ===================================== @@ -155,7 +155,7 @@   - <lib.version.java4all.jaxx>3.0-alpha-86</lib.version.java4all.jaxx> + <lib.version.java4all.jaxx>3.0-alpha-87</lib.version.java4all.jaxx>    ===================================== server/configuration/src/main/config/Server.ini ===================================== @@ -104,7 +104,7 @@ type = int defaultValue = 30000 [option temporaryFilesTimeout] -description = observe.config.temporaryFilesTimeout.description +description = observe.config.client.temporaryFiles.timeout.description key = observeweb.temporaryFilesTimeout type = int defaultValue = 120 ===================================== server/configuration/src/main/i18n/getters/config.getter ===================================== @@ -1,5 +1,5 @@ ObserveWebApplicationConfig.description -observe.config.temporaryFilesTimeout.description +observe.config.client.temporaryFiles.timeout.description observe.model.version observeweb.adminApiKey.description observeweb.baseDirectory.description ===================================== server/configuration/src/main/java/fr/ird/observe/server/configuration/ServerConfig.java ===================================== @@ -37,6 +37,8 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.Collections; +import java.util.Map; /** * La configuration de l'application web. @@ -49,9 +51,8 @@ import java.nio.file.Paths; hints = {TemplateGeneratorConfig.class, CleanTemporaryFilesTaskConfiguration.class}) public class ServerConfig extends GeneratedServerConfig implements CleanTemporaryFilesTaskConfiguration { - private static Logger log = LogManager.getLogger(ServerConfig.class); - private static final String DEFAULT_OBSERVE_WEB_CONFIGURATION_FILENAME = "observe-server.conf"; + private static Logger log = LogManager.getLogger(ServerConfig.class); public static ServerConfig fromContextPath(String contextPath) { ServerConfig config = new ServerConfig(); @@ -70,6 +71,11 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar delegate.setConfigFileName(confFileName); } + @Override + public Map<Path, Integer> getTemporaryDirectoriesAndTimeout() { + return Collections.singletonMap(getTemporaryDirectory().toPath(), getTemporaryFilesTimeout()); + } + public void init(String... args) { log.info("Starts to init ObServe server configuration..."); ===================================== server/i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1,5 +1,5 @@ ObserveWebApplicationConfig.description=ObServe Web configuration -observe.config.temporaryFilesTimeout.description=Temporary files delete (in hours) +observe.config.client.temporaryFiles.timeout.description=Temporary files delete (in hours) observe.model.version=Model version observe.ui.datasource.storage.error.rest.adminApiKey.invalid=Admin key not valid observe.ui.datasource.storage.error.rest.adminApiKey.required=Admin key not found ===================================== server/i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1,5 +1,5 @@ ObserveWebApplicationConfig.description=Configuración de Observe web -observe.config.temporaryFilesTimeout.description=Temporary files delete (in hours) \#TODO +observe.config.client.temporaryFiles.timeout.description=Temporary files delete (in hours) \#TODO observe.model.version=Versión del modelo observe.ui.datasource.storage.error.rest.adminApiKey.invalid=Admin key not valid \#TODO observe.ui.datasource.storage.error.rest.adminApiKey.required=Admin key not found \#TODO ===================================== server/i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1,5 +1,5 @@ ObserveWebApplicationConfig.description=Observe web Configuration -observe.config.temporaryFilesTimeout.description=Nettoyage des fichiers temporaires (en heures) +observe.config.client.temporaryFiles.timeout.description=Nettoyage des fichiers temporaires (en heures) observe.model.version=Version du modèle observe.ui.datasource.storage.error.rest.adminApiKey.invalid=Pas de clef admin trouvée observe.ui.datasource.storage.error.rest.adminApiKey.required=Clef admin non valide ===================================== toolkit/service/src/main/java/fr/ird/observe/services/service/CleanTemporaryFilesTask.java ===================================== @@ -49,10 +49,6 @@ public class CleanTemporaryFilesTask extends TimerTask { private final CleanTemporaryFilesTaskConfiguration configuration; - public CleanTemporaryFilesTask(CleanTemporaryFilesTaskConfiguration configuration) { - this.configuration = configuration; - } - public static Timer create(CleanTemporaryFilesTaskConfiguration configuration) { Timer result = new Timer("Delete temporary files daemon", true); result.scheduleAtFixedRate(new CleanTemporaryFilesTask(configuration), new Date(), TimeUnit.HOURS.toMillis(1)); @@ -65,16 +61,22 @@ public class CleanTemporaryFilesTask extends TimerTask { } } + public CleanTemporaryFilesTask(CleanTemporaryFilesTaskConfiguration configuration) { + this.configuration = configuration; + } + @Override public void run() { + configuration.getTemporaryDirectoriesAndTimeout().forEach(this::run); + } - Path temporaryDirectory = configuration.getTemporaryDirectory().toPath(); + private void run(Path temporaryDirectory, Integer timeout) { if (Files.notExists(temporaryDirectory)) { return; } Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date()); - calendar.add(Calendar.HOUR_OF_DAY, -configuration.getTemporaryFilesTimeout()); + calendar.add(Calendar.HOUR_OF_DAY, -timeout); Date deleteBefore = calendar.getTime(); long deleteBeforeTime = deleteBefore.getTime(); ===================================== toolkit/service/src/main/java/fr/ird/observe/services/service/CleanTemporaryFilesTaskConfiguration.java ===================================== @@ -22,7 +22,8 @@ package fr.ird.observe.services.service; * #L% */ -import java.io.File; +import java.nio.file.Path; +import java.util.Map; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -30,11 +31,6 @@ import java.io.File; */ public interface CleanTemporaryFilesTaskConfiguration { - File getTemporaryDirectory(); + Map<Path, Integer> getTemporaryDirectoriesAndTimeout(); - void setTemporaryDirectory(File temporaryDirectory); - - int getTemporaryFilesTimeout(); - - void setTemporaryFilesTimeout(int temporaryFilesTimeout); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4407da5d08987002d79ef8d0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4407da5d08987002d79ef8d0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: low log level
by Tony CHEMIT 24 Dec '20

24 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 97767340 by Tony Chemit at 2020-12-24T08:06:08+01:00 low log level - - - - - 4407da5d by Tony Chemit at 2020-12-24T08:06:37+01:00 no more need of singleton supplier since we apply some lazy instances now. - - - - - 2 changed files: - models/dto/src/main/java/fr/ird/observe/dto/data/ps/consolidate/dcp/SimplifiedObjectTypeSpecializedRules.java - toolkit/persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContextSupport.java Changes: ===================================== models/dto/src/main/java/fr/ird/observe/dto/data/ps/consolidate/dcp/SimplifiedObjectTypeSpecializedRules.java ===================================== @@ -112,7 +112,7 @@ public class SimplifiedObjectTypeSpecializedRules implements ObserveDto { int currentSize = specializedMappingBuilder.size(); addInheritance(specializedMappingBuilder, standardCodeMapping, tuple, standardCode, dependencies); int newSize = specializedMappingBuilder.size(); - log.info(String.format("Add %d inheritance rules for main rule: %s", newSize - currentSize, tuple)); + log.debug(String.format("Add %d inheritance rules for main rule: %s", newSize - currentSize, tuple)); } log.info(String.format("Found %d rules (from %d main rules).", specializedMappingBuilder.size(), rules.size())); @@ -120,7 +120,7 @@ public class SimplifiedObjectTypeSpecializedRules implements ObserveDto { } private void addInheritance(Map<ImmutableSet<SimplifiedObjectTypeNode>, String> specializedMappingBuilder, Map<String, SimplifiedObjectTypeNode> standardCodeMapping, ImmutableSet<SimplifiedObjectTypeNode> tuple, String standardCode, Map<SimplifiedObjectTypeNode, Set<SimplifiedObjectTypeNode>> dependencies) { - log.info(String.format("Add inheritance for standard code: %s on tuple: %s", standardCode, tuple)); + log.debug(String.format("Add inheritance for standard code: %s on tuple: %s", standardCode, tuple)); int size = tuple.size(); @SuppressWarnings("unchecked") List<SimplifiedObjectTypeNode>[] dependenciesTuples = (List<SimplifiedObjectTypeNode>[]) Array.newInstance(List.class, size); int index = 0; @@ -154,18 +154,18 @@ public class SimplifiedObjectTypeSpecializedRules implements ObserveDto { SimplifiedObjectTypeNode thisNode = standardCodeMapping.get(standardCode); SimplifiedObjectTypeNode otherNode = standardCodeMapping.get(existingStandardCode); if (thisNode.getLevel() < otherNode.getLevel()) { - log.debug(String.format("Mismatch standard code (found: %s, wants to set: %s) - reject it since less specialized for tuple: %s", existingStandardCode, standardCode, currentTuple)); + log.trace(String.format("Mismatch standard code (found: %s, wants to set: %s) - reject it since less specialized for tuple: %s", existingStandardCode, standardCode, currentTuple)); } else { keepRule = true; - log.debug(String.format("Mismatch standard code (found: %s, wants to set: %s) - accept it more specialized for tuple: %s", existingStandardCode, standardCode, currentTuple)); + log.trace(String.format("Mismatch standard code (found: %s, wants to set: %s) - accept it more specialized for tuple: %s", existingStandardCode, standardCode, currentTuple)); } } } if (keepRule) { - log.info(String.format("[%d/%d] Set standard code: %s for tuple: %s", currentIndex + 1, count, standardCode, Arrays.toString(indexTuples))); + log.debug(String.format("[%d/%d] Set standard code: %s for tuple: %s", currentIndex + 1, count, standardCode, Arrays.toString(indexTuples))); specializedMappingBuilder.put(currentTuple, standardCode); } else { - log.info(String.format("[%d/%d] Reject set standard code: %s for tuple: %s", currentIndex + 1, count, standardCode, Arrays.toString(indexTuples))); + log.debug(String.format("[%d/%d] Reject set standard code: %s for tuple: %s", currentIndex + 1, count, standardCode, Arrays.toString(indexTuples))); } } ===================================== toolkit/persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContextSupport.java ===================================== @@ -24,7 +24,6 @@ package fr.ird.observe.entities; import com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.referential.ReferentialDto; -import io.ultreia.java4all.util.SingletonSupplier; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.hibernate.tool.hbm2ddl.SchemaExport; @@ -81,15 +80,15 @@ public abstract class ObserveTopiaApplicationContextSupport<P extends ObserveTop /** * Meta model support. */ - private transient SingletonSupplier<TopiaMetadataModelSupport> topiaMetadataModelSupport; + private transient TopiaMetadataModelSupport topiaMetadataModelSupport; /** * Entity sql support. */ - private transient SingletonSupplier<TopiaEntitySqlModelSupport> topiaEntitySqlModelSupport; + private transient TopiaEntitySqlModelSupport topiaEntitySqlModelSupport; /** * Usage model. */ - private transient SingletonSupplier<TopiaUsageModel> topiaUsageModel; + private transient TopiaUsageModel topiaUsageModel; public ObserveTopiaApplicationContextSupport(TopiaConfiguration topiaConfiguration) { super(topiaConfiguration); @@ -117,16 +116,16 @@ public abstract class ObserveTopiaApplicationContextSupport<P extends ObserveTop public TopiaUsageModel getTopiaUsageModel() { if (topiaUsageModel == null) { - topiaUsageModel = SingletonSupplier.of(this::newUsageModel); + topiaUsageModel = newUsageModel(); } - return topiaUsageModel.get(); + return topiaUsageModel; } public TopiaEntitySqlModelSupport getTopiaEntitySqlModelSupport() { if (topiaEntitySqlModelSupport == null) { - topiaEntitySqlModelSupport = SingletonSupplier.of(this::newEntitySqlModelSupport); + topiaEntitySqlModelSupport = newEntitySqlModelSupport(); } - return topiaEntitySqlModelSupport.get(); + return topiaEntitySqlModelSupport; } public final String getAuthenticationToken() { @@ -135,9 +134,9 @@ public abstract class ObserveTopiaApplicationContextSupport<P extends ObserveTop protected final TopiaMetadataModelSupport getTopiaMetadataModelSupport() { if (topiaMetadataModelSupport == null) { - topiaMetadataModelSupport = SingletonSupplier.of(this::newMetaModelSupport); + topiaMetadataModelSupport = newMetaModelSupport(); } - return topiaMetadataModelSupport.get(); + return topiaMetadataModelSupport; } @Override View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c0cb65a8383c57afbd602620… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c0cb65a8383c57afbd602620… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: debug level for report tests
by Tony CHEMIT 23 Dec '20

23 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fab9f566 by Tony Chemit at 2020-12-23T15:28:50+01:00 debug level for report tests - - - - - c0cb65a8 by Tony Chemit at 2020-12-23T15:29:44+01:00 fix bad design in ToPIA: we should not do init stuff in application context, but just do it in a init method outside of the constructor hell hole - - - - - 2 changed files: - services/local-impl/src/test/java/fr/ird/observe/services/local/service/actions/report/AbstractReportServiceLocalTest.java - toolkit/persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContextSupport.java Changes: ===================================== services/local-impl/src/test/java/fr/ird/observe/services/local/service/actions/report/AbstractReportServiceLocalTest.java ===================================== @@ -140,7 +140,7 @@ public abstract class AbstractReportServiceLocalTest extends ServiceLocalTestSup // on execute le report DataMatrix result = service.executeReport(report, tripIds); - log.info(String.format("Result :\n%s", result.getClipboardContent(true, true, true, ','))); + log.debug(String.format("Result :\n%s", result.getClipboardContent(true, true, true, ','))); // on verifie le resultat testReportResult(result); ===================================== toolkit/persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContextSupport.java ===================================== @@ -73,30 +73,26 @@ public abstract class ObserveTopiaApplicationContextSupport<P extends ObserveTop /** * Unique id associated with this application context. */ - protected final String authenticationToken; + protected final String authenticationToken = UUID.randomUUID().toString(); + /** + * Mise à {@code true} quand au moins une connection a été effectuée. + */ + protected boolean open; /** * Meta model support. */ - private transient final SingletonSupplier<TopiaMetadataModelSupport> topiaMetadataModelSupport; + private transient SingletonSupplier<TopiaMetadataModelSupport> topiaMetadataModelSupport; /** * Entity sql support. */ - private transient final SingletonSupplier<TopiaEntitySqlModelSupport> topiaEntitySqlModelSupport; + private transient SingletonSupplier<TopiaEntitySqlModelSupport> topiaEntitySqlModelSupport; /** * Usage model. */ - private transient final SingletonSupplier<TopiaUsageModel> topiaUsageModel; - /** - * Mise à {@code true} quand au moins une connection a été effectuée. - */ - protected boolean open; + private transient SingletonSupplier<TopiaUsageModel> topiaUsageModel; public ObserveTopiaApplicationContextSupport(TopiaConfiguration topiaConfiguration) { super(topiaConfiguration); - this.authenticationToken = UUID.randomUUID().toString(); - this.topiaMetadataModelSupport = SingletonSupplier.of(this::newMetaModelSupport); - this.topiaEntitySqlModelSupport = SingletonSupplier.of(this::newEntitySqlModelSupport); - this.topiaUsageModel = SingletonSupplier.of(this::newUsageModel); } @SuppressWarnings("deprecation") @@ -120,10 +116,16 @@ public abstract class ObserveTopiaApplicationContextSupport<P extends ObserveTop public abstract ImmutableSet<Class<? extends ReferentialDto>> referentialForReplicationDto(); public TopiaUsageModel getTopiaUsageModel() { + if (topiaUsageModel == null) { + topiaUsageModel = SingletonSupplier.of(this::newUsageModel); + } return topiaUsageModel.get(); } public TopiaEntitySqlModelSupport getTopiaEntitySqlModelSupport() { + if (topiaEntitySqlModelSupport == null) { + topiaEntitySqlModelSupport = SingletonSupplier.of(this::newEntitySqlModelSupport); + } return topiaEntitySqlModelSupport.get(); } @@ -132,6 +134,9 @@ public abstract class ObserveTopiaApplicationContextSupport<P extends ObserveTop } protected final TopiaMetadataModelSupport getTopiaMetadataModelSupport() { + if (topiaMetadataModelSupport == null) { + topiaMetadataModelSupport = SingletonSupplier.of(this::newMetaModelSupport); + } return topiaMetadataModelSupport.get(); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/dfc7cad31d57f527f4196d25… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/dfc7cad31d57f527f4196d25… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] optimize dependencies + add license headers
by Tony CHEMIT 23 Dec '20

23 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: dfc7cad3 by Tony Chemit at 2020-12-23T14:59:44+01:00 optimize dependencies + add license headers - - - - - 3 changed files: - toolkit/maven-plugin/pom.xml - toolkit/maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/persistence/GenerateEmptyDatabases.java - toolkit/persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContextSupport.java Changes: ===================================== toolkit/maven-plugin/pom.xml ===================================== @@ -93,7 +93,18 @@ <artifactId>auto-service</artifactId> <scope>provided</scope> </dependency> - + <dependency> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>service-migration</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-version</artifactId> + </dependency> + <dependency> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>persistence</artifactId> + </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> ===================================== toolkit/maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/persistence/GenerateEmptyDatabases.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.maven.plugins.toolbox.persistence; +/*- + * #%L + * ObServe Toolkit :: Maven plugin + * %% + * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.entities.ObserveTopiaApplicationContextSupport; import fr.ird.observe.entities.ObserveTopiaConfiguration; ===================================== toolkit/persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContextSupport.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.entities; +/*- + * #%L + * ObServe Toolkit :: Persistence + * %% + * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.referential.ReferentialDto; import io.ultreia.java4all.util.SingletonSupplier; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/dfc7cad31d57f527f4196d25a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/dfc7cad31d57f527f4196d25a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Mis sort property on table
by Tony CHEMIT 23 Dec '20

23 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 56ec6300 by Tony Chemit at 2020-12-23T09:57:28+01:00 Mis sort property on table - - - - - 222b71c0 by Tony Chemit at 2020-12-23T14:40:06+01:00 Add postInit method on IdDto to do some technical stuff (like init quadrant of coordinates) - - - - - 000ff8d4 by Tony Chemit at 2020-12-23T14:43:15+01:00 Generate call to dto.postInit in copy from entity overrides dto.postInit when needed and then remove code from entities (more entities to delete) - - - - - d302d0bf by Tony Chemit at 2020-12-23T14:44:17+01:00 Generate call to dto.postInit in copy from entity overrides dto.postInit when needed and then remove code from entities (more entities to delete) - - - - - d284c154 by Tony Chemit at 2020-12-23T14:44:57+01:00 remove SectionObsTemplate (no more used) - - - - - 20d387fe by Tony Chemit at 2020-12-23T14:47:02+01:00 Improve TopiaApplicationContext: now the final one just implments and overrides some method, but have no more internal states. everything else was moved to toolkit. And now can easy move GenerateEmptyDatabases runner to toolkit as well (feel more safe to not have this code in runtime module...) - - - - - 580cf759 by Tony Chemit at 2020-12-23T14:47:27+01:00 Clean more unused entities contract and method - - - - - 30 changed files: - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUI.jaxx - models/dto/src/main/java/fr/ird/observe/dto/data/ll/common/TripDto.java - models/dto/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityDto.java - models/dto/src/main/java/fr/ird/observe/dto/data/ll/logbook/SampleDto.java - models/persistence/src/main/java/fr/ird/observe/entities/data/ll/logbook/SampleImpl.java → models/dto/src/main/java/fr/ird/observe/dto/data/ll/logbook/SetDto.java - models/dto/src/main/java/fr/ird/observe/dto/data/ll/observation/ActivityDto.java - models/persistence/src/main/java/fr/ird/observe/entities/referential/common/HarbourImpl.java → models/dto/src/main/java/fr/ird/observe/dto/data/ll/observation/SetDto.java - models/dto/src/main/java/fr/ird/observe/dto/data/ps/observation/ActivityDto.java - models/persistence/src/main/java/fr/ird/observe/entities/LastUpdateDateTopiaDao.java → models/dto/src/main/java/fr/ird/observe/dto/referential/common/HarbourDto.java - models/persistence/src/test/java/fr/ird/observe/entities/data/ll/observation/SectionObsTemplateTest.java → models/dto/src/test/java/fr/ird/observe/dto/data/ll/observation/SectionTemplateDtoTest.java - models/persistence/pom.xml - models/persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContext.java - models/persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaApplicationContextFactory.java - models/persistence/src/main/java/fr/ird/observe/entities/ObserveTopiaPersistenceContext.java - − models/persistence/src/main/java/fr/ird/observe/entities/data/GearFeaturesAware.java - models/persistence/src/main/java/fr/ird/observe/entities/data/ll/common/TripImpl.java - models/persistence/src/main/java/fr/ird/observe/entities/data/ll/logbook/ActivityImpl.java - − models/persistence/src/main/java/fr/ird/observe/entities/data/ll/logbook/SetImpl.java - models/persistence/src/main/java/fr/ird/observe/entities/data/ll/observation/ActivityImpl.java - − models/persistence/src/main/java/fr/ird/observe/entities/data/ll/observation/SectionObsTemplate.java - models/persistence/src/main/java/fr/ird/observe/entities/data/ll/observation/SetImpl.java - models/persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/ActivityImpl.java - − models/persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/FloatingObjectImpl.java - − models/persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/RouteImpl.java - models/persistence/src/main/models/Observe-00-common.model - models/persistence/src/main/models/Observe-20-data-ps-observation.model - models/persistence/src/main/models/Observe-25-data-ps-common.model - models/persistence/src/main/models/Observe-35-data-ll-common.model - models/persistence/src/test/java/fr/ird/observe/entities/spi/ReplicationOrderBuilderTest.java - models/persistence/src/test/java/fr/ird/observe/entities/spi/TopiaMetadataModelPathsTest.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b86789d1a167676e6be98622… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b86789d1a167676e6be98622… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Revoir le code de gestion des échantillons - Closes #1663
by Tony CHEMIT 22 Dec '20

22 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b86789d1 by Tony Chemit at 2020-12-22T23:51:51+01:00 Revoir le code de gestion des échantillons - Closes #1663 - - - - - 24 changed files: - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/SampleUIHandlerSupport.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/SampleUIModelSupport.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/SampleUISupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/actions/ResetSizeMeasureType.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/ResetSizeMeasureType.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/actions/ResetWeightMeasureType.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/ResetWeightMeasureType.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/actions/SampleUIActionSupport.java → client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/table/CommonSample.jcss - − client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SampleImplHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUIModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/DiscardedTargetSampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/DiscardedTargetSampleUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/DiscardedTargetSampleUIModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/DiscardedTargetSampleUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/KeptTargetSampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/KeptTargetSampleUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/KeptTargetSampleUIModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/KeptTargetSampleUITableModel.java - − client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/NonTargetSampleImplHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/NonTargetSampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/NonTargetSampleUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/NonTargetSampleUIModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/NonTargetSampleUITableModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b86789d1a167676e6be986225… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b86789d1a167676e6be986225… You're receiving this email because of your account on gitlab.com.

1 0