GitLab

at 2023-07-26T16:56:52+02:00

Fix migration - See #2762

On ne voit pas les toolTip dans les arbres des assistants de synchronisation - Closes #2768

Add a new classifier «action» on enumeration I18n constants (will be used by new actions based on enumration)

Open API in ToolkitTreeModelSupport to be able to build first the flatModel and then build the root node from it (will be used when we want to keep the flatModel and do some filter on it to produce root node without having to make a service call, since the flatModel won't have changed)

Review method SelectionTreeModelSupport.allDataIds to be able to use it outside of the model scope

Improve SelectionTreeNodeRendererContext API to be able to extend it

Ne plus afficher le label L'opération requière des corrections sur les interfaces de certains assistants - Closes #2767

 }

 

 public void destroy() {

+    getHandler().destroy();

     description.setText("");

     leftSourceModel = null;

     rightSourceModel = null;

 import javax.swing.JButton;

 import javax.swing.JTextArea;

 import javax.swing.SwingUtilities;

+import java.awt.GridBagConstraints;

+import java.awt.Insets;

 import java.io.PrintWriter;

 import java.io.StringWriter;

 import java.util.Objects;

         progression.append(text + "\n");

         progression.setCaretPosition(progression.getDocument().getLength());

     }

+

+    protected void hideFixedPanelLabel(AdminTabUI ui) {

+        // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2767

+        // FIXME Maybe we should use a simple JPanel instead?

+        ui.getNEED_FIX_panel().removeAll();

+        ui.getNEED_FIX_panel().add(ui.getNEED_FIX_content(), new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0, 10, 1, new Insets(3, 3, 3, 3), 0, 0));

+    }

+

+    public void destroy() {

+

+    }

 }
     public void afterInit(ActivityPairingUI ui) {

         super.afterInit(ui);

         setAutoStart(ui.getPrepare());

+        hideFixedPanelLabel(ui);

     }

 }
         }

     }

 

+    @Override

     public void destroy() {

         ObserveSwingDataSource dataSource = ui.getModel().getConfigModel().getLeftSourceModel().getSafeSource(false);

         if (dataSource.isOpen()) {

 import org.nuiton.jaxx.runtime.spi.UIHandler;

 

 import javax.swing.JScrollPane;

+import javax.swing.ToolTipManager;

 

 import static io.ultreia.java4all.i18n.I18n.t;

 

         SelectUnselectWithOpposite.init(ui.getLeftTreePane().getTree(), null, new SelectUnselectWithOpposite(ui.getRightTreePane().getTree()));

         JScrollPane descriptionPane = ui.getDescriptionPane();

         descriptionPane.getParent().remove(descriptionPane);

+

+        hideFixedPanelLabel(ui);

     }

 

     @Override

         configModel.addPropertyChangeListener(StorageUIModel.VALID_PROPERTY_NAME, evt -> getModel().validate());

     }

 

+    @Override

+    public void destroy() {

+        ToolTipManager.sharedInstance().unregisterComponent(ui.getLeftTreePane().getTree().getTree());

+        ToolTipManager.sharedInstance().unregisterComponent(ui.getRightTreePane().getTree().getTree());

+    }

 }
 import javax.swing.JPopupMenu;

 import javax.swing.JSeparator;

 import javax.swing.SwingUtilities;

+import javax.swing.ToolTipManager;

 import javax.swing.tree.TreePath;

 import java.awt.Color;

 import java.awt.event.MouseAdapter;

         Consumer<TreeConfigUI> consumer = TreeConfigUIHandler::hideOptions;

         Consumer<TreeConfigUI> apply = u -> initPanel(parent, ui);

         SelectionTreePaneHandler.init(treePane, consumer, apply);

-

+        ToolTipManager.sharedInstance().registerComponent(tree);

         if (isLeft) {

             stepModel.setLeftSelectionDataModel(treeModel);

         } else {

 import org.apache.logging.log4j.Logger;

 import org.nuiton.jaxx.runtime.spi.UIHandler;

 

+import javax.swing.ToolTipManager;

 import java.util.EnumSet;

 

 import static io.ultreia.java4all.i18n.I18n.t;

                 parentUI.getTabs().setTitleAt(1, t("observe.ui.datasource.editor.actions.synchro.referential.withMode", newValue.getLabel()));

             }

         });

+        hideFixedPanelLabel(ui);

+        ToolTipManager.sharedInstance().registerComponent(ui.getLeftTreePane().getTree());

