You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2016/10/20 14:49:39 UTC
[4/7] cayenne git commit: CM Reverse Engineering: Remove default
wildcard pattern for tables with Meaningful PK
CM Reverse Engineering: Remove default wildcard pattern for tables with Meaningful PK
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/aa6efa42
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/aa6efa42
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/aa6efa42
Branch: refs/heads/master
Commit: aa6efa42ccc36fdd5cb517b77ed09ae9c8bf34e3
Parents: 82a984a
Author: Savva Kolbachev <s....@gmail.com>
Authored: Thu Oct 20 13:49:42 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Thu Oct 20 13:49:42 2016 +0300
----------------------------------------------------------------------
.../apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/aa6efa42/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java
index 4d9dee4..3dbb59a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderOptionsDialog.java
@@ -110,7 +110,7 @@ public class DbLoaderOptionsDialog extends CayenneDialog {
builder.append("Table Name Pattern:", tableNamePatternField);
procedureLabel = builder.append("Procedure Name Pattern:", procNamePatternField);
builder.append("Naming Strategy:", strategyCombo);
- builder.append("Meaningful PK", meaningfulPk);
+ builder.append("Tables with Meaningful PK Pattern:", meaningfulPk);
JPanel buttons = new JPanel(new FlowLayout(FlowLayout.RIGHT));
buttons.add(cancelButton);
@@ -146,7 +146,6 @@ public class DbLoaderOptionsDialog extends CayenneDialog {
this.choice = CANCEL;
this.tableNamePatternField.setText(WILDCARD_PATTERN);
this.procNamePatternField.setText(WILDCARD_PATTERN);
- this.meaningfulPk.setText(WILDCARD_PATTERN);
Vector<String> arr = NameGeneratorPreferences
.getInstance()