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

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.0.0-RC-23)
by Tony CHEMIT (＠tchemit) Feb. 15, 2022

Feb. 15, 2022

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 391724d3 by Tony Chemit at 2022-02-15T13:38:45+01:00 Site checkin for project ObServe (version 9.0.0-RC-23) - - - - - 8 changed files: - − 9.0.0-RC-23-SNAPSHOT/changelog.html - 9.0.0-RC-23-SNAPSHOT/CHANGELOG.html → 9.0.0-RC-23/CHANGELOG.html - 9.0.0-RC-23-SNAPSHOT/architecture-logicielle.html → 9.0.0-RC-23/architecture-logicielle.html - 9.0.0-RC-23-SNAPSHOT/avdth/common.html → 9.0.0-RC-23/avdth/common.html - 9.0.0-RC-23-SNAPSHOT/avdth/index.html → 9.0.0-RC-23/avdth/index.html - 9.0.0-RC-23-SNAPSHOT/avdth/landing.html → 9.0.0-RC-23/avdth/landing.html - 9.0.0-RC-23-SNAPSHOT/avdth/local_market.html → 9.0.0-RC-23/avdth/local_market.html - 9.0.0-RC-23-SNAPSHOT/avdth/logbook.html → 9.0.0-RC-23/avdth/logbook.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/391724d3622cb7e19d34e298f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/391724d3622cb7e19d34e298f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.0-RC-23
by Tony CHEMIT (＠tchemit) Feb. 15, 2022

Feb. 15, 2022

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

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 9.0.0-RC-24-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) Feb. 15, 2022

Feb. 15, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fddf99dd by Tony Chemit at 2022-02-15T12:44:34+01:00 [jgitflow-maven-plugin]updating poms for 9.0.0-RC-24-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fddf99dd13da940d4d741da94… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fddf99dd13da940d4d741da94… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ne pas renseigner Trip.logbookProgram lors de la migration v7 → v9 - Closes #2163
by Tony CHEMIT (＠tchemit) Feb. 15, 2022

Feb. 15, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8b1395f1 by Tony Chemit at 2022-02-15T12:20:06+01:00 Ne pas renseigner Trip.logbookProgram lors de la migration v7 → v9 - Closes #2163 - - - - - 2 changed files: - core/persistence/resources/src/main/resources/db/migration/v9/9.0/01_2_adapt_program-H2.sql - core/persistence/resources/src/main/resources/db/migration/v9/9.0/01_2_adapt_program-PG.sql Changes: ===================================== core/persistence/resources/src/main/resources/db/migration/v9/9.0/01_2_adapt_program-H2.sql ===================================== @@ -25,8 +25,8 @@ ALTER TABLE ll_common.Trip ADD COLUMN logbookProgram VARCHAR(255); ALTER TABLE ps_common.Trip ADD COLUMN observationsProgram VARCHAR(255); ALTER TABLE ps_common.Trip ADD COLUMN logbookProgram VARCHAR(255); -UPDATE ll_common.Trip SET observationsProgram = REPLACE(program, '.common.', '.ll.common.'), logbookProgram = '${Program_LL_9}', topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}; -UPDATE ps_common.Trip SET observationsProgram = REPLACE(program, '.common.', '.ps.common.'), logbookProgram = '${Program_PS_9}', topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}; +UPDATE ll_common.Trip SET observationsProgram = REPLACE(program, '.common.', '.ll.common.'), topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}; +UPDATE ps_common.Trip SET observationsProgram = REPLACE(program, '.common.', '.ps.common.'), topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}; ALTER TABLE ll_common.Trip ADD CONSTRAINT fk_ll_common_Trip_observationsProgram FOREIGN KEY(observationsProgram) REFERENCES ll_common.Program; ALTER TABLE ll_common.Trip ADD CONSTRAINT fk_ll_common_Trip_logbookProgram FOREIGN KEY(logbookProgram) REFERENCES ll_common.Program; ===================================== core/persistence/resources/src/main/resources/db/migration/v9/9.0/01_2_adapt_program-PG.sql ===================================== @@ -25,8 +25,8 @@ ALTER TABLE ll_common.Trip ADD COLUMN logbookProgram VARCHAR(255); ALTER TABLE ps_common.Trip ADD COLUMN observationsProgram VARCHAR(255); ALTER TABLE ps_common.Trip ADD COLUMN logbookProgram VARCHAR(255); -UPDATE ll_common.Trip SET observationsProgram = REPLACE(program, '.common.', '.ll.common.'), logbookProgram = '${Program_LL_9}', topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}; -UPDATE ps_common.Trip SET observationsProgram = REPLACE(program, '.common.', '.ps.common.'), logbookProgram = '${Program_PS_9}', topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}; +UPDATE ll_common.Trip SET observationsProgram = REPLACE(program, '.common.', '.ll.common.'), topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}; +UPDATE ps_common.Trip SET observationsProgram = REPLACE(program, '.common.', '.ps.common.'), topiaVersion = topiaVersion + 1, lastUpdateDate = ${CURRENT_TIMESTAMP}; ALTER TABLE ll_common.Trip ADD CONSTRAINT fk_ll_common_Trip_observationsProgram FOREIGN KEY(observationsProgram) REFERENCES ll_common.Program; ALTER TABLE ll_common.Trip ADD CONSTRAINT fk_ll_common_Trip_logbookProgram FOREIGN KEY(logbookProgram) REFERENCES ll_common.Program; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8b1395f1296b1b16a7e39c04d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8b1395f1296b1b16a7e39c04d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: update pom
by Tony CHEMIT (＠tchemit) Feb. 15, 2022