+        ToolTipManager.sharedInstance().registerComponent(ui.getRightTreePane().getTree());

     }

 

     @Override

         super.getTreeCellRendererComponent(tree, text, sel, expanded, leaf, row, hasFocus);

 

         setIcon(icon);

-        setToolTipText(text);

+        panel.setToolTipText(text);

         boolean selectedState;

         Icon selectedIcon = unselectedIcon;

         if (node.isLeaf()) {

         Set<ValidatorDto> validators = getValidatorsManager().getValidators();

         ValidateModel stepModel = model.getValidateModel();

         stepModel.setAllValidators(validators);

+        hideFixedPanelLabel(ui);

     }

 

     @Override

 -- <http://www.gnu.org/licenses/gpl-3.0.html>.

 -- #L%

 ---

-ALTER TABLE ps_common.ObservedSystem RENAME allwObservation TO observation;

-ALTER TABLE ps_common.ObservedSystem RENAME allwLogbook TO logbook;

-ALTER TABLE ps_common.WeightCategory RENAME allwLanding TO landing;

-ALTER TABLE ps_common.WeightCategory RENAME allwLogbook TO logbook;

-ALTER TABLE ps_common.WeightCategory RENAME allwWellPlan TO wellPlan;
+ALTER TABLE ps_common.ObservedSystem RENAME allowObservation TO observation;

+ALTER TABLE ps_common.ObservedSystem RENAME allowLogbook TO logbook;

+ALTER TABLE ps_common.WeightCategory RENAME allowLanding TO landing;

+ALTER TABLE ps_common.WeightCategory RENAME allowLogbook TO logbook;

+ALTER TABLE ps_common.WeightCategory RENAME allowWellPlan TO wellPlan;
     public static final String I18N_CONSTANT_LABEL = "label";

     public static final String I18N_CONSTANT_LABEL_PATTERN = "observe.constant.@CLASS_SIMPLE_NAME@.@NAME@";

     public static final String I18N_CONSTANT_DESCRIPTION_PATTERN = "observe.constant.@CLASS_SIMPLE_NAME@.@NAME@.description";

+    public static final String I18N_CONSTANT_ACTION = "action";

+    public static final String I18N_CONSTANT_ACTION_PATTERN = "observe.constant.@CLASS_SIMPLE_NAME@.@NAME@.action";

     public static final String I18N_CONSTANT_STORAGE_LABEL_PATTERN = "observe.constant.storage.@CLASS_SIMPLE_NAME@.@NAME@";

     public static final String I18N_CONSTANT_NAVIGATION_LABEL_PATTERN = "observe.Common.navigation.config.@CLASS_SIMPLE_NAME@.@NAME@";

     public static final String I18N_CONSTANT_NAVIGATION_DESCRIPTION_PATTERN = "observe.Common.navigation.config.@CLASS_SIMPLE_NAME@.@NAME@.description";

 import java.util.Enumeration;

 import java.util.List;

 import java.util.Objects;

+import java.util.function.Consumer;

 import java.util.function.Function;

 import java.util.function.Supplier;

 

         this.editIds = editIds;

     }

 

