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

[Git][ultreiaio/ird-observe][develop] 2 commits: [LL] Bug sur création d'activité logbook LL - Closes #1672
by Tony CHEMIT 17 Dec '20

17 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 09f0824e by Tony Chemit at 2020-12-17T16:20:18+01:00 [LL] Bug sur création d'activité logbook LL - Closes #1672 - - - - - 8a5edc9f by Tony Chemit at 2020-12-17T16:20:41+01:00 Fix bug when collapsing a node (need a second review on those magic listener) - - - - - 2 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTreeSelectionListenerImpl.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTreeSelectionListenerImpl.java ===================================== @@ -84,7 +84,7 @@ class NavigationTreeSelectionListenerImpl implements fr.ird.observe.client.datas @Override public void treeWillCollapse(TreeExpansionEvent event) throws ExpandVetoException { //FIXME check this is working ? - tree.getSelectionModel().fireTreeWillCollapseEvent(event); +// tree.getSelectionModel().fireTreeWillCollapseEvent(event); NavigationNode node = (NavigationNode) event.getPath().getLastPathComponent(); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java ===================================== @@ -47,7 +47,7 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { @Override protected ContentOpen<ActivityUI> createContentOpen(ActivityUI ui) { - ContentOpenableUIOpenExecutor<ActivityDto, ActivityUI> executor = new ContentOpenableUIOpenExecutor<ActivityDto, ActivityUI>() { + ContentOpenableUIOpenExecutor<ActivityDto, ActivityUI> executor = new ContentOpenableUIOpenExecutor<>() { @Override public void openModel(ActivityUI ui) { ActivityUIModel model = getModel(); @@ -57,13 +57,12 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { onOpenAfterOpenModel(); } }; - return new ContentOpen<ActivityUI>(ui, executor, executor) { + return new ContentOpen<>(ui, executor, executor) { @Override public DefaultUIInitializerResult init(ContentUIInitializer<ActivityUI> initializer) { //FIXME Bug in Jaxx this.getUi().getRelatedObservedActivity().setBeanType(fr.ird.observe.dto.data.ll.observation.ActivityReference.class); - super.init(initializer); - return null; + return super.init(initializer); } }; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5094b739a0b7fa39888b0f04… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5094b739a0b7fa39888b0f04… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Miss a reference contract (no code on RTP)
by Tony CHEMIT 17 Dec '20