Feb. 15, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9fe481cc by Tony Chemit at 2022-02-15T05:25:32+01:00 update pom Update toolkit - - - - - ba6e0abe by Tony Chemit at 2022-02-15T05:25:32+01:00 Improve DAO API - See ultreiaio/topia-extension#105 - - - - - b22d6eb2 by Tony Chemit at 2022-02-15T05:25:32+01:00 Remove dao operators - - - - - 17c59e20 by Tony Chemit at 2022-02-15T05:25:32+01:00 Ajouter dans les arbres une zone où afficher les statistiques sur la source de données - See #2161 - - - - - 30 changed files: - client/core/src/main/i18n/getters/java.getter - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/ObserveKeyStrokesActions.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/config/SelectDataUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePane.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePaneHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/ApplyNavigationConfiguration.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeModeExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTree.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTreeModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/ShowConfigure.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/select/SelectNodesByModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/select/SelectNodesByModelNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/selection/SelectionTreePane.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/selection/SelectionTreePane.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/selection/SelectionTreePaneHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/selection/actions/ShowConfigurePanel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/ShowInformation.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/selection/actions/ShowInformationPanel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/ToggleMenu.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/selection/actions/ToggleMenu.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/actions/Cancel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/SelectDataUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/RouteCloseCallback.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/ShowConfigure.java → core/persistence/java/src/main/java/fr/ird/observe/entities/AbstractObserveTopiaDao.java - model/src/main/models/Observe/persistence/00-common.model - pom.xml Changes: ===================================== client/core/src/main/i18n/getters/java.getter ===================================== @@ -165,6 +165,8 @@ observe.ui.datasource.storage.remote.useSll observe.ui.datasource.storage.remoteConfiguration.presets observe.ui.datasource.storage.remoteConfiguration.presets.save observe.ui.datasource.storage.server.dataBase +observe.ui.datasource.storage.server.dataBase.name +observe.ui.datasource.storage.server.default.dataBase observe.ui.datasource.storage.serverConfiguration.presets observe.ui.error.hide.error observe.ui.error.show.error ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java ===================================== @@ -48,6 +48,7 @@ import fr.ird.observe.dto.db.configuration.ObserveDataSourceConfigurationAndConn import fr.ird.observe.dto.db.configuration.ObserveDataSourceConfigurationAndConnectionDto; import fr.ird.observe.dto.db.configuration.ObserveDataSourceConnection; import fr.ird.observe.dto.db.configuration.ObserveDataSourceInformation; +import fr.ird.observe.dto.db.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.dto.db.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.dto.db.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.dto.reference.ReferentialDtoReference; @@ -93,6 +94,7 @@ import java.util.Date; import java.util.Iterator; import java.util.Map; import java.util.Objects; +import java.util.Optional; import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; @@ -645,4 +647,24 @@ public class ObserveSwingDataSource extends AbstractJavaBean implements ObserveS } } + public String getLabelWithUrl() { + String txt; + switch (getConfiguration().getConnectMode()) { + case LOCAL: + return getLabel(); + case SERVER: { + txt = getConfiguration().getUrl(); + ObserveDataSourceConfigurationRest configuration = (ObserveDataSourceConfigurationRest) getConfiguration(); + Optional<String> optionalDatabaseName = Optional.ofNullable(configuration.getDatabaseName()); + txt += " - " + t("observe.ui.datasource.storage.server.dataBase.name") + " " + (optionalDatabaseName.orElse(t("observe.ui.datasource.storage.server.default.dataBase"))); + } + break; + case REMOTE: + txt = getConfiguration().getUrl(); + break; + default: + throw new IllegalStateException(String.format("Can't have a such mode: %s", getConfiguration().getConnectMode())); + } + return String.format("%s (%s)", getLabel(), txt); + } } ===================================== client/datasource/actions/src/main/i18n/getters/java.getter ===================================== @@ -23,8 +23,6 @@ observe.ui.action.goto.next.stage observe.ui.action.goto.next.stage.tip observe.ui.action.goto.previous.stage observe.ui.action.goto.previous.stage.tip -observe.ui.action.info.configure -observe.ui.action.info.storage observe.ui.action.info.storage.tip observe.ui.choice.cancel observe.ui.choice.replace @@ -179,7 +177,6 @@ observe.ui.title.choose.db.dump.directory observe.ui.title.choose.reportFile observe.ui.title.storage.info observe.ui.tree.action.collapseAll.tip -observe.ui.tree.action.configure.tip observe.ui.tree.action.expandAll.tip observe.ui.tree.action.selectAll.tip observe.ui.tree.action.unselectAll.tip ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/ObserveKeyStrokesActions.java ===================================== @@ -34,17 +34,9 @@ import javax.swing.KeyStroke; */ public class ObserveKeyStrokesActions extends ObserveKeyStrokesEditorApi { - public static final KeyStroke KEY_STROKE_STORAGE_MENU_LEFT = KeyStroke.getKeyStroke("pressed F1"); - public static final KeyStroke KEY_STROKE_NAVIGATION_CONFIGURE_LEFT = KeyStroke.getKeyStroke("pressed F2"); - - public static final KeyStroke KEY_STROKE_STORAGE_MENU_RIGHT = KeyStroke.getKeyStroke("pressed F6"); - public static final KeyStroke KEY_STROKE_NAVIGATION_CONFIGURE_RIGHT = KeyStroke.getKeyStroke("pressed F7"); - - public static final KeyStroke KEY_STROKE_DATA_SYNCHRO_INFO_LEFT = KeyStroke.getKeyStroke("pressed F3"); public static final KeyStroke KEY_STROKE_DATA_SYNCHRO_COPY_LEFT = KeyStroke.getKeyStroke("pressed F4"); public static final KeyStroke KEY_STROKE_DATA_SYNCHRO_DELETE_LEFT = KeyStroke.getKeyStroke("pressed F5"); - public static final KeyStroke KEY_STROKE_DATA_SYNCHRO_INFO_RIGHT = KeyStroke.getKeyStroke("pressed F8"); public static final KeyStroke KEY_STROKE_DATA_SYNCHRO_COPY_RIGHT = KeyStroke.getKeyStroke("pressed F9"); public static final KeyStroke KEY_STROKE_DATA_SYNCHRO_DELETE_RIGHT = KeyStroke.getKeyStroke("pressed F10"); ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java ===================================== @@ -27,6 +27,8 @@ import fr.ird.observe.client.datasource.actions.AdminStep; import fr.ird.observe.client.datasource.actions.AdminUIModel; import fr.ird.observe.client.datasource.actions.validate.ValidateModel; import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; +import fr.ird.observe.client.datasource.editor.api.selection.SelectionTreePane; +import fr.ird.observe.client.datasource.editor.api.selection.SelectionTreePaneHandler; import fr.ird.observe.navigation.tree.selection.SelectionTreeConfig; import fr.ird.observe.navigation.tree.selection.SelectionTreeModel; import org.apache.logging.log4j.LogManager; @@ -102,7 +104,7 @@ public class SelectDataModel extends AdminActionModel { this.selectionDataModel = selectionDataModel; } - public boolean initSelectionModel(AdminUIModel uiModel, boolean init) { + public boolean initSelectionModel(SelectionTreePane selectTreePane, AdminUIModel uiModel, boolean init) { boolean selectAllData = true; boolean loadData = true; boolean loadReferential = true; @@ -162,7 +164,7 @@ public class SelectDataModel extends AdminActionModel { config.setLoadReferential(loadReferential); config.setUseOpenData(useOpenData); } - + SelectionTreePaneHandler.initDataSource(selectTreePane, dataSource); selectionDataModel.populate(dataSource.getNavigationService()::loadSelectionRoot); if (uiModel.containsOperation(AdminStep.EXPORT_DATA)) { ObserveSwingDataSource safeCentralSource = uiModel.getConfigModel().getRightSourceModel().getSafeSource(true); ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUIHandler.java ===================================== @@ -27,16 +27,14 @@ import fr.ird.observe.client.datasource.actions.AdminTabUIHandler; import fr.ird.observe.client.datasource.actions.AdminUIModel; import fr.ird.observe.client.datasource.editor.api.config.TreeConfigUI; import fr.ird.observe.client.datasource.editor.api.config.TreeConfigUIHandler; -import fr.ird.observe.client.datasource.editor.api.config.actions.ApplySelectionConfiguration; +import fr.ird.observe.client.datasource.editor.api.selection.SelectionTreePaneHandler; import fr.ird.observe.client.datasource.editor.api.selection.actions.SelectUnselect; -import fr.ird.observe.client.datasource.editor.api.selection.actions.ShowConfigurePanel; import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.navigation.tree.selection.SelectionTree; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.runtime.swing.SwingUtil; import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; -import javax.swing.JToggleButton; import javax.swing.SwingUtilities; import java.awt.GridBagConstraints; import java.awt.Insets; @@ -62,7 +60,7 @@ public class SelectDataUIHandler extends AdminTabUIHandler<SelectDataUI> impleme SelectionTree selectTree = ui.getSelectTreePane().getTree(); selectTree.clearSelection(); } - boolean isLocal = ui.getModel().getSelectDataModel().initSelectionModel(model, init); + boolean isLocal = ui.getModel().getSelectDataModel().initSelectionModel(ui.getSelectTreePane(),model, init); SelectionTree tree = ui.getSelectTreePane().getTree(); if (tree.getModel().isNotEmpty()) { tree.setSelectionRow(0); @@ -76,7 +74,7 @@ public class SelectDataUIHandler extends AdminTabUIHandler<SelectDataUI> impleme @Override public void registerActions(SelectDataUI ui) { SelectUnselect.installUI(ui.getSelectTreePane()); - Consumer<TreeConfigUI> consumer = u -> { + Consumer<TreeConfigUI> init = u -> { if (u.getBean().isLoadData()) { TreeConfigUIHandler.hideOptions(u); } else { @@ -85,10 +83,7 @@ public class SelectDataUIHandler extends AdminTabUIHandler<SelectDataUI> impleme } }; Consumer<TreeConfigUI> apply = u -> loadSelectData(ui); - JToggleButton showConfigure = ui.getSelectTreePane().getShowConfigure(); - showConfigure.putClientProperty(ShowConfigurePanel.UI_CONSUMER, consumer); - showConfigure.putClientProperty(ApplySelectionConfiguration.APPLY_CONSUMER, apply); - ShowConfigurePanel.init(ui.getSelectTreePane(), showConfigure, new ShowConfigurePanel()); + SelectionTreePaneHandler.init(ui.getSelectTreePane(), init, apply); } @Override ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePane.jaxx ===================================== @@ -17,12 +17,12 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<org.jdesktop.swingx.JXTitledPanel id='topPanel' contentContainer='{tree}' leftDecoration='{dataSourceToolbar}'> -  - <import> - fr.ird.observe.client.datasource.editor.api.selection.SelectionTreePane - </import> - <script><![CDATA[ +<JPanel id='topPanel' layout="{new BorderLayout()}"> + <import> + fr.ird.observe.client.datasource.editor.api.selection.SelectionTreePane + </import> + <script><![CDATA[ + public boolean isLeft() { return !isRight(); } @@ -30,20 +30,11 @@ public boolean isRight() { return Boolean.TRUE.equals(getOpposite()); } ]]> - </script> - <Boolean id='opposite' initializer='getContextValue(Boolean.class)'/> - <JPopupMenu id='menuPopup'> - <JMenuItem id='showConfigure'/> - <JMenuItem id='showInformation'/> - </JPopupMenu> - <JToolBar id='dataSourceToolbar'> - <JToggleButton id='toggleMenu'/> - <JLabel id="label"/> - </JToolBar> - <SelectionTreePane id='tree' constructorParams="isRight()"/> - <JToolBar id="middleActions"> - <JButton id="copy" enabled="false"/> - <JButton id="delete" enabled="false"/> - </JToolBar> - -</org.jdesktop.swingx.JXTitledPanel> + </script> + <Boolean id='opposite' initializer='getContextValue(Boolean.class)'/> + <JToolBar id="toolbar"> + <JButton id="copy" enabled="false"/> + <JButton id="delete" enabled="false"/> + </JToolBar> + <SelectionTreePane id='tree' constructorParams="isRight()" constraints='BorderLayout.CENTER'/> +</JPanel> ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePaneHandler.java ===================================== @@ -30,9 +30,8 @@ import fr.ird.observe.client.datasource.actions.synchronize.data.tree.actions.Re import fr.ird.observe.client.datasource.api.data.TaskSide; import fr.ird.observe.client.datasource.editor.api.config.TreeConfigUI; import fr.ird.observe.client.datasource.editor.api.config.TreeConfigUIHandler; -import fr.ird.observe.client.datasource.editor.api.config.actions.ApplySelectionConfiguration; import fr.ird.observe.client.datasource.editor.api.selection.SelectionTreePane; -import fr.ird.observe.client.datasource.editor.api.selection.actions.ShowConfigurePanel; +import fr.ird.observe.client.datasource.editor.api.selection.SelectionTreePaneHandler; import fr.ird.observe.client.datasource.editor.api.wizard.connexion.DataSourceSelectorModel; import fr.ird.observe.client.util.init.UIInitHelper; import fr.ird.observe.navigation.tree.selection.SelectionTree; @@ -88,13 +87,14 @@ public class DataSelectionTreePaneHandler implements UIHandler<DataSelectionTree ui.getDelete().setEnabled(canWriteData); ui.getCopy().setEnabled(oppositeCanWriteData); - - String label = sourceModel.getLabel(); - String labelWithUrl = sourceModel.getLabelWithUrl().substring(label.length() + 1); - JLabel dataSourceInformation = ui.getLabel(); - dataSourceInformation.setIcon(sourceModel.getSource().getIcon()); - dataSourceInformation.setText(sourceModel.getSource().getLabel() + " " + labelWithUrl); + SelectionTreePaneHandler.initDataSource(ui.getTree(), sourceModel.getSource()); +// String label = sourceModel.getLabel(); +// String labelWithUrl = sourceModel.getLabelWithUrl().substring(label.length() + 1); + JLabel dataSourceInformation = ui.getTree().getLabel(); +// dataSourceInformation.setIcon(sourceModel.getSource().getIcon()); +// dataSourceInformation.setText(sourceModel.getSource().getLabel() + " " + labelWithUrl); dataSourceInformation.setForeground(color); +// ui.putClientProperty("$$Label", dataSourceInformation); } public static void init(DataSelectionTreePane ui) { @@ -108,7 +108,8 @@ public class DataSelectionTreePaneHandler implements UIHandler<DataSelectionTree DataSynchroUI parent = ui.getContextValue(DataSynchroUI.class, AdminTabUIHandler.ADMIN_TAB_UI); DataSynchroModel stepModel = parent.getStepModel(); SelectionTreeModel treeModel = tree.getModel(); - treePane.getRightToolbar().remove(treePane.getShowConfigure()); +// ui.setLeftDecoration(treePane.getRightToolbar()); +// treePane.getRightToolbar().remove(treePane.getShowConfigure()); treePane.getCollapseAll().setText(null); treePane.getExpandAll().setText(null); treePane.getSelectAll().setText(null); @@ -119,8 +120,8 @@ public class DataSelectionTreePaneHandler implements UIHandler<DataSelectionTree Consumer<TreeConfigUI> consumer = TreeConfigUIHandler::hideOptions; Consumer<TreeConfigUI> apply = u -> initPanel(parent, ui); - ui.getShowConfigure().putClientProperty(ShowConfigurePanel.UI_CONSUMER, consumer); - ui.getShowConfigure().putClientProperty(ApplySelectionConfiguration.APPLY_CONSUMER, apply); + SelectionTreePaneHandler.init(treePane, consumer, apply); + if (isLeft) { stepModel.setLeftSelectionDataModel(treeModel); } else { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java ===================================== @@ -155,12 +155,14 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit public void loadNavigationUI(ProgressionModel progressModel, NavigationNode previousNode) { NavigationUI navigationUI = ui.getNavigationUI(); NavigationTree tree = navigationUI.getTree(); + // need to keep paths now, after populate previous node may be altered + String[] previousPaths = previousNode == null ? null : previousNode.toPaths(); tree.populate(null); progressModel.increments(); // select initial node if (previousNode != null) { try { - tree.reselectInitialNode(previousNode); + tree.reselectInitialNode(previousPaths); } catch (Exception e) { log.error("Could not load previous node", e); previousNode = null; ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java ===================================== @@ -34,14 +34,24 @@ import javax.swing.KeyStroke; */ public class ObserveKeyStrokesEditorApi extends ObserveKeyStrokesSupport { - //FIXME Let's design a nice new API to register KeyStroke (a new annotation, processed to generate KeyStroke ressource) + //FIXME Let's design a nice new API to register KeyStroke (a new annotation, processed to generate KeyStroke resources) // Navigation public static final KeyStroke KEY_STROKE_MAP_CONFIGURE = KeyStroke.getKeyStroke("alt pressed F2"); public static final KeyStroke KEY_STROKE_NAVIGATION_CONFIGURE = KeyStroke.getKeyStroke("pressed F12"); - public static final KeyStroke KEY_STROKE_NAVIGATION_CONFIGURE_LEFT = KeyStroke.getKeyStroke("pressed F1"); - public static final KeyStroke KEY_STROKE_NAVIGATION_CONFIGURE_RIGHT = KeyStroke.getKeyStroke("pressed F10"); +// public static final KeyStroke KEY_STROKE_NAVIGATION_CONFIGURE_LEFT = KeyStroke.getKeyStroke("pressed F1"); +// public static final KeyStroke KEY_STROKE_NAVIGATION_CONFIGURE_RIGHT = KeyStroke.getKeyStroke("pressed F10"); + + + public static final KeyStroke KEY_STROKE_STORAGE_MENU_LEFT = KeyStroke.getKeyStroke("pressed F1"); + public static final KeyStroke KEY_STROKE_STORAGE_MENU_RIGHT = KeyStroke.getKeyStroke("pressed F6"); + + public static final KeyStroke KEY_STROKE_NAVIGATION_CONFIGURE_LEFT = KeyStroke.getKeyStroke("pressed F2"); + public static final KeyStroke KEY_STROKE_NAVIGATION_CONFIGURE_RIGHT = KeyStroke.getKeyStroke("pressed F7"); + + public static final KeyStroke KEY_STROKE_DATA_SYNCHRO_INFO_LEFT = KeyStroke.getKeyStroke("pressed F3"); + public static final KeyStroke KEY_STROKE_DATA_SYNCHRO_INFO_RIGHT = KeyStroke.getKeyStroke("pressed F8"); public static final KeyStroke KEY_STROKE_TOGGLE_LEGEND = KeyStroke.getKeyStroke("pressed F11"); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUIHandler.java ===================================== @@ -91,8 +91,7 @@ public class TreeConfigUIHandler implements UIHandler<TreeConfigUI>, PropertyCha } public static void showPanel(JComponent editor, TreeConfigUI configUI) { - JPopupMenu popup = editor.getComponentPopupMenu(); - configUI.setComponentPopupMenu(popup); + JPopupMenu popup = Objects.requireNonNull(configUI.getComponentPopupMenu()); Dimension preferredSize = configUI.getPreferredSize(); popup.setMinimumSize(preferredSize); popup.removeAll(); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/ApplyNavigationConfiguration.java ===================================== @@ -86,10 +86,11 @@ public class ApplyNavigationConfiguration extends ApplyConfigurationSupport { protected void applyConsumer(TreeConfigUI ui) { NavigationTree tree = tree(ui); NavigationNode selectedNode = selectedNode(ui); + String[] paths = selectedNode.toPaths(); try { tree.populate(null); } finally { - SwingUtilities.invokeLater(() -> tree.reselectInitialNode(selectedNode)); + SwingUtilities.invokeLater(() -> tree.reselectInitialNode(paths)); } } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeModeExecutor.java ===================================== @@ -77,7 +77,7 @@ public class ChangeModeExecutor<U extends ContentUI> { String id = request.getSelectedId(ui, selectedNode); log.info(String.format("Will open: %s → (select: %s - edit: %s)", id, selectedNode, editNode)); NavigationTree tree = dataSourceEditor.getNavigationUI().getTree(); - NavigationNode previousOpenedNode = editNode.isEnabled() ? tree.getModel().getNodeFromModelNode(editNode, false) : null; + NavigationNode previousOpenedNode = editNode.isEnabled() ? tree.getModel().getNodeFromModelNode(editNode) : null; ChangeMode.openData(ui.getHandler(), editNode, selectedNode, id); afterOpen(ui, dataSourceEditor, previousOpenedNode, id); } catch (CloseNodeVetoException e1) { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTree.java ===================================== @@ -203,7 +203,7 @@ public class NavigationTree extends JXTree implements WithClientUIContextApi { * @param editNode the node to select */ public void selectNode(IdNode<?> editNode) { - NavigationNode node = getModel().getNodeFromModelNode(editNode, false); + NavigationNode node = getModel().getNodeFromModelNode(editNode); selectNode(node); } @@ -222,10 +222,8 @@ public class NavigationTree extends JXTree implements WithClientUIContextApi { /** * Select initial node when data source just opened. */ - public void reselectInitialNode(NavigationNode selectedNode) { - //FIXME If on data Find out new groupBy value, go to this node, then do normal search - //FIXME Otherwise tree will be loaded until matching groupBy value is found - NavigationNode node = getModel().getNodeFromPath(selectedNode.toPaths(), true); + public void reselectInitialNode(String[] paths) { + NavigationNode node = getModel().getNodeFromPath(paths, true); if (node == null) { selectInitialNode(); } else { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTreeModel.java ===================================== @@ -131,8 +131,8 @@ public class NavigationTreeModel extends DefaultTreeModel implements WithClientU return node.orElse(null); } - public NavigationNode getNodeFromModelNode(IdNode<?> model, boolean checkGroupBy) { - Optional<NavigationNode> node = new SelectNodesByModelNode(model, checkGroupBy).apply(getRoot()); + public NavigationNode getNodeFromModelNode(IdNode<?> model) { + Optional<NavigationNode> node = new SelectNodesByModelNode(model).apply(getRoot()); return node.orElse(null); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/ShowConfigure.java ===================================== @@ -59,6 +59,7 @@ public class ShowConfigure extends MenuActionSupport { ui.getTree().getModel().getGroupByHelper(), new ApplyNavigationConfiguration(), ui.getTree()); + configUI.setComponentPopupMenu(ui.getComponentPopupMenu()); TreeConfigUIHandler.showPanel(ui, configUI); }); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/select/SelectNodesByModel.java ===================================== @@ -55,7 +55,7 @@ public class SelectNodesByModel implements SelectNodeStrategy { // get all ids from model List<IdNode<?>> nodesWithIds = model.getNodesWithIds(); IdNode<?> modelNodeToFind = nodesWithIds.get(nodesWithIds.size() - 1); - result = SelectNodesByModelNode.findNode(rootNode, modelNodeToFind, checkGroupBy); + result = SelectNodesByModelNode.findNode(rootNode, modelNodeToFind); } return Optional.ofNullable(result); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/select/SelectNodesByModelNode.java ===================================== @@ -43,21 +43,17 @@ import java.util.Optional; public class SelectNodesByModelNode implements SelectNodeStrategy { private final IdNode<?> model; - private final boolean checkGroupBy; - public static NavigationNode findNode(RootNavigationNode rootNode, IdNode<?> editNode, boolean checkGroupBy) { - if (checkGroupBy) { - // get root edit node - IdNode<?> root = editNode.getRoot(); - String groupByValue = rootNode.computeGroupByValue(root.getId()); - NavigationNode groupByNode = rootNode.findChildById(groupByValue); - if (root.equals(editNode)) { - return groupByNode; - } - // start normal search from groupBy node - return findNode(groupByNode, editNode); + public static NavigationNode findNode(RootNavigationNode rootNode, IdNode<?> editNode) { + // get root edit node + IdNode<?> root = editNode.getRoot(); + String groupByValue = rootNode.computeGroupByValue(root.getId()); + NavigationNode groupByNode = rootNode.findChildById(groupByValue); + if (root.equals(editNode)) { + return groupByNode; } - return findNode(rootNode, editNode); + // start normal search from groupBy node + return findNode(groupByNode, editNode); } public static NavigationNode findNode(NavigationNode source, IdNode<?> editNode) { @@ -99,16 +95,15 @@ public class SelectNodesByModelNode implements SelectNodeStrategy { return null; } - public SelectNodesByModelNode(IdNode<?> model, boolean checkGroupBy) { + public SelectNodesByModelNode(IdNode<?> model) { this.model = model; - this.checkGroupBy = checkGroupBy; } @Override public Optional<NavigationNode> apply(RootNavigationNode rootNode) { NavigationNode result = null; if (model.isEnabled()) { - result = findNode(rootNode, model, checkGroupBy); + result = findNode(rootNode, model); } return Optional.ofNullable(result); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/selection/SelectionTreePane.jaxx ===================================== @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JScrollPane id='treePane' columnHeaderView='{treeHeader}' viewportView="{tree}"> +<org.jdesktop.swingx.JXTitledPanel id='topPanel' contentContainer='{rootTreePane}' leftDecoration="{rightToolbar}" rightDecoration="{toolbar}" > <import> fr.ird.observe.client.util.UIHelper fr.ird.observe.navigation.tree.selection.SelectionTree @@ -37,19 +37,29 @@ public SelectionTreePane(boolean opposite) { public boolean isOpposite() { return opposite; } ]]> </script> + <JPopupMenu id='menuPopup'> + <JMenuItem id='showConfigure'/> + <JMenuItem id='showInformation'/> + </JPopupMenu> <String id='labelText' javaBean='null'/> - <SelectionTree id='tree'/> - <JPanel id="treeHeader" layout='{new BorderLayout()}'> - <JToolBar id='rightToolbar' constraints='BorderLayout.CENTER'> - <JToggleButton id='showConfigure'/> - <JSeparator/> - <JLabel id="label"/> - </JToolBar> - <JToolBar id='toolbar' constraints='BorderLayout.EAST'> - <JButton id='collapseAll'/> - <JButton id='expandAll'/> - <JButton id='selectAll'/> - <JButton id='unselectAll'/> - </JToolBar> + <JToolBar id='rightToolbar'> + <JToggleButton id='toggleMenu'/> + <JSeparator orientation='{JSeparator.VERTICAL}'/> + <JLabel id="label"/> + </JToolBar> + <JToolBar id='toolbar'> + <JSeparator orientation='{JSeparator.VERTICAL}'/> + <JButton id='collapseAll'/> + <JButton id='expandAll'/> + <JButton id='selectAll'/> + <JButton id='unselectAll'/> + </JToolBar> + <JPanel id="rootTreePane" layout="{new BorderLayout()}"> + <JScrollPane id='treePane' viewportView="{tree}" constraints='BorderLayout.CENTER'> + <SelectionTree id='tree'/> + </JScrollPane> + <JPanel id="statusPanel" constraints='BorderLayout.SOUTH'> + <JLabel id="statusLabel"/> + </JPanel> </JPanel> -</JScrollPane> +</org.jdesktop.swingx.JXTitledPanel> \ No newline at end of file ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/selection/SelectionTreePane.jcss ===================================== @@ -24,11 +24,15 @@ font-size:11; } +#toggleMenu { + inheritsPopupMenu:true; +} + #treePane { verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}; } -#label { +#statusLabel { text:{getLabelText()}; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/selection/SelectionTreePaneHandler.java ===================================== @@ -22,14 +22,23 @@ package fr.ird.observe.client.datasource.editor.api.selection; * #L% */ +import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; +import fr.ird.observe.client.datasource.api.ObserveSwingDataSourceTemplate; +import fr.ird.observe.client.datasource.editor.api.config.TreeConfigUI; +import fr.ird.observe.client.datasource.editor.api.config.actions.ApplySelectionConfiguration; +import fr.ird.observe.client.datasource.editor.api.selection.actions.ShowConfigurePanel; +import fr.ird.observe.client.datasource.editor.api.selection.actions.ShowInformationPanel; import fr.ird.observe.client.util.init.UIInitHelper; import fr.ird.observe.navigation.tree.selection.SelectionTree; import fr.ird.observe.navigation.tree.selection.SelectionTreeModel; import org.nuiton.jaxx.runtime.spi.UIHandler; +import javax.swing.JLabel; +import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.util.function.Consumer; import static io.ultreia.java4all.i18n.I18n.t; @@ -40,6 +49,21 @@ import static io.ultreia.java4all.i18n.I18n.t; public class SelectionTreePaneHandler implements UIHandler<SelectionTreePane>, PropertyChangeListener { private SelectionTreePane ui; + public static void init(SelectionTreePane ui, Consumer<TreeConfigUI> consumer, Consumer<TreeConfigUI> apply) { + JMenuItem showConfigure = ui.getShowConfigure(); + showConfigure.putClientProperty(ShowConfigurePanel.UI_CONSUMER, consumer); + showConfigure.putClientProperty(ApplySelectionConfiguration.APPLY_CONSUMER, apply); + ShowConfigurePanel.init(ui, showConfigure, new ShowConfigurePanel()); + } + + public static void initDataSource(SelectionTreePane ui, ObserveSwingDataSource dataSource) { + String labelWithUrl = dataSource.getLabelWithUrl(); + JLabel dataSourceInformation = ui.getLabel(); + dataSourceInformation.setIcon(dataSource.getIcon()); + dataSourceInformation.setText(labelWithUrl); + ShowInformationPanel.init(ui, ui.getShowInformation(), new ShowInformationPanel(() -> ObserveSwingDataSourceTemplate.generate(dataSource))); + } + @Override public void beforeInit(SelectionTreePane ui) { this.ui = ui; @@ -49,7 +73,7 @@ public class SelectionTreePaneHandler implements UIHandler<SelectionTreePane>, P @Override public void afterInit(SelectionTreePane ui) { SelectionTree tree = ui.getTree(); - UIInitHelper.init(ui); + UIInitHelper.init(ui.getTreePane()); UIInitHelper.init(tree); tree.getModel().addPropertyChangeListener(SelectionTreeModel.SELECTED_COUNT, this); onSelectedCountChanged(tree.getModel().getSelectedCount()); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/selection/actions/ShowConfigurePanel.java ===================================== @@ -28,16 +28,15 @@ import fr.ird.observe.client.datasource.editor.api.config.TreeConfigUIHandler; import fr.ird.observe.client.datasource.editor.api.config.actions.ApplySelectionConfiguration; import fr.ird.observe.client.datasource.editor.api.navigation.actions.MenuActionSupport; import fr.ird.observe.client.datasource.editor.api.selection.SelectionTreePane; -import fr.ird.observe.client.util.UIHelper; import javax.swing.AbstractButton; import javax.swing.JComponent; -import javax.swing.JToggleButton; import javax.swing.SwingUtilities; import java.awt.event.ActionEvent; import java.util.function.Consumer; import static io.ultreia.java4all.i18n.I18n.n; +import static io.ultreia.java4all.i18n.I18n.t; /** * Created by tchemit on 03/10/2018. @@ -60,24 +59,24 @@ public class ShowConfigurePanel extends SelectionTreePaneActionSupport { if (uiConsumer != null) { uiConsumer.accept(configUI); } - TreeConfigUIHandler.showPanel(viewPort, configUI); + configUI.setComponentPopupMenu(ui.getComponentPopupMenu()); + TreeConfigUIHandler.showPanel(ui.getTree(), configUI); }); } public ShowConfigurePanel() { - super(""/*t("observe.ui.action.info.configure")*/, n("observe.ui.tree.action.configure.tip"), UIHelper.getContentActionIconKey("menu")/*UIHelper.getContentActionIconKey("configure")*/, ObserveKeyStrokesEditorApi.KEY_STROKE_NAVIGATION_CONFIGURE_LEFT, ObserveKeyStrokesEditorApi.KEY_STROKE_NAVIGATION_CONFIGURE_RIGHT); + super(t("observe.ui.action.info.configure"), n("observe.ui.tree.action.configure.tip"), "generate"/*UIHelper.getContentActionIconKey("configure")*/, ObserveKeyStrokesEditorApi.KEY_STROKE_NAVIGATION_CONFIGURE_LEFT, ObserveKeyStrokesEditorApi.KEY_STROKE_NAVIGATION_CONFIGURE_RIGHT); setCheckMenuItemIsArmed(false); } @Override public void init() { super.init(); - MenuActionSupport.toggle((JToggleButton) editor, ui.getComponentPopupMenu()); + MenuActionSupport.toggle(ui.getToggleMenu(), ui.getComponentPopupMenu()); } @Override protected void doActionPerformed(ActionEvent e, SelectionTreePane ui) { - showConfig(ui, editor, ui.getViewport()); + showConfig(ui, editor, ui.getToggleMenu()); } - } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/ShowInformation.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/selection/actions/ShowInformationPanel.java ===================================== @@ -1,8 +1,8 @@ -package fr.ird.observe.client.datasource.actions.synchronize.data.tree.actions; +package fr.ird.observe.client.datasource.editor.api.selection.actions; /*- * #%L - * ObServe Client :: DataSource :: Actions + * ObServe Client :: DataSource :: Editor :: API * %% * Copyright (C) 2008 - 2022 IRD, Code Lutin, Ultreia.io * %% @@ -22,11 +22,9 @@ package fr.ird.observe.client.datasource.actions.synchronize.data.tree.actions; * #L% */ -import fr.ird.observe.client.datasource.actions.ObserveKeyStrokesActions; -import fr.ird.observe.client.datasource.actions.synchronize.data.tree.DataSelectionTreePane; -import fr.ird.observe.client.datasource.api.ObserveSwingDataSourceTemplate; +import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi; import fr.ird.observe.client.datasource.editor.api.navigation.actions.MenuActionSupport; -import fr.ird.observe.client.datasource.editor.api.wizard.connexion.DataSourceSelectorModel; +import fr.ird.observe.client.datasource.editor.api.selection.SelectionTreePane; import javax.swing.JLabel; import javax.swing.JPanel; @@ -34,6 +32,7 @@ import javax.swing.JPopupMenu; import javax.swing.border.TitledBorder; import java.awt.BorderLayout; import java.awt.event.ActionEvent; +import java.util.function.Supplier; import static io.ultreia.java4all.i18n.I18n.t; @@ -41,10 +40,13 @@ import static io.ultreia.java4all.i18n.I18n.t; * @author Tony Chemit - dev(a)tchemit.fr * @since 8.0 */ -public class ShowInformation extends DataSelectionTreePaneActionSupport { +public class ShowInformationPanel extends SelectionTreePaneActionSupport { - public ShowInformation() { - super(t("observe.ui.action.info.storage"), t("observe.ui.action.info.storage.tip"), "information", ObserveKeyStrokesActions.KEY_STROKE_DATA_SYNCHRO_INFO_LEFT, ObserveKeyStrokesActions.KEY_STROKE_DATA_SYNCHRO_INFO_RIGHT); + private final Supplier<String> informationTextSupplier; + + public ShowInformationPanel(Supplier<String> informationTextSupplier) { + super(t("observe.ui.action.info.storage"), t("observe.ui.action.info.storage.tip"), "information", ObserveKeyStrokesEditorApi.KEY_STROKE_DATA_SYNCHRO_INFO_LEFT, ObserveKeyStrokesEditorApi.KEY_STROKE_DATA_SYNCHRO_INFO_RIGHT); + this.informationTextSupplier = informationTextSupplier; setCheckMenuItemIsArmed(false); } @@ -55,25 +57,19 @@ public class ShowInformation extends DataSelectionTreePaneActionSupport { } @Override - protected void doActionPerformed(ActionEvent e, DataSelectionTreePane ui) { - editor.setSelected(true); - try { - DataSourceSelectorModel dataSourceSelectorModel = ui.getContextValue(DataSourceSelectorModel.class); - String text = ObserveSwingDataSourceTemplate.generate(dataSourceSelectorModel.getSource()); - JPanel content = new JPanel(new BorderLayout()); - content.add(new JLabel(text), BorderLayout.CENTER); - String title = t("observe.ui.title.storage.info"); - content.setBorder(new TitledBorder(title + " ")); - JPopupMenu popup = ui.getComponentPopupMenu(); - popup.removeAll(); - popup.add(content); - content.setBorder(new TitledBorder(title + " ")); - popup.removeAll(); - popup.add(content); - popup.pack(); - popup.show(ui.getTree(), 0, 0); - } finally { - editor.setSelected(false); - } + protected void doActionPerformed(ActionEvent e, SelectionTreePane ui) { + String text = informationTextSupplier.get(); + JPanel content = new JPanel(new BorderLayout()); + content.add(new JLabel(text), BorderLayout.CENTER); + String title = t("observe.ui.title.storage.info"); + content.setBorder(new TitledBorder(title + " ")); + JPopupMenu popup = ui.getComponentPopupMenu(); + popup.removeAll(); + popup.add(content); + content.setBorder(new TitledBorder(title + " ")); + popup.removeAll(); + popup.add(content); + popup.pack(); + popup.show(ui.getTree(), 0, 0); } } ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/ToggleMenu.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/selection/actions/ToggleMenu.java ===================================== @@ -1,4 +1,4 @@ -package fr.ird.observe.client.datasource.actions.synchronize.data.tree.actions; +package fr.ird.observe.client.datasource.editor.api.selection.actions; /*- * #%L @@ -22,9 +22,9 @@ package fr.ird.observe.client.datasource.actions.synchronize.data.tree.actions; * #L% */ -import fr.ird.observe.client.datasource.actions.ObserveKeyStrokesActions; -import fr.ird.observe.client.datasource.actions.synchronize.data.tree.DataSelectionTreePane; +import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi; import fr.ird.observe.client.datasource.editor.api.navigation.actions.MenuActionSupport; +import fr.ird.observe.client.datasource.editor.api.selection.SelectionTreePane; import fr.ird.observe.client.util.UIHelper; import org.nuiton.jaxx.runtime.swing.action.MenuAction; @@ -37,10 +37,10 @@ import java.awt.event.ActionEvent; * @author Tony Chemit - dev(a)tchemit.fr * @since 8 */ -public class ToggleMenu extends DataSelectionTreePaneActionSupport { +public class ToggleMenu extends SelectionTreePaneActionSupport { public ToggleMenu() { - super("", "", UIHelper.getContentActionIconKey("menu"), ObserveKeyStrokesActions.KEY_STROKE_STORAGE_MENU_LEFT, ObserveKeyStrokesActions.KEY_STROKE_STORAGE_MENU_RIGHT); + super("", "", UIHelper.getContentActionIconKey("menu"), ObserveKeyStrokesEditorApi.KEY_STROKE_STORAGE_MENU_LEFT, ObserveKeyStrokesEditorApi.KEY_STROKE_STORAGE_MENU_RIGHT); } @Override @@ -50,7 +50,7 @@ public class ToggleMenu extends DataSelectionTreePaneActionSupport { } @Override - protected void doActionPerformed(ActionEvent e, DataSelectionTreePane ui) { + protected void doActionPerformed(ActionEvent e, SelectionTreePane ui) { SwingUtilities.invokeLater(() -> { JPopupMenu p = ui.getMenuPopup(); p.show(ui.getTree(), 0, 0); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/actions/Cancel.java ===================================== @@ -38,7 +38,7 @@ public class Cancel extends StorageUIActionSupport { private static final Logger log = LogManager.getLogger(Cancel.class); public Cancel() { - super(t("observe.ui.action.cancel"), t("observe.ui.datasource.storage.action.cancel.tip"), "cancel", ObserveKeyStrokesEditorApi.KEY_STROKE_ESCAPE); + super(t("observe.ui.action.cancel"), t("observe.ui.datasource.storage.action.cancel.tip"), "cancel", ObserveKeyStrokesEditorApi.KEY_STROKE_CANCEL); } @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/SelectDataUIHandler.java ===================================== @@ -26,9 +26,8 @@ import fr.ird.observe.client.WithClientUIContextApi; import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.datasource.editor.api.config.TreeConfigUI; import fr.ird.observe.client.datasource.editor.api.config.TreeConfigUIHandler; -import fr.ird.observe.client.datasource.editor.api.config.actions.ApplySelectionConfiguration; +import fr.ird.observe.client.datasource.editor.api.selection.SelectionTreePaneHandler; import fr.ird.observe.client.datasource.editor.api.selection.actions.SelectUnselect; -import fr.ird.observe.client.datasource.editor.api.selection.actions.ShowConfigurePanel; import fr.ird.observe.client.datasource.editor.api.wizard.DataSourceHelper; import fr.ird.observe.client.datasource.editor.api.wizard.ObstunaAdminAction; import fr.ird.observe.client.datasource.editor.api.wizard.StorageUIModel; @@ -39,7 +38,6 @@ import fr.ird.observe.navigation.tree.selection.SelectionTreeConfig; import fr.ird.observe.navigation.tree.selection.SelectionTreeModel; import org.nuiton.jaxx.runtime.spi.UIHandler; -import javax.swing.JToggleButton; import javax.swing.SwingUtilities; import java.util.List; import java.util.function.Consumer; @@ -72,6 +70,7 @@ public class SelectDataUIHandler extends StorageTabUIHandler<SelectDataUI> imple if (createDataSource) { // create temporary data source try (ObserveSwingDataSource dataSource = DataSourceHelper.toImportDataSourceConfig(model)) { + SelectionTreePaneHandler.initDataSource(ui.getSelectedTreePane(), dataSource); dataSource.open(); if (init) { doInit(treeModel.getConfig(), dataSource); @@ -81,6 +80,7 @@ public class SelectDataUIHandler extends StorageTabUIHandler<SelectDataUI> imple } else { // use main data source ObserveSwingDataSource dataSource = context.getDataSourcesManager().getMainDataSource(); + SelectionTreePaneHandler.initDataSource(ui.getSelectedTreePane(), dataSource); if (init) { doInit(treeModel.getConfig(), dataSource); } @@ -125,10 +125,7 @@ public class SelectDataUIHandler extends StorageTabUIHandler<SelectDataUI> imple SelectUnselect.installUI(ui.getSelectedTreePane()); Consumer<TreeConfigUI> consumer = TreeConfigUIHandler::hideOptions; Consumer<TreeConfigUI> apply = u -> loadSelectData(this, ui); - JToggleButton showConfigure = ui.getSelectedTreePane().getShowConfigure(); - showConfigure.putClientProperty(ShowConfigurePanel.UI_CONSUMER, consumer); - showConfigure.putClientProperty(ApplySelectionConfiguration.APPLY_CONSUMER, apply); - ShowConfigurePanel.init(ui.getSelectedTreePane(), showConfigure, new ShowConfigurePanel()); + SelectionTreePaneHandler.init(ui.getSelectedTreePane(), consumer, apply); } @Override ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/RouteCloseCallback.java ===================================== @@ -132,7 +132,7 @@ public class RouteCloseCallback implements CloseNodeCallback, WithClientUIContex DataSourceEditor dataSourceEditor = (DataSourceEditor) getMainUI().getMainUIBodyContentManager().getCurrentBody().get(); NavigationTree tree = dataSourceEditor.getNavigationUI().getTree(); - RouteUINavigationNode routeNode = (RouteUINavigationNode) tree.getModel().getNodeFromModelNode(node, false); + RouteUINavigationNode routeNode = (RouteUINavigationNode) tree.getModel().getNodeFromModelNode(node); ActivityListUINavigationNode parentNode = Objects.requireNonNull(routeNode).getActivityListUINavigationNode(); tree.selectSafeNode(parentNode); ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/ShowConfigure.java → core/persistence/java/src/main/java/fr/ird/observe/entities/AbstractObserveTopiaDao.java ===================================== @@ -1,8 +1,8 @@ -package fr.ird.observe.client.datasource.actions.synchronize.data.tree.actions; +package fr.ird.observe.entities; /*- * #%L - * ObServe Client :: DataSource :: Actions + * ObServe Core :: Persistence :: Java * %% * Copyright (C) 2008 - 2022 IRD, Code Lutin, Ultreia.io * %% @@ -22,35 +22,5 @@ package fr.ird.observe.client.datasource.actions.synchronize.data.tree.actions; * #L% */ -import fr.ird.observe.client.datasource.actions.ObserveKeyStrokesActions; -import fr.ird.observe.client.datasource.actions.synchronize.data.tree.DataSelectionTreePane; -import fr.ird.observe.client.datasource.editor.api.navigation.actions.MenuActionSupport; -import fr.ird.observe.client.datasource.editor.api.selection.actions.ShowConfigurePanel; - -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.0 - */ -public class ShowConfigure extends DataSelectionTreePaneActionSupport { - - public ShowConfigure() { - super(t("observe.ui.action.info.configure"), n("observe.ui.tree.action.configure.tip"), "generate"/*UIHelper.getContentActionIconKey("configure")*/, ObserveKeyStrokesActions.KEY_STROKE_NAVIGATION_CONFIGURE_LEFT, ObserveKeyStrokesActions.KEY_STROKE_NAVIGATION_CONFIGURE_RIGHT); - setCheckMenuItemIsArmed(false); - } - - @Override - public void init() { - super.init(); - MenuActionSupport.toggle(ui.getToggleMenu(), ui.getComponentPopupMenu()); - } - - @Override - protected void doActionPerformed(ActionEvent e, DataSelectionTreePane ui) { - ShowConfigurePanel.showConfig(ui.getTree(), editor, ui.getTree()); - } +public abstract class AbstractObserveTopiaDao<E extends Entity> extends ToolkitTopiaDaoSupport<E> { } ===================================== model/src/main/models/Observe/persistence/00-common.model ===================================== @@ -1,7 +1,6 @@ model @model.name@ | generatePropertyChangeSupport model @model.name@ | generateForeignKeyNames model @model.name@ | notGenerateToString -model @model.name@ | generateOperatorForDAOHelper model @model.name@ | indexForeignKeys model @model.name@ | useEnumerationName=false model @model.name@ | attributeType.Boolean=java.lang.Boolean ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2022.20</version> + <version>2022.21</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -155,7 +155,7 @@  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <lib.version.toolkit>6.0.0-SNAPSHOT</lib.version.toolkit> + <lib.version.toolkit>6.0.1</lib.version.toolkit> <lib.version.ognl>3.1.29</lib.version.ognl>  <lib.version.h2>1.4.196</lib.version.h2> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d667076f269bf5afb5c58943… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d667076f269bf5afb5c58943… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update toolkit
by Tony CHEMIT (＠tchemit) Feb. 14, 2022

