This is an automated email from the ASF dual-hosted git repository.
aadamchik pushed a commit to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/STABLE-4.1 by this push:
new dd1baf5 succinct DBImport labels.. "add include" / "add exclude"
seems redundant
dd1baf5 is described below
commit dd1baf57d4d7d2558e3fd4ead4b22e10f7591240
Author: Andrus Adamchik <[email protected]>
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 ee1435d..c53ad74 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 ef844ba..d84c711 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 b8dbeb8..208b413 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 ea5c5ef..8c23a7c 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 ca567b7..06a3dfe 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 3d7c197..c2aec51 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) {