17 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e2ae3d0e by Tony Chemit at 2020-12-17T08:19:32+01:00 Miss a reference contract (no code on RTP) - - - - - 5094b739 by Tony Chemit at 2020-12-17T08:27:37+01:00 Petit problème erratique sur l'ouverture de nœud dans l'arbre - Closes #1667 - - - - - 16 changed files: - 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/DataSourceEditorLayerUI.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIManager.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewContentTableUIEntry.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/data/TripActionHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/SaveEditUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/SaveOpenableUIAdapter.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/NavigationTreeSelectionListenerImpl.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTreeShowPopupHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationNode.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/RouteCloseCallback.java - models/dto/src/main/models/Observe-01-referential-common.model Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.client.datasource.editor.api; import fr.ird.observe.client.ClientUIContext; import fr.ird.observe.client.WithClientUIContext; import fr.ird.observe.client.datasource.editor.api.actions.ChangeEditorFocus; +import fr.ird.observe.client.datasource.editor.api.content.ContentUI; import fr.ird.observe.client.datasource.editor.api.content.ContentUIManager; import fr.ird.observe.client.datasource.editor.api.content.validation.ContentMessageTableRenderer; import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTree; @@ -32,12 +33,15 @@ import fr.ird.observe.client.datasource.editor.api.navigation.NavigationTreeMode import fr.ird.observe.client.util.ProgressModel; import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.client.util.init.UIInitHelper; +import fr.ird.observe.client.util.session.ObserveSwingSessionHelper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; +import javax.swing.JComponent; import javax.swing.SwingUtilities; +import java.awt.BorderLayout; import java.util.Objects; /** @@ -49,6 +53,8 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit private static final Logger log = LogManager.getLogger(DataSourceEditorHandler.class); private DataSourceEditor ui; + private ObserveSwingSessionHelper swingSessionHelper; + private boolean contentAdjusting; @Override public void beforeInit(DataSourceEditor ui) { @@ -57,8 +63,9 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit ui.setContextValue(model.getDatasourceMenuModel()); ui.setContextValue(model.getNavigationMenuModel()); ClientUIContext clientUIContext = getClientUIContext(); + swingSessionHelper = clientUIContext.getObserveSwingSessionHelper(); ui.setContextValue(clientUIContext.getClientConfig()); - ui.setContextValue(new ContentUIManager(clientUIContext.getMainUI().getMainUIBodyContentManager(), clientUIContext.getObserveSwingSessionHelper())); + ui.setContextValue(new ContentUIManager(clientUIContext.getMainUI().getMainUIBodyContentManager())); } @Override @@ -77,6 +84,43 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit // register this action since there is no editor on which attach this action ChangeEditorFocus.init(ui, null, ChangeEditorFocus.class); + + ui.getModel().addPropertyChangeListener(DataSourceEditorModel.PROPERTY_CONTENT, evt -> onContentChanged((ContentUI) evt.getOldValue(), (ContentUI) evt.getNewValue())); + } + + private void onContentChanged(ContentUI previousContentUI, ContentUI contentUI) { + if (contentAdjusting) { + return; + } + contentAdjusting = true; + try { + log.info(String.format("Content ui changed from: %s to %s", previousContentUI == null ? null : previousContentUI.getModel().getPrefix(), contentUI == null ? null : contentUI.getModel().getPrefix())); + if (previousContentUI != null) { + log.info(String.format("[%s] Will destroy previous content ui", previousContentUI.getClass().getSimpleName())); + previousContentUI.destroy(); + } + if (contentUI == null) { + setNoContent(); + } else { + setContent(contentUI); + openContent(contentUI); + } + } catch (Exception e) { + setNoContent(); + ui.getModel().setContent(null); + } finally { + contentAdjusting = false; + } + } + + private void setNoContent() { + setContent(ui.getEmptySelection()); + } + + private void setContent(JComponent content) { + log.info("Set content: " + content.getName()); + ui.getContent().removeAll(); + ui.getContent().add(content, BorderLayout.CENTER); } public void updateContentSize() { @@ -88,21 +132,28 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit ui.getContentSplitPane().setDividerLocation(plusSize); } + public void openContent(ContentUI contentUI) { + log.info(String.format("%sWill open ui", contentUI.getModel().getPrefix())); + contentUI.open(); + updateContentSize(); + swingSessionHelper.addComponent(contentUI, true); + swingSessionHelper.save(); + log.info(String.format("%s opened", contentUI.getModel().getPrefix())); + SwingUtilities.invokeLater(contentUI::opened); + } + /** - * Charge dans l'ui un nouveau modèle de navigation. + * Charge dans l'interface graphique un nouveau modèle de navigation. * - * Note: cette méthode doit être appelée après tout rechargement de modèle de naivgation. + * Note: cette méthode doit être appelée après tout rechargement de modèle de navigation. * * @param progressModel the progress model to interact with ui */ public void loadNavigationUI(ProgressModel progressModel) { - NavigationTree tree = ui.getNavigationUI().getTree(); - NavigationTreeModel treeModel = tree.getModel(); treeModel.populate(false); progressModel.increments(); - // select initial node try { tree.selectInitialNode(); @@ -110,9 +161,7 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit log.error("Could not load initial node", e); } progressModel.increments(); - tree.setVisible(true); - ui.getModel().setFocusOnNavigation(true); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorLayerUI.java ===================================== @@ -117,7 +117,7 @@ public class DataSourceEditorLayerUI extends AbstractLayerUI<JComponent> impleme log.debug("Set focus on content"); editor.getNavigationView().setBorder(getNoFocusBorder()); editor.getContentSplitPane().setBorder(getFocusBorder()); - ContentUI contentUI = editor.getContentUIManager().getSelectedContentUI(); + ContentUI contentUI = editor.getModel().getContent(); if (contentUI != null) { Component focusComponent = contentUI.getModel().getStates().getFormFocusOwner(); if (focusComponent == null) { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorModel.java ===================================== @@ -39,7 +39,7 @@ import java.util.Objects; public class DataSourceEditorModel extends AbstractJavaBean { public static final String PROPERTY_FOCUS_ON_NAVIGATION = "focusOnNavigation"; - private static final String PROPERTY_CONTENT = "content"; + public static final String PROPERTY_CONTENT = "content"; /** * Shared message table model. */ @@ -78,6 +78,11 @@ public class DataSourceEditorModel extends AbstractJavaBean { return content; } + @SuppressWarnings("unchecked") + public U getTypedContent() { + return (U) content; + } + public void setContent(ContentUI content) { ContentUI oldValue = getContent(); this.content = content; ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIManager.java ===================================== @@ -25,17 +25,11 @@ import fr.ird.observe.client.datasource.editor.api.DataSourceEditor; import fr.ird.observe.client.datasource.editor.api.DataSourceEditorBodyContent; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; import fr.ird.observe.client.main.body.MainUIBodyContentManager; -import fr.ird.observe.client.util.UIHelper; -import fr.ird.observe.client.util.session.ObserveSwingSessionHelper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.JAXXContext; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; -import javax.swing.JPanel; -import javax.swing.SwingUtilities; -import java.awt.BorderLayout; -import java.awt.Component; import java.lang.reflect.Constructor; /** @@ -49,7 +43,6 @@ public class ContentUIManager { private static final Logger log = LogManager.getLogger(ContentUIManager.class); - private final ObserveSwingSessionHelper swingSessionHelper; private final DataSourceEditorBodyContent dataSourceEditorBody; public static JAXXInitialContext newContext(ContentUI parent) { @@ -63,178 +56,54 @@ public class ContentUIManager { .add(dataSourceEditor); } - public ContentUIManager(MainUIBodyContentManager mainUIBodyContentManager, ObserveSwingSessionHelper swingSessionHelper) { - this.swingSessionHelper = swingSessionHelper; + public ContentUIManager(MainUIBodyContentManager mainUIBodyContentManager) { this.dataSourceEditorBody = mainUIBodyContentManager.getBodyTyped(DataSourceEditor.class, DataSourceEditorBodyContent.class); } - public U getContent() { - JPanel layoutContent = getLayoutContent(); - Component currentContent = layoutContent.getComponent(0); - if (!(currentContent instanceof ContentUI)) { - return null; - } - @SuppressWarnings("unchecked") U content = (U) currentContent; - log.debug(String.format("Will use existing content: %s", content.getClass().getName())); - return content; - } - public void closeSafeSelectedContentUI() { - ContentUI selectedContentUI = getSelectedContentUI(); + ContentUI selectedContentUI = getDataSourceEditor().getModel().getContent(); if (selectedContentUI != null) { selectedContentUI.getHandler().getContentOpen().closeSafeUI(); } } public U createContent(NavigationNode node, Class uiClass) { - DataSourceEditor dataSourceEditor = getDataSourceEditor(); - JAXXInitialContext jaxxInitialContext = newContext(dataSourceEditor, node); - U result; try { Constructor constructor = uiClass.getConstructor(JAXXContext.class); log.info(String.format("[%s] Will create new ui", uiClass.getSimpleName())); - result = constructor.newInstance(jaxxInitialContext); + JAXXInitialContext jaxxInitialContext = newContext(getDataSourceEditor(), node); + return constructor.newInstance(jaxxInitialContext); } catch (Exception e) { throw new IllegalStateException("Could not create content ui " + uiClass, e); } - try { - // ajout du content dans son parent - getLayoutContent().removeAll(); - getLayoutContent().add(result, BorderLayout.CENTER); - log.debug(String.format("Add new content: %s", result.getClass().getName())); - return result; - } catch (Exception e) { - throw new IllegalStateException("Could not init content ui " + uiClass, e); - } - } - - public void openContent(ContentUI content) { - log.info(String.format("%sWill open ui", content.getModel().getPrefix())); - boolean withError = false; - try { - content.open(); - } catch (Exception e) { - //FIXME:BodyContent See what to do exactly in this case, remove everything ? - UIHelper.handlingError(e); - withError = true; - } finally { - if (!withError) { - getLayoutContent().removeAll(); - getLayoutContent().add(content, BorderLayout.CENTER); - getDataSourceEditor().updateContentSize(); - - swingSessionHelper.addComponent(content, true); - swingSessionHelper.save(); - log.info(String.format("%s opened", content.getModel().getPrefix())); - - SwingUtilities.invokeLater(content::opened); - } - } - } - - public void close() { - getLayoutContent().removeAll(); - getLayoutContent().add(getDataSourceEditor().getEmptySelection(), BorderLayout.CENTER); - } - - public ContentUI getSelectedContentUI() { - return getSelectedContentUI(getDataSourceEditor()); - } - - public boolean closeSelectedContentUI() { - return closeSelectedContentUI(getDataSourceEditor()); } /** * Essaye de fermer l'écran d'édition s'il existe. * - * @param dataSourceEditor l'ui principale - * @return {@code true} si le contenu a bien été fermé, {@code false} si on - * ne peut pas fermer l'écran + * @return {@code true} si le contenu a bien été fermé, {@code false} si on ne peut pas fermer l'écran * @since 1.5 */ - public boolean closeSelectedContentUI(DataSourceEditor dataSourceEditor) { - ContentUI ui = getSelectedContentUI(dataSourceEditor); + public boolean closeSelectedContentUI() { + ContentUI ui = getDataSourceEditor().getModel().getContent(); if (ui == null) { // no content ui return true; } log.info(String.format("[%s] Will close ui", ui.getClass().getSimpleName())); - boolean closed = false; + boolean closed; try { closed = ui.close(); } catch (Exception e) { - UIHelper.handlingError(e); + log.error(String.format("%sCould not close ui", ui.getModel().getPrefix()), e); + // still we accept to qui the content + closed = true; } return closed; } - public void removeSelectedContentUI() { - ContentUI selectedContentUI = getSelectedContentUI(); - if (selectedContentUI != null) { - try { - getLayoutContent().removeAll(); - } catch (Exception e) { - e.printStackTrace(); - } - log.info(String.format("[%s] Will destroy ui", selectedContentUI.getClass().getSimpleName())); - selectedContentUI.destroy(); - } - getLayoutContent().add(getDataSourceEditor().getEmptySelection(), BorderLayout.CENTER); - } - - //FIXME:BodyContent Who used this ? -// public void restartEdit() { -// -// ContentUI selectedUI = getSelectedContentUI(); -// if (selectedUI == null) { -// // pas d'écran selectionne -// return; -// } -// ContentUIModel model = selectedUI.getModel(); -// if (!model.isEditable()) { -// // modele non editable -// return; -// } -// -// if (!model.isUpdatingMode()) { -// // ecran non en mode mis a jour -// return; -// } -// -// log.info(String.format("[%s] Will restart edit ui", selectedUI.getClass().getSimpleName())); -// selectedUI.restartEdit(); -// } - - @Override - protected void finalize() throws Throwable { - super.finalize(); - close(); - } - - private JPanel getLayoutContent() { - return getDataSourceEditor().getContent(); - } - private DataSourceEditor getDataSourceEditor() { return dataSourceEditorBody.get(); } - private ContentUI getSelectedContentUI(DataSourceEditor ui) { - if (ui == null) { - // no ui, so no modification - return null; - } - ContentUI result = null; - JPanel container = ui.getContent(); - if (container.getComponentCount() < 1) { - return null; - } - Component currentContent = container.getComponent(0); - if (currentContent instanceof ContentUI) { - result = (ContentUI) currentContent; - } - return result; - } - } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewContentTableUIEntry.java ===================================== @@ -83,7 +83,7 @@ public class CreateNewContentTableUIEntry extends ContentUI ContentTableUI<?, ?, ?> newContentUI; if (!source.equals(selectedNode)) { tree.selectSafeNode(selectedNode); - newContentUI = (ContentTableUI<?, ?, ?>) getDataSourceEditor().getContentUIManager().getSelectedContentUI(); + newContentUI = (ContentTableUI<?, ?, ?>) getDataSourceEditor().getModel().getContent(); } else { newContentUI = (ContentTableUI<?, ?, ?>) ui; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeMode.java ===================================== @@ -251,22 +251,18 @@ public class ChangeMode extends ContentUIActionSupport { } public void rebuildEditableZone(U ui) { -// ui.getActions().setVisible(true); ui.getHandler().getDataSourceEditor().getMessageView().setVisible(true); SwingUtilities.invokeLater(ui.getHandler()::fixFormSize); getDataSourceEditor().updateContentSize(); -// ui.getHandler().fixFormSize(); } protected void rebuildNotEditableZone(U ui) { -// ui.getActions().setVisible(false); ui.getHandler().getDataSourceEditor().getMessageView().setVisible(false); ui.getHandler().fixFormSize(); getDataSourceEditor().updateContentSize(); SwingUtilities.invokeLater(ui.getHandler()::fixFormSize); } - protected void rebuildFocus(U ui, ContentMode mode) { ContentUIModel model = ui.getModel(); model.setFormFocusOwner(null); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripActionHelper.java ===================================== @@ -136,7 +136,7 @@ public abstract class TripActionHelper implements WithClientUIContext { NavigationTree tree = ui.getHandler().getDataSourceEditor().getNavigationUI().getTree(); NavigationNode tripNode = tree.getSelectedNode().upToReferenceNode(getReferenceType()); tree.selectSafeNode(tripNode); - TripUI<?> tripUI = (TripUI<?>) ui.getHandler().getDataSourceEditor().getContentUIManager().getSelectedContentUI(); + TripUI<?> tripUI = (TripUI<?>) ui.getHandler().getDataSourceEditor().getModel().getContent(); // set availability flag to true tripUI.getModel().set(availabilityPropertyName, true); // go to meta-data tab ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/SaveEditUIAdapter.java ===================================== @@ -59,7 +59,7 @@ public class SaveEditUIAdapter> implements SaveAda dataSourceEditor.getNavigationUI().getTree().reSelectSafeNode(node); // apply extra actions from previous opened content (go back to correct tab if any, ...) - U newUi = dataSourceEditor.getContentUIManager().getContent(); + U newUi = dataSourceEditor.getModel().getTypedContent(); newUi.resetFromPreviousUi(ui); } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/SaveOpenableUIAdapter.java ===================================== @@ -69,12 +69,12 @@ public class SaveOpenableUIAdapter> implements dataSourceEditor.getNavigationUI().getTree().reSelectSafeNode(node); // apply extra actions from previous opened content (go back to correct tab if any, ...) - U newUi = dataSourceEditor.getContentUIManager().getContent(); + U newUi = dataSourceEditor.getModel().getTypedContent(); newUi.resetFromPreviousUi(ui); if (request.isNotPersisted() && predicate.test(bean)) { // reload ui and do click - U content = dataSourceEditor.getContentUIManager().getContent(); + U content = dataSourceEditor.getModel().getTypedContent(); SwingUtilities.invokeLater(() -> buttonGetter.apply(content).doClick()); } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTree.java ===================================== @@ -45,42 +45,9 @@ public class NavigationTree extends JXTree { public NavigationTree() { super(new NavigationTreeModel()); - setLargeModel(true); setRootVisible(false); - -// addTreeWillExpandListener(new TreeWillExpandListener() { -// -// @Override -// public void treeWillExpand(TreeExpansionEvent event) throws ExpandVetoException { -// getSelectionModel().fireTreeWillExpandEvent(event); -// openNode(event.getPath()); -// } -// -// @Override -// public void treeWillCollapse(TreeExpansionEvent event) throws ExpandVetoException { -// //FIXME check this is working ? -// getSelectionModel().fireTreeWillCollapseEvent(event); -// } -// }); -// addTreeSelectionListener(e -> { -// if (!e.isAddedPath()) { -// return; -// } -// openNode(e.getPath()); -// }); - - } - -// public boolean getScrollableTracksViewportWidth() { -// return true; -// } - -// @Override -// public boolean isFixedRowHeight() { -// return true; -// } - + } @Override public void updateUI() { @@ -157,9 +124,9 @@ public class NavigationTree extends JXTree { NavigationNode selectedNode = getModel().getInitialNode(); log.info(String.format("Initial selected node: %s", selectedNode)); if (selectedNode != null) { - selectSafeNode(selectedNode); + reSelectSafeNode(selectedNode); } - SwingUtilities.invokeLater(this::grabFocus); + SwingUtilities.invokeLater(this::requestFocusInWindow); } /** @@ -180,7 +147,7 @@ public class NavigationTree extends JXTree { selectFirstNode(); } } - SwingUtilities.invokeLater(this::grabFocus); + SwingUtilities.invokeLater(this::requestFocusInWindow); } public void addUnsavedNode(NavigationNode parentNode, NavigationNode result) { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTreeSelectionListenerImpl.java ===================================== @@ -24,6 +24,7 @@ package fr.ird.observe.client.datasource.editor.api.navigation; import fr.ird.observe.client.ClientUIContext; import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; +import fr.ird.observe.client.datasource.editor.api.DataSourceEditorModel; import fr.ird.observe.client.datasource.editor.api.content.ContentUI; import fr.ird.observe.client.datasource.editor.api.content.ContentUIManager; import fr.ird.observe.client.datasource.editor.api.navigation.event.NavigationTreeSelectionEvent; @@ -48,9 +49,11 @@ class NavigationTreeSelectionListenerImpl implements fr.ird.observe.client.datas private final ClientUIContext clientUIContext; private final ContentUIManager contentUIManager; private final NavigationUI ui; + private final DataSourceEditorModel dataSourceEditorModel; private final NavigationTree tree; - NavigationTreeSelectionListenerImpl(ContentUIManager contentUIManager, NavigationUI ui, NavigationTree tree) { + NavigationTreeSelectionListenerImpl(DataSourceEditorModel dataSourceEditorModel, ContentUIManager contentUIManager, NavigationUI ui, NavigationTree tree) { + this.dataSourceEditorModel = Objects.requireNonNull(dataSourceEditorModel); this.tree = Objects.requireNonNull(tree); this.clientUIContext = tree.getRootNode().getClientUIContext(); this.contentUIManager = Objects.requireNonNull(contentUIManager); @@ -70,9 +73,8 @@ class NavigationTreeSelectionListenerImpl implements fr.ird.observe.client.datas } @Override - public void treeWillExpand(TreeExpansionEvent event) throws ExpandVetoException { + public void treeWillExpand(TreeExpansionEvent event) { // do nothing -// tree.getSelectionModel().fireTreeWillExpandEvent(event); TreePath path = event.getPath(); NavigationNode node = (NavigationNode) path.getLastPathComponent(); log.info(String.format("Will expand - do open node: %s", node)); @@ -82,7 +84,7 @@ class NavigationTreeSelectionListenerImpl implements fr.ird.observe.client.datas @Override public void treeWillCollapse(TreeExpansionEvent event) throws ExpandVetoException { //FIXME check this is working ? -// tree.getSelectionModel().fireTreeWillCollapseEvent(event); + tree.getSelectionModel().fireTreeWillCollapseEvent(event); NavigationNode node = (NavigationNode) event.getPath().getLastPathComponent(); @@ -111,12 +113,13 @@ class NavigationTreeSelectionListenerImpl implements fr.ird.observe.client.datas if (source == null || !source.isOpen()) { //FIXME Is this can really happen ? not sure // no open data source - log.debug("No open Data source."); + log.warn("No open Data source."); return; } if (tree.isSelectionEmpty()) { - log.debug("No selection, show empty panel..."); - contentUIManager.removeSelectedContentUI(); + log.info("No selection, show empty panel..."); + dataSourceEditorModel.setContent(null); +// contentUIManager.removeSelectedContentUI(); return; } @@ -125,6 +128,7 @@ class NavigationTreeSelectionListenerImpl implements fr.ird.observe.client.datas String params = node.toString(); String message = t("observe.ui.action.open.screen", params); + log.info("Open selection: " + message); node.open(); @@ -137,75 +141,23 @@ class NavigationTreeSelectionListenerImpl implements fr.ird.observe.client.datas // obtain the ui type to show Class<? extends ContentUI> uiClass = node.getScope().getContentUiType(); - log.info(String.format("new selected path = %s, ui = %s", node, uiClass)); + log.info(String.format("Will open content for node = %s, ui = %s", node, uiClass)); - //FIXME Just for test - if (uiClass == null) { - //FIXME We should always have a ui associated to node, improve this code to not accept this state - // no ui found, do nothing - return; - } // compute the selected ids to put in data context node.getContext().storeSelectedNodes(node); - //FIXME:Focus this is not the place to set focus -// boolean focusOnNavigation = false; -// JComponent focusOwner; -// ObserveMainUI mainUI = getClientUIContext().getMainUI(); -// Component focusOwner1 = mainUI.getFocusOwner(); -// if (focusOwner1 == null || focusOwner1.equals(ui) || focusOwner1.equals(mainUI)) { -// focusOnNavigation = true; -// focusOwner = ui.getNavigationUI().getTree(); -// } else { -// focusOwner = (JComponent) mainUI.getFocusOwner(); -// -// if (focusOwner != null) { -// if (ui.getNavigationUI().getTree().equals(focusOwner)) { -// focusOnNavigation = true; -// } -// if (ui.getNavigationUI().equals(focusOwner)) { -// focusOnNavigation = true; -// } -// if (ui.getNavigationView().equals(focusOwner)) { -// focusOnNavigation = true; -// } -// if (!focusOnNavigation) { -// Container focusOwnerParent = focusOwner.getParentReference(); -// while (focusOwnerParent != null) { -// if (ui.getNavigationUI().getTree().equals(focusOwnerParent)) { -// focusOnNavigation = true; -// break; -// } -// if (ui.getNavigationUI().equals(focusOwnerParent)) { -// focusOnNavigation = true; -// break; -// } -// if (ui.getNavigationView().equals(focusOwnerParent)) { -// focusOnNavigation = true; -// break; -// } -// focusOwnerParent = focusOwnerParent.getParentReference(); -// } -// } -// } -// } -// if (focusOnNavigation) { -// log.debug("Focus on navigation: " + focusOwner); +// ContentUI previousSelectedContent = contentUIManager.getSelectedContentUI(); +// if (previousSelectedContent != null) { +// contentUIManager.removeSelectedContentUI(); // } - ContentUI previousSelectedContent = contentUIManager.getSelectedContentUI(); - if (previousSelectedContent != null) { - contentUIManager.removeSelectedContentUI(); - } - // create new content ContentUI content = contentUIManager.createContent(node, node.getScope().getContentUiType()); // open content - contentUIManager.openContent(content); + dataSourceEditorModel.setContent(content); +// contentUIManager.openContent(content); ObserveUtil.cleanMemory(); - -// if (focusOnNavigation) SwingUtilities.invokeLater(focusOwner::requestFocusInWindow); } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTreeShowPopupHandler.java ===================================== @@ -22,9 +22,9 @@ package fr.ird.observe.client.datasource.editor.api.navigation; * #L% */ +import fr.ird.observe.client.datasource.editor.api.DataSourceEditorModel; import fr.ird.observe.client.datasource.editor.api.content.ContentUI; import fr.ird.observe.client.datasource.editor.api.content.ContentUIHandler; -import fr.ird.observe.client.datasource.editor.api.content.ContentUIManager; import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -57,10 +57,10 @@ public class NavigationTreeShowPopupHandler implements KeyListener, MouseListene private final JPopupMenu popup; private final NavigationTree tree; private final JMenuItem noAction; - private final ContentUIManager contentUIManager; + private final DataSourceEditorModel dataSourceEditorModel; - NavigationTreeShowPopupHandler(ContentUIManager contentUIManager, NavigationTree tree, JPopupMenu popup, JMenuItem noAction) { - this.contentUIManager = Objects.requireNonNull(contentUIManager); + NavigationTreeShowPopupHandler(DataSourceEditorModel dataSourceEditorModel, NavigationTree tree, JPopupMenu popup, JMenuItem noAction) { + this.dataSourceEditorModel = Objects.requireNonNull(dataSourceEditorModel); this.popup = Objects.requireNonNull(popup); this.tree = Objects.requireNonNull(tree); this.noAction = Objects.requireNonNull(noAction); @@ -84,7 +84,7 @@ public class NavigationTreeShowPopupHandler implements KeyListener, MouseListene // clean popup popup.removeAll(); popup.setLabel(selectedNode.toString()); - ContentUI selectedContentUI = contentUIManager.getSelectedContentUI(); + ContentUI selectedContentUI = dataSourceEditorModel.getContent(); ContentUIHandler<?> handler = selectedContentUI.getHandler(); int length = 0; List<AbstractButton> actions = handler.getNavigationPopupActions(); @@ -187,7 +187,7 @@ public class NavigationTreeShowPopupHandler implements KeyListener, MouseListene // try to change selection TreePath pathForRow = tree.getPathForRow(closestRowForLocation); - if (pathForRow==null) { + if (pathForRow == null) { e.consume(); return; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUIInitializer.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.api.navigation; */ import fr.ird.observe.client.configuration.NavigationTreeConfigBean; +import fr.ird.observe.client.datasource.editor.api.DataSourceEditorModel; import fr.ird.observe.client.datasource.editor.api.content.ContentUIManager; import fr.ird.observe.client.datasource.editor.api.navigation.actions.ConfigureMenuAction; import fr.ird.observe.client.util.init.UIInitHelper; @@ -115,9 +116,10 @@ class NavigationUIInitializer extends UIInitializerSupport<NavigationUI, UIIniti editor.setCellRenderer(new NavigationTreeCellRenderer()); editor.getModel().loadConfig(); NavigationUI ui = initializerContext.getUi(); + DataSourceEditorModel dataSourceEditorModel = Objects.requireNonNull(ui.getContextValue(DataSourceEditorModel.class)); ContentUIManager contentUIManager = Objects.requireNonNull(ui.getContextValue(ContentUIManager.class)); - editor.installShowPopupHandler(new NavigationTreeShowPopupHandler(contentUIManager, editor, ui.getNavigationPopup(), ui.getNoAction())); - NavigationTreeSelectionListenerImpl selectionListener = new NavigationTreeSelectionListenerImpl(contentUIManager, ui, editor); + editor.installShowPopupHandler(new NavigationTreeShowPopupHandler(dataSourceEditorModel, editor, ui.getNavigationPopup(), ui.getNoAction())); + NavigationTreeSelectionListenerImpl selectionListener = new NavigationTreeSelectionListenerImpl(dataSourceEditorModel, contentUIManager, ui, editor); editor.addNavigationTreeSelectionListener(selectionListener); editor.addTreeWillExpandListener(selectionListener); editor.addTreeSelectionListener(selectionListener); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationNode.java ===================================== @@ -104,9 +104,9 @@ public class RootNavigationNode extends NavigationNode { public NavigationNode findNodeFromPreviousSelectedNode(NavigationNode oldSelectedNode) { NavigationNode result = this; TreeNode[] pathToRoot = oldSelectedNode.getPath(); - for (int i = 1; i < pathToRoot.length; i++) { + for (TreeNode treeNode : pathToRoot) { NavigationNode next; - NavigationNode oldNode = (NavigationNode) pathToRoot[i]; + NavigationNode oldNode = (NavigationNode) treeNode; if (oldNode.getScope().isSelectNode()) { next = result.findChildByType(oldNode.getClass(), oldNode.getInitializer().getSelectNodeId()); } else { ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/RouteCloseCallback.java ===================================== @@ -146,7 +146,7 @@ public class RouteCloseCallback implements EditNodeCloseCallback, WithClientUICo parentNode.addEmptyActivityUINavigationNode(); // on récupère l'écran d'édition - ActivityUI selectedUI = (ActivityUI) dataSourceEditor.getContentUIManager().getSelectedContentUI(); + ActivityUI selectedUI = (ActivityUI) dataSourceEditor.getModel().getContent(); // on recupère l'activité de fin de veille VesselActivityReference vesselActivitySeine = null; ===================================== models/dto/src/main/models/Observe-01-referential-common.model ===================================== @@ -58,7 +58,7 @@ longitude + {*:1} Float | mayNotNull quadrant + {*:1} Integer | mayNotNull country {*:0..1} fr.ird.observe.dto.referential.common.CountryReference | notNull -referential.common.LengthLengthParameter > referential.common.LengthFormulaSupport | references=uri,oceanLabel,sexLabel,species,startDate,endDate,inputSizeMeasureType,outputSizeMeasureType,inputOutputFormula,outputInputFormula +referential.common.LengthLengthParameter > referential.common.LengthFormulaSupport >> reference.ReferentialDtoReferenceWithNoCodeAware | references=uri,oceanLabel,sexLabel,species,startDate,endDate,inputSizeMeasureType,outputSizeMeasureType,inputOutputFormula,outputInputFormula inputOutputFormula + {*:1} String | notNull inputOutputFormulaValid + {*:1} boolean outputInputFormula + {*:1} String | notNull @@ -66,7 +66,7 @@ outputInputFormulaValid + {*:1} boolean inputSizeMeasureType {*:1} fr.ird.observe.dto.referential.common.SizeMeasureTypeReference | notNull outputSizeMeasureType {*:1} fr.ird.observe.dto.referential.common.SizeMeasureTypeReference | notNull -referential.common.LengthWeightParameter > referential.common.LengthFormulaSupport | references=uri,oceanLabel,sexLabel,species,startDate,endDate,lengthWeightFormula,weightLengthFormula,sizeMeasureType +referential.common.LengthWeightParameter > referential.common.LengthFormulaSupport >> reference.ReferentialDtoReferenceWithNoCodeAware | references=uri,oceanLabel,sexLabel,species,startDate,endDate,lengthWeightFormula,weightLengthFormula,sizeMeasureType lengthWeightFormula + {*:1} String | notNull weightLengthFormula + {*:1} String | notNull meanLength + {*:1} Float | strictlyPositiveNumber View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/95c108a128ade08e284ab2a4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/95c108a128ade08e284ab2a4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Low log level
by Tony CHEMIT 17 Dec '20