Feb. 14, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d667076f by Tony Chemit at 2022-02-14T17:10:53+01:00 Update toolkit - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -155,7 +155,7 @@  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <lib.version.toolkit>6.0.0-SNAPSHOT</lib.version.toolkit> + <lib.version.toolkit>6.0.0</lib.version.toolkit> <lib.version.ognl>3.1.29</lib.version.ognl>  <lib.version.h2>1.4.196</lib.version.h2> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d667076f269bf5afb5c589438… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d667076f269bf5afb5c589438… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.0.0-rc-23 [skip CI]
by Tony CHEMIT (＠tchemit) Feb. 14, 2022

Feb. 14, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 48a26688 by Tony Chemit at 2022-02-14T17:08:15+01:00 Update changelog for v.9.0.0-rc-23 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -8,6 +8,10 @@ **Closed at 2022-02-14.** +### Download +* [Application (observe-9.0.0-RC-23-client.zip)](https://repo1.maven.org/maven2/fr/ird/obse…) +* [Server (observe-9.0.0-RC-23-server.zip)](https://repo1.maven.org/maven2/fr/ird/obse…) +* ### Issues * [[Type::Anomalie 2138]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2138) **Séparation du référentiel Programme pour chaque domaine (ps_common et ll_common)** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2139]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2139) **Problème pour ouvrir les assistants gestion avancée des données et du référentiel** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/48a26688cec080f6e061bce67… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/48a26688cec080f6e061bce67… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.0.0-rc-23 [skip CI]
by Tony CHEMIT (＠tchemit) Feb. 14, 2022

