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

[Git][ultreiaio/ird-observe][develop] 2 commits: [EXPORT CARTE] Le nom de fichier est généré sans l'extension PNG - Closes #1434
by Tony CHEMIT 13 Feb '20

13 Feb '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 137b6b48 by tchemit at 2020-02-13T12:55:38+01:00 [EXPORT CARTE] Le nom de fichier est généré sans l'extension PNG - Closes #1434 - - - - - 3d6870bc by tchemit at 2020-02-13T12:59:17+01:00 [LL] Contrôle sur nombre de baskets trop limité - Closes #1433 - - - - - 26 changed files: - client-core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/report/actions/ChooseFileReport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/tabs/actions/ConfigDataUIChooseDumpFileAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/tabs/actions/ConfigReferentialUIChooseDumpFileAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/tabs/actions/ConfigUIChooseDumpFileAction.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/trip/map/actions/ExportPng.java - client-datasource-editor-ll/pom.xml - client-datasource-editor-ll/src/main/i18n/getters/java.getter - client-datasource-editor-ll/src/main/i18n/getters/jaxx.getter - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/ObserveLLKeyStrokes.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SensorUsedUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SensorUsedUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SensorUsedUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/TdrUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/TdrUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/TdrUIHandler.java - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/SensorUsedUIActionSupport.java - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/SensorUsedUIDeleteData.java - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/SensorUsedUIExportData.java - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/SensorUsedUIImportData.java - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/TdrUIActionSupport.java - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/TdrUIDeleteData.java - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/TdrUIExportData.java - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/TdrUIImportData.java - validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDto-update-error-validation.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/util/UIHelper.java ===================================== @@ -173,16 +173,16 @@ public class UIHelper extends SwingUtil { /** * Choisir un fichier via un sélecteur graphique de fichiers. * - * @param parent le component swing appelant le controle - * @param title le titre du dialogue de sélection - * @param buttonLabel le label du boutton d'acceptation - * @param incoming le fichier de base à utilier - * @param filters les filtres + descriptions sur le sélecteur de - * fichiers + * @param parent le component swing appelant le controle + * @param title le titre du dialogue de sélection + * @param buttonLabel le label du boutton d'acceptation + * @param incoming le fichier de base à utilier + * @param mainExtension l'extension principale (à rajouter sur le nom du fichier si besoin) + * @param filters les filtres + descriptions sur le sélecteur de fichiers * @return le fichier choisi ou le fichier incoming si l'opération a été * annulée */ - public static File chooseFile(Component parent, String title, String buttonLabel, File incoming, String... filters) { + public static File chooseFile(Component parent, String title, String buttonLabel, File incoming, String mainExtension, String... filters) { JaxxFileChooser.ToLoadFile toLoadFile = JaxxFileChooser.forLoadingFile() .setParent(parent) @@ -199,7 +199,7 @@ public class UIHelper extends SwingUtil { if (log.isDebugEnabled()) { log.debug(title + " : " + file); } - return file == null ? incoming : file; + return file == null ? incoming : ensureFileExtension(file, mainExtension); } /** @@ -229,6 +229,13 @@ public class UIHelper extends SwingUtil { return file; } + public static File ensureFileExtension(File file, String extension) { + if (extension != null && !file.getName().toLowerCase().endsWith(extension)) { + file = file.toPath().getParent().resolve(file.getName() + extension).toFile(); + } + return file; + } + private static File getParentDirectoryIfExist(File incoming) { if (incoming != null) { File basedir; ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/report/actions/ChooseFileReport.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.datasource.actions.report.ReportConfigUI; import fr.ird.observe.client.datasource.actions.report.ReportModel; import fr.ird.observe.client.util.ObserveKeyStrokesSupport; import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.dto.ObserveUtil; import org.nuiton.jaxx.runtime.swing.action.JComponentActionSupport; import java.awt.event.ActionEvent; @@ -42,13 +43,13 @@ public class ChooseFileReport extends JComponentActionSupport<ReportConfigUI> { @Override protected void doActionPerformed(ActionEvent e, ReportConfigUI ui) { ReportModel model = ui.getModel().getReportModel(); - File f = UIHelper.chooseFile( - ui, - t("observe.title.choose.reportFile"), - t("observe.action.choose.reportFile"), - model.getReportFile(), - "^.+\\.properties$", - t("observe.action.choose.reportFile.description")); + File f = UIHelper.chooseFile(ui, + t("observe.title.choose.reportFile"), + t("observe.action.choose.reportFile"), + model.getReportFile(), + ObserveUtil.PROPERTIES_EXTENSION, + ObserveUtil.PROPERTIES_EXTENSION_PATTERN, + t("observe.action.choose.reportFile.description")); if (f != null) { model.setReportFile(f); } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/tabs/actions/ConfigDataUIChooseDumpFileAction.java ===================================== @@ -41,11 +41,12 @@ public class ConfigDataUIChooseDumpFileAction extends StorageTabUIActionSupport< @Override protected void doActionPerformed(ActionEvent e, ConfigDataUI ui) { File f = UIHelper.chooseFile(ui, - t("observe.title.choose.db.dump"), - t("observe.action.choose.db.dump"), - ui.getModel().getDumpFile(), - ObserveUtil.SQL_GZ_EXTENSION_PATTERN, - t("observe.action.choose.db.dump.description")); + t("observe.title.choose.db.dump"), + t("observe.action.choose.db.dump"), + ui.getModel().getDumpFile(), + ObserveUtil.SQL_GZ_EXTENSION, + ObserveUtil.SQL_GZ_EXTENSION_PATTERN, + t("observe.action.choose.db.dump.description")); if (f != null) { ui.getHandler().setDumpFile(f.getAbsolutePath()); } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/tabs/actions/ConfigReferentialUIChooseDumpFileAction.java ===================================== @@ -41,11 +41,12 @@ public class ConfigReferentialUIChooseDumpFileAction extends StorageTabUIActionS @Override protected void doActionPerformed(ActionEvent e, ConfigReferentialUI ui) { File f = UIHelper.chooseFile(ui, - t("observe.title.choose.db.dump"), - t("observe.action.choose.db.dump"), - ui.getModel().getDumpFile(), - ObserveUtil.SQL_GZ_EXTENSION_PATTERN, - t("observe.action.choose.db.dump.description")); + t("observe.title.choose.db.dump"), + t("observe.action.choose.db.dump"), + ui.getModel().getDumpFile(), + ObserveUtil.SQL_GZ_EXTENSION, + ObserveUtil.SQL_GZ_EXTENSION_PATTERN, + t("observe.action.choose.db.dump.description")); if (f != null) { ui.getHandler().setDumpFile(f.getAbsolutePath()); } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/tabs/actions/ConfigUIChooseDumpFileAction.java ===================================== @@ -41,11 +41,12 @@ public class ConfigUIChooseDumpFileAction extends StorageTabUIActionSupport<Conf @Override protected void doActionPerformed(ActionEvent event, ConfigUI ui) { File f = UIHelper.chooseFile(ui, - t("observe.title.choose.db.dump"), - t("observe.action.choose.db.dump"), - ui.getModel().getDumpFile(), - ObserveUtil.SQL_GZ_EXTENSION_PATTERN, - t("observe.action.choose.db.dump.description")); + t("observe.title.choose.db.dump"), + t("observe.action.choose.db.dump"), + ui.getModel().getDumpFile(), + ObserveUtil.SQL_GZ_EXTENSION, + ObserveUtil.SQL_GZ_EXTENSION_PATTERN, + t("observe.action.choose.db.dump.description")); if (f != null) { ui.getHandler().setDumpFile(f.getAbsolutePath()); } ===================================== client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/trip/map/actions/ExportPng.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.datasource.editor.content.data.trip.map.TripMapUI; import fr.ird.observe.client.util.ObserveKeyStrokesSupport; import fr.ird.observe.client.util.ObserveSwingTechnicalException; import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.dto.ObserveUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -57,13 +58,13 @@ public class ExportPng extends TripMapUIActionSupport { @Override protected void doActionPerformed(ActionEvent event, TripMapUI ui) { - File file = UIHelper.chooseFile( - ui, - t("observe.content.map.export.chooseFile.title"), - t("observe.content.map.export.chooseFile.ok"), - null, - "^.+\\.png|.+\\.PNG$", - t("observe.content.map.export.chooseFile.png")); + File file = UIHelper.chooseFile(ui, + t("observe.content.map.export.chooseFile.title"), + t("observe.content.map.export.chooseFile.ok"), + null, + ObserveUtil.PNG_EXTENSION, + ObserveUtil.PNG_EXTENSION_PATTERN, + t("observe.content.map.export.chooseFile.png")); if (file != null && UIHelper.confirmOverwriteFileIfExist(ui, file)) { ===================================== client-datasource-editor-ll/pom.xml ===================================== @@ -137,10 +137,6 @@ <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-datetime</artifactId> </dependency> - <dependency> - <groupId>io.ultreia.java4all.jaxx</groupId> - <artifactId>jaxx-widgets-status</artifactId> - </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-select</artifactId> ===================================== client-datasource-editor-ll/src/main/i18n/getters/java.getter ===================================== @@ -225,7 +225,12 @@ observe.data.ll.observation.SensorUsed.action.importData observe.data.ll.observation.SensorUsed.choose.title.exportData observe.data.ll.observation.SensorUsed.choose.title.importData observe.data.ll.observation.SensorUsed.delete.data.message -observe.data.ll.observation.SensorUsed.message.data.exported +observe.data.ll.observation.SensorUsed.deleteData +observe.data.ll.observation.SensorUsed.deleteData.tip +observe.data.ll.observation.SensorUsed.exportData +observe.data.ll.observation.SensorUsed.exportData.tip +observe.data.ll.observation.SensorUsed.importData +observe.data.ll.observation.SensorUsed.importData.tip observe.data.ll.observation.SensorUsed.replace.data.message observe.data.ll.observation.SensorUsed.table.data observe.data.ll.observation.SensorUsed.table.data.tip @@ -289,7 +294,12 @@ observe.data.ll.observation.Tdr.action.exportData observe.data.ll.observation.Tdr.action.importData observe.data.ll.observation.Tdr.choose.title.exportData observe.data.ll.observation.Tdr.choose.title.importData -observe.data.ll.observation.Tdr.delete.data.message +observe.data.ll.observation.Tdr.deleteData +observe.data.ll.observation.Tdr.deleteData.tip +observe.data.ll.observation.Tdr.exportData +observe.data.ll.observation.Tdr.exportData.tip +observe.data.ll.observation.Tdr.importData +observe.data.ll.observation.Tdr.importData.tip observe.data.ll.observation.Tdr.replace.data.message observe.data.ll.observation.Tdr.table.data observe.data.ll.observation.Tdr.table.data.tip ===================================== client-datasource-editor-ll/src/main/i18n/getters/jaxx.getter ===================================== @@ -319,12 +319,6 @@ observe.data.ll.observation.SensorUsed.action.create.tip observe.data.ll.observation.SensorUsed.data observe.data.ll.observation.SensorUsed.dataLocation observe.data.ll.observation.SensorUsed.dataLocation.tip -observe.data.ll.observation.SensorUsed.deleteData -observe.data.ll.observation.SensorUsed.deleteData.tip -observe.data.ll.observation.SensorUsed.exportData -observe.data.ll.observation.SensorUsed.exportData.tip -observe.data.ll.observation.SensorUsed.importData -observe.data.ll.observation.SensorUsed.importData.tip observe.data.ll.observation.SensorUsed.sensorBrand observe.data.ll.observation.SensorUsed.sensorDataFormat observe.data.ll.observation.SensorUsed.sensorSerialNo @@ -414,22 +408,16 @@ observe.data.ll.observation.Tdr.caracteristicsTab observe.data.ll.observation.Tdr.data observe.data.ll.observation.Tdr.dataLocation observe.data.ll.observation.Tdr.dataLocation.tip -observe.data.ll.observation.Tdr.deleteData -observe.data.ll.observation.Tdr.deleteData.tip observe.data.ll.observation.Tdr.deployementEnd observe.data.ll.observation.Tdr.deployementStart observe.data.ll.observation.Tdr.enableTimestamp observe.data.ll.observation.Tdr.enableTimestamp.tip -observe.data.ll.observation.Tdr.exportData -observe.data.ll.observation.Tdr.exportData.tip observe.data.ll.observation.Tdr.fishingEnd observe.data.ll.observation.Tdr.fishingEndDepth observe.data.ll.observation.Tdr.fishingStart observe.data.ll.observation.Tdr.fishingStartDepth observe.data.ll.observation.Tdr.floatline1Length observe.data.ll.observation.Tdr.floatline2Length -observe.data.ll.observation.Tdr.importData -observe.data.ll.observation.Tdr.importData.tip observe.data.ll.observation.Tdr.itemHorizontalPosition observe.data.ll.observation.Tdr.itemVerticalPosition observe.data.ll.observation.Tdr.keyDataTab ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/ObserveLLKeyStrokes.java ===================================== @@ -41,4 +41,7 @@ public class ObserveLLKeyStrokes extends ObserveKeyStrokesSupport { public static final KeyStroke KEY_STROKE_ADD_SET_LONGLINE = KeyStroke.getKeyStroke("ctrl pressed L"); public static final KeyStroke KEY_STROKE_ADD_SAMPLE_LONGLINE = KeyStroke.getKeyStroke("ctrl pressed M"); public static final KeyStroke KEY_STROKE_GENERATE_ID = KeyStroke.getKeyStroke("ctrl pressed G"); + public static final KeyStroke KEY_STROKE_IMPORT_DATA = KeyStroke.getKeyStroke("ctrl pressed I"); + public static final KeyStroke KEY_STROKE_DELETE_DATA = KeyStroke.getKeyStroke("shift ctrl pressed D"); + public static final KeyStroke KEY_STROKE_EXPORT_DATA = KeyStroke.getKeyStroke("ctrl pressed E"); } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SensorUsedUI.jaxx ===================================== @@ -126,9 +126,9 @@ </cell> <cell weightx='1' anchor='east'> <JPanel layout='{new GridLayout()}'> - <JButton id="importDataButton" onActionPerformed="getHandler().importData()"/> - <JButton id="exportDataButton" onActionPerformed="getHandler().exportData()"/> - <JButton id="deleteDataButton" onActionPerformed="getHandler().deleteData()"/> + <JButton id="importData"/> + <JButton id="exportData"/> + <JButton id="deleteData"/> </JPanel> </cell> </row> ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SensorUsedUI.jcss ===================================== @@ -24,22 +24,10 @@ toolTipText:"observe.data.ll.observation.SensorUsed.dataLocation.tip"; } -#importDataButton { - actionIcon:data-import; - text:"observe.data.ll.observation.SensorUsed.importData"; - toolTipText:"observe.data.ll.observation.SensorUsed.importData.tip"; -} - -#exportDataButton { - actionIcon:data-export; - text:"observe.data.ll.observation.SensorUsed.exportData"; - toolTipText:"observe.data.ll.observation.SensorUsed.exportData.tip"; +#exportData { enabled:{tableEditBean.isHasData()}; } -#deleteDataButton { - actionIcon:delete; - text:"observe.data.ll.observation.SensorUsed.deleteData"; - toolTipText:"observe.data.ll.observation.SensorUsed.deleteData.tip"; +#deleteData { enabled:{tableEditBean.isHasData()}; } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SensorUsedUIHandler.java ===================================== @@ -22,13 +22,9 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.observation; * #L% */ -import fr.ird.observe.client.ClientUIContextApplicationComponent; import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUIHandler; import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUILayoutFocusTraversalPolicy; -import fr.ird.observe.client.main.ObserveMainUI; -import fr.ird.observe.client.util.ObserveSwingTechnicalException; import fr.ird.observe.client.util.UIHelper; -import fr.ird.observe.dto.data.DataFileDto; import fr.ird.observe.dto.data.ll.observation.ActivitySensorUsedDto; import fr.ird.observe.dto.data.ll.observation.SensorUsedDto; import fr.ird.observe.dto.form.Form; @@ -39,19 +35,13 @@ import fr.ird.observe.dto.result.SaveResultDto; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.spi.UIHandler; -import org.nuiton.jaxx.widgets.file.JaxxFileChooser; -import javax.swing.JOptionPane; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; import java.awt.Component; import java.awt.Container; -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; import static io.ultreia.java4all.i18n.I18n.n; -import static io.ultreia.java4all.i18n.I18n.t; /** * Created on 8/31/14. @@ -138,78 +128,4 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivitySensorUse saveResult.toDto(bean); } - public void importData() { - SensorUsedDto tableEditBean = getModel().getTableEditBean(); - if (tableEditBean.isHasData()) { - DataFileDto dataFile = tableEditBean.getData(); - if (dataFile == null) { - dataFile = getLlObservationActivitySensorUsedService().getDataFile(tableEditBean.getId()); - } - int response = UIHelper.askUser(ui, - t("observe.title.confirmReplace"), - t("observe.data.ll.observation.SensorUsed.replace.data.message", dataFile.getName()), - JOptionPane.WARNING_MESSAGE, - new Object[]{t("observe.choice.confirm.replace"), - t("observe.choice.cancel")}, - 1); - boolean doReplace = response == 0; - if (!doReplace) { - return; - } - } - File file = UIHelper.chooseFile(ui, - t("observe.data.ll.observation.SensorUsed.choose.title.importData"), - t("observe.data.ll.observation.SensorUsed.action.importData"), - null); - if (file != null) { - log.info(prefix + "Set data from file: " + file); - DataFileDto dataFileDto = UIHelper.fileToDataFileDto(file); - tableEditBean.setData(dataFileDto); - tableEditBean.setHasData(true); - } - } - - public void deleteData() { - int response = UIHelper.askUser(ui, - t("observe.title.delete"), - t("observe.data.ll.observation.SensorUsed.delete.data.message"), - JOptionPane.WARNING_MESSAGE, - new Object[]{t("observe.choice.confirm.delete"), - t("observe.choice.cancel")}, - 1); - boolean doDelete = response == 0; - if (doDelete) { - SensorUsedDto tableEditBean = getModel().getTableEditBean(); - log.info(prefix + "Delete sensorUsed data " + tableEditBean.getData()); - tableEditBean.setData(null); - tableEditBean.setHasData(false); - } - } - - public void exportData() { - SensorUsedDto tableEditBean = getModel().getTableEditBean(); - DataFileDto dataFile = tableEditBean.getData(); - if (dataFile == null) { - dataFile = getLlObservationActivitySensorUsedService().getDataFile(tableEditBean.getId()); - } - File file = JaxxFileChooser - .forSaving() - .setParent(ui) - .setTitle(t("observe.data.ll.observation.SensorUsed.choose.title.exportData")) - .setApprovalText(t("observe.data.ll.observation.SensorUsed.action.exportData")) - .setFilename(dataFile.getName()) - .setUseAcceptAllFileFilter(true) - .choose(); - - if (file != null && UIHelper.confirmOverwriteFileIfExist(ui, file)) { - log.info(prefix + "save sensorUsed data to " + file); - try { - Files.write(file.toPath(), dataFile.getContent()); - ObserveMainUI mainUI = ClientUIContextApplicationComponent.value().getMainUI(); - mainUI.getStatus().setStatus(t("observe.data.ll.observation.SensorUsed.message.data.exported", file)); - } catch (IOException e) { - throw new ObserveSwingTechnicalException("Could not save binary data to " + file, e); - } - } - } } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/TdrUI.jaxx ===================================== @@ -133,9 +133,9 @@ </cell> <cell weightx='1' anchor='east'> <JPanel layout='{new GridLayout()}'> - <JButton id="importDataButton" onActionPerformed="getHandler().importData()"/> - <JButton id="exportDataButton" onActionPerformed="getHandler().exportData()"/> - <JButton id="deleteDataButton" onActionPerformed="getHandler().deleteData()"/> + <JButton id="importData"/> + <JButton id="exportData"/> + <JButton id="deleteData"/> </JPanel> </cell> </row> ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/TdrUI.jcss ===================================== @@ -28,23 +28,11 @@ toolTipText:"observe.data.ll.observation.Tdr.dataLocation.tip"; } -#importDataButton { - actionIcon:data-import; - text:"observe.data.ll.observation.Tdr.importData"; - toolTipText:"observe.data.ll.observation.Tdr.importData.tip"; -} - -#exportDataButton { - actionIcon:data-export; - text:"observe.data.ll.observation.Tdr.exportData"; - toolTipText:"observe.data.ll.observation.Tdr.exportData.tip"; +#exportData { enabled:{tableEditBean.isHasData()}; } -#deleteDataButton { - actionIcon:delete; - text:"observe.data.ll.observation.Tdr.deleteData"; - toolTipText:"observe.data.ll.observation.Tdr.deleteData.tip"; +#deleteData { enabled:{tableEditBean.isHasData()}; } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/TdrUIHandler.java ===================================== @@ -22,16 +22,12 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.observation; * #L% */ -import fr.ird.observe.client.ClientUIContextApplicationComponent; import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableModel; import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUIHandler; import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUILayoutFocusTraversalPolicy; import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUIModel; import fr.ird.observe.client.datasource.editor.content.spi.ContentUIReferenceCache; -import fr.ird.observe.client.main.ObserveMainUI; -import fr.ird.observe.client.util.ObserveSwingTechnicalException; import fr.ird.observe.client.util.UIHelper; -import fr.ird.observe.dto.data.DataFileDto; import fr.ird.observe.dto.data.ll.observation.SetTdrDto; import fr.ird.observe.dto.data.ll.observation.TdrDto; import fr.ird.observe.dto.form.Form; @@ -40,20 +36,14 @@ import fr.ird.observe.dto.result.SaveResultDto; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.spi.UIHandler; -import org.nuiton.jaxx.widgets.file.JaxxFileChooser; import javax.swing.JComponent; -import javax.swing.JOptionPane; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; import java.util.Date; import java.util.List; import static io.ultreia.java4all.i18n.I18n.n; -import static io.ultreia.java4all.i18n.I18n.t; /** * Created on 9/30/14. @@ -214,85 +204,6 @@ public class TdrUIHandler extends ContentTableUIHandler<SetTdrDto, TdrDto, TdrUI setTimestamp(bean, timeStamp); } - public void importData() { - TdrDto tableEditBean = getModel().getTableEditBean(); - if (tableEditBean.isHasData()) { - DataFileDto dataFile = tableEditBean.getData(); - if (dataFile == null) { - dataFile = getLlObservationSetTdrService().getDataFile(tableEditBean.getId()); - } - int response = UIHelper.askUser(ui, - t("observe.title.confirmReplace"), - t("observe.data.ll.observation.Tdr.replace.data.message", dataFile.getName()), - JOptionPane.WARNING_MESSAGE, - new Object[]{t("observe.choice.confirm.replace"), - t("observe.choice.cancel")}, - 1); - boolean doReplace = response == 0; - if (!doReplace) { - return; - } - } - - File file = UIHelper.chooseFile(ui, - t("observe.data.ll.observation.Tdr.choose.title.importData"), - t("observe.data.ll.observation.Tdr.action.importData"), - null); - if (file != null) { - log.info("Set data from file: " + file); - DataFileDto dataFileDto = UIHelper.fileToDataFileDto(file); - tableEditBean.setData(dataFileDto); - tableEditBean.setHasData(true); - } - } - - public void deleteData() { - int response = UIHelper.askUser(ui, - t("observe.title.delete"), - t("observe.data.ll.observation.Tdr.delete.data.message"), - JOptionPane.WARNING_MESSAGE, - new Object[]{t("observe.choice.confirm.delete"), - t("observe.choice.cancel")}, - 1); - boolean doDelete = response == 0; - if (doDelete) { - TdrDto tableEditBean = getModel().getTableEditBean(); - log.info("Delete tdr data " + tableEditBean.getData()); - tableEditBean.setData(null); - tableEditBean.setHasData(false); - } - } - - public void exportData() { - - TdrDto tableEditBean = getModel().getTableEditBean(); - DataFileDto dataFile = tableEditBean.getData(); - - if (dataFile == null) { - dataFile = getLlObservationSetTdrService().getDataFile(tableEditBean.getId()); - } - - File file = JaxxFileChooser - .forSaving() - .setParent(ui) - .setTitle(t("observe.data.ll.observation.Tdr.choose.title.exportData")) - .setApprovalText(t("observe.data.ll.observation.Tdr.action.exportData")) - .setFilename(dataFile.getName()) - .setUseAcceptAllFileFilter(true) - .choose(); - - if (file != null && UIHelper.confirmOverwriteFileIfExist(ui, file)) { - log.info("save tdr data to " + file); - try { - Files.write(file.toPath(), dataFile.getContent()); - ObserveMainUI mainUI = ClientUIContextApplicationComponent.value().getMainUI(); - mainUI.getStatus().setStatus(t("observe.data.ll.observation.SensorUsed.message.data.exported", file)); - } catch (IOException e) { - throw new ObserveSwingTechnicalException("Could not save binary data to " + file, e); - } - } - } - private void setTimestamp(TdrDto bean, Date timestamp) { bean.setDeployementStart(timestamp); bean.setDeployementEnd(timestamp); ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/SensorUsedUIActionSupport.java ===================================== @@ -0,0 +1,41 @@ +package fr.ird.observe.client.datasource.editor.content.data.ll.observation.actions; + +/*- + * #%L + * ObServe :: Client DataSource Editor LL + * %% + * 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.client.datasource.editor.content.actions.ContentUIActionSupport; +import fr.ird.observe.client.datasource.editor.content.data.ll.observation.SensorUsedUI; + +import javax.swing.KeyStroke; + +/** + * @author Tony Chemit - dev(a)tchemit.fr + * @since 8 + */ +public abstract class SensorUsedUIActionSupport extends ContentUIActionSupport<SensorUsedUI> { + + protected SensorUsedUIActionSupport(String label, String shortDescription, String actionIcon, KeyStroke acceleratorKey) { + super(label, shortDescription, actionIcon, acceleratorKey); + } + +} + ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/SensorUsedUIDeleteData.java ===================================== @@ -0,0 +1,68 @@ +package fr.ird.observe.client.datasource.editor.content.data.ll.observation.actions; + +/*- + * #%L + * ObServe :: Client DataSource Editor LL + * %% + * 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.client.datasource.editor.content.ObserveLLKeyStrokes; +import fr.ird.observe.client.datasource.editor.content.data.ll.observation.SensorUsedUI; +import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.dto.data.ll.observation.SensorUsedDto; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.swing.JOptionPane; +import java.awt.event.ActionEvent; + +import static io.ultreia.java4all.i18n.I18n.n; +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * @author Tony Chemit - dev(a)tchemit.fr + * @since ? + */ +public class SensorUsedUIDeleteData extends SensorUsedUIActionSupport { + + private static final Logger log = LogManager.getLogger(SensorUsedUIDeleteData.class); + + public SensorUsedUIDeleteData() { + super(n("observe.data.ll.observation.SensorUsed.deleteData"), n("observe.data.ll.observation.SensorUsed.deleteData.tip"), "delete", ObserveLLKeyStrokes.KEY_STROKE_DELETE_DATA); + } + + @Override + protected void doActionPerformed(ActionEvent e, SensorUsedUI ui) { + int response = UIHelper.askUser(ui, + t("observe.title.delete"), + t("observe.data.ll.observation.SensorUsed.delete.data.message"), + JOptionPane.WARNING_MESSAGE, + new Object[]{t("observe.choice.confirm.delete"), + t("observe.choice.cancel")}, + 1); + boolean doDelete = response == 0; + if (doDelete) { + SensorUsedDto tableEditBean = ui.getModel().getTableEditBean(); + log.info(String.format("%s Delete sensorUsed data %s", ui.getModel().getPrefix(), tableEditBean.getData())); + tableEditBean.setData(null); + tableEditBean.setHasData(false); + } + + } +} ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/SensorUsedUIExportData.java ===================================== @@ -0,0 +1,81 @@ +package fr.ird.observe.client.datasource.editor.content.data.ll.observation.actions; + +/*- + * #%L + * ObServe :: Client DataSource Editor LL + * %% + * 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.client.datasource.editor.content.ObserveLLKeyStrokes; +import fr.ird.observe.client.datasource.editor.content.data.ll.observation.SensorUsedUI; +import fr.ird.observe.client.util.ObserveSwingTechnicalException; +import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.dto.data.DataFileDto; +import fr.ird.observe.dto.data.ll.observation.SensorUsedDto; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.nuiton.jaxx.widgets.file.JaxxFileChooser; + +import java.awt.event.ActionEvent; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; + +import static io.ultreia.java4all.i18n.I18n.n; +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * @author Tony Chemit - dev(a)tchemit.fr + * @since 8 + */ +public class SensorUsedUIExportData extends SensorUsedUIActionSupport { + + private static final Logger log = LogManager.getLogger(SensorUsedUIExportData.class); + + public SensorUsedUIExportData() { + super(n("observe.data.ll.observation.SensorUsed.exportData"), n("observe.data.ll.observation.SensorUsed.exportData.tip"), "data-export", ObserveLLKeyStrokes.KEY_STROKE_EXPORT_DATA); + } + + @Override + protected void doActionPerformed(ActionEvent event, SensorUsedUI ui) { + + SensorUsedDto tableEditBean = ui.getModel().getTableEditBean(); + DataFileDto dataFile = tableEditBean.getData(); + if (dataFile == null) { + dataFile = getDataSource().getLlObservationActivitySensorUsedService().getDataFile(tableEditBean.getId()); + } + File file = JaxxFileChooser + .forSaving() + .setParent(ui) + .setTitle(t("observe.data.ll.observation.SensorUsed.choose.title.exportData")) + .setApprovalText(t("observe.data.ll.observation.SensorUsed.action.exportData")) + .setFilename(dataFile.getName()) + .setUseAcceptAllFileFilter(true) + .choose(); + + if (file != null && UIHelper.confirmOverwriteFileIfExist(ui, file)) { + log.info(String.format("%s save sensorUsed data to %s", ui.getModel().getPrefix(), file)); + try { + Files.write(file.toPath(), dataFile.getContent()); + } catch (IOException e) { + throw new ObserveSwingTechnicalException("Could not save binary data to " + file, e); + } + } + } +} ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/SensorUsedUIImportData.java ===================================== @@ -0,0 +1,85 @@ +package fr.ird.observe.client.datasource.editor.content.data.ll.observation.actions; + +/*- + * #%L + * ObServe :: Client DataSource Editor LL + * %% + * 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.client.datasource.editor.content.ObserveLLKeyStrokes; +import fr.ird.observe.client.datasource.editor.content.data.ll.observation.SensorUsedUI; +import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.dto.data.DataFileDto; +import fr.ird.observe.dto.data.ll.observation.SensorUsedDto; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.swing.JOptionPane; +import java.awt.event.ActionEvent; +import java.io.File; + +import static io.ultreia.java4all.i18n.I18n.n; +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * @author Tony Chemit - dev(a)tchemit.fr + * @since 8 + */ +public class SensorUsedUIImportData extends SensorUsedUIActionSupport { + + private static final Logger log = LogManager.getLogger(SensorUsedUIImportData.class); + + public SensorUsedUIImportData() { + super(n("observe.data.ll.observation.SensorUsed.importData"), n("observe.data.ll.observation.SensorUsed.importData.tip"), "data-import", ObserveLLKeyStrokes.KEY_STROKE_IMPORT_DATA); + } + + @Override + protected void doActionPerformed(ActionEvent e, SensorUsedUI ui) { + SensorUsedDto tableEditBean = ui.getModel().getTableEditBean(); + if (tableEditBean.isHasData()) { + DataFileDto dataFile = tableEditBean.getData(); + if (dataFile == null) { + dataFile = getDataSource().getLlObservationActivitySensorUsedService().getDataFile(tableEditBean.getId()); + } + int response = UIHelper.askUser(ui, + t("observe.title.confirmReplace"), + t("observe.data.ll.observation.SensorUsed.replace.data.message", dataFile.getName()), + JOptionPane.WARNING_MESSAGE, + new Object[]{t("observe.choice.confirm.replace"), + t("observe.choice.cancel")}, + 1); + boolean doReplace = response == 0; + if (!doReplace) { + return; + } + } + + File file = UIHelper.chooseFile(ui, + t("observe.data.ll.observation.SensorUsed.choose.title.importData"), + t("observe.data.ll.observation.SensorUsed.action.importData"), + null, + null); + if (file != null) { + log.info(String.format("%s Import sensorUsed data from file: %s", ui.getModel().getPrefix(), file)); + DataFileDto dataFileDto = UIHelper.fileToDataFileDto(file); + tableEditBean.setData(dataFileDto); + tableEditBean.setHasData(true); + } + } +} ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/TdrUIActionSupport.java ===================================== @@ -0,0 +1,52 @@ +package fr.ird.observe.client.datasource.editor.content.data.ll.observation.actions; + +/*- + * #%L + * ObServe :: Client DataSource Editor LL + * %% + * 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.client.datasource.editor.content.actions.ContentUIActionSupport; +import fr.ird.observe.client.datasource.editor.content.data.ll.observation.TdrUI; + +import javax.swing.KeyStroke; + +/** + * @author Tony Chemit - dev(a)tchemit.fr + * @since 8 + */ +public abstract class TdrUIActionSupport extends ContentUIActionSupport<TdrUI> { + + protected TdrUIActionSupport(String label, String shortDescription, String actionIcon, KeyStroke acceleratorKey) { + super(label, shortDescription, actionIcon, acceleratorKey); + } + + protected TdrUIActionSupport(String actionCommandKey, String label, String shortDescription, String actionIcon, KeyStroke acceleratorKey) { + super(actionCommandKey, label, shortDescription, actionIcon, acceleratorKey); + } + + protected TdrUIActionSupport(String label, String shortDescription, String actionIcon, char acceleratorKey) { + super(label, shortDescription, actionIcon, acceleratorKey); + } + + protected TdrUIActionSupport(String actionCommandKey, String label, String shortDescription, String actionIcon, char acceleratorKey) { + super(actionCommandKey, label, shortDescription, actionIcon, acceleratorKey); + } +} + ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/TdrUIDeleteData.java ===================================== @@ -0,0 +1,67 @@ +package fr.ird.observe.client.datasource.editor.content.data.ll.observation.actions; + +/*- + * #%L + * ObServe :: Client DataSource Editor LL + * %% + * 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.client.datasource.editor.content.ObserveLLKeyStrokes; +import fr.ird.observe.client.datasource.editor.content.data.ll.observation.TdrUI; +import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.dto.data.ll.observation.TdrDto; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.swing.JOptionPane; +import java.awt.event.ActionEvent; + +import static io.ultreia.java4all.i18n.I18n.n; +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * @author Tony Chemit - dev(a)tchemit.fr + * @since 8 + */ +public class TdrUIDeleteData extends TdrUIActionSupport { + + private static final Logger log = LogManager.getLogger(TdrUIDeleteData.class); + + public TdrUIDeleteData() { + super(n("observe.data.ll.observation.Tdr.deleteData"), n("observe.data.ll.observation.Tdr.deleteData.tip"), "delete", ObserveLLKeyStrokes.KEY_STROKE_DELETE_DATA); + } + + @Override + protected void doActionPerformed(ActionEvent e, TdrUI ui) { + int response = UIHelper.askUser(ui, + t("observe.title.delete"), + t("observe.data.ll.observation.SensorUsed.delete.data.message"), + JOptionPane.WARNING_MESSAGE, + new Object[]{t("observe.choice.confirm.delete"), + t("observe.choice.cancel")}, + 1); + boolean doDelete = response == 0; + if (doDelete) { + TdrDto tableEditBean = ui.getModel().getTableEditBean(); + log.info(String.format("%s Delete tdr data %s", ui.getModel().getPrefix(), tableEditBean.getData())); + tableEditBean.setData(null); + tableEditBean.setHasData(false); + } + } +} ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/TdrUIExportData.java ===================================== @@ -0,0 +1,83 @@ +package fr.ird.observe.client.datasource.editor.content.data.ll.observation.actions; + +/*- + * #%L + * ObServe :: Client DataSource Editor LL + * %% + * 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.client.datasource.editor.content.ObserveLLKeyStrokes; +import fr.ird.observe.client.datasource.editor.content.data.ll.observation.TdrUI; +import fr.ird.observe.client.util.ObserveSwingTechnicalException; +import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.dto.data.DataFileDto; +import fr.ird.observe.dto.data.ll.observation.TdrDto; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.nuiton.jaxx.widgets.file.JaxxFileChooser; + +import java.awt.event.ActionEvent; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; + +import static io.ultreia.java4all.i18n.I18n.n; +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * @author Tony Chemit - dev(a)tchemit.fr + * @since 8 + */ +public class TdrUIExportData extends TdrUIActionSupport { + + private static final Logger log = LogManager.getLogger(TdrUIExportData.class); + + public TdrUIExportData() { + super(n("observe.data.ll.observation.Tdr.exportData"), n("observe.data.ll.observation.Tdr.exportData.tip"), "data-export", ObserveLLKeyStrokes.KEY_STROKE_EXPORT_DATA); + } + + @Override + protected void doActionPerformed(ActionEvent event, TdrUI ui) { + + TdrDto tableEditBean = ui.getModel().getTableEditBean(); + DataFileDto dataFile = tableEditBean.getData(); + + if (dataFile == null) { + dataFile = getDataSource().getLlObservationSetTdrService().getDataFile(tableEditBean.getId()); + } + + File file = JaxxFileChooser + .forSaving() + .setParent(ui) + .setTitle(t("observe.data.ll.observation.Tdr.choose.title.exportData")) + .setApprovalText(t("observe.data.ll.observation.Tdr.action.exportData")) + .setFilename(dataFile.getName()) + .setUseAcceptAllFileFilter(true) + .choose(); + + if (file != null && UIHelper.confirmOverwriteFileIfExist(ui, file)) { + try { + log.info(String.format("%s save tdr data to %s", ui.getModel().getPrefix(), file)); + Files.write(file.toPath(), dataFile.getContent()); + } catch (IOException e) { + throw new ObserveSwingTechnicalException("Could not save binary data to " + file, e); + } + } + } +} ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/TdrUIImportData.java ===================================== @@ -0,0 +1,85 @@ +package fr.ird.observe.client.datasource.editor.content.data.ll.observation.actions; + +/*- + * #%L + * ObServe :: Client DataSource Editor LL + * %% + * 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.client.datasource.editor.content.ObserveLLKeyStrokes; +import fr.ird.observe.client.datasource.editor.content.data.ll.observation.TdrUI; +import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.dto.data.DataFileDto; +import fr.ird.observe.dto.data.ll.observation.TdrDto; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.swing.JOptionPane; +import java.awt.event.ActionEvent; +import java.io.File; + +import static io.ultreia.java4all.i18n.I18n.n; +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * @author Tony Chemit - dev(a)tchemit.fr + * @since 8 + */ +public class TdrUIImportData extends TdrUIActionSupport { + + private static final Logger log = LogManager.getLogger(TdrUIImportData.class); + + public TdrUIImportData() { + super(n("observe.data.ll.observation.Tdr.importData"), n("observe.data.ll.observation.Tdr.importData.tip"), "data-import", ObserveLLKeyStrokes.KEY_STROKE_IMPORT_DATA); + } + + @Override + protected void doActionPerformed(ActionEvent e, TdrUI ui) { + TdrDto tableEditBean = ui.getModel().getTableEditBean(); + if (tableEditBean.isHasData()) { + DataFileDto dataFile = tableEditBean.getData(); + if (dataFile == null) { + dataFile = getDataSource().getLlObservationSetTdrService().getDataFile(tableEditBean.getId()); + } + int response = UIHelper.askUser(ui, + t("observe.title.confirmReplace"), + t("observe.data.ll.observation.Tdr.replace.data.message", dataFile.getName()), + JOptionPane.WARNING_MESSAGE, + new Object[]{t("observe.choice.confirm.replace"), + t("observe.choice.cancel")}, + 1); + boolean doReplace = response == 0; + if (!doReplace) { + return; + } + } + + File file = UIHelper.chooseFile(ui, + t("observe.data.ll.observation.Tdr.choose.title.importData"), + t("observe.data.ll.observation.Tdr.action.importData"), + null, + null); + if (file != null) { + log.info(String.format("%s Import tdr data from file: %s", ui.getModel().getPrefix(), file)); + DataFileDto dataFileDto = UIHelper.fileToDataFileDto(file); + tableEditBean.setData(dataFileDto); + tableEditBean.setHasData(true); + } + } +} ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDto-create-error-validation.xml ===================================== @@ -100,41 +100,6 @@ <message/> </field-validator> </field> - <field name="haulingStartTimeStamp"> - <field-validator type="mandatory" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ settingEndTimeStamp == null || settingEndTimeStamp.time < haulingStartTimeStamp.time ]]> - </param> - <message>observe.validation.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp</message> - </field-validator> - </field> - <field name="haulingEndTimeStamp"> - <field-validator type="mandatory" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ haulingStartTimeStamp == null || haulingStartTimeStamp.time < haulingEndTimeStamp.time ]]> - </param> - <message>observe.validation.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp</message> - </field-validator> - </field> - <field name="settingStartQuadrant"> - <field-validator type="mandatory" short-circuit="true"> - <message/> - </field-validator> - <field-validator type="quadrantDto" short-circuit="true"> - <param name="ocean">currentLlCommonTrip.ocean</param> - <message/> - </field-validator> - </field> <field name="settingStartLatitude"> <field-validator type="mandatory" short-circuit="true"> <message/> @@ -153,7 +118,7 @@ <message/> </field-validator> </field> - <field name="settingEndQuadrant"> + <field name="settingStartQuadrant"> <field-validator type="mandatory" short-circuit="true"> <message/> </field-validator> @@ -180,7 +145,7 @@ <message/> </field-validator> </field> - <field name="haulingStartQuadrant"> + <field name="settingEndQuadrant"> <field-validator type="mandatory" short-circuit="true"> <message/> </field-validator> @@ -207,7 +172,7 @@ <message/> </field-validator> </field> - <field name="haulingEndQuadrant"> + <field name="haulingStartQuadrant"> <field-validator type="mandatory" short-circuit="true"> <message/> </field-validator> @@ -234,6 +199,15 @@ <message/> </field-validator> </field> + <field name="haulingEndQuadrant"> + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> + <field-validator type="quadrantDto" short-circuit="true"> + <param name="ocean">currentLlCommonTrip.ocean</param> + <message/> + </field-validator> + </field> <field name="totalSectionsCount"> <field-validator type="mandatory" short-circuit="true"> <message/> @@ -267,7 +241,7 @@ <field name="totalBasketsCount"> <field-validator type="boundNumber" short-circuit="true"> <param name="min">0.0</param> - <param name="max">1000.0</param> + <param name="max">400.0</param> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDto-update-error-validation.xml ===================================== @@ -49,6 +49,7 @@ <field-validator type="mandatory" short-circuit="true"> <message/> </field-validator> +  <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> @@ -57,30 +58,6 @@ <message>observe.validation.setLongline.settingStartTimeStamp.before.settingEndTimeStamp</message> </field-validator> </field> - <field name="haulingStartTimeStamp"> - <field-validator type="mandatory" short-circuit="true"> - <message/> - </field-validator> -  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ settingEndTimeStamp == null || settingEndTimeStamp.time < haulingStartTimeStamp.time ]]> - </param> - <message>observe.validation.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp</message> - </field-validator> - </field> - <field name="haulingEndTimeStamp"> - <field-validator type="mandatory" short-circuit="true"> - <message/> - </field-validator> -  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ haulingStartTimeStamp == null || haulingStartTimeStamp.time < haulingEndTimeStamp.time ]]> - </param> - <message>observe.validation.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp</message> - </field-validator> - </field> <field name="settingVesselSpeed"> <field-validator type="boundNumber" short-circuit="true"> <param name="min">0.0</param> @@ -264,7 +241,7 @@ <field name="totalBasketsCount"> <field-validator type="boundNumber" short-circuit="true"> <param name="min">0.0</param> - <param name="max">1000.0</param> + <param name="max">400.0</param> <message/> </field-validator> </field> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c6c83b3b5bb3b974e310a2b2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c6c83b3b5bb3b974e310a2b2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [LL] Contrôle sur nombre de baskets trop limité - Closes #1433
by Tony CHEMIT 13 Feb '20