17 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2434a371 by Tony Chemit at 2020-12-17T06:05:56+01:00 Low log level - - - - - 512a2d47 by Tony Chemit at 2020-12-17T06:11:48+01:00 Si on annule le changement d'une source de donnée, la source précédente reste connectée mais on ne voit pas l'arbre de navigation - Closes #1670 - - - - - 95c108a1 by Tony Chemit at 2020-12-17T06:11:48+01:00 Lors d'une action d'import d'une sauvegarde, la source de donnée courante est fermée avant même que l'utilisateur est validé - Closes #1671 - - - - - 4 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewContentTableUIEntry.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/ImportStorageFromFileAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/LoadStorageActionSupport.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewContentTableUIEntry.java ===================================== @@ -60,7 +60,7 @@ public class CreateNewContentTableUIEntry extends ContentUI JMenuItem editor = new JMenuItem(); String fieldName = "add" + StringUtils.capitalize(dtoType.getSimpleName().replace("Dto", "")); editor.setName(fieldName); - log.info("Create new action: " + fieldName); + log.debug("Create new action: " + fieldName); ui.get$objectMap().put(editor.getName(), editor); init(ui, editor, action); return editor; ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModelSupport.java ===================================== @@ -99,8 +99,9 @@ public abstract class ContentSimpleUIModelSupport<D extends DataDto> extends Con if (result) { D bean = getStates().getBean(); result = ContentTableUINavigationInitializer.isEnabled(bean, dtoType); - if (result) { // got a matching bean property - log.info(String.format("%sUse dto bean property to enable %s create action.", getPrefix(), dtoType.getName())); + if (result) { + // got a matching bean property + log.debug(String.format("%sUse dto bean property to enable %s create action.", getPrefix(), dtoType.getName())); } return result; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/ImportStorageFromFileAction.java ===================================== @@ -26,9 +26,7 @@ import fr.ird.observe.client.constants.CreationMode; import fr.ird.observe.client.constants.DbMode; import fr.ird.observe.client.datasource.editor.api.wizard.StorageStep; import fr.ird.observe.client.datasource.editor.api.wizard.StorageUI; -import fr.ird.observe.client.datasource.editor.api.wizard.StorageUILauncher; import fr.ird.observe.client.datasource.editor.api.wizard.StorageUIModel; -import fr.ird.observe.client.main.ObserveMainUI; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -76,19 +74,9 @@ public class ImportStorageFromFileAction extends LoadStorageActionSupport { } } - @Override - protected StorageUILauncher startWizard(ObserveMainUI mainUI) { - if (getObserveDataSourcesManager().getOptionalMainDataSource().isPresent()) { - log.info("Closing datasource..."); - getDataSourceEditorBodyContent().doCloseStorage(); - } - return super.startWizard(mainUI); - } - @Override protected void doChangeStorage(StorageUI ui) { log.info("Start importing new datasource from backup file..."); - super.doChangeStorage(ui); } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/actions/LoadStorageActionSupport.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.datasource.editor.api.menu.actions; * #L% */ +import fr.ird.observe.client.datasource.editor.api.DataSourceEditor; import fr.ird.observe.client.datasource.editor.api.loading.LoadingDataSourceContext; import fr.ird.observe.client.datasource.editor.api.loading.close.CloseDataSourceAction; import fr.ird.observe.client.datasource.editor.api.loading.open.OpenDataSourceAction; @@ -70,9 +71,12 @@ public abstract class LoadStorageActionSupport extends DataSourceEditorMenuActio JAXXContext rootContext = ui == null ? mainUI : ui; return new StorageUILauncher(rootContext, mainUI, getTitle()) { + boolean withPreviousDatasource; + @Override protected void init(StorageUI ui) { super.init(ui); + withPreviousDatasource = getClientUIContext().getDataSourcesManager().getOptionalMainDataSource().isPresent(); LoadStorageActionSupport.this.init(ui); } @@ -82,6 +86,13 @@ public abstract class LoadStorageActionSupport extends DataSourceEditorMenuActio doChangeStorage(ui); } + @Override + public void doClose(StorageUI ui, boolean wasCanceled) { + super.doClose(ui, wasCanceled); + if (wasCanceled && withPreviousDatasource) { + mainUI.changeBodyContent(DataSourceEditor.class); + } + } }; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/72e7bfd8d4b5854492138778… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/72e7bfd8d4b5854492138778… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Improve how to display permission (once for all only one place to get the...
by Tony CHEMIT 17 Dec '20