Feb. 14, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 65a43003 by Tony Chemit at 2022-02-14T17:06:35+01:00 Update changelog for v.9.0.0-rc-23 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,28 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2021-12-25 11:14. + * Last generated at 2022-02-14 17:06. + +## Version [9.0.0-RC-23](https://gitlab.com/ultreiaio/ird-observe/-/milestones/211) + +**Closed at 2022-02-14.** + + +### Issues + * [[Type::Anomalie 2138]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2138) **Séparation du référentiel Programme pour chaque domaine (ps_common et ll_common)** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2139]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2139) **Problème pour ouvrir les assistants gestion avancée des données et du référentiel** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2147]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2147) **Le client ObServe ne démarre plus depuis Java 17 (peut-être 15 ou 16)** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 1475]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1475) **Logique de fonctionnement des fichiers de configuration** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 1793]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1793) **Réduire la taille des fichiers livrables** (Thanks to ) (Reported by Tony CHEMIT) + * [[Type::Evolution 1959]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1959) **Critères de groupement pour le nouvel arbre** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Evolution 2051]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2051) **Supprimer ces flags sur Program** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2133]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2133) **Ajout d'un ordre naturel sur les requêtes GetAll et GetSome** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2134]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2134) **Permettre d'avoir sur le serveur plusieurs instances du serveur tournant sur des configurations différentes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2135]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2135) **Utilisation d'un seul fichier server.yml pour la configuration du serveur (remplace databases.yml et users.yml)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2155]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2155) **Amélioration de l'interface graphique des source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2156]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2156) **Amélioration de l'API publique (GetSome)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2160]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2160) **Ajouter la notion d'obligatoire sur les critères de groupements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2162]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2162) **Lors de la création d'une nouvelle marée, pré-renseigner si le critère de groupement est qualitatif, sa valeur dans le formulaire** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [9.0.0-RC](https://gitlab.com/ultreiaio/ird-observe/-/milestones/181) @@ -913,6 +934,17 @@ Merry Christmas * [[Type::Evolution 1181]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1181) **Ajouter un champ vessel.lloydid** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 1183]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1183) **[V8][DATA MODEL] Transformer Vessel.fleetcountry (int4) en topiaid** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) +## Version [7.6.11](https://gitlab.com/ultreiaio/ird-observe/-/milestones/214) + +**Closed at 2022-01-06.** + +### Download +* [Application (observe-7.6.11.zip)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) +* [Serveur (observe-7.6.11.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) + +### Issues + * [[Type::Evolution 2151]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2151) **Update to log4j 2.27.1** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + ## Version [7.6.10](https://gitlab.com/ultreiaio/ird-observe/-/milestones/213) **Closed at 2021-12-24.** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/65a430032fc0acec65ddb3dc2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/65a430032fc0acec65ddb3dc2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Add thin API to collect Gson adapters - See ultreiaio/http#47
by Tony CHEMIT (＠tchemit) Feb. 14, 2022