13 Feb '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: fe8162d9 by tchemit at 2020-02-13T12:12:37+01:00 [LL] Contrôle sur nombre de baskets trop limité - Closes #1433 - - - - - 2 changed files: - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineDto-update-error-validation.xml Changes: ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineDto-create-error-validation.xml ===================================== @@ -58,6 +58,30 @@ <message>observe.validation.setLongline.settingStartTimeStamp.before.settingEndTimeStamp</message> </field-validator> </field> + <field name="haulingStartTimeStamp"> + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> +  + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ settingEndTimeStamp == null || settingEndTimeStamp.time < haulingStartTimeStamp.time ]]> + </param> + <message>observe.validation.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp</message> + </field-validator> + </field> + <field name="haulingEndTimeStamp"> + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> +  + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ haulingStartTimeStamp == null || haulingStartTimeStamp.time < haulingEndTimeStamp.time ]]> + </param> + <message>observe.validation.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp</message> + </field-validator> + </field> <field name="settingVesselSpeed"> <field-validator type="boundNumber" short-circuit="true"> <param name="min">0.0</param> @@ -100,41 +124,6 @@ <message/> </field-validator> </field> - <field name="haulingStartTimeStamp"> - <field-validator type="mandatory" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ settingEndTimeStamp == null || settingEndTimeStamp.time < haulingStartTimeStamp.time ]]> - </param> - <message>observe.validation.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp</message> - </field-validator> - </field> - <field name="haulingEndTimeStamp"> - <field-validator type="mandatory" short-circuit="true"> - <message/> - </field-validator> - -  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ haulingStartTimeStamp == null || haulingStartTimeStamp.time < haulingEndTimeStamp.time ]]> - </param> - <message>observe.validation.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp</message> - </field-validator> - </field> - <field name="settingStartQuadrant"> - <field-validator type="mandatory" short-circuit="true"> - <message/> - </field-validator> - <field-validator type="quadrantDto" short-circuit="true"> - <param name="ocean">currentTripLongline.ocean</param> - <message/> - </field-validator> - </field> <field name="settingStartLatitude"> <field-validator type="mandatory" short-circuit="true"> <message/> @@ -153,7 +142,7 @@ <message/> </field-validator> </field> - <field name="settingEndQuadrant"> + <field name="settingStartQuadrant"> <field-validator type="mandatory" short-circuit="true"> <message/> </field-validator> @@ -180,7 +169,7 @@ <message/> </field-validator> </field> - <field name="haulingStartQuadrant"> + <field name="settingEndQuadrant"> <field-validator type="mandatory" short-circuit="true"> <message/> </field-validator> @@ -207,7 +196,7 @@ <message/> </field-validator> </field> - <field name="haulingEndQuadrant"> + <field name="haulingStartQuadrant"> <field-validator type="mandatory" short-circuit="true"> <message/> </field-validator> @@ -234,6 +223,15 @@ <message/> </field-validator> </field> + <field name="haulingEndQuadrant"> + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> + <field-validator type="quadrantDto" short-circuit="true"> + <param name="ocean">currentTripLongline.ocean</param> + <message/> + </field-validator> + </field> <field name="totalSectionsCount"> <field-validator type="mandatory" short-circuit="true"> <message/> @@ -267,7 +265,7 @@ <field name="totalBasketsCount"> <field-validator type="boundNumber" short-circuit="true"> <param name="min">0.0</param> - <param name="max">100.0</param> + <param name="max">400.0</param> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineDto-update-error-validation.xml ===================================== @@ -49,6 +49,7 @@ <field-validator type="mandatory" short-circuit="true"> <message/> </field-validator> +  <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> @@ -264,7 +265,7 @@ <field name="totalBasketsCount"> <field-validator type="boundNumber" short-circuit="true"> <param name="min">0.0</param> - <param name="max">1000.0</param> + <param name="max">400.0</param> <message/> </field-validator> </field> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fe8162d94548348ffddf21f80… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fe8162d94548348ffddf21f80… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] move to version 7.3.1-SNAPSHOT
by Tony CHEMIT 13 Feb '20

