GitLab

at 2023-11-28T17:19:37+01:00

avoid re-entrant code in listener

Do not enable change mode action if not one selected data

On list ui, always select first item at end open

On list ui, show configuration actions in navigation context menu even if model is not editable (may have the goto editing child action enabled here)

Merge branch 'feature/issue-2810' into develop
LL observations, en sélection multiple d'activités, la fonction 'Rouvrir la donnée de type activité' ne devrait pas être disponible
- Closes #2810

     private final U ui;

     private final PropertyChangeListener listener;

 

+    private boolean adjusting;

+

     public ChangeModeProducer(U ui, ChangeModeRequest request, String... properties) {

         this.ui = Objects.requireNonNull(ui);

         this.request = Objects.requireNonNull(request);

 

         listener = (PropertyChangeEvent evt) -> {

             if (modelStates.contains(evt.getPropertyName())) {

-                doRebuildChangeMode();

+                if (adjusting) {

+                    return;

+                }

+                try {

+                    adjusting = true;

+                    doRebuildChangeMode();

+                } finally {

+                    adjusting = false;

+                }

+

             }

         };

         ui.getModel().getStates().addPropertyChangeListener(ContentUIModelStates.PROPERTY_OPENED, evt -> {

 

 import javax.swing.JComponent;

 import javax.swing.JMenuItem;

+import javax.swing.SwingUtilities;

 import java.awt.BorderLayout;

 import java.awt.Container;

 import java.awt.event.MouseEvent;

         ShowTechnicalInformations.installAction(ui);

     }

 

+    @Override

+    public void onEndOpenUI() {

+        super.onEndOpenUI();

+        SwingUtilities.invokeLater(()-> {

+            if (!ui.getModel().getStates().isEmpty() && ui.getList().isSelectionEmpty()) {

+                ui.getList().setSelectedIndex(0);

+            }

+        });

+    }

+

     @Override

     public void installChangeModeAction() {

         ChangeModeRequest request = ui.getModel().toChangeModeRequest();

                 ui.getActions().setVisible(false);

                 super.rebuildNotEditableZone(ui);

             }

+

+            @Override

+            protected void rebuildAction(U ui, ContentMode newValue) {

+                ContentListUIModelStates<R> states = ui.getModel().getStates();

+                boolean editable = states.isEditable();

+                if (editable && ContentMode.READ.equals(newValue)) {

+                    boolean disableAction = false;

+                    if (!states.isOneSelectedData()) {

+                        disableAction = true;

+                        states.setEditable(false);

+                    }

+                    super.rebuildAction(ui, newValue);

+                    if(disableAction) {

+                        states.setEditable(true);

+                        setEnabled(false);

+                    }

+                } else {

+                    super.rebuildAction(ui, newValue);

+                }

+            }

         };

         ChangeMode.installAction(ui, action);

     }

 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.data.list.ContentListUI;

 import fr.ird.observe.client.datasource.editor.api.content.referential.ReferentialHomeUI;

 import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNode;

 import org.apache.logging.log4j.LogManager;

             actions.forEach(a -> ContentUIMenuAction.createWithKeyStroke(popup, a).init());

             length = popup.getSubElements().length;

         } else {

-            if (selectedContentUI.getMode().isEnabled()) {

+            if (selectedContentUI.getMode().isEnabled() || selectedContentUI instanceof ContentListUI) {

                 ContentUIMenuAction.createWithKeyStroke(popup, selectedContentUI.getMode()).init();

                 actions.forEach(a -> ContentUIMenuAction.createWithKeyStroke(popup, a).init());

                 popup.addSeparator();

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

3 changed files:

Changes: