This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 2e11cd0e093b97b8f4dda023f92991cf4fb1b7d7 Author: Nikita Timofeev <[email protected]> AuthorDate: Wed May 26 15:37:24 2021 +0300 Minor code cleanup --- .../editor/dbimport/DatabaseSchemaLoader.java | 21 +++++++++++++++------ .../modeler/editor/dbimport/DbImportTree.java | 5 +++-- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DatabaseSchemaLoader.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DatabaseSchemaLoader.java index 51b2b2c..476c62d 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DatabaseSchemaLoader.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DatabaseSchemaLoader.java @@ -29,7 +29,15 @@ import java.util.Comparator; import java.util.List; import org.apache.cayenne.dba.DbAdapter; -import org.apache.cayenne.dbsync.reverse.dbimport.*; +import org.apache.cayenne.dbsync.reverse.dbimport.Catalog; +import org.apache.cayenne.dbsync.reverse.dbimport.FilterContainer; +import org.apache.cayenne.dbsync.reverse.dbimport.IncludeColumn; +import org.apache.cayenne.dbsync.reverse.dbimport.IncludeProcedure; +import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable; +import org.apache.cayenne.dbsync.reverse.dbimport.PatternParam; +import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering; +import org.apache.cayenne.dbsync.reverse.dbimport.Schema; +import org.apache.cayenne.dbsync.reverse.dbimport.SchemaContainer; import org.apache.cayenne.modeler.ClassLoadingService; import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode; import org.apache.cayenne.modeler.pref.DBConnectionInfo; @@ -152,9 +160,8 @@ public class DatabaseSchemaLoader { String catalog = resultSet.getString("TABLE_CAT"); packTable(table, catalog == null ? catalogName : catalog, schema, null); } - if (!hasTables) { - if (catalogName != null || schemaName != null) - packFilterContainer(catalogName, schemaName); + if (!hasTables && (catalogName != null || schemaName != null)) { + packFilterContainer(catalogName, schemaName); } packProcedures(connection); } @@ -218,8 +225,9 @@ public class DatabaseSchemaLoader { } private Object getUserObjectOrNull(TreePath path, int pathIndex) { - if (path == null) + if (path == null) { return null; + } return ((DbImportTreeNode) path.getPathComponent(pathIndex)).getUserObject(); } @@ -290,8 +298,9 @@ public class DatabaseSchemaLoader { } private void addColumn(FilterContainer filterContainer, IncludeTable table, String columnName) { - if (columnName == null) + if (columnName == null) { return; + } filterContainer = filterContainer == null ? databaseReverseEngineering : filterContainer; IncludeTable foundTable = getTableByName(filterContainer.getIncludeTables(), table.getPattern()); diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportTree.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportTree.java index d035fb3..6770525 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportTree.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportTree.java @@ -105,10 +105,11 @@ public class DbImportTree extends JTree { if (container != null) { container.setLoaded(true); } else { - if (!filterContainer.getIncludeTables().isEmpty()) + if (!filterContainer.getIncludeTables().isEmpty()) { container = root; - else + } else { return; + } } processor.apply(filterContainer, container);