17 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3eeb40a9 by Tony Chemit at 2020-12-17T05:43:32+01:00 Improve how to display permission (once for all only one place to get the correct label): what a really mess in templates (thanks to sbavencoff) - - - - - 72e7bfd8 by Tony Chemit at 2020-12-17T05:48:21+01:00 Revoir le bouton qui permet de voir la base chargée - Closes #1657 - - - - - 30 changed files: - client/core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl - client/core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl - client/core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl - client/datasource/editor/api/src/main/i18n/templates/storageModelDataSourceConfiguration_en_GB.ftl - client/datasource/editor/api/src/main/i18n/templates/storageModelDataSourceConfiguration_es_ES.ftl - client/datasource/editor/api/src/main/i18n/templates/storageModelDataSourceConfiguration_fr_FR.ftl - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditor.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditor.jcss - 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/DataSourceEditorHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorModel.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 - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorMenuModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorNavigationMenuHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUI.jaxx - 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/NavigationUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/GoDown.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/GoUp.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/NavigationConfigUIActionSupport.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/menu/actions/StorageStatusAction.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/ToggleInformation.java - services/i18n/src/main/i18n/translations/services_en_GB.properties - services/i18n/src/main/i18n/translations/services_es_ES.properties - services/i18n/src/main/i18n/translations/services_fr_FR.properties - toolkit/dto/src/main/i18n/getters/java.getter - toolkit/dto/src/main/java/fr/ird/observe/security/WithPermission.java - toolkit/service/src/main/i18n/templates/dataSourcePolicy_en_GB.ftl - toolkit/service/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/741ced544142b11a7077fc08… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/741ced544142b11a7077fc08… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Avoid NPE when the navigation node has no data
by Tony CHEMIT 15 Dec '20

