Possible exceptions in the Modeler

Author: stariy95

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAttributePathComboBoxEditor.java

@@ -19,6 +19,7 @@
 
 package org.apache.cayenne.modeler.util;
 
+import org.apache.cayenne.exp.path.CayennePath;
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DbRelationship;
@@ -81,13 +82,12 @@ protected Object getCurrentNodeToInitializeCombo(ObjAttributeTableModel model, i
 
     @Override
     protected String getPathToInitializeCombo(ObjAttributeTableModel model, int row) {
-        String pathString = model.getAttribute(row).getValue().getDbAttributePath().value();
-        if (pathString == null) {
+        CayennePath path = model.getAttribute(row).getValue().getDbAttributePath();
+        if (path == null || path.isEmpty()) {
             return "";
         }
-        String[] pathStrings = pathString.split(Pattern.quote("."));
-        String lastStringInPath = pathStrings[pathStrings.length - 1];
-        return pathString.replaceAll(lastStringInPath + '$', "");
+        return path.parent()
+                .dot(path.last().value().replaceAll("\\$", "")).value();
     }
 
     @Override

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PathChooserComboBoxCellEditor.java

@@ -244,10 +244,10 @@ public Component getListCellRendererComponent(JList<?> list, Object value, int i
                                                       boolean isSelected, boolean cellHasFocus) {
 
             JPanel panel = new JPanel(new BorderLayout());
-            JLabel label = new JLabel((String) value);
+            JLabel label = new JLabel(value.toString());
             panel.add(label);
 
-            Object currentNode = getCurrentNode((String) value);
+            Object currentNode = getCurrentNode(value.toString());
             if (treeModel.isLeaf(currentNode)) {
                 ListCellRenderer<Object> leafRenderer = CellRenderers.listRenderer();
                 return leafRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);