Feb. 14, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 361860dc by Tony Chemit at 2022-02-13T15:29:11+01:00 Add thin API to collect Gson adapters - See ultreiaio/http#47 Toolkit v6.0.0 is on - - - - - 7516be6e by Tony Chemit at 2022-02-13T15:29:11+01:00 Unify navigation id model, now just one! - - - - - 971899c2 by Tony Chemit at 2022-02-13T15:29:11+01:00 Save now full selected path and improve how to load a node from Root. Do not save any longer select id model - - - - - 89ec96f3 by Tony Chemit at 2022-02-13T15:29:11+01:00 use one navigation service - - - - - a6c8195a by Tony Chemit at 2022-02-13T16:06:13+01:00 Clean some ui model - - - - - 7bdc1f5d by Tony Chemit at 2022-02-14T16:39:04+01:00 Lors de la création d'une nouvelle marée, pré-renseigner si le critère de groupement est qualitatif, sa valeur dans le formulaire - Closes ultreiaio/ird-observe#2162 - - - - - dd5c5a85 by Tony Chemit at 2022-02-14T16:58:09+01:00 improve deploy in maven and release - - - - - 30 changed files: - .gitlab-ci.yml - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/ClientUIContextApi.java - client/core/src/main/java/fr/ird/observe/client/WithClientUIContextApi.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/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/main/MainUIModel.java - client/core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.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/synchronize/data/DataSynchroModel.java - client/datasource/editor/api/src/main/i18n/getters/jaxx.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/MainDataSourceListener.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewOpenableUI.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewRootOpenableUI.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/delete/DeleteRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeMode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeModeExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeModeRequest.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/actions/GotoOpenData.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/21a6d5b9a700f0a613e1ef03… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/21a6d5b9a700f0a613e1ef03… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 15 commits: update pom
by Tony CHEMIT (＠tchemit) Feb. 13, 2022