15 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 39bdcab6 by Tony Chemit at 2020-12-15T14:36:25+01:00 Avoid NPE when the navigation node has no data - - - - - 72eac333 by Tony Chemit at 2020-12-15T14:50:40+01:00 Add fixme - - - - - 741ced54 by Tony Chemit at 2020-12-15T15:17:45+01:00 Améliorer les performances lors du changement de l'arbre de navigation - Closes #1655 Ajouter un onglet dans la configuration pour tout ce qui concerne l'arbre de navigation - Closes #1656 - - - - - 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/main/java/fr/ird/observe/client/configuration/NavigationTreeConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfigBean.java - client/core/src/main/i18n/getters/java.getter - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.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/DataSourceEditorHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/ReferentialSaveAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/SelectionTreeModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/menu/DataSourceEditorNavigationMenuHandler.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/NavigationTreeModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTreeShowPopupHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUI.jaxx - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationUI.jcss - 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/NavigationUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/ToggleShowDisabled.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/LoadDisabledProgram.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/ToggleShowEmpty.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/LoadEmptyProgram.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/ToggleShowLongline.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/LoadLlModule.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/ToggleShowSeine.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/LoadPsModule.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/ToggleShowReferential.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/LoadReferential.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/NavigationConfigUIToggleShowActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationCapability.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationTreeNodeProvider.java - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/CommonRootSelectionTreeNodeProvider.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/87feceb667e47c54fe23e409… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/87feceb667e47c54fe23e409… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Fix backup usage
by Tony CHEMIT 15 Dec '20

