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

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 8.0.0-RC-9-SNAPSHOT development[skip ci]
by Tony CHEMIT 10 Jul '20

10 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 06f72117 by Tony Chemit at 2020-07-10T17:38:22+02:00 [jgitflow-maven-plugin]updating poms for 8.0.0-RC-9-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-datasource-actions/pom.xml - client-datasource-editor-api/pom.xml - client-datasource-editor-common/pom.xml - client-datasource-editor-ll/pom.xml - client-datasource-editor-ps/pom.xml - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/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 - templates/pom.xml - test-config/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/06f72117a3227a0747c7a1ab4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/06f72117a3227a0747c7a1ab4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Appairement des activités : cosmétique - Closes #1537 (libelle)
by Tony CHEMIT 10 Jul '20

10 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e25c6734 by Tony Chemit at 2020-07-10T17:18:22+02:00 [LL] Appairement des activités : cosmétique - Closes #1537 (libelle) - - - - - 3 changed files: - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -224,8 +224,8 @@ observe.actions.longline.pairing=Longline activities pairing observe.actions.longline.pairing.config=Pairing configuration observe.actions.longline.pairing.description=Longline activities pairing observe.actions.longline.pairing.message.operation.done=Pairing operation done in %1$s. -observe.actions.longline.pairing.table.logbook.activity=Observation activities -observe.actions.longline.pairing.table.observation.activity=Logbook activities +observe.actions.longline.pairing.table.logbook.activity=Logbook activities +observe.actions.longline.pairing.table.observation.activity=Observation activities observe.actions.longline.pairing.table.selected=To be saved observe.actions.longline.pairing.tip=Longline activities pairing observe.actions.longline.pairing.title=Longline activities pairing ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -224,8 +224,8 @@ observe.actions.longline.pairing=Longline activities pairing \#TODO observe.actions.longline.pairing.config=Pairing configuration \#TODO observe.actions.longline.pairing.description=Longline activities pairing \#TODO observe.actions.longline.pairing.message.operation.done=Pairing operation done in %1$s. \#TODO -observe.actions.longline.pairing.table.logbook.activity=Observation activities \#TODO -observe.actions.longline.pairing.table.observation.activity=Logbook activities \#TODO +observe.actions.longline.pairing.table.logbook.activity=Logbook activities \#TODO +observe.actions.longline.pairing.table.observation.activity=Observation activities \#TODO observe.actions.longline.pairing.table.selected=Debe grabar \#TODO observe.actions.longline.pairing.tip=Longline activities pairing \#TODO observe.actions.longline.pairing.title=Longline activities pairing \#TODO ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -224,8 +224,8 @@ observe.actions.longline.pairing=Appairement des activités palangre observe.actions.longline.pairing.config=Configuration de l'appairement observe.actions.longline.pairing.description=Appairement des activités palangre observe.actions.longline.pairing.message.operation.done=Opération terminées en %1$s. -observe.actions.longline.pairing.table.logbook.activity=Activités Observation -observe.actions.longline.pairing.table.observation.activity=Activités Livre de Bord +observe.actions.longline.pairing.table.logbook.activity=Activités Livre de Bord +observe.actions.longline.pairing.table.observation.activity=Activités Observation observe.actions.longline.pairing.table.selected=À enregistrer observe.actions.longline.pairing.tip=Appairement des activités palangre observe.actions.longline.pairing.title=Appairement des activités palangre View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e25c6734b00ca8ae5e37c11f1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e25c6734b00ca8ae5e37c11f1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL][LOGBOOKS] Activité : champ vitesse vent superflu - Closes #1531 (libelle)
by Tony CHEMIT 10 Jul '20

10 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fca82cb7 by Tony Chemit at 2020-07-10T16:51:10+02:00 [LL][LOGBOOKS] Activité : champ vitesse vent superflu - Closes #1531 (libelle) - - - - - 3 changed files: - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1016,7 +1016,7 @@ observe.data.ll.logbook.Activity.titles=Activities observe.data.ll.logbook.Activity.type=Activity observe.data.ll.logbook.Activity.types=Activities observe.data.ll.logbook.Activity.vesselActivity=Vessel activity -observe.data.ll.logbook.Activity.wind=Wind +observe.data.ll.logbook.Activity.wind=Wind (Beaufort) observe.data.ll.logbook.Activity.windDirection=Wind direction (°) observe.data.ll.logbook.Activity.windSpeed=Wind speed (kt) observe.data.ll.logbook.BaitsComposition.action.create=Insert this bait ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1016,7 +1016,7 @@ observe.data.ll.logbook.Activity.titles=Actividades observe.data.ll.logbook.Activity.type=Actividad observe.data.ll.logbook.Activity.types=Actividades observe.data.ll.logbook.Activity.vesselActivity=Actividad barco -observe.data.ll.logbook.Activity.wind=Wind \#TODO +observe.data.ll.logbook.Activity.wind=Fuerza del viento observe.data.ll.logbook.Activity.windDirection=Dirección del viento (°) observe.data.ll.logbook.Activity.windSpeed=Wind sppe (kt) \#TODO observe.data.ll.logbook.BaitsComposition.action.create=Insertar este cebo ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1016,7 +1016,7 @@ observe.data.ll.logbook.Activity.titles=Activités observe.data.ll.logbook.Activity.type=Activité observe.data.ll.logbook.Activity.types=Activités observe.data.ll.logbook.Activity.vesselActivity=Activité bateau -observe.data.ll.logbook.Activity.wind=Vent +observe.data.ll.logbook.Activity.wind=Vent Beaufort observe.data.ll.logbook.Activity.windDirection=Direction du vent (°) observe.data.ll.logbook.Activity.windSpeed=Vitesse du vent (nd) observe.data.ll.logbook.BaitsComposition.action.create=Insérer cet appât View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fca82cb72a00ae51b31f49944… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fca82cb72a00ae51b31f49944… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Correction création LL Logbook Set
by Tony CHEMIT 10 Jul '20