Feb. 13, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5c22ddd5 by Tony Chemit at 2022-02-13T10:02:19+01:00 update pom tidy pom - - - - - 1ac4f094 by Tony Chemit at 2022-02-13T10:02:19+01:00 fix some JTree action init issue + improve DataSynchroUI - - - - - adee607f by Tony Chemit at 2022-02-13T10:02:19+01:00 fix avdth program universe - - - - - beefee81 by Tony Chemit at 2022-02-13T10:02:19+01:00 FIXME Remove ObserveSwingDataSource service cache - See if it is better - - - - - 35b2d48a by Tony Chemit at 2022-02-13T10:02:19+01:00 Fix JAXX warning - - - - - 01703cff by Tony Chemit at 2022-02-13T10:02:19+01:00 Improve config ui Ajouter la notion d'obligatoire sur les critères de groupements - See ultreiaio/ird-observe#2160 clean Navigation API clean data source actions - - - - - fe5f96bc by Tony Chemit at 2022-02-13T10:02:19+01:00 update public API (fix id filters) Amélioration de l'API publique (GetSome) - See ultreiaio/ird-observe#2156 update Public API Documentation Ajouter la notion d'obligatoire sur les critères de groupements - See ultreiaio/ird-observe#2160 Improve EntityFilterProperty (add withDefaultValue and isPrimitive methods) - Closes ultreiaio/topia-extension#104 - - - - - 8c98cc17 by Tony Chemit at 2022-02-13T10:02:19+01:00 Ajout du groupBy ocean - See #1959 - - - - - 84712eb8 by Tony Chemit at 2022-02-13T10:02:19+01:00 Amélioration de l'interface graphique des source de données - Closes #2155 - - - - - 0a8d63b1 by Tony Chemit at 2022-02-13T10:02:19+01:00 Amélioration du chargement des nœuds dans l'arbre de navigation - - - - - a753c951 by Tony Chemit at 2022-02-13T10:02:19+01:00 Toolkit v6.0.0 is on - - - - - 2a9a5fdd by Tony Chemit at 2022-02-13T10:02:19+01:00 Unify navigation id model, now just one! - - - - - 3578ed25 by Tony Chemit at 2022-02-13T10:02:19+01:00 Save now full selected path and improve how to load a node from Root. - - - - - ff2daf33 by Tony Chemit at 2022-02-13T11:11:35+01:00 use one navigation service - - - - - 21a6d5b9 by Tony Chemit at 2022-02-13T11:11:57+01:00 Add thin API to collect Gson adapters - See ultreiaio/http#47 - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/ClientUIContextApi.java - client/core/src/main/java/fr/ird/observe/client/WithClientUIContextApi.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/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/main/MainUIModel.java - client/core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/util/DtoIconHelper.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.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/config/SelectDataUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePaneHandler.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/i18n/getters/jaxx.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/actions/CopyAuthenticationToken.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUIHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/selection/actions/ApplyConfiguration.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/ApplyConfigurationSupport.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8a7f7b30d91d88eef0f4e54d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8a7f7b30d91d88eef0f4e54d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 9 commits: update pom
by Tony CHEMIT (＠tchemit) Feb. 11, 2022

Feb. 11, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4d5a6305 by Tony Chemit at 2022-02-11T11:00:10+01:00 update pom - - - - - 7fcb1df1 by Tony Chemit at 2022-02-11T11:00:10+01:00 fix some JTree action init issue + improve DataSynchroUI - - - - - 7ae43f26 by Tony Chemit at 2022-02-11T11:00:10+01:00 fix avdth program universe - - - - - 4b14523a by Tony Chemit at 2022-02-11T11:00:10+01:00 FIXME Remove ObserveSwingDataSource service cache - See if it is better - - - - - 3d4d74f4 by Tony Chemit at 2022-02-11T11:00:10+01:00 Fix JAXX warning - - - - - d4b52c46 by Tony Chemit at 2022-02-11T11:00:10+01:00 Improve config ui Ajouter la notion d'obligatoire sur les critères de groupements - See ultreiaio/ird-observe#2160 clean Navigation API clean data source actions - - - - - d4834a96 by Tony Chemit at 2022-02-11T11:07:26+01:00 update public API (fix id filters) Amélioration de l'API publique (GetSome) - See ultreiaio/ird-observe#2156 update Public API Documentation Ajouter la notion d'obligatoire sur les critères de groupements - See ultreiaio/ird-observe#2160 Improve EntityFilterProperty (add withDefaultValue and isPrimitive methods) - Closes ultreiaio/topia-extension#104 - - - - - ad4c2c5b by Tony Chemit at 2022-02-11T11:07:26+01:00 Ajout du groupBy ocean - See #1959 - - - - - 8a7f7b30 by Tony Chemit at 2022-02-11T11:07:26+01:00 Amélioration de l'interface graphique des source de données - Closes #2155 - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/core/src/main/java/fr/ird/observe/client/main/MainUIModel.java - client/core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePaneHandler.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/i18n/getters/jaxx.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/actions/CopyAuthenticationToken.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUIHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/selection/actions/ApplyConfiguration.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/ApplyConfigurationSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/ApplyConfiguration.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/ApplyNavigationConfiguration.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/selection/SelectionConfigUIHandler.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/ApplySelectionConfiguration.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationConfigUIHandler.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/Cancel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/ChangePropertyAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/ResetConfiguration.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/UseGroupByAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/UseGroupByFlavorAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/UseModuleAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c3b54775ecad05a77b974caa… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c3b54775ecad05a77b974caa… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: fix some JTree action init issue + improve DataSynchroUI
by Tony CHEMIT (＠tchemit) Feb. 10, 2022

