Fixed select db path in object attribute edit
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/df1ff56d Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/df1ff56d Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/df1ff56d Branch: refs/heads/master Commit: df1ff56d8fabd0f19bc3af052e11b81d3011c8f4 Parents: 5bb62a0 Author: Nikita Timofeev <stari...@gmail.com> Authored: Fri Nov 11 14:31:14 2016 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Fri Nov 11 14:31:14 2016 +0300 ---------------------------------------------------------------------- .../org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java | 2 +- .../cayenne/modeler/util/PathChooserComboBoxCellEditor.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/df1ff56d/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java index 595c690..097ec8b 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityTab.java @@ -63,7 +63,7 @@ import com.jgoodies.forms.layout.FormLayout; */ public class DbEntityTab extends JPanel implements ExistingSelectionProcessor, DbEntityDisplayListener { - static final String PK_DEFAULT_GENERATOR = "Cayenne-Generated"; + static final String PK_DEFAULT_GENERATOR = "Cayenne-Generated (Default)"; static final String PK_DB_GENERATOR = "Database-Generated"; static final String PK_CUSTOM_SEQUENCE_GENERATOR = "Custom Sequence"; http://git-wip-us.apache.org/repos/asf/cayenne/blob/df1ff56d/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PathChooserComboBoxCellEditor.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PathChooserComboBoxCellEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PathChooserComboBoxCellEditor.java index 2c5509b..fd796f8 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PathChooserComboBoxCellEditor.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PathChooserComboBoxCellEditor.java @@ -59,6 +59,7 @@ public abstract class PathChooserComboBoxCellEditor extends AbstractCellEditor i protected int previousEmbeddedLevel = 0; protected EntityTreeModel treeModel; protected int row; + private JTable table; protected abstract void enterPressed(JTable table); @@ -72,6 +73,7 @@ public abstract class PathChooserComboBoxCellEditor extends AbstractCellEditor i Object currentNode = getCurrentNodeToInitializeCombo(model, row); String dbAttributePath = getPathToInitializeCombo(model, row); List<String> nodeChildren = getChildren(currentNode, dbAttributePath); + this.table = table; comboBoxPathChooser = Application.getWidgetFactory().createComboBox( nodeChildren, false); @@ -213,6 +215,7 @@ public abstract class PathChooserComboBoxCellEditor extends AbstractCellEditor i if (comboBoxPathChooser.getSelectedIndex() != (-1)) { ((JTextComponent) (comboBoxPathChooser). getEditor().getEditorComponent()).setText(comboBoxPathChooser.getSelectedItem().toString()); + enterPressed(table); } }