13 Feb '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: ba28c9d7 by tchemit at 2020-02-13T12:00:19+01:00 move to version 7.3.1-SNAPSHOT - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.3.1-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.3.1-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.3.1-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.3.1-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.3.1-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.3.1-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.3.1-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.3.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.3.1-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.3.1-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.3.1-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.3.1-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.3.1-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.3.1-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.3.1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.4.0-SNAPSHOT</version> + <version>7.3.1-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ba28c9d7c1b8d577c3ab36ec6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ba28c9d7c1b8d577c3ab36ec6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [EXPORT CARTE] Le nom de fichier est généré sans l'extension PNG - Closes #1434
by Tony CHEMIT 13 Feb '20

13 Feb '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: fac65120 by tchemit at 2020-02-13T11:59:41+01:00 [EXPORT CARTE] Le nom de fichier est généré sans l'extension PNG - Closes #1434 - - - - - 8 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ExportPngUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/report/ReportUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/SensorUsedUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigDataUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigReferentielUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/tripMap/ExportPngUIAction.java ===================================== @@ -61,6 +61,7 @@ public class ExportPngUIAction extends TripMapActionSupport { t("observe.content.map.export.chooseFile.title"), t("observe.content.map.export.chooseFile.ok"), null, + ".png", "^.+\\.png|.+\\.PNG$", t("observe.content.map.export.chooseFile.png")); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/report/ReportUIHandler.java ===================================== @@ -245,6 +245,7 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa t("observe.title.choose.reportFile"), t("observe.action.choose.reportFile"), model.getReportFile(), + ".properties", "^.+\\.properties$", t("observe.action.choose.reportFile.description")); model.setReportFile(f); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/SensorUsedUIHandler.java ===================================== @@ -137,6 +137,7 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineS File file = UIHelper.chooseFile(ui, t("observe.common.SensorUsedDto.choose.title.importData"), t("observe.common.SensorUsedDto.action.importData"), + null, null); if (file != null) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUIHandler.java ===================================== @@ -301,6 +301,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt File file = UIHelper.chooseFile(ui, t("observe.common.TdrDto.choose.title.importData"), t("observe.common.TdrDto.action.importData"), + null, null); if (file != null) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigDataUIHandler.java ===================================== @@ -86,6 +86,7 @@ public class ConfigDataUIHandler extends StorageTabUIHandler<ConfigDataUI> imple t("observe.title.choose.db.dump"), t("observe.action.choose.db.dump"), ui.getModel().getDumpFile(), + ".sql.gz", "^.+\\.sql\\.gz$", t("observe.action.choose.db.dump.description")); ui.getCentralSourceModel().setDumpFile(f); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigReferentielUIHandler.java ===================================== @@ -111,6 +111,7 @@ public class ConfigReferentielUIHandler extends StorageTabUIHandler<ConfigRefere t("observe.title.choose.db.dump"), t("observe.action.choose.db.dump"), ui.getModel().getDumpFile(), + ".sql.gz", "^.+\\.sql\\.gz$", t("observe.action.choose.db.dump.description")); ui.getCentralSourceModel().setDumpFile(f); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUIHandler.java ===================================== @@ -204,6 +204,7 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI t("observe.title.choose.db.dump"), t("observe.action.choose.db.dump"), ui.getModel().getDumpFile(), + ".sql.gz", "^.+\\.sql\\.gz$", t("observe.action.choose.db.dump.description")); ui.getModel().setDumpFile(f); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java ===================================== @@ -255,12 +255,12 @@ public class UIHelper extends SwingUtil { * @param title le titre du dialogue de sélection * @param buttonLabel le label du boutton d'acceptation * @param incoming le fichier de base à utilier - * @param filters les filtres + descriptions sur le sélecteur de - * fichiers + * @param mainExtension l'extension principale (à rajouter sur le nom du fichier si besoin) + * @param filters les filtres + descriptions sur le sélecteur de fichiers * @return le fichier choisi ou le fichier incoming si l'opération a été * annulée */ - public static File chooseFile(Component parent, String title, String buttonLabel, File incoming, String... filters) { + public static File chooseFile(Component parent, String title, String buttonLabel, File incoming,String mainExtension, String... filters) { JaxxFileChooser.ToLoadFile toLoadFile = JaxxFileChooser.forLoadingFile() .setParent(parent) @@ -277,7 +277,7 @@ public class UIHelper extends SwingUtil { if (log.isDebugEnabled()) { log.debug(title + " : " + file); } - return file == null ? incoming : file; + return file == null ? incoming : ensureFileExtension(file, mainExtension); } /** @@ -307,6 +307,13 @@ public class UIHelper extends SwingUtil { return file; } + public static File ensureFileExtension(File file, String extension) { + if (extension!=null && !file.getName().toLowerCase().endsWith(extension)) { + file = file.toPath().getParent().resolve(file.getName() + extension).toFile(); + } + return file; + } + private static File getParentDirectoryIfExist(File incoming) { if (incoming != null) { File basedir; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fac65120f5e9a85b5d22f6328… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fac65120f5e9a85b5d22f6328… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: use last toolkit version (improved dto and persistence api)
by Tony CHEMIT 13 Feb '20

13 Feb '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a5ccf3cd by tchemit at 2020-02-13T02:33:16+01:00 use last toolkit version (improved dto and persistence api) - - - - - ba199376 by tchemit at 2020-02-13T02:54:44+01:00 fix constructor parameters order - - - - - 783f6e6a by tchemit at 2020-02-13T03:02:49+01:00 fix npe on body content - - - - - a1caf391 by tchemit at 2020-02-13T03:11:17+01:00 [PS] Sur calée, supprimer les champs booléens "Tuna discard?" et "Fauna discard?" - Closes #1345 - - - - - c6c83b3b by tchemit at 2020-02-13T03:12:07+01:00 use next toolkit (testing party) - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client-core/src/main/java/fr/ird/observe/client/main/MainUIModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/SaveActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/SaveActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/usage/UsageUIHandlerSupport.java - dto/pom.xml - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - dto/src/test/java/fr/ird/observe/spi/DtoModelHelperTest.java - persistence/pom.xml - persistence/src/main/resources/db/migration/8.0-RC-1/103_create_ps_observation_schema-common.sql - persistence/src/main/resources/db/migration/8.0-RC-1/202_ps_modify_data_tables-H2.sql - persistence/src/main/resources/db/migration/8.0-RC-1/202_ps_modify_data_tables-PG.sql - persistence/src/test/java/fr/ird/observe/spi/DbModelHelperTest.java - pom.xml - services-client/src/main/java/fr/ird/observe/services/client/referential/ReferentialServiceClient.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/usage/UsageServiceLocal.java - services-validation/src/main/java/fr/ird/observe/validation/ValidationContext.java - services/src/main/java/fr/ird/observe/gson/ReportVariableAdapter.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java - services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingEngine.java - test/src/main/java/fr/ird/observe/test/ObserveFixtures.java - test/src/main/resources/db/8.0-RC-2/dataForTestLongline.sql.gz - test/src/main/resources/db/8.0-RC-2/dataForTestSeine.sql.gz - test/src/main/resources/db/8.0-RC-2/empty_h2.sql.gz - test/src/main/resources/db/8.0-RC-2/empty_pg.sql.gz The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2d86581a19726fad0ffe1476… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2d86581a19726fad0ffe1476… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 9 commits: rename TripDto to TripAware
by Tony CHEMIT 11 Feb '20

11 Feb '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 96719ce2 by tchemit at 2020-02-04T15:58:01+01:00 rename TripDto to TripAware - - - - - 2817be2d by tchemit at 2020-02-04T15:58:25+01:00 add ActivityAware in model - - - - - 71fdcfc1 by tchemit at 2020-02-04T17:07:16+01:00 Use DtoTransformer instead of BeanTransformer (then it generates DtoWithreference contract on dto with references) and remove DtoRefrenceBinder API - - - - - d66ea44d by tchemit at 2020-02-06T15:13:23+01:00 update pom - - - - - 177211ac by tchemit at 2020-02-06T15:46:20+01:00 update pom - - - - - 1e810120 by tchemit at 2020-02-06T23:40:00+01:00 clean code and use last toolkit api. - - - - - 831a1389 by tchemit at 2020-02-09T11:02:59+01:00 update pom - - - - - 5c9c5a7b by tchemit at 2020-02-09T17:09:04+01:00 * remove when possible usage of guava * clean some code * review server configuration design (but there is still some work to do) * use un persistence API - - - - - 2d86581a by tchemit at 2020-02-12T00:02:10+01:00 Use last API from toolkit - - - - - 30 changed files: - client-configuration/src/main/java/fr/ird/observe/client/ObserveClientResourceManager.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/TripEntry.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Start.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/actions/Prepare.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Apply.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/CopyFromLeft.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/CopyFromRight.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/DeleteFromLeft.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/DeleteFromRight.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/task/CopyToLeftDataSynchronizeTask.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/task/CopyToRightDataSynchronizeTask.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/task/DataSynchronizeTaskSupport.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/task/DeleteFromLeftDataSynchronizeTask.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/task/DeleteFromRightDataSynchronizeTask.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidationMessageTableModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/SaveReport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/ObserveNavigationTreeShowPopupAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIInitializer.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableMeta.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/actions/Delete.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/actions/Save.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/spi/ContentUIReferenceCache.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/95da8e54e76a653485a513b2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/95da8e54e76a653485a513b2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v7.3.0
by Tony CHEMIT 27 Jan '20