Feb. 10, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9a16c5ed by Tony Chemit at 2022-02-10T04:00:59+01:00 fix some JTree action init issue + improve DataSynchroUI - - - - - cc79ca7e by Tony Chemit at 2022-02-10T04:00:59+01:00 fix avdth program universe - - - - - 83128e28 by Tony Chemit at 2022-02-10T04:00:59+01:00 FIXME Remove ObserveSwingDataSource service cache - See if it is better - - - - - 32acb192 by Tony Chemit at 2022-02-10T04:00:59+01:00 Fix JAXX warning - - - - - c3b54775 by Tony Chemit at 2022-02-10T04:00:59+01:00 clean Navigation API clean data source actions - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/core/src/main/java/fr/ird/observe/client/main/MainUIModel.java - client/core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePaneHandler.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/actions/CopyAuthenticationToken.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUIHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/selection/actions/ApplyConfiguration.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/ApplyConfigurationSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/ApplyConfiguration.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/ApplyNavigationConfiguration.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationConfigUIHandler.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/ApplySelectionConfiguration.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/ChangePropertyAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/ResetConfiguration.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/UseGroupByAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/UseGroupByFlavorAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/UseModuleAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorMenu.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorMenu.jcss The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0ac6cf2b436be511e6e68e56… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0ac6cf2b436be511e6e68e56… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: fix some JTree action init issue + improve DataSynchroUI
by Tony CHEMIT (＠tchemit) Feb. 9, 2022