10 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 94ba8702 by Tony Chemit at 2020-07-10T16:30:13+02:00 Correction création LL Logbook Set - - - - - 9f5f153f by Tony Chemit at 2020-07-10T16:32:05+02:00 LL Observations / Echec d'enregistrement d'une capture - Closes #1519 (set focus Owner event if not in our focus handler...) - - - - - 2 changed files: - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/logbook/ActivityLonglineLogbookNavigationTreeNode.java Changes: ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java ===================================== @@ -91,6 +91,7 @@ import javax.swing.JTabbedPane; import javax.swing.JToolBar; import javax.swing.SwingUtilities; import java.awt.Component; +import java.awt.FocusTraversalPolicy; import java.awt.KeyboardFocusManager; import java.beans.PropertyChangeListener; import java.util.Arrays; @@ -459,6 +460,7 @@ public abstract class ContentUIHandler implements ObserveSe // dettach all validators uninstallValidators(); } + public void resetFromPreviousUi(U ui) { if (tabbedPaneValidator != null) { JTabbedPane mainTabbedPane = (JTabbedPane) ui.getObjectById(JaxxObjectInitializer.MAIN_TABBED_PANE); @@ -467,6 +469,7 @@ public abstract class ContentUIHandler implements ObserveSe } } } + final void destroyUI() { if (ui == null) { return; @@ -904,8 +907,14 @@ public abstract class ContentUIHandler implements ObserveSe } public final void setFormFocusOwner(Component formFocusOwner) { - ObserveLayoutFocusTraversalPolicy<?> focusTraversalPolicy = (ObserveLayoutFocusTraversalPolicy<?>) ui.getFocusTraversalPolicy(); - Component realFocusComponent = focusTraversalPolicy.getRealFocusComponent(formFocusOwner); + FocusTraversalPolicy focusTraversalPolicy = ui.getFocusTraversalPolicy(); + Component realFocusComponent; + if (focusTraversalPolicy instanceof ObserveLayoutFocusTraversalPolicy) { + ObserveLayoutFocusTraversalPolicy<?> focusTraversalPolicy1 = (ObserveLayoutFocusTraversalPolicy<?>) ui.getFocusTraversalPolicy(); + realFocusComponent = focusTraversalPolicy1.getRealFocusComponent(formFocusOwner); + } else { + realFocusComponent = focusTraversalPolicy.getFirstComponent(ui.getContentContainer()); + } ui.getModel().setFormFocusOwner(realFocusComponent); } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/logbook/ActivityLonglineLogbookNavigationTreeNode.java ===================================== @@ -30,6 +30,7 @@ import fr.ird.observe.dto.data.ll.logbook.ActivityReference; import fr.ird.observe.dto.data.ll.logbook.SampleReference; import fr.ird.observe.dto.data.ll.logbook.SetDto; import fr.ird.observe.dto.data.ll.logbook.SetReference; +import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.navigation.model.edit.longline.node.ObserveLonglineLogbookActivityEditNode; import fr.ird.observe.navigation.model.select.longline.node.ObserveLonglineLogbookActivitySelectNode; import fr.ird.observe.navigation.tree.SingleReferenceContainerNode; @@ -107,4 +108,17 @@ public class ActivityLonglineLogbookNavigationTreeNode extends ReferenceNavigati public SetLonglineLogbookNavigationTreeNode newSingleChildNode(String parentId) { return newSingleChildNode(new SetReference(new SetDto(), null)); } + + public int getNewPosition(DtoReference beanReference) { + if (beanReference instanceof SetReference) { + return 0; + } + if (beanReference instanceof SampleReference) { + if (getData().getSet() == null) { + return 0; + } + return 1; + } + throw new IllegalStateException(String.format("Can't manage bean: %s", beanReference)); + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/780acacd477ecfc3288131b5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/780acacd477ecfc3288131b5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Amélioration accéssibilité des menu navigations pour accéder aux sous reéférentiels
by Tony CHEMIT 10 Jul '20