27 Jan '20

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

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v8.0-RC-5
by Tony CHEMIT 08 Jan '20

08 Jan '20

Tony CHEMIT pushed new tag v8.0-RC-5 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/v8.0-RC-5 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Sanitize NonTargetSampleUI SpeciesFate referential filter
by Tony CHEMIT 02 Jan '20

02 Jan '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 80d3acfd by tchemit at 2020-01-02T11:17:41+01:00 Sanitize NonTargetSampleUI SpeciesFate referential filter - - - - - e9c164f4 by tchemit at 2020-01-02T11:36:46+01:00 Bad extra zone layout in ContentTableUI - Closes #1415 - - - - - 6 changed files: - client-core/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetSampleUIHandler.java - client-datasource-editor/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUI.jaxx - dto/src/main/models/Observe-20-data-ps-observation.model - server-core/src/main/filtered-resources/mapping - services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/NonTargetSampleServiceLocal.java - services/src/main/java/fr/ird/observe/services/service/data/ps/observation/NonTargetSampleService.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetSampleUIHandler.java ===================================== @@ -21,7 +21,6 @@ */ package fr.ird.observe.client.datasource.editor.content.data.ps.observation; -import com.google.common.collect.Lists; import fr.ird.observe.client.constants.AcquisitionMode; import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableModel; import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUILayoutFocusTraversalPolicy; @@ -50,7 +49,7 @@ import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; import java.awt.Component; import java.awt.Container; -import java.util.Collection; +import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.Optional; @@ -81,12 +80,12 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS super.afterInit(ui); } - @Override - protected void onOpenBeforeOpenModel() { - super.onOpenBeforeOpenModel(); - // We can't add filter since it uses the model.form, so add them now - onAfterInitAddReferentialFilters(getModel().getReferenceCache()); - } +// @Override +// protected void onOpenBeforeOpenModel() { +// super.onOpenBeforeOpenModel(); +// // We can't add filter since it uses the model.form, so add them now +// onAfterInitAddReferentialFilters(getModel().getReferenceCache()); +// } @Override protected ContentTableUILayoutFocusTraversalPolicy<NonTargetSampleUI> createFocusTraversalPolicy() { @@ -113,9 +112,6 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS @Override protected void onAfterInitAddReferentialFilters(ContentUIReferenceCache referenceCache) { - if (getModel().getForm() == null) { - return; - } referenceCache.addReferentialFilter(NonTargetLengthDto.PROPERTY_SPECIES, newSpeciesList()); referenceCache.addReferentialFilter(NonTargetLengthDto.PROPERTY_SPECIES_FATE, newSpeciesFateList()); } @@ -129,8 +125,8 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS private ReferentialReferencesFilter<SpeciesFateDto, SpeciesFateReference> newSpeciesFateList() { return incomingReferences -> { - Collection<SpeciesFateReference> speciesFate = getModel().getForm().getObject().getSpeciesFate(); - return new LinkedList<>(speciesFate); + ReferentialDtoReferenceSet<SpeciesFateReference> speciesFateSet = getPsObservationNonTargetSampleService().getSampleSpeciesFate(getModel().getSelectedId()); + return new LinkedList<>(speciesFateSet.toSet()); }; } @@ -211,7 +207,6 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS } - @SuppressWarnings("unchecked") @Override protected void onSelectedRowChanged(int editingRow, NonTargetLengthDto bean, boolean create) { ContentTableModel<NonTargetSampleDto, NonTargetLengthDto> model = getTableModel(); @@ -247,7 +242,7 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS AcquisitionMode enumValue = AcquisitionMode.valueOf(acquisitionMode); ui.getAcquisitionModeGroup().setSelectedValue(null); ui.getAcquisitionModeGroup().setSelectedValue(enumValue); - availableEspeces = Lists.newArrayList(species); + availableEspeces = Collections.singletonList(species); sizeMeasureType = Optional.ofNullable(bean.getSizeMeasureType()); } ===================================== client-datasource-editor/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUI.jaxx ===================================== @@ -150,7 +150,7 @@ public abstract SwingValidator<C> getValidatorTable(); </cell> </row> <row> - <cell> + <cell fill="both"> <Table id='extraZone' decorator='boxed'/> </cell> </row> ===================================== dto/src/main/models/Observe-20-data-ps-observation.model ===================================== @@ -102,7 +102,6 @@ lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasure data.ps.observation.NonTargetSample > data.Commentable | form=data.ps.observation.NonTargetLength nonTargetLength + {*} data.ps.observation.NonTargetLength | ordered -speciesFate {*:*} fr.ird.observe.dto.referential.ps.common.SpeciesFateReference data.ps.observation.ObjectObservedSpecies > data.Data | references=speciesLabel,speciesStatusLabel,count count + {*:1} Integer ===================================== server-core/src/main/filtered-resources/mapping ===================================== @@ -230,6 +230,7 @@ GET /api/v1/data/ps/observation/NonTargetCatchService/loadForm POST /api/v1/data/ps/observation/NonTargetCatchService/save v1.data.ps.observation.NonTargetCatchServiceRestApi.save GET /api/v1/data/ps/observation/NonTargetSampleService/canUseNonTargetSample v1.data.ps.observation.NonTargetSampleServiceRestApi.canUseNonTargetSample GET /api/v1/data/ps/observation/NonTargetSampleService/getSampleSpecies v1.data.ps.observation.NonTargetSampleServiceRestApi.getSampleSpecies +GET /api/v1/data/ps/observation/NonTargetSampleService/getSampleSpeciesFate v1.data.ps.observation.NonTargetSampleServiceRestApi.getSampleSpeciesFate GET /api/v1/data/ps/observation/NonTargetSampleService/loadForm v1.data.ps.observation.NonTargetSampleServiceRestApi.loadForm POST /api/v1/data/ps/observation/NonTargetSampleService/save v1.data.ps.observation.NonTargetSampleServiceRestApi.save GET /api/v1/data/ps/observation/ObjectObservedSpeciesService/loadForm v1.data.ps.observation.ObjectObservedSpeciesServiceRestApi.loadForm ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/NonTargetSampleServiceLocal.java ===================================== @@ -32,11 +32,9 @@ import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.entities.data.ps.observation.NonTargetCatch; import fr.ird.observe.entities.data.ps.observation.NonTargetSample; import fr.ird.observe.entities.data.ps.observation.Set; -import fr.ird.observe.entities.referential.ps.common.SpeciesFate; import fr.ird.observe.services.local.service.ObserveServiceLocal; import fr.ird.observe.services.service.data.ps.observation.NonTargetSampleService; -import java.util.List; import java.util.stream.Collectors; /** @@ -54,14 +52,7 @@ public class NonTargetSampleServiceLocal extends ObserveServiceLocal implements public Form<NonTargetSampleDto> loadForm(String setSeineId) { Set set = DATA_PS_OBSERVATION_SET_SPI.loadEntity(getTopiaPersistenceContext(), setSeineId); NonTargetSample nonTargetSample = getNonTargetSample(set); - Form<NonTargetSampleDto> form = DATA_PS_OBSERVATION_NON_TARGET_SAMPLE_SPI.entityToForm(nonTargetSample, getReferentialLocale()); - List<SpeciesFate> entities = set.getNonTargetCatch().stream() - .map(NonTargetCatch::getSpeciesFate) - .distinct() - .collect(Collectors.toList()); - ReferentialDtoReferenceSet<SpeciesFateReference> references = REFERENTIAL_PS_COMMON_SPECIES_FATE_SPI.toReferenceSet(entities, getReferentialLocale(), null); - form.getObject().setSpeciesFate(references.toSet()); - return form; + return DATA_PS_OBSERVATION_NON_TARGET_SAMPLE_SPI.entityToForm(nonTargetSample, getReferentialLocale()); } @Override @@ -74,6 +65,16 @@ public class NonTargetSampleServiceLocal extends ObserveServiceLocal implements getReferentialLocale(), null); } + @Override + public ReferentialDtoReferenceSet<SpeciesFateReference> getSampleSpeciesFate(String setSeineId) { + Set set = DATA_PS_OBSERVATION_SET_SPI.loadEntity(getTopiaPersistenceContext(), setSeineId); + return REFERENTIAL_PS_COMMON_SPECIES_FATE_SPI.toReferenceSet(set.getNonTargetCatch().stream() + .map(NonTargetCatch::getSpeciesFate) + .distinct() + .collect(Collectors.toList()), + getReferentialLocale(), null); + } + @Override public SaveResultDto save(String setSeineId, NonTargetSampleDto dto) { Set set = DATA_PS_OBSERVATION_SET_SPI.loadEntity(getTopiaPersistenceContext(), setSeineId); ===================================== services/src/main/java/fr/ird/observe/services/service/data/ps/observation/NonTargetSampleService.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.dto.data.ps.observation.NonTargetSampleDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; import fr.ird.observe.dto.referential.common.SpeciesReference; +import fr.ird.observe.dto.referential.ps.common.SpeciesFateReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.services.service.ObserveService; import fr.ird.observe.services.spi.ReadDataPermission; @@ -51,6 +52,10 @@ public interface NonTargetSampleService extends ObserveService { @ReadDataPermission ReferentialDtoReferenceSet<SpeciesReference> getSampleSpecies(String setSeineId); + @Get + @ReadDataPermission + ReferentialDtoReferenceSet<SpeciesFateReference> getSampleSpeciesFate(String setSeineId); + @Write @WriteDataPermission @Post View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/63d388dc32b077b6048e803e3d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/63d388dc32b077b6048e803e3d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] set new version to 8.0
by Tony CHEMIT 01 Jan '20

01 Jan '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 63d388dc by tchemit at 2020-01-01T15:06:23+01:00 set new version to 8.0 - - - - - 30 changed files: - client-api-admin/pom.xml - client-api-mainui/pom.xml - client-api-trip-map/pom.xml - client-api-util/pom.xml - client-api-validation/pom.xml - client-configuration/pom.xml - client-core/pom.xml - client-datasource-api/pom.xml - client-datasource-dcp/pom.xml - client-datasource-editor/pom.xml - client-datasource-h2-backup/pom.xml - client-datasource-h2-server/pom.xml - client-datasource-tree-navigation/pom.xml - client-datasource-tree-selection/pom.xml - client-runner/pom.xml - dto-spi/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence-spi/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services-validation/pom.xml - services/pom.xml - test-config/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/63d388dc32b077b6048e803e3d3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/63d388dc32b077b6048e803e3d3… You're receiving this email because of your account on gitlab.com.

1 0