Feb. 9, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4e4b90da by Tony Chemit at 2022-02-09T10:37:51+01:00 fix some JTree action init issue + improve DataSynchroUI - - - - - 11b1732c by Tony Chemit at 2022-02-09T10:58:24+01:00 fix avdth program universe - - - - - 0ac6cf2b by Tony Chemit at 2022-02-09T10:58:54+01:00 FIXME Remove ObserveSwingDataSource service cache - See if it is better - - - - - 4 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUIInitializer.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java ===================================== @@ -90,7 +90,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Collections; import java.util.Date; -import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.Objects; @@ -106,7 +105,7 @@ import static io.ultreia.java4all.i18n.I18n.t; */ @GenerateJavaBeanDefinition @GenerateTemplate(template = "ObserveSwingDataSource.ftl") -public class ObserveSwingDataSource extends AbstractJavaBean implements ObserveServicesProvider ,ObserveDataSourceConfigurationAndConnection, WithClientUIContextApi, WithPermission { +public class ObserveSwingDataSource extends AbstractJavaBean implements ObserveServicesProvider, ObserveDataSourceConfigurationAndConnection, WithClientUIContextApi, WithPermission { private static final Logger log = LogManager.getLogger(ObserveSwingDataSource.class); @@ -117,9 +116,9 @@ public class ObserveSwingDataSource extends AbstractJavaBean implements ObserveS private final DataSourceReferenceProvider referenceProvider; private final DecoratorService decoratorService; private final Icon icon; - private final Map<Class<?>, ObserveService> cache; + private final ObserveServicesProviderImpl servicesProvider; + // private final Map<Class<?>, ObserveService> cache; private ProgressionModel progressModel; -private final ObserveServicesProviderImpl servicesProvider; // connexion expired, but data source not closed private boolean expired; // at least one commit was performed on this data source @@ -157,7 +156,7 @@ private final ObserveServicesProviderImpl servicesProvider; this.expired = false; this.icon = configuration.getConnectMode().getIcon(); //FIXME Not sure a cache here is good, any leak inside a service will stay here... - this.cache = new HashMap<>(); +// this.cache = new HashMap<>(); setProgressModel(new ProgressionModel()); this.servicesProvider = new ObserveServicesProviderImpl(serviceFactory, this::createServiceInitializer); } @@ -184,12 +183,13 @@ private final ObserveServicesProviderImpl servicesProvider; @Override public <S extends ObserveService> S getService(Class<S> serviceType) { - @SuppressWarnings("unchecked") S result = (S) cache.get(serviceType); - if (result == null) { - result = servicesProvider.getService(serviceType); - cache.put(serviceType, result); - } - return result; +// @SuppressWarnings("unchecked") S result = (S) cache.get(serviceType); +// if (result == null) { +// result = servicesProvider.getService(serviceType); +// cache.put(serviceType, result); +// } +// return result; + return servicesProvider.getService(serviceType); } protected ObserveServiceInitializer createServiceInitializer() { @@ -277,7 +277,7 @@ private final ObserveServicesProviderImpl servicesProvider; dataSourceService.close(); } } finally { - cache.clear(); +// cache.clear(); ObserveUtil.cleanMemory(); setConnection(null); expired = false; ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java ===================================== @@ -216,7 +216,6 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi } catch (Exception e) { mainUI.removeBodyContent(); throw e; -// UIHelper.handlingError(e); } } @@ -235,7 +234,6 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi public void doImportAvdth() { if (isAlive()) { ImportAvdthFile action = (ImportAvdthFile) get().getNavigationUI().getImportAvdthFile().getAction(); -// ImportAvdthFileAction action = (ImportAvdthFileAction) editorMenu.getImportAvdthFile().getAction(); action.run(); } } @@ -243,15 +241,13 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi public void doCloseStorage() { if (isAlive()) { CloseStorage action = (CloseStorage) get().getNavigationUI().getCloseStorage().getAction(); -// CloseStorageAction action = (CloseStorageAction) editorMenu.getCloseStorage().getAction(); action.run(); } } public void doReloadStorage() { if (isAlive()) { - ReloadStorage action = (ReloadStorage) get().getNavigationUI().getCloseStorage().getAction(); -// ReloadStorageAction action = (ReloadStorageAction) editorMenu.getReloadStorage().getAction(); + ReloadStorage action = (ReloadStorage) get().getNavigationUI().getReloadStorage().getAction(); action.run(); } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogModel.java ===================================== @@ -45,6 +45,7 @@ import java.nio.file.Path; import java.util.Date; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * Created on 12/06/2021. @@ -126,7 +127,8 @@ public class ImportDialogModel extends AbstractJavaBean { public static ImportDialogModel create(WithClientUIContextApi clientUIContext) { ObserveSwingDataSource dataSource = clientUIContext.getDataSourcesManager().getMainDataSource(); - List<ProgramReference> programs = dataSource.getReferenceProvider().getReferentialReferences(ProgramReference.class).toList(); + // get only program for logbook + List<ProgramReference> programs = dataSource.getReferenceProvider().getReferentialReferences(ProgramReference.class).stream().filter(ProgramReference::isLogbook).collect(Collectors.toList()); List<OceanReference> oceans = dataSource.getReferenceProvider().getReferentialReferences(OceanReference.class).toArrayList(); ClientConfig clientConfig = clientUIContext.getClientConfig(); Path temporaryDirectory = clientConfig.getTemporaryDirectory().toPath(); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUIInitializer.java ===================================== @@ -88,7 +88,6 @@ class NavigationUIInitializer extends UIInitializerSupport<NavigationUI, UIIniti protected void init(NavigationTree editor) { initializerContext.checkFirstPass(); - UIInitHelper.init(editor); editor.setFont(editor.getFont().deriveFont(11f)); editor.setCellRenderer(new NavigationTreeCellRenderer()); NavigationUI ui = initializerContext.getUi(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d6f3df6d57baaf3cc2611185… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d6f3df6d57baaf3cc2611185… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 12 commits: use new pom plugin-module profile
by Tony CHEMIT (＠tchemit) Feb. 9, 2022

Feb. 9, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5aa76e21 by Tony Chemit at 2022-02-06T15:27:14+01:00 use new pom plugin-module profile update pom at last make core module Remove toolkit i18n module continue Selection Config ui for admin actions Remove ModelType and Select Data configuration in Admin actions Continue usage of new tree configure Introduce DecoratorDefinitionJavaFileBuilder to be able to generate java files without annotation processor - See ultreiaio/decorator#5 introduce core-api-services module introduce core-api-tree module improve generated DataGroupByDefinition (add constant NAME) improve decorator for DataGroupBy objects (use a unique decorator definition) improve decorator provider (project implements concrete providers) add configure in selection tree remove Navigation menu review JAXX Actions add navigation menu in NavigationUI Fix SelectionModel issues Improve and simplify TreeConfig - - - - - 903ce07e by Tony Chemit at 2022-02-07T03:08:44+01:00 add more nice icons but do not use them... Need more time. - - - - - 43caa473 by Tony Chemit at 2022-02-07T03:08:44+01:00 avoid NPE - - - - - 5508ee74 by Tony Chemit at 2022-02-07T03:08:44+01:00 avoid NPE - - - - - 991a7771 by Tony Chemit at 2022-02-07T06:02:18+01:00 add FIXME - - - - - 74a60477 by Tony Chemit at 2022-02-08T01:25:34+01:00 add quantitative group by \o/ continue Selection Config ui for admin actions - - - - - e148fa8a by Tony Chemit at 2022-02-08T01:25:34+01:00 Sort some sort issues in navigation API - - - - - 55d0575f by Tony Chemit at 2022-02-09T08:58:46+01:00 replace some object on service layout - - - - - a24e1ce1 by Tony Chemit at 2022-02-09T08:58:46+01:00 review gson layout and place it as spi.json please - - - - - 87ce6b7b by Tony Chemit at 2022-02-09T10:01:51+01:00 Introduce Service annotation to generate ServicesProvider - See ultreiaio/http#46 use last API in Http and class-mapping lib java4all 4 ever - - - - - fda54849 by Tony Chemit at 2022-02-09T10:01:51+01:00 update pom - - - - - d6f3df6d by Tony Chemit at 2022-02-09T10:01:51+01:00 fix some JTree action init issue + improve DataSynchroUI - - - - - 30 changed files: - client/configuration/pom.xml - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - − client/configuration/src/main/java/fr/ird/observe/client/configuration/ObserveServiceInitializerConfigClient.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/ClientUIContextApi.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/data/CopyDataTask.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/data/DeleteDataTask.java - client/core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - + client/core/src/main/resources/icons/navigation/default/actions/close.png - + client/core/src/main/resources/icons/navigation/default/actions/collapse.png - client/core/src/main/resources/icons/navigation/default/actions/configure.png - + client/core/src/main/resources/icons/navigation/default/actions/configure2.png - + client/core/src/main/resources/icons/navigation/default/actions/down2.png - + client/core/src/main/resources/icons/navigation/default/actions/download.png - + client/core/src/main/resources/icons/navigation/default/actions/erase.png - + client/core/src/main/resources/icons/navigation/default/actions/expand.png - + client/core/src/main/resources/icons/navigation/default/actions/filter.png - + client/core/src/main/resources/icons/navigation/default/actions/first2.png - + client/core/src/main/resources/icons/navigation/default/actions/groupBy.png - + client/core/src/main/resources/icons/navigation/default/actions/home.png - + client/core/src/main/resources/icons/navigation/default/actions/information.png - + client/core/src/main/resources/icons/navigation/default/actions/last2.png - + client/core/src/main/resources/icons/navigation/default/actions/menu.png The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ade93d7caba97bc2fa73fedc… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ade93d7caba97bc2fa73fedc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Introduce DecoratorDefinitionJavaFileBuilder to be able to generate java files...
by Tony CHEMIT (＠tchemit) Feb. 6, 2022

Feb. 6, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 80bfa1e0 by Tony Chemit at 2022-02-06T01:19:48+01:00 Introduce DecoratorDefinitionJavaFileBuilder to be able to generate java files without annotation processor - See ultreiaio/decorator#5 introduce core-api-services module introduce core-api-tree module - - - - - a9d33ca0 by Tony Chemit at 2022-02-06T04:28:47+01:00 Remove ModelType and Select Data configuration in Admin actions Continue usage of new tree configure - - - - - ade93d7c by Tony Chemit at 2022-02-06T04:28:47+01:00 Remove toolkit i18n module - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/datasource/actions/pom.xml - client/datasource/actions/src/main/i18n/getters/jaxx.getter - − client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataConfigUI.jaxx - 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/config/SelectDataUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/actions/SelectData.java - − client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/actions/SelectModelType.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/actions/Prepare.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/i18n/getters/jaxx.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/tree/config/TreeConfigUI.jaxx → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/tree/config/TreeConfigUI.jcss → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/tree/config/TreeConfigUIHandler.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/TreeConfigUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/tree/config/actions/ChangePropertyAction.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/ChangePropertyAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/tree/config/actions/ResetConfiguration.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/ResetConfiguration.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/tree/config/actions/TreeConfigUIActionSupport.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/TreeConfigUIActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/tree/config/actions/UseGroupByAction.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/UseGroupByAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/tree/config/actions/UseModuleAction.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/config/actions/UseModuleAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/rlist/ContentRootListUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationConfigUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationConfigUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/32ba06dd1ce8f6e6736c178b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/32ba06dd1ce8f6e6736c178b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: fix nasty javac bug (stack over flow...)
by Tony CHEMIT (＠tchemit) Feb. 5, 2022

Feb. 5, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 390ce396 by Tony Chemit at 2022-02-04T12:55:41+01:00 fix nasty javac bug (stack over flow...) update toolkit \o/ update pom - - - - - 1b4fdac9 by Tony Chemit at 2022-02-04T12:56:31+01:00 Remove avdth maven module re-introduce services maven module - - - - - 7d748390 by Tony Chemit at 2022-02-04T12:58:48+01:00 add configure in selection tree remove Navigation menu review JAXX Actions add navigation menu in NavigationUI Fix SelectionModel issues Improve and simplify TreeConfig - - - - - 45f4e0f2 by Tony Chemit at 2022-02-04T12:58:48+01:00 improve generated DataGroupByDefinition (add constant NAME) improve decorator for DataGroupBy objects (use a unique decorator definition) improve decorator provider (project implements concrete providers) - - - - - 26fadc05 by Tony Chemit at 2022-02-04T12:58:48+01:00 add more nice icons but do not use them... Need more time. - - - - - d3c1b1a2 by Tony Chemit at 2022-02-04T17:16:15+01:00 clean i18n - - - - - 32ba06dd by Tony Chemit at 2022-02-05T11:27:30+01:00 introduce core-api-services module introduce core-api-tree module - - - - - 30 changed files: - client/configuration/pom.xml - 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/main/ObserveMainUI.jaxx - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - + client/core/src/main/resources/icons/navigation/default/actions/close.png - + client/core/src/main/resources/icons/navigation/default/actions/collapse.png - + client/core/src/main/resources/icons/navigation/default/actions/down2.png - + client/core/src/main/resources/icons/navigation/default/actions/download.png - + client/core/src/main/resources/icons/navigation/default/actions/erase.png - + client/core/src/main/resources/icons/navigation/default/actions/expand.png - + client/core/src/main/resources/icons/navigation/default/actions/filter.png - + client/core/src/main/resources/icons/navigation/default/actions/first2.png - + client/core/src/main/resources/icons/navigation/default/actions/groupBy.png - + client/core/src/main/resources/icons/navigation/default/actions/home.png - + client/core/src/main/resources/icons/navigation/default/actions/information.png - + client/core/src/main/resources/icons/navigation/default/actions/last2.png - + client/core/src/main/resources/icons/navigation/default/actions/move.png - + client/core/src/main/resources/icons/navigation/default/actions/next2.png - + client/core/src/main/resources/icons/navigation/default/actions/open-folder.png - + client/core/src/main/resources/icons/navigation/default/actions/open.png - + client/core/src/main/resources/icons/navigation/default/actions/pause.png - + client/core/src/main/resources/icons/navigation/default/actions/play.png - + client/core/src/main/resources/icons/navigation/default/actions/previous2.png - + client/core/src/main/resources/icons/navigation/default/actions/quit.png - + client/core/src/main/resources/icons/navigation/default/actions/reload.png - + client/core/src/main/resources/icons/navigation/default/actions/undo.png - + client/core/src/main/resources/icons/navigation/default/actions/up2.png - + client/core/src/main/resources/icons/navigation/default/actions/upload.png - + client/core/src/main/resources/icons/navigation/default/actions/zoom-in.png The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c2c0eefa280dd569f400d3ed… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c2c0eefa280dd569f400d3ed… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 8 commits: improve generated DataGroupByDefinition (add constant NAME)
by Tony CHEMIT (＠tchemit) Feb. 3, 2022

Feb. 3, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e4b933fd by Tony Chemit at 2022-02-02T11:38:35+01:00 improve generated DataGroupByDefinition (add constant NAME) improve decorator for DataGroupBy objects (use a unique decorator definition) improve decorator provider (project implements concrete providers) - - - - - 886f6466 by Tony Chemit at 2022-02-02T11:39:26+01:00 Fix SelectionModel issues - - - - - 4944b2c8 by Tony Chemit at 2022-02-02T12:42:25+01:00 Remove avdth maven module - - - - - 6bf3963d by Tony Chemit at 2022-02-03T17:44:34+01:00 update pom - - - - - 6c336d93 by Tony Chemit at 2022-02-03T17:44:34+01:00 add more nice icons but do not use them... Need more time. - - - - - 72a40d67 by Tony Chemit at 2022-02-03T17:44:34+01:00 review JAXX Actions add navigation menu in NavigationUI - - - - - 36e59983 by Tony Chemit at 2022-02-03T22:48:24+01:00 update toolkit \o/ - - - - - c2c0eefa by Tony Chemit at 2022-02-03T22:49:13+01:00 remove Navigation menu - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx - + client/core/src/main/resources/icons/navigation/default/actions/close.png - + client/core/src/main/resources/icons/navigation/default/actions/collapse.png - + client/core/src/main/resources/icons/navigation/default/actions/down2.png - + client/core/src/main/resources/icons/navigation/default/actions/download.png - + client/core/src/main/resources/icons/navigation/default/actions/erase.png - + client/core/src/main/resources/icons/navigation/default/actions/expand.png - + client/core/src/main/resources/icons/navigation/default/actions/filter.png - + client/core/src/main/resources/icons/navigation/default/actions/first2.png - + client/core/src/main/resources/icons/navigation/default/actions/groupBy.png - + client/core/src/main/resources/icons/navigation/default/actions/home.png - + client/core/src/main/resources/icons/navigation/default/actions/information.png - + client/core/src/main/resources/icons/navigation/default/actions/last2.png - + client/core/src/main/resources/icons/navigation/default/actions/move.png - + client/core/src/main/resources/icons/navigation/default/actions/next2.png - + client/core/src/main/resources/icons/navigation/default/actions/open-folder.png - + client/core/src/main/resources/icons/navigation/default/actions/open.png - + client/core/src/main/resources/icons/navigation/default/actions/pause.png - + client/core/src/main/resources/icons/navigation/default/actions/play.png - + client/core/src/main/resources/icons/navigation/default/actions/previous2.png - + client/core/src/main/resources/icons/navigation/default/actions/quit.png - + client/core/src/main/resources/icons/navigation/default/actions/reload.png - + client/core/src/main/resources/icons/navigation/default/actions/undo.png - + client/core/src/main/resources/icons/navigation/default/actions/up2.png - + client/core/src/main/resources/icons/navigation/default/actions/upload.png - + client/core/src/main/resources/icons/navigation/default/actions/zoom-in.png - + client/core/src/main/resources/icons/navigation/default/actions/zoom-out.png - client/core/src/main/resources/observe-ui.properties - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c5f1877a36b6ed94ab990b0b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c5f1877a36b6ed94ab990b0b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: update pom
by Tony CHEMIT (＠tchemit) Feb. 1, 2022

Feb. 1, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 56484d56 by Tony Chemit at 2022-02-01T12:30:40+01:00 update pom - - - - - 214134ef by Tony Chemit at 2022-02-01T12:30:40+01:00 re-introduce services maven module - - - - - c5f1877a by Tony Chemit at 2022-02-01T12:30:40+01:00 Improve and simplify TreeConfig - - - - - 30 changed files: - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorNavigationMenuModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorNavigationModuleContext.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationConfigUI.jaxx - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationConfigUI.jcss - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationConfigUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTree.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTreeModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/config/actions/ApplyConfiguration.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/ApplyConfiguration.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/NavigationTreeConfigUIActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/config/actions/ResetConfiguration.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/ResetConfiguration.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/ToggleConfigure.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/config/NavigationConfigUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/config/NavigationConfigUI.jaxx → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/tree/config/TreeConfigUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/config/NavigationConfigUI.jcss → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/tree/config/TreeConfigUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/config/NavigationConfigUIHandler.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/tree/config/TreeConfigUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/config/actions/ChangePropertyAction.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/tree/config/actions/ChangePropertyAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/config/actions/NavigationConfigUIActionSupport.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/tree/config/actions/TreeConfigUIActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/config/actions/UseGroupByAction.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/tree/config/actions/UseGroupByAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/config/actions/UseModuleAction.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/tree/config/actions/UseModuleAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/StorageUIHandler.java - client/runner/pom.xml - core/pom.xml - pom.xml - server/core/pom.xml - server/runner/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8fadc724beb269b66ef24769… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8fadc724beb269b66ef24769… You're receiving this email because of your account on gitlab.com.

1 0