10 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 793b6911 by Tony Chemit at 2020-07-10T15:19:26+02:00 Amélioration accéssibilité des menu navigations pour accéder aux sous reéférentiels - - - - - 780acacd by Tony Chemit at 2020-07-10T15:34:12+02:00 Fix some names... (See #1534) - - - - - 4 changed files: - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/DataSourceEditorNavigationMenuHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/CatchUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/CatchUI.jcss Changes: ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/menu/DataSourceEditorNavigationMenuHandler.java ===================================== @@ -82,13 +82,13 @@ public class DataSourceEditorNavigationMenuHandler implements UIHandler<DataSour public void propertyChange(PropertyChangeEvent evt) { NavigationTreeConfigBean config = ui.getUiModel().getConfig(); boolean withConfig = config != null; - boolean withSeine = withConfig &&config.isShowSeineTrip(); - boolean withLongline = withConfig &&config.isShowLonglineTrip(); - - ui.getMenuNavigationSeine().setEnabled(withSeine && seineEditModel.isEnabled()); - ui.getMenuNavigationLongline().setEnabled(withLongline && longlineEditModel.isEnabled()); + boolean withSeine = withConfig && config.isShowSeineTrip(); + boolean withLongline = withConfig && config.isShowLonglineTrip(); boolean showReferential = withConfig && config.isShowReferential(); + ui.getMenuNavigationSeine().setEnabled(withSeine && (showReferential || seineEditModel.isEnabled())); + ui.getMenuNavigationLongline().setEnabled(withLongline && (showReferential || longlineEditModel.isEnabled())); + ui.getSelectCommonReferential().setEnabled(showReferential); boolean seineNewValue = showReferential && withSeine; ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUI.jcss ===================================== @@ -39,7 +39,7 @@ layout:{new GridLayout(0,1)}; } -#acquisitionModeIndividualal { +#acquisitionModeIndividual { buttonGroup:acquisitionModeGroup; value:{CatchAcquisitionMode.INDIVIDUAL}; text:{CatchAcquisitionMode.INDIVIDUAL.toString()}; ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/CatchUI.jaxx ===================================== @@ -138,7 +138,7 @@ <cell columns="2">  <JPanel id='acquisitionModePanel'> - <JRadioButton id='acquisitionModeIndividualal'/> + <JRadioButton id='acquisitionModeIndividual'/> <JRadioButton id='acquisitionModeGrouped'/> </JPanel> </cell> ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/CatchUI.jcss ===================================== @@ -41,7 +41,7 @@ layout:{new GridLayout(0,1)}; } -#acquisitionModeIndividualal { +#acquisitionModeIndividual { buttonGroup:acquisitionModeGroup; value:{CatchAcquisitionMode.INDIVIDUAL}; text:{CatchAcquisitionMode.INDIVIDUAL.toString()}; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1ccd9702cdf11f53730dfc59… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1ccd9702cdf11f53730dfc59… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Bascule entre langues - Closes #1553
by Tony CHEMIT 10 Jul '20

10 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1ccd9702 by Tony Chemit at 2020-07-10T13:21:05+02:00 Bascule entre langues - Closes #1553 Improve the way to keep data source while reload application - - - - - 9 changed files: - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - 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/main/actions/ReloadApplicationAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/loading/close/OpenLocalDataSourceActionStep.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUIModel.java - client-runner/src/main/java/fr/ird/observe/client/RunObserve.java - common-service/src/main/java/fr/ird/observe/services/configuration/rest/ObserveDataSourceConfigurationRest.java - common-service/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConfigurationTopiaSupport.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java ===================================== @@ -22,9 +22,9 @@ package fr.ird.observe.client; import fr.ird.observe.client.configuration.ClientConfig; -import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.services.ObserveServiceMainFactory; import fr.ird.observe.services.ObserveServiceMainFactoryApplicationComponent; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.spi.DtoModelHelper; import io.ultreia.java4all.application.context.ApplicationContext; import org.apache.logging.log4j.LogManager; @@ -45,7 +45,7 @@ import static io.ultreia.java4all.i18n.I18n.n; public class ObserveSwingApplicationContext extends ApplicationContext { private static final Logger log = LogManager.getLogger(ObserveSwingApplicationContext.class); - private static ObserveSwingDataSource dataSourceToReload; + private static ObserveDataSourceConfiguration dataSourceConfigurationToReload; public static ObserveSwingApplicationContext init(ClientConfig config) { ClientConfigFinderInstance.config = config; @@ -94,11 +94,11 @@ public class ObserveSwingApplicationContext extends ApplicationContext { } - public static void setDataSourceToReload(ObserveSwingDataSource dataSourceToReload) { - ObserveSwingApplicationContext.dataSourceToReload = dataSourceToReload; + public static void setDataSourceToReload(ObserveDataSourceConfiguration dataSourceToReload) { + ObserveSwingApplicationContext.dataSourceConfigurationToReload = dataSourceToReload; } - public static Optional<ObserveSwingDataSource> getDataSourceToReload() { - return Optional.ofNullable(dataSourceToReload); + public static Optional<ObserveDataSourceConfiguration> getDataSourceToReload() { + return Optional.ofNullable(dataSourceConfigurationToReload); } } ===================================== client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java ===================================== @@ -25,7 +25,6 @@ package fr.ird.observe.client.datasource.api; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.datasource.api.event.ObserveSwingDataSourceEvent; import fr.ird.observe.client.datasource.api.event.ObserveSwingDataSourceListenerAdapter; -import fr.ird.observe.client.util.ProgressModel; import fr.ird.observe.navigation.model.edit.ObserveEditModel; import fr.ird.observe.navigation.model.select.ObserveSelectModel; import fr.ird.observe.services.ObserveDataSourceConfigurationMainFactory; @@ -42,6 +41,7 @@ import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.DatabaseOpenException; import io.ultreia.java4all.application.context.spi.GenerateApplicationComponent; +import io.ultreia.java4all.i18n.I18n; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -50,11 +50,11 @@ import java.io.File; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.UUID; import static fr.ird.observe.client.configuration.ClientConfig.DB_NAME; -import static io.ultreia.java4all.i18n.I18n.t; /** * Permet de gérer les différentes data sources utilisées dans l'application. @@ -102,7 +102,7 @@ public class ObserveDataSourcesManager implements Closeable { */ public ObserveSwingDataSource newLocalDataSource() { - ObserveDataSourceConfigurationTopiaH2 dataSourceConfigurationH2 = newH2DataSourceConfiguration(t("observe.runner.initStorage.label.local")); + ObserveDataSourceConfigurationTopiaH2 dataSourceConfigurationH2 = newH2DataSourceConfiguration(I18n.n("observe.runner.initStorage.label.local")); if (!dataSourceConfigurationH2.getDatabaseFile().exists()) { throw new IllegalStateException("local base must exist, when using this method (" + @@ -197,7 +197,7 @@ public class ObserveDataSourcesManager implements Closeable { super.onOpened(event); ObserveSwingDataSource dataSource = event.getSource(); dataSources.add(dataSource); - log.info(String.format("Data source opened : %s (%d datas sources open)", dataSource.getConfiguration(), dataSources.size())); + log.info(String.format("Data source opened : %s (%d data sources open)", dataSource.getConfiguration(), dataSources.size())); } @Override @@ -205,6 +205,10 @@ public class ObserveDataSourcesManager implements Closeable { super.onClosed(event); ObserveSwingDataSource dataSource = event.getSource(); dataSources.remove(dataSource); + if (Objects.equals(dataSource, getMainDataSource())) { + log.info(String.format("Remove main data source: %s", dataSource)); + setMainDataSource(null); + } log.info(String.format("Data source closed : %s (%d data sources open)", dataSource.getConfiguration(), dataSources.size())); } }); @@ -215,10 +219,6 @@ public class ObserveDataSourcesManager implements Closeable { @Override public void open() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException, DatabaseOpenException { try { - //FIXME:BodyContent Review progress model, not linked to ui any more... - if (getProgressModel() == null) { - setProgressModel(new ProgressModel()); - } create(createDto); } catch (IncompatibleDataSourceCreateConfigurationException | DataSourceCreateWithNoReferentialImportException e) { throw new DatabaseOpenException(e, configuration); ===================================== client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java ===================================== @@ -134,6 +134,8 @@ public class ObserveSwingDataSource extends ObserveServicesProviderSupport imple this.servicesProvider = new ObserveDataSourceServicesProvider(this); this.serviceFactory = serviceFactory; this.expired = false; + setProgressModel(new ProgressModel()); + if (isLocal()) { icon = SwingUtil.getUIManagerActionIcon("db-local"); } else if (isRemote()) { ===================================== client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.main.body.NoBodyContentComponent; import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.swing.application.ApplicationRunner; @@ -57,15 +58,17 @@ public class ReloadApplicationAction extends CloseApplicationAction { ObserveSwingDataSource mainDataSource = getObserveDataSourcesManager().getMainDataSource(); if (mainDataSource != null) { + ObserveDataSourceConfiguration mainDataSourceConfiguration = mainDataSource.getConfiguration(); if (mainDataSource.isOpen()) { try { mainDataSource.close(); } catch (Exception e) { UIHelper.handlingError("Can't close data source", e); - mainDataSource = null; + // In this case, won't try to reopen it + mainDataSourceConfiguration = null; } } - ObserveSwingApplicationContext.setDataSourceToReload(mainDataSource); + ObserveSwingApplicationContext.setDataSourceToReload(mainDataSourceConfiguration); } ApplicationRunner.getRunner().setReload(true); ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/loading/close/OpenLocalDataSourceActionStep.java ===================================== @@ -27,6 +27,7 @@ import fr.ird.observe.client.datasource.api.ObserveDataSourcesManager; import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.datasource.editor.loading.LoadingDataSourceContext; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; +import io.ultreia.java4all.i18n.I18n; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -62,7 +63,7 @@ public class OpenLocalDataSourceActionStep extends CloseDataSourceActionStepSupp public void doAction0(ActionWithSteps<LoadingDataSourceContext> mainAction) throws Exception { ObserveDataSourcesManager dataSourcesManager = actionContext.getDataSourcesManager(); - ObserveDataSourceConfigurationTopiaH2 localConfiguration = dataSourcesManager.newH2DataSourceConfiguration(t("observe.runner.initStorage.label.local")); + ObserveDataSourceConfigurationTopiaH2 localConfiguration = dataSourcesManager.newH2DataSourceConfiguration(I18n.n("observe.runner.initStorage.label.local")); // can't migrate datasource in this case //FIXME I don't understand why in this cas we can't try to migrate local data source? ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUIModel.java ===================================== @@ -63,6 +63,7 @@ import fr.ird.observe.services.service.PingService; import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; import fr.ird.observe.services.service.sql.SqlScriptProducerService; import io.ultreia.java4all.application.template.spi.GenerateTemplate; +import io.ultreia.java4all.i18n.I18n; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.logging.log4j.LogManager; @@ -160,8 +161,6 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie * doBackup est active. */ protected File backupFile = new File(""); - /** un drapeau pour savoir s'il faut sauver la configuration à distante */ - protected boolean storeRemoteConfig; /** le storage precedemment utilise */ protected ObserveDataSourceConfiguration previousDataSourceConfiguration; protected ConnexionStatus connexionStatus; @@ -236,7 +235,7 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie Version modelVersion = getClientConfig().getModelVersion(); h2Config = factory.createObserveDataSourceConfigurationTopiaH2( - t("observe.runner.initStorage.label.local"), + I18n.n("observe.runner.initStorage.label.local"), null, ClientConfig.DB_NAME, "", @@ -247,7 +246,7 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie ); pgConfig = factory.createObserveDataSourceConfigurationTopiaPG( - t("observe.storage.label.remote"), + I18n.n("observe.storage.label.remote"), "", "", EMPTY_PASSWORD, @@ -258,7 +257,7 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie ); restConfig = factory.createObserveDataSourceConfigurationRest( - t("observe.storage.label.server"), + I18n.n("observe.storage.label.server"), null, "", EMPTY_PASSWORD, @@ -341,9 +340,9 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie ObserveDataSourcesManager dataSourcesManager = ObserveDataSourcesManagerApplicationComponent.value(); - h2Config = dataSourcesManager.newH2DataSourceConfiguration(t("observe.runner.initStorage.label.local")); - pgConfig = dataSourcesManager.newPGDataSourceConfiguration(t("observe.storage.label.remote")); - restConfig = dataSourcesManager.newRestDataSourceConfiguration(t("observe.storage.label.server")); + h2Config = dataSourcesManager.newH2DataSourceConfiguration(I18n.n("observe.runner.initStorage.label.local")); + pgConfig = dataSourcesManager.newPGDataSourceConfiguration(I18n.n("observe.storage.label.remote")); + restConfig = dataSourcesManager.newRestDataSourceConfiguration(I18n.n("observe.storage.label.server")); if (source != null) { @@ -417,9 +416,9 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie ObserveDataSourcesManager dataSourcesManager = ObserveDataSourcesManagerApplicationComponent.value(); // on initialise les configuration avec les valeurs par défaut - h2Config = dataSourcesManager.newH2DataSourceConfiguration(t("observe.runner.initStorage.label.local")); - pgConfig = dataSourcesManager.newPGDataSourceConfiguration(t("observe.storage.label.remote")); - restConfig = dataSourcesManager.newRestDataSourceConfiguration(t("observe.storage.label.server")); + h2Config = dataSourcesManager.newH2DataSourceConfiguration(I18n.n("observe.runner.initStorage.label.local")); + pgConfig = dataSourcesManager.newPGDataSourceConfiguration(I18n.n("observe.storage.label.remote")); + restConfig = dataSourcesManager.newRestDataSourceConfiguration(I18n.n("observe.storage.label.server")); if (previousConfig instanceof ObserveDataSourceConfigurationTopiaH2) { @@ -451,7 +450,7 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie ObserveDataSourceConfiguration configuration; switch (getDbMode()) { case CREATE_LOCAL: - configuration = toH2StorageConfig(t("observe.runner.initStorage.label.local")); + configuration = toH2StorageConfig(I18n.n("observe.runner.initStorage.label.local")); dataSource = dataSourcesManager.newDataSource(configuration); dataSource.addObserveSwingDataSourceListener( @@ -493,15 +492,15 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie break; case USE_LOCAL: - configuration = toH2StorageConfig(t("observe.runner.initStorage.label.local")); + configuration = toH2StorageConfig(I18n.n("observe.runner.initStorage.label.local")); dataSource = dataSourcesManager.newDataSource(configuration); break; case USE_REMOTE: - configuration = toPGStorageConfig(t("observe.storage.label.remote")); + configuration = toPGStorageConfig(I18n.n("observe.storage.label.remote")); dataSource = dataSourcesManager.newDataSource(configuration); break; case USE_SERVER: - configuration = toRestStorageConfig(t("observe.storage.label.server")); + configuration = toRestStorageConfig(I18n.n("observe.storage.label.server")); dataSource = dataSourcesManager.newDataSource(configuration); break; } @@ -553,9 +552,9 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie ObserveDataSourcesManager dataSourcesManager = ObserveDataSourcesManagerApplicationComponent.value(); - h2Config = dataSourcesManager.newH2DataSourceConfiguration(t("observe.runner.initStorage.label.local")); - pgConfig = dataSourcesManager.newPGDataSourceConfiguration(t("observe.storage.label.remote")); - restConfig = dataSourcesManager.newRestDataSourceConfiguration(t("observe.storage.label.server")); + h2Config = dataSourcesManager.newH2DataSourceConfiguration(I18n.n("observe.runner.initStorage.label.local")); + pgConfig = dataSourcesManager.newPGDataSourceConfiguration(I18n.n("observe.storage.label.remote")); + restConfig = dataSourcesManager.newRestDataSourceConfiguration(I18n.n("observe.storage.label.server")); Pair<CreationMode, DbMode> modes = computeModes(config); CreationMode mode = modes.getLeft(); @@ -1217,10 +1216,6 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie validate(); } - public boolean isStoreRemoteConfig() { - return storeRemoteConfig; - } - public File getBackupFile() { return backupFile; } @@ -1839,7 +1834,7 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie if (isImportReferential()) { - String dbLabel = t("observe.storage.label.reference.import.db"); + String dbLabel = I18n.n("observe.storage.label.reference.import.db"); switch (getReferentielImportMode()) { @@ -1916,7 +1911,7 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie if (isImportData()) { - String dbLabel = t("observe.storage.label.data.import.db"); + String dbLabel = I18n.n("observe.storage.label.data.import.db"); switch (getDataImportMode()) { ===================================== client-runner/src/main/java/fr/ird/observe/client/RunObserve.java ===================================== @@ -40,9 +40,9 @@ import fr.ird.observe.client.datasource.h2.backup.WithLocalDatabaseBackupTimer; import fr.ird.observe.client.main.ObserveMainUI; import fr.ird.observe.client.util.FloatConverter; import fr.ird.observe.client.util.ObserveSwingTechnicalException; -import fr.ird.observe.client.util.ProgressModel; import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.services.configuration.DataSourceCreateConfigurationDto; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import io.ultreia.java4all.application.context.ApplicationContext; @@ -80,7 +80,6 @@ import java.util.Set; import java.util.logging.Level; import static fr.ird.observe.client.ClientUIContext.askUser; -import static io.ultreia.java4all.i18n.I18n.n; import static io.ultreia.java4all.i18n.I18n.t; /** @@ -119,6 +118,125 @@ public class RunObserve extends ApplicationRunner implements WithBackupsManager, return (RunObserve) ApplicationRunner.getRunner(); } + public static void askToCreateLocalDatabase(ObserveMainUI mainUI, + ClientConfig config, + ObserveDataSourcesManager dataSourcesManager, + BackupStorage lastAutomaticBackup) { + + InitStorageModel initStorageModel = new InitStorageModel(config.getLocalDBDirectory(), lastAutomaticBackup); + + String text = InitStorageModelTemplate.generate(initStorageModel); + + Object[] options; + int defaultOption; + boolean noAutomaticBackup = lastAutomaticBackup == null; + if (noAutomaticBackup) { + options = new Object[]{ + t("observe.runner.initStorage.choice.useRemoteStorage"), + t("observe.runner.initStorage.choice.createLocalStorage"), + t("observe.runner.initStorage.choice.doNothing")}; + defaultOption = 1; + + } else { + options = new Object[]{ + t("observe.runner.initStorage.choice.useRemoteStorage"), + t("observe.runner.initStorage.choice.createLocalStorage"), + t("observe.runner.initStorage.choice.loadLastAutomaticBackup"), + t("observe.runner.initStorage.choice.doNothing")}; + defaultOption = 2; + + } + + JLabel label = new JLabel(text); + int response = askUser( + null, + t("observe.runner.initStorage.title.no.local.db.found"), + label, + JOptionPane.QUESTION_MESSAGE, + options, + defaultOption + ); + log.debug(String.format("response : %d", response)); + + if (noAutomaticBackup) { + Set<DbMode> dbModes = EnumSet.noneOf(DbMode.class); + String title = null; + if (response != JOptionPane.CLOSED_OPTION && response < 2) { + + if (response == 1) { + // creation de la base locale + dbModes.add(DbMode.CREATE_LOCAL); + title = I18n.n("observe.runner.initStorage.title.create.local.db"); + } else { + // connexion à une base distante + dbModes.add(DbMode.USE_REMOTE); + dbModes.add(DbMode.USE_SERVER); + title = I18n.n("observe.runner.initStorage.title.load.remote.db"); + } + } + if (!dbModes.isEmpty()) { + + DataSourceEditorBodyContent body = mainUI.getMainUIBodyContentManager().getBodyTyped(DataSourceEditor.class, DataSourceEditorBodyContent.class); + body.doChangeStorage(dbModes, title); + } + } else { + + Set<DbMode> dbModes = EnumSet.noneOf(DbMode.class); + String title = null; + if (response != JOptionPane.CLOSED_OPTION && response < 3) { + + switch (response) { + case 2: + // load last backup + loadBackup(dataSourcesManager, mainUI, lastAutomaticBackup); + break; + case 1: + // create local db + // creation de la base locale + dbModes.add(DbMode.CREATE_LOCAL); + title = I18n.n("observe.runner.initStorage.title.create.local.db"); + break; + case 0: + // use remote db + dbModes.add(DbMode.USE_REMOTE); + dbModes.add(DbMode.USE_SERVER); + title = I18n.n("observe.runner.initStorage.title.load.remote.db"); + break; + } + } + if (!dbModes.isEmpty()) { + DataSourceEditorBodyContent body = mainUI.getMainUIBodyContentManager().getBodyTyped(DataSourceEditor.class, DataSourceEditorBodyContent.class); + body.doChangeStorage(dbModes, title); + } + } + + } + + public static void loadBackup(ObserveDataSourcesManager dataSourcesManager, ObserveMainUI mainUI, BackupStorage backupStorage) { + log.info("Will load last backup: " + backupStorage.getFile()); + try { +// byte[] dump = Files.readAllBytes(backupStorage.getFile().toPath()); + DataSourceCreateConfigurationDto createDto = new DataSourceCreateConfigurationDto(); + createDto.setImportDatabase(TopiaSqlScript.of(backupStorage.getFile().toURI())); + + ObserveDataSourceConfigurationTopiaH2 dataSourceConfigurationH2 = dataSourcesManager.newH2DataSourceConfiguration(I18n.n("observe.runner.initStorage.label.local")); + + ObserveSwingDataSource dataSource = dataSourcesManager.newDataSource(dataSourceConfigurationH2, createDto); + + mainUI.getMainUIBodyContentManager().getBodyTyped(DataSourceEditor.class, DataSourceEditorBodyContent.class).loadStorage(mainUI, dataSource, true); + + //FIXME:BodyContent Review progress model, not linked to ui any more... +// dataSource.setProgressModel(new ProgressModel()); +// dataSource.create(createDto); +// +// mainUI.changeBodyContent(DataSourceEditor.class); +// mainUI.getModel().setMode(ObserveUIMode.DB); + + } catch (Exception e) { + throw new ObserveSwingTechnicalException("Impossible de créer la base locale", e); + } + } + @Override protected void initOnce() { if (!init) { @@ -272,7 +390,7 @@ public class RunObserve extends ApplicationRunner implements WithBackupsManager, // // return; // } - Optional<ObserveSwingDataSource> dataSourceToReload = ObserveSwingApplicationContext.getDataSourceToReload(); + Optional<ObserveDataSourceConfiguration> dataSourceToReload = ObserveSwingApplicationContext.getDataSourceToReload(); ObserveSwingApplicationContext.setDataSourceToReload(null); if (!config.isLoadLocalStorage() && !dataSourceToReload.isPresent()) { @@ -368,19 +486,19 @@ public class RunObserve extends ApplicationRunner implements WithBackupsManager, //FIXME Need to have a unified API and only one //FIXME first try to open specified ds (here local ds) //FIXME if can not load local ds, then feedback it and propose to load automatic backup, or to create a new local ds - private void initStorage(ClientConfig config, JFrame ui, ObserveSwingDataSource previousDataSource) { + private void initStorage(ClientConfig config, JFrame ui, ObserveDataSourceConfiguration previousDataSourceConfiguration) { ObserveMainUI mainUI = (ObserveMainUI) ui; ObserveDataSourcesManager dataSourcesManager = getObserveDataSourcesManager(); BackupsManager backupsManager = getBackupsManager(); - if (previousDataSource != null) { + if (previousDataSourceConfiguration != null) { // reuse previous data source - previousDataSource.setProgressModel(new ProgressModel()); + ObserveSwingDataSource previousDataSource = dataSourcesManager.newDataSource(previousDataSourceConfiguration); mainUI.getMainUIBodyContentManager().getBodyTyped(DataSourceEditor.class, DataSourceEditorBodyContent.class).loadStorage(mainUI, previousDataSource, true); - } else if (config.isLoadLocalStorage()){ + } else if (config.isLoadLocalStorage()) { boolean askToCreate = true; BackupStorage lastAutomaticBackup = backupsManager.getAutomaticBackups().stream().findFirst().orElse(null); @@ -390,7 +508,6 @@ public class RunObserve extends ApplicationRunner implements WithBackupsManager, // une base locale existe, on l'ouvre ObserveSwingDataSource dataSource = dataSourcesManager.newLocalDataSource(); - dataSource.setProgressModel(new ProgressModel()); try { @@ -430,124 +547,4 @@ public class RunObserve extends ApplicationRunner implements WithBackupsManager, log.info(t("observe.runner.initStorage.done")); } - - public static void askToCreateLocalDatabase(ObserveMainUI mainUI, - ClientConfig config, - ObserveDataSourcesManager dataSourcesManager, - BackupStorage lastAutomaticBackup) { - - InitStorageModel initStorageModel = new InitStorageModel(config.getLocalDBDirectory(), lastAutomaticBackup); - - String text = InitStorageModelTemplate.generate(initStorageModel); - - Object[] options; - int defaultOption; - boolean noAutomaticBackup = lastAutomaticBackup == null; - if (noAutomaticBackup) { - options = new Object[]{ - t("observe.runner.initStorage.choice.useRemoteStorage"), - t("observe.runner.initStorage.choice.createLocalStorage"), - t("observe.runner.initStorage.choice.doNothing")}; - defaultOption = 1; - - } else { - options = new Object[]{ - t("observe.runner.initStorage.choice.useRemoteStorage"), - t("observe.runner.initStorage.choice.createLocalStorage"), - t("observe.runner.initStorage.choice.loadLastAutomaticBackup"), - t("observe.runner.initStorage.choice.doNothing")}; - defaultOption = 2; - - } - - JLabel label = new JLabel(text); - int response = askUser( - null, - t("observe.runner.initStorage.title.no.local.db.found"), - label, - JOptionPane.QUESTION_MESSAGE, - options, - defaultOption - ); - log.debug(String.format("response : %d", response)); - - if (noAutomaticBackup) { - Set<DbMode> dbModes = EnumSet.noneOf(DbMode.class); - String title = null; - if (response != JOptionPane.CLOSED_OPTION && response < 2) { - - if (response == 1) { - // creation de la base locale - dbModes.add(DbMode.CREATE_LOCAL); - title = n("observe.runner.initStorage.title.create.local.db"); - } else { - // connexion à une base distante - dbModes.add(DbMode.USE_REMOTE); - dbModes.add(DbMode.USE_SERVER); - title = n("observe.runner.initStorage.title.load.remote.db"); - } - } - if (!dbModes.isEmpty()) { - - DataSourceEditorBodyContent body = mainUI.getMainUIBodyContentManager().getBodyTyped(DataSourceEditor.class, DataSourceEditorBodyContent.class); - body.doChangeStorage(dbModes, title); - } - } else { - - Set<DbMode> dbModes = EnumSet.noneOf(DbMode.class); - String title = null; - if (response != JOptionPane.CLOSED_OPTION && response < 3) { - - switch (response) { - case 2: - // load last backup - loadBackup(dataSourcesManager, mainUI, lastAutomaticBackup); - break; - case 1: - // create local db - // creation de la base locale - dbModes.add(DbMode.CREATE_LOCAL); - title = n("observe.runner.initStorage.title.create.local.db"); - break; - case 0: - // use remote db - dbModes.add(DbMode.USE_REMOTE); - dbModes.add(DbMode.USE_SERVER); - title = n("observe.runner.initStorage.title.load.remote.db"); - break; - } - } - if (!dbModes.isEmpty()) { - DataSourceEditorBodyContent body = mainUI.getMainUIBodyContentManager().getBodyTyped(DataSourceEditor.class, DataSourceEditorBodyContent.class); - body.doChangeStorage(dbModes, title); - } - } - - } - - public static void loadBackup(ObserveDataSourcesManager dataSourcesManager, ObserveMainUI mainUI, BackupStorage backupStorage) { - log.info("Will load last backup: " + backupStorage.getFile()); - try { -// byte[] dump = Files.readAllBytes(backupStorage.getFile().toPath()); - DataSourceCreateConfigurationDto createDto = new DataSourceCreateConfigurationDto(); - createDto.setImportDatabase(TopiaSqlScript.of(backupStorage.getFile().toURI())); - - ObserveDataSourceConfigurationTopiaH2 dataSourceConfigurationH2 = dataSourcesManager.newH2DataSourceConfiguration(t("observe.runner.initStorage.label.local")); - - ObserveSwingDataSource dataSource = dataSourcesManager.newDataSource(dataSourceConfigurationH2, createDto); - - mainUI.getMainUIBodyContentManager().getBodyTyped(DataSourceEditor.class, DataSourceEditorBodyContent.class).loadStorage(mainUI, dataSource, true); - - //FIXME:BodyContent Review progress model, not linked to ui any more... -// dataSource.setProgressModel(new ProgressModel()); -// dataSource.create(createDto); -// -// mainUI.changeBodyContent(DataSourceEditor.class); -// mainUI.getModel().setMode(ObserveUIMode.DB); - - } catch (Exception e) { - throw new ObserveSwingTechnicalException("Impossible de créer la base locale", e); - } - } - } ===================================== common-service/src/main/java/fr/ird/observe/services/configuration/rest/ObserveDataSourceConfigurationRest.java ===================================== @@ -25,10 +25,12 @@ package fr.ird.observe.services.configuration.rest; import com.google.common.base.MoreObjects; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceType; +import io.ultreia.java4all.i18n.I18n; +import org.nuiton.version.Version; + import java.net.URL; import java.nio.file.Path; import java.util.Optional; -import org.nuiton.version.Version; /** * Configuration d'une source de données Rest non connectée. @@ -37,6 +39,7 @@ import org.nuiton.version.Version; * * @author Tony Chemit - dev(a)tchemit.fr */ +@SuppressWarnings("unused") public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConfiguration { private static final long serialVersionUID = 1L; @@ -75,7 +78,7 @@ public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConf @Override public String getLabel() { - return label; + return I18n.t(label); } @Override ===================================== common-service/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConfigurationTopiaSupport.java ===================================== @@ -24,6 +24,7 @@ package fr.ird.observe.services.configuration.topia; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceType; +import io.ultreia.java4all.i18n.I18n; import org.nuiton.version.Version; import java.nio.file.Path; @@ -101,7 +102,7 @@ public abstract class ObserveDataSourceConfigurationTopiaSupport implements Obse @Override public String getLabel() { - return label; + return I18n.t(label); } public void setLabel(String label) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1ccd9702cdf11f53730dfc591… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1ccd9702cdf11f53730dfc591… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Move feedback helper to menu Help
by Tony CHEMIT 10 Jul '20

10 Jul '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7ee7eb28 by Tony Chemit at 2020-07-10T11:01:52+02:00 Move feedback helper to menu Help - - - - - ad4c3466 by Tony Chemit at 2020-07-10T12:44:31+02:00 Bascule entre langues - Closes #1553 Improve the way to keep data source while reload application - - - - - 7 changed files: - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - 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/main/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUIModel.java - client-runner/src/main/java/fr/ird/observe/client/RunObserve.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java ===================================== @@ -22,9 +22,9 @@ package fr.ird.observe.client; import fr.ird.observe.client.configuration.ClientConfig; -import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.services.ObserveServiceMainFactory; import fr.ird.observe.services.ObserveServiceMainFactoryApplicationComponent; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.spi.DtoModelHelper; import io.ultreia.java4all.application.context.ApplicationContext; import org.apache.logging.log4j.LogManager; @@ -45,7 +45,7 @@ import static io.ultreia.java4all.i18n.I18n.n; public class ObserveSwingApplicationContext extends ApplicationContext { private static final Logger log = LogManager.getLogger(ObserveSwingApplicationContext.class); - private static ObserveSwingDataSource dataSourceToReload; + private static ObserveDataSourceConfiguration dataSourceConfigurationToReload; public static ObserveSwingApplicationContext init(ClientConfig config) { ClientConfigFinderInstance.config = config; @@ -94,11 +94,11 @@ public class ObserveSwingApplicationContext extends ApplicationContext { } - public static void setDataSourceToReload(ObserveSwingDataSource dataSourceToReload) { - ObserveSwingApplicationContext.dataSourceToReload = dataSourceToReload; + public static void setDataSourceToReload(ObserveDataSourceConfiguration dataSourceToReload) { + ObserveSwingApplicationContext.dataSourceConfigurationToReload = dataSourceToReload; } - public static Optional<ObserveSwingDataSource> getDataSourceToReload() { - return Optional.ofNullable(dataSourceToReload); + public static Optional<ObserveDataSourceConfiguration> getDataSourceToReload() { + return Optional.ofNullable(dataSourceConfigurationToReload); } } ===================================== client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java ===================================== @@ -25,7 +25,6 @@ package fr.ird.observe.client.datasource.api; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.datasource.api.event.ObserveSwingDataSourceEvent; import fr.ird.observe.client.datasource.api.event.ObserveSwingDataSourceListenerAdapter; -import fr.ird.observe.client.util.ProgressModel; import fr.ird.observe.navigation.model.edit.ObserveEditModel; import fr.ird.observe.navigation.model.select.ObserveSelectModel; import fr.ird.observe.services.ObserveDataSourceConfigurationMainFactory; @@ -50,6 +49,7 @@ import java.io.File; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -205,6 +205,10 @@ public class ObserveDataSourcesManager implements Closeable { super.onClosed(event); ObserveSwingDataSource dataSource = event.getSource(); dataSources.remove(dataSource); + if (Objects.equals(dataSource, getMainDataSource())) { + log.info(String.format("Remove main data source: %s", dataSource)); + setMainDataSource(null); + } log.info(String.format("Data source closed : %s (%d data sources open)", dataSource.getConfiguration(), dataSources.size())); } }); @@ -215,10 +219,6 @@ public class ObserveDataSourcesManager implements Closeable { @Override public void open() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException, DatabaseOpenException { try { - //FIXME:BodyContent Review progress model, not linked to ui any more... - if (getProgressModel() == null) { - setProgressModel(new ProgressModel()); - } create(createDto); } catch (IncompatibleDataSourceCreateConfigurationException | DataSourceCreateWithNoReferentialImportException e) { throw new DatabaseOpenException(e, configuration); ===================================== client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java ===================================== @@ -134,6 +134,8 @@ public class ObserveSwingDataSource extends ObserveServicesProviderSupport imple this.servicesProvider = new ObserveDataSourceServicesProvider(this); this.serviceFactory = serviceFactory; this.expired = false; + setProgressModel(new ProgressModel()); + if (isLocal()) { icon = SwingUtil.getUIManagerActionIcon("db-local"); } else if (isRemote()) { ===================================== client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx ===================================== @@ -97,7 +97,6 @@ public void destroy() { <JMenu id='menuFile'> <JMenuItem id='reloadApplication'/> - <JMenuItem id='openLastFeedBack'/> <JMenuItem id='closeApplication'/> </JMenu> <JMenu id='menuConfiguration'> @@ -116,6 +115,7 @@ public void destroy() { <JMenu id='menuHelp'> <JMenuItem id='gotoSite'/> <JMenuItem id='showAbout'/> + <JMenuItem id='openLastFeedBack'/> <JSeparator/> <JMenuItem id='translate'/> </JMenu> ===================================== client-core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.main.body.NoBodyContentComponent; import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.swing.application.ApplicationRunner; @@ -57,15 +58,17 @@ public class ReloadApplicationAction extends CloseApplicationAction { ObserveSwingDataSource mainDataSource = getObserveDataSourcesManager().getMainDataSource(); if (mainDataSource != null) { + ObserveDataSourceConfiguration mainDataSourceConfiguration = mainDataSource.getConfiguration(); if (mainDataSource.isOpen()) { try { mainDataSource.close(); } catch (Exception e) { UIHelper.handlingError("Can't close data source", e); - mainDataSource = null; + // In this case, won't try to reopen it + mainDataSourceConfiguration = null; } } - ObserveSwingApplicationContext.setDataSourceToReload(mainDataSource); + ObserveSwingApplicationContext.setDataSourceToReload(mainDataSourceConfiguration); } ApplicationRunner.getRunner().setReload(true); ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUIModel.java ===================================== @@ -160,8 +160,6 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie * doBackup est active. */ protected File backupFile = new File(""); - /** un drapeau pour savoir s'il faut sauver la configuration à distante */ - protected boolean storeRemoteConfig; /** le storage precedemment utilise */ protected ObserveDataSourceConfiguration previousDataSourceConfiguration; protected ConnexionStatus connexionStatus; @@ -1217,10 +1215,6 @@ public class StorageUIModel extends WizardModel<StorageStep> implements WithClie validate(); } - public boolean isStoreRemoteConfig() { - return storeRemoteConfig; - } - public File getBackupFile() { return backupFile; } ===================================== client-runner/src/main/java/fr/ird/observe/client/RunObserve.java ===================================== @@ -40,9 +40,9 @@ import fr.ird.observe.client.datasource.h2.backup.WithLocalDatabaseBackupTimer; import fr.ird.observe.client.main.ObserveMainUI; import fr.ird.observe.client.util.FloatConverter; import fr.ird.observe.client.util.ObserveSwingTechnicalException; -import fr.ird.observe.client.util.ProgressModel; import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.services.configuration.DataSourceCreateConfigurationDto; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import io.ultreia.java4all.application.context.ApplicationContext; @@ -272,7 +272,7 @@ public class RunObserve extends ApplicationRunner implements WithBackupsManager, // // return; // } - Optional<ObserveSwingDataSource> dataSourceToReload = ObserveSwingApplicationContext.getDataSourceToReload(); + Optional<ObserveDataSourceConfiguration> dataSourceToReload = ObserveSwingApplicationContext.getDataSourceToReload(); ObserveSwingApplicationContext.setDataSourceToReload(null); if (!config.isLoadLocalStorage() && !dataSourceToReload.isPresent()) { @@ -368,19 +368,19 @@ public class RunObserve extends ApplicationRunner implements WithBackupsManager, //FIXME Need to have a unified API and only one //FIXME first try to open specified ds (here local ds) //FIXME if can not load local ds, then feedback it and propose to load automatic backup, or to create a new local ds - private void initStorage(ClientConfig config, JFrame ui, ObserveSwingDataSource previousDataSource) { + private void initStorage(ClientConfig config, JFrame ui, ObserveDataSourceConfiguration previousDataSourceConfiguration) { ObserveMainUI mainUI = (ObserveMainUI) ui; ObserveDataSourcesManager dataSourcesManager = getObserveDataSourcesManager(); BackupsManager backupsManager = getBackupsManager(); - if (previousDataSource != null) { + if (previousDataSourceConfiguration != null) { // reuse previous data source - previousDataSource.setProgressModel(new ProgressModel()); + ObserveSwingDataSource previousDataSource = dataSourcesManager.newDataSource(previousDataSourceConfiguration); mainUI.getMainUIBodyContentManager().getBodyTyped(DataSourceEditor.class, DataSourceEditorBodyContent.class).loadStorage(mainUI, previousDataSource, true); - } else if (config.isLoadLocalStorage()){ + } else if (config.isLoadLocalStorage()) { boolean askToCreate = true; BackupStorage lastAutomaticBackup = backupsManager.getAutomaticBackups().stream().findFirst().orElse(null); @@ -390,7 +390,6 @@ public class RunObserve extends ApplicationRunner implements WithBackupsManager, // une base locale existe, on l'ouvre ObserveSwingDataSource dataSource = dataSourcesManager.newLocalDataSource(); - dataSource.setProgressModel(new ProgressModel()); try { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fcea594dfa7657079cceb68f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fcea594dfa7657079cceb68f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 09 Jul '20

09 Jul '20

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 058c40e3 by 166231 at 2020-07-09T07:07:57+00:00 Site checkin for project ObServe :: Pom - - - - - 7 changed files: - administration-web.html - architecture-logicielle.html - img/architecture.svg - index.html - install-serverPG.html - install.html - synchro-referential.html Changes: ===================================== administration-web.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Installation de lapplication web</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2020-06-22</li> - <li id="projectVersion" class="pull-right">|Version: 7.6.3</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2020-07-09</li> + <li id="projectVersion" class="pull-right">|Version: 7.6.4</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -102,7 +102,7 @@ <div class="source"><pre class="prettyprint linenums"> /var/local/observeweb/{contextPath} |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-7.6.3.log # logs de l'application + | `-- observeweb-7.6.4.log # logs de l'application |-- observeweb-log4j2.xml # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs ===================================== architecture-logicielle.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Architecture logicielle dObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2020-06-22</li> - <li id="projectVersion" class="pull-right">|Version: 7.6.3</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2020-07-09</li> + <li id="projectVersion" class="pull-right">|Version: 7.6.4</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== img/architecture.svg ===================================== @@ -9,12 +9,10 @@ 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>. ===================================== index.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">ObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2020-06-22</li> - <li id="projectVersion" class="pull-right">|Version: 7.6.3</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2020-07-09</li> + <li id="projectVersion" class="pull-right">|Version: 7.6.4</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install-serverPG.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Installation du serveur Obstuna</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2020-06-22</li> - <li id="projectVersion" class="pull-right">|Version: 7.6.3</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2020-07-09</li> + <li id="projectVersion" class="pull-right">|Version: 7.6.4</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Installation dObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2020-06-22</li> - <li id="projectVersion" class="pull-right">|Version: 7.6.3</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2020-07-09</li> + <li id="projectVersion" class="pull-right">|Version: 7.6.4</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== synchro-referential.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Synchronisation avancée du référentiel</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2020-06-22</li> - <li id="projectVersion" class="pull-right">|Version: 7.6.3</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2020-07-09</li> + <li id="projectVersion" class="pull-right">|Version: 7.6.4</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/058c40e3f998194a2d7f18a85… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/058c40e3f998194a2d7f18a85… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.6.4
by Tony CHEMIT 09 Jul '20

09 Jul '20

Tony CHEMIT deleted branch release/7.6.4 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v7.6.4
by Tony CHEMIT 09 Jul '20

09 Jul '20

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

1 0