You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2019/07/08 10:39:34 UTC
[cayenne] branch master updated: succinct DBImport labels.. "add
include" / "add exclude" seems redundant
This is an automated email from the ASF dual-hosted git repository.
aadamchik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new f094d6b succinct DBImport labels.. "add include" / "add exclude" seems redundant
f094d6b is described below
commit f094d6bdb1216e48a0bbd041f418e952d4312ca3
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Mon Jul 8 13:36:05 2019 +0300
succinct DBImport labels.. "add include" / "add exclude" seems redundant
---
.../apache/cayenne/modeler/action/dbimport/AddExcludeColumnAction.java | 2 +-
.../cayenne/modeler/action/dbimport/AddExcludeProcedureAction.java | 2 +-
.../apache/cayenne/modeler/action/dbimport/AddExcludeTableAction.java | 2 +-
.../apache/cayenne/modeler/action/dbimport/AddIncludeColumnAction.java | 2 +-
.../cayenne/modeler/action/dbimport/AddIncludeProcedureAction.java | 2 +-
.../apache/cayenne/modeler/action/dbimport/AddIncludeTableAction.java | 3 +--
6 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddExcludeColumnAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddExcludeColumnAction.java
index f9508ce..1dccbec 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddExcludeColumnAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddExcludeColumnAction.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.modeler.Application;
*/
public class AddExcludeColumnAction extends AddPatternParamAction {
- private static final String ACTION_NAME = "Add Exclude Column";
+ private static final String ACTION_NAME = "Exclude Column";
private static final String ICON_NAME = "icon-dbi-excludeColumn.png";
public AddExcludeColumnAction(Application application) {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddExcludeProcedureAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddExcludeProcedureAction.java
index e262f27..9d3a1b1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddExcludeProcedureAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddExcludeProcedureAction.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.modeler.Application;
*/
public class AddExcludeProcedureAction extends AddPatternParamAction {
- private static final String ACTION_NAME = "Add Exclude Procedure";
+ private static final String ACTION_NAME = "Exclude Procedure";
private static final String ICON_NAME = "icon-dbi-excludeProcedure.png";
public AddExcludeProcedureAction(Application application) {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddExcludeTableAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddExcludeTableAction.java
index 92ed454..5570793 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddExcludeTableAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddExcludeTableAction.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.modeler.Application;
*/
public class AddExcludeTableAction extends AddPatternParamAction {
- private static final String ACTION_NAME = "Add Exclude Table";
+ private static final String ACTION_NAME = "Exclude Table";
private static final String ICON_NAME = "icon-dbi-excludeTable.png";
public AddExcludeTableAction(Application application) {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddIncludeColumnAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddIncludeColumnAction.java
index 85f57b4..29b38e0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddIncludeColumnAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddIncludeColumnAction.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.modeler.Application;
*/
public class AddIncludeColumnAction extends AddPatternParamAction {
- private static final String ACTION_NAME = "Add Include Column";
+ private static final String ACTION_NAME = "Include Column";
private static final String ICON_NAME = "icon-dbi-includeColumn.png";
public AddIncludeColumnAction(Application application) {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddIncludeProcedureAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddIncludeProcedureAction.java
index c88b5d5..e642a34 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddIncludeProcedureAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddIncludeProcedureAction.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.modeler.Application;
*/
public class AddIncludeProcedureAction extends AddPatternParamAction {
- private static final String ACTION_NAME = "Add Include Procedure";
+ private static final String ACTION_NAME = "Include Procedure";
private static final String ICON_NAME = "icon-dbi-includeProcedure.png";
public AddIncludeProcedureAction(Application application) {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddIncludeTableAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddIncludeTableAction.java
index 20dd63d..2bacc49 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddIncludeTableAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddIncludeTableAction.java
@@ -25,7 +25,6 @@ import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
-import javax.swing.tree.TreePath;
import java.awt.event.ActionEvent;
/**
@@ -33,7 +32,7 @@ import java.awt.event.ActionEvent;
*/
public class AddIncludeTableAction extends TreeManipulationAction {
- private static final String ACTION_NAME = "Add Include Table";
+ private static final String ACTION_NAME = "Include Table";
private static final String ICON_NAME = "icon-dbi-includeTable.png";
public AddIncludeTableAction(Application application) {