[Git][ultreiaio/ird-observe][develop] 3 commits: update pom

10 Jun 2022


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


Commits:
134fef94 by Tony Chemit at 2022-06-10T11:56:42+02:00
update pom

- - - - -
5465fa21 by Tony Chemit at 2022-06-10T12:16:20+02:00
Exceptions au premier démarrage sur une nouvelle source de données - Closes #2396

- - - - -
7555318a by Tony Chemit at 2022-06-10T12:22:02+02:00
update toolkit

- - - - -


3 changed files:

- 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
- pom.xml


Changes:

=====================================
client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTree.java
=====================================
@@ -215,39 +215,19 @@ public class NavigationTree extends JXTree implements WithClientUIContextApi {
      * Select initial node when data source just opened.
      */
     public void reselectInitialNode(String[] paths) {
-        NavigationNode node = paths == null ? null : getModel().getNodeFromPath(paths, true);
-        if (node == null) {
-            selectInitialNode();
-        } else {
-            selectSafeNode(node);
+        try {
+            NavigationNode node = paths == null ? null : getModel().getNodeFromPath(paths, true);
+            if (node == null) {
+                selectInitialNode();
+            } else {
+                selectSafeNode(node);
+            }
+        } catch (Exception e) {
+            log.error("Could not re select initial node", e);
         }
-//        RootNavigationNode root = getRootNode();
-//        if (!root.isLeaf()) {
-//            try {
-//                NavigationNode nodeFromRoot = root.findNodeFromPreviousSelectedNode(selectedNode);
-//                if (nodeFromRoot == null) {
-//                    selectInitialNode();
-//                } else {
-//                    selectSafeNode(nodeFromRoot);
-//                }
-//            } catch (Exception e) {
-//                // can't reselect this node
-//                selectFirstNode();
-//            }
-//        }
         SwingUtilities.invokeLater(this::requestFocusInWindow);
     }
 
-//    public void addUnsavedNode(NavigationNode parentNode, NavigationNode result) {
-//        parentNode.add(result);
-//        // refresh parent node (renderResource of parent can have changed)
-//        parentNode.nodeChangedDeep();
-//        // Fix bug (if no child in parent node, it will not expand...)
-//        fireTreeExpanded(new TreePath(result.getPath()));
-//        // Select new node
-//        selectSafeNode(result);
-//    }
-
     public RootNavigationNode getRootNode() {
         return getModel().getRoot();
     }


=====================================
client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTreeModel.java
=====================================
@@ -117,7 +117,13 @@ public class NavigationTreeModel extends DefaultTreeModel implements WithClientU
         NavigationNode selectedNode = null;
         RootNavigationNode rootNode = getRoot();
         for (SelectNodeStrategy selectNodeStrategy : getSelectNodeStrategies(rootNode.getInitializer().getRequest())) {
-            Optional<NavigationNode> optionalSelectedNode = selectNodeStrategy.apply(rootNode);
+            Optional<NavigationNode> optionalSelectedNode;
+            try {
+                optionalSelectedNode = selectNodeStrategy.apply(rootNode);
+            } catch (Exception e) {
+                log.error("can't get initial node from strategy: " + selectNodeStrategy, e);
+                optionalSelectedNode = Optional.empty();
+            }
             if (optionalSelectedNode.isPresent()) {
                 selectedNode = optionalSelectedNode.get();
                 break;


=====================================
pom.xml
=====================================
@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.ultreia.maven</groupId>
     <artifactId>pom</artifactId>
-    <version>2022.60</version>
+    <version>2022.62</version>
   </parent>
   <groupId>fr.ird.observe</groupId>
   <artifactId>ird-observe</artifactId>
@@ -111,7 +111,7 @@
     <!-- build timestamp configuration -->
     <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
     <buildDate>${maven.build.timestamp}</buildDate>
-    <lib.version.toolkit>6.1.4</lib.version.toolkit>
+    <lib.version.toolkit>6.1.5-SNAPSHOT</lib.version.toolkit>
     <lib.version.ognl>3.1.29</lib.version.ognl>
     <!-- FIXME  <lib.version.ognl>3.3.2</lib.version.ognl>-->
     <lib.version.h2>1.4.196</lib.version.h2>



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2e5417da30e55e1ee5e3a3088...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2e5417da30e55e1ee5e3a3088...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT (＠tchemit)

tags

participants (1)