15 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cba03f18 by Tony Chemit at 2020-12-14T16:28:07+01:00 Fix backup usage - - - - - 87feceb6 by Tony Chemit at 2020-12-15T09:49:31+01:00 add fixme - - - - - 3 changed files: - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java - client/core/src/main/java/fr/ird/observe/dto/decoration/WithDecoratorService.java Changes: ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -179,7 +179,9 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig private File feedBackDirectoryFile; public static ClientConfig forTest() { - return new ClientConfig(ApplicationConfigInit.forAllScopesWithout(ApplicationConfigScope.HOME, ApplicationConfigScope.ENV, ApplicationConfigScope.SYSTEM), DEFAULT_OBSERVE_SWING_CONFIGURATION_FILENAME); + ClientConfig clientConfig = new ClientConfig(ApplicationConfigInit.forAllScopesWithout(ApplicationConfigScope.HOME, ApplicationConfigScope.ENV, ApplicationConfigScope.SYSTEM), DEFAULT_OBSERVE_SWING_CONFIGURATION_FILENAME); + clientConfig.setBackupUse(false); + return clientConfig; } public static void initI18n(ClientConfig config) { ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java ===================================== @@ -126,7 +126,7 @@ public class BackupsManager implements Closeable { try { List<BackupStorage> backups; - if (Files.exists(storePath)) { + if (config.isBackupUse() && Files.exists(storePath)) { try (BufferedReader reader = Files.newBufferedReader(storePath, StandardCharsets.UTF_8)) { Type typeOfT = new TypeToken<List<BackupStorage>>() { }.getType(); ===================================== client/core/src/main/java/fr/ird/observe/dto/decoration/WithDecoratorService.java ===================================== @@ -24,6 +24,9 @@ package fr.ird.observe.dto.decoration; import fr.ird.observe.client.ClientUIContextApplicationComponent; +/** + * FIXME Remove this, decoration should not be exposed but internal + */ public interface WithDecoratorService { default DecoratorService getDecoratorService() { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d8dca290f8a6cb54ffbbfb3a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d8dca290f8a6cb54ffbbfb3a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Impossible d'ouvrir les bases de données - Closes #1666
by Tony CHEMIT 14 Dec '20

14 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d8dca290 by Tony Chemit at 2020-12-14T15:51:27+01:00 Impossible d'ouvrir les bases de données - Closes #1666 - - - - - 1 changed file: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHelper.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHelper.java ===================================== @@ -135,7 +135,7 @@ public class DataSourceEditorHelper { try { // byte[] dump = Files.readAllBytes(backupStorage.getFile().toPath()); DataSourceCreateConfigurationDto createDto = new DataSourceCreateConfigurationDto(); - createDto.setImportDatabase(TopiaSqlScript.of(backupStorage.getFile().toURI())); + createDto.setImportDatabase(TopiaSqlScript.of(backupStorage.getFile().toPath().toUri())); ObserveDataSourceConfigurationTopiaH2 dataSourceConfigurationH2 = dataSourcesManager.newH2DataSourceConfiguration(I18n.n("observe.runner.initStorage.label.local")); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d8dca290f8a6cb54ffbbfb3a8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d8dca290f8a6cb54ffbbfb3a8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Impossible d'ouvrir les bases de données - See #1666
by Tony CHEMIT 14 Dec '20

14 Dec '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8041ee2f by Tony Chemit at 2020-12-14T15:19:50+01:00 Impossible d'ouvrir les bases de données - See #1666 - - - - - 1 changed file: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripActionHelper.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripActionHelper.java ===================================== @@ -69,7 +69,8 @@ public abstract class TripActionHelper implements WithClientUIContext { public static void disableCreateActionIfProgramDisabled(ContentListUI<?, ?, ?> ui, ProgramReference program) { if (ui.getModel().getStates().isEditable()) { if (program.isDisabled() && !ui.getModel().getClientUIContext().getClientConfig().isValidationUseDisabledReferential()) { - JMenuItem createAction = (JMenuItem) ui.getClientProperty(ContentListUIHandler.CLIENT_PROPERTY_CREATE_ACTION); + String editorName = (String) ui.getClientProperty(ContentListUIHandler.CLIENT_PROPERTY_CREATE_ACTION); + JMenuItem createAction = (JMenuItem) ui.getObjectById(editorName); createAction.setEnabled(false); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8041ee2f09fe2a6135ad387fb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8041ee2f09fe2a6135ad387fb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe
by Tony CHEMIT 14 Dec '20

14 Dec '20

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: ee297561 by 166231 at 2020-12-14T14:19:23+00:00 Site checkin for project ObServe - - - - - 3 changed files: - administration-web.html - architecture-logicielle.html - − css/apache-maven-fluido-1.8.min.css The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ee297561dc268d7c2804115f6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ee297561dc268d7c2804115f6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/8.0.1
by Tony CHEMIT 14 Dec '20

14 Dec '20

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

1 0