-    public final void populate(Function<ToolkitTreeFlatModelRootRequest, ToolkitTreeFlatModel> service) {

+    public final ToolkitTreeFlatModel buildFlatModel(Function<ToolkitTreeFlatModelRootRequest, ToolkitTreeFlatModel> service) {

         request = toRequest();

         ToolkitTreeFlatModel flatModel = service.apply(request);

         dataCount = flatModel.getDataCount();

         augmentsModel(flatModel);

+        return flatModel;

+    }

+

+    public final void populate(ToolkitTreeFlatModel flatModel, Consumer<R> rootConsumer) {

         R rootNode = new ToolkitTreeNodeBuilder().load(rootSupplier.get(), flatModel.getMapping());

         augmentsRoot(rootNode);

+        if (rootConsumer != null) {

+            rootConsumer.accept(rootNode);

+        }

         setRoot(rootNode);

     }

 

+    public final void populate(Function<ToolkitTreeFlatModelRootRequest, ToolkitTreeFlatModel> service) {

+        populate(service, null);

+    }

+

+    public final void populate(Function<ToolkitTreeFlatModelRootRequest, ToolkitTreeFlatModel> service, Consumer<R> rootConsumer) {

+        ToolkitTreeFlatModel flatModel = buildFlatModel(service);

+        populate(flatModel, rootConsumer);

+    }

+

     public final ToolkitTreeFlatModelRootRequest getRequest() {

         return request;

     }

         this.selected.setIcon(context.selectionState.getIcon());

         setForeground(context.color);

         setIcon(context.icon);

-        setToolTipText(context.tip);

+        panel.setToolTipText(context.tip);

         if (context.open) {

             setFont(getFont().deriveFont(Font.BOLD));

         } else {

      */

     private int selectedCount = -1;

 

+    public static List<String> allDataIds(TreeNode root) {

+        Enumeration<?> children = root.children();

+        List<String> result = new LinkedList<>();

+        while (children.hasMoreElements()) {

+            SelectionTreeNode topNode = (SelectionTreeNode) children.nextElement();

+            Enumeration<TreeNode> dataEnum = topNode.children();

+            while (dataEnum.hasMoreElements()) {

+                SelectionTreeNode treeNode = (SelectionTreeNode) dataEnum.nextElement();

+                result.add(treeNode.getUserObject().getId());

+            }

+        }

+        return result;

+    }

+

     public SelectionTreeModelSupport(BusinessProject businessProject, SelectionTreeConfig config, Supplier<R> rootSupplier) {

         super(businessProject, config, rootSupplier);

         selectedData = new LinkedList<>();

         recomputeSelectedCount();

     }

 

-    public List<String> allDataIds() {

-        Enumeration<?> children = getRoot().children();

-        List<String> result = new LinkedList<>();

-        while (children.hasMoreElements()) {

-            SelectionTreeNode topNode = (SelectionTreeNode) children.nextElement();

-            Enumeration<TreeNode> dataEnum = topNode.children();

-            while (dataEnum.hasMoreElements()) {

-                SelectionTreeNode treeNode = (SelectionTreeNode) dataEnum.nextElement();

-                result.add(treeNode.getUserObject().getId());

-            }

-        }

-        return result;

-    }

-

     public long allDataCount() {

         Enumeration<?> children = getRoot().children();

         long result = 0;

 

     public void augmentsExistIds(List<String> otherSideIds) {

         if (otherSideIds != null) {

-            List<String> thisSideIds = allDataIds();

+            List<String> thisSideIds = allDataIds(getRoot());

             // optimization: only deal with this ids that are also on this side

             otherSideIds.removeIf(id -> !thisSideIds.contains(id));

             // augments exist state

         } else {

             this.count = node.getChildCount();

         }

-        this.icon = node.getIcon();

+        this.icon = buildIcon(node);

+        this.text = buildText(node);

+        this.tip = buildTip(node, text);

+        this.color = enabled && (!node.getUserObject().isReferentialType() || count > 0) ? Color.BLACK : Color.GRAY;

+        this.selectionState = node.getSelectionState();

+    }

+

+    protected Icon buildIcon(SelectionTreeNode node) {

+        return node.getIcon();

+    }

+

+    protected String buildText(SelectionTreeNode node) {

         String text = node.getUserObject().getText();

-        String tip = text;

         if (exist) {

             text = t("observe.common.exist.on.remote", text);

-            tip = t("observe.ui.message.warning.will.be.delete", text);

         }

-        this.text = text;

-        this.tip = tip;

-        this.color = enabled && (!node.getUserObject().isReferentialType() || count > 0) ? Color.BLACK : Color.GRAY;

-        this.selectionState = node.getSelectionState();

+        return text;

+    }

+

+    protected String buildTip(SelectionTreeNode node, String text) {

+        String tip = text;

+        if (exist) {

+            tip += t("observe.ui.message.warning.will.be.delete", text);

+        }

+        return tip;

     }

 }

...	...	@@ -36,5 +36,6 @@ public class ActivityPairingUIHandler extends AdminTabUIHandler<ActivityPairingU
36	36	public void afterInit(ActivityPairingUI ui) {
37	37	super.afterInit(ui);
38	38	setAutoStart(ui.getPrepare());
	39	+ hideFixedPanelLabel(ui);
39	40	}
40	41	}

...	...	@@ -122,6 +122,7 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa
122	122	}
123	123	}
124	124
	125	+ @Override
125	126	public void destroy() {
126	127	ObserveSwingDataSource dataSource = ui.getModel().getConfigModel().getLeftSourceModel().getSafeSource(false);
127	128	if (dataSource.isOpen()) {

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

Commits:

15 changed files:

Changes: