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 2016/10/04 09:14:29 UTC
cayenne git commit: CAY-2051
Repository: cayenne
Updated Branches:
refs/heads/master b2a3bf575 -> 6b849c737
CAY-2051
reverse engineering UI cleanup
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/6b849c73
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/6b849c73
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/6b849c73
Branch: refs/heads/master
Commit: 6b849c737ea877438774f7d472f2f842ed8c1e66
Parents: b2a3bf5
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Tue Oct 4 12:04:27 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Tue Oct 4 12:05:23 2016 +0300
----------------------------------------------------------------------
.../modeler/dialog/db/DataMapViewModel.java | 13 +--
.../modeler/dialog/db/ModelerDbLoader.java | 107 +++++++++----------
.../dialog/db/ReverseEngineeringController.java | 6 +-
.../dialog/db/ReverseEngineeringView.java | 10 +-
.../modeler/dialog/db/model/DBCatalog.java | 37 -------
.../modeler/dialog/db/model/DBColumn.java | 39 -------
.../modeler/dialog/db/model/DBElement.java | 59 ----------
.../modeler/dialog/db/model/DBEntity.java | 37 -------
.../modeler/dialog/db/model/DBModel.java | 38 -------
.../modeler/dialog/db/model/DBProcedure.java | 38 -------
.../modeler/dialog/db/model/DBSchema.java | 48 ---------
.../modeler/dialog/db/model/DbCatalog.java | 30 ++++++
.../modeler/dialog/db/model/DbColumn.java | 34 ++++++
.../modeler/dialog/db/model/DbElement.java | 62 +++++++++++
.../modeler/dialog/db/model/DbEntity.java | 37 +++++++
.../modeler/dialog/db/model/DbModel.java | 29 +++++
.../modeler/dialog/db/model/DbProcedure.java | 33 ++++++
.../modeler/dialog/db/model/DbSchema.java | 29 +++++
.../dialog/pref/FilteredTreeCellRenderer.java | 30 +++---
.../cayenne/modeler/dialog/pref/TreeEditor.java | 36 +++----
.../cayenne/modeler/util/CellRenderers.java | 11 +-
21 files changed, 357 insertions(+), 406 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataMapViewModel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataMapViewModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataMapViewModel.java
index 1748207..6b53409 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataMapViewModel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataMapViewModel.java
@@ -18,20 +18,15 @@
*/
package org.apache.cayenne.modeler.dialog.db;
-import org.apache.cayenne.modeler.dialog.db.model.DBModel;
+import org.apache.cayenne.modeler.dialog.db.model.DbModel;
/**
* @since 4.0
*/
public class DataMapViewModel {
- private final String dataMapName;
private String reverseEngineeringText;
- private DBModel reverseEngineeringTree;
-
- public DataMapViewModel(String dataMapName) {
- this.dataMapName = dataMapName;
- }
+ private DbModel reverseEngineeringTree;
public String getReverseEngineeringText() {
return reverseEngineeringText;
@@ -41,11 +36,11 @@ public class DataMapViewModel {
this.reverseEngineeringText = reverseEngineeringText;
}
- public DBModel getReverseEngineeringTree() {
+ public DbModel getReverseEngineeringTree() {
return reverseEngineeringTree;
}
- public void setReverseEngineeringTree(DBModel reverseEngineeringTree) {
+ public void setReverseEngineeringTree(DbModel reverseEngineeringTree) {
this.reverseEngineeringTree = reverseEngineeringTree;
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ModelerDbLoader.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ModelerDbLoader.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ModelerDbLoader.java
index 9904150..e238664 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ModelerDbLoader.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ModelerDbLoader.java
@@ -26,15 +26,14 @@ import org.apache.cayenne.dbsync.reverse.filters.CatalogFilter;
import org.apache.cayenne.dbsync.reverse.filters.SchemaFilter;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbAttribute;
-import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.Procedure;
-import org.apache.cayenne.modeler.dialog.db.model.DBCatalog;
-import org.apache.cayenne.modeler.dialog.db.model.DBColumn;
-import org.apache.cayenne.modeler.dialog.db.model.DBElement;
-import org.apache.cayenne.modeler.dialog.db.model.DBEntity;
-import org.apache.cayenne.modeler.dialog.db.model.DBModel;
-import org.apache.cayenne.modeler.dialog.db.model.DBProcedure;
-import org.apache.cayenne.modeler.dialog.db.model.DBSchema;
+import org.apache.cayenne.modeler.dialog.db.model.DbCatalog;
+import org.apache.cayenne.modeler.dialog.db.model.DbColumn;
+import org.apache.cayenne.modeler.dialog.db.model.DbElement;
+import org.apache.cayenne.modeler.dialog.db.model.DbEntity;
+import org.apache.cayenne.modeler.dialog.db.model.DbModel;
+import org.apache.cayenne.modeler.dialog.db.model.DbProcedure;
+import org.apache.cayenne.modeler.dialog.db.model.DbSchema;
import org.apache.cayenne.modeler.dialog.pref.TreeEditor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -62,10 +61,10 @@ class ModelerDbLoader extends DbLoader {
}
@Override
- public void load(DataMap dataMap, DbLoaderConfiguration config) throws SQLException {
- Map<String, Procedure> procedureMap = loadProcedures(dataMap, config);
- load(dataMap, config);
- addProcedures(procedureMap);
+ public Map<String, Procedure> loadProcedures(DataMap dataMap, DbLoaderConfiguration config) throws SQLException {
+ Map<String, Procedure> procedures = super.loadProcedures(dataMap, config);
+ addProcedures(procedures);
+ return procedures;
}
@Override
@@ -91,43 +90,43 @@ class ModelerDbLoader extends DbLoader {
}
private void addProcedures(Map<String, Procedure> procedureMap) throws SQLException {
- DBElement currentDBCatalog;
- DBElement currentDBSchema;
+ DbElement currentDBCatalog;
+ DbElement currentDBSchema;
for (Map.Entry<String, Procedure> procedure : procedureMap.entrySet()) {
if (supportCatalogs()) {
String dbCatalogName = procedure.getValue().getCatalog();
- DBElement dbCatalog = reverseEngineeringController.dbModel.getExistingElement(dbCatalogName);
+ DbElement dbCatalog = reverseEngineeringController.dbModel.getExistingElement(dbCatalogName);
if (dbCatalog != null) {
currentDBCatalog = dbCatalog;
} else {
- currentDBCatalog = new DBCatalog(dbCatalogName);
+ currentDBCatalog = new DbCatalog(dbCatalogName);
reverseEngineeringController.dbModel.addElement(currentDBCatalog);
}
if (supportSchemas()) {
String dbSchemaName = procedure.getValue().getSchema();
- DBElement dbSchema = currentDBCatalog.getExistingElement(dbSchemaName);
+ DbElement dbSchema = currentDBCatalog.getExistingElement(dbSchemaName);
if (dbSchema != null) {
currentDBSchema = dbSchema;
} else {
- currentDBSchema = new DBSchema(dbSchemaName);
+ currentDBSchema = new DbSchema(dbSchemaName);
currentDBCatalog.addElement(currentDBSchema);
}
- DBProcedure currentProcedure = new DBProcedure(procedure.getValue().getName());
+ DbProcedure currentProcedure = new DbProcedure(procedure.getValue().getName());
currentDBSchema.addElement(currentProcedure);
} else {
- DBProcedure currentProcedure = new DBProcedure(procedure.getValue().getName());
+ DbProcedure currentProcedure = new DbProcedure(procedure.getValue().getName());
currentDBCatalog.addElement(currentProcedure);
}
} else if (supportSchemas()) {
String dbSchemaName = procedure.getValue().getSchema();
- DBElement dbSchema = reverseEngineeringController.dbModel.getExistingElement(dbSchemaName);
+ DbElement dbSchema = reverseEngineeringController.dbModel.getExistingElement(dbSchemaName);
if (dbSchema != null) {
currentDBSchema = dbSchema;
} else {
- currentDBSchema = new DBSchema(dbSchemaName);
+ currentDBSchema = new DbSchema(dbSchemaName);
reverseEngineeringController.dbModel.addElement(currentDBSchema);
}
- DBProcedure currentProcedure = new DBProcedure(procedure.getValue().getName());
+ DbProcedure currentProcedure = new DbProcedure(procedure.getValue().getName());
currentDBSchema.addElement(currentProcedure);
}
}
@@ -136,27 +135,27 @@ class ModelerDbLoader extends DbLoader {
private void createIfNotNull(DataMap dataMap, DbLoaderConfiguration config,
String[] types) throws SQLException {
treeEditor.setRoot(reverseEngineeringController.dataSourceKey);
- reverseEngineeringController.dbModel = new DBModel(reverseEngineeringController.dataSourceKey);
+ reverseEngineeringController.dbModel = new DbModel(reverseEngineeringController.dataSourceKey);
boolean catalogSetted = false;
- DBElement currentDBCatalog = null;
- DBElement currentDBSchema = null;
+ DbElement currentDBCatalog = null;
+ DbElement currentDBSchema = null;
for (CatalogFilter catalog : config.getFiltersConfig().getCatalogs()) {
for (SchemaFilter schema : catalog.schemas) {
- List<DbEntity> entityList =
+ List<org.apache.cayenne.map.DbEntity> entityList =
createTableLoader(catalog.name, schema.name, schema.tables)
.loadDbEntities(dataMap, config, types);
- DbEntity entityFromLoader = entityList.get(0);
+ org.apache.cayenne.map.DbEntity entityFromLoader = entityList.get(0);
if (entityFromLoader != null) {
if (!catalogSetted && entityFromLoader.getCatalog() != null) {
- currentDBCatalog = new DBCatalog(entityFromLoader.getCatalog());
+ currentDBCatalog = new DbCatalog(entityFromLoader.getCatalog());
reverseEngineeringController.dbModel.addElement(currentDBCatalog);
catalogSetted = true;
}
if (entityFromLoader.getSchema() != null) {
- currentDBSchema = new DBSchema(entityFromLoader.getSchema());
+ currentDBSchema = new DbSchema(entityFromLoader.getSchema());
if (currentDBCatalog != null) {
currentDBCatalog.addElement(currentDBSchema);
} else {
@@ -165,20 +164,20 @@ class ModelerDbLoader extends DbLoader {
}
}
- DBEntity currentDBEntity;
+ DbEntity currentDBEntity;
if (currentDBSchema != null) {
- for (DbEntity dbEntity : entityList) {
- currentDBEntity = new DBEntity(dbEntity.getName());
+ for (org.apache.cayenne.map.DbEntity dbEntity : entityList) {
+ currentDBEntity = new DbEntity(dbEntity.getName());
currentDBSchema.addElement(currentDBEntity);
for (DbAttribute dbColumn : dbEntity.getAttributes()) {
- currentDBEntity.addElement(new DBColumn(dbColumn.getName()));
+ currentDBEntity.addElement(new DbColumn(dbColumn.getName()));
}
}
} else {
- for (DbEntity dbEntity : entityList) {
- currentDBEntity = new DBEntity(dbEntity.getName());
+ for (org.apache.cayenne.map.DbEntity dbEntity : entityList) {
+ currentDBEntity = new DbEntity(dbEntity.getName());
for (DbAttribute dbColumn : dbEntity.getAttributes()) {
- currentDBEntity.addElement(new DBColumn(dbColumn.getName()));
+ currentDBEntity.addElement(new DbColumn(dbColumn.getName()));
}
currentDBCatalog.addElement(currentDBEntity);
}
@@ -194,61 +193,61 @@ class ModelerDbLoader extends DbLoader {
String[] types) throws SQLException {
treeEditor.setRoot(reverseEngineeringController.dataSourceKey);
- reverseEngineeringController.dbModel = new DBModel(reverseEngineeringController.dataSourceKey);
- DBElement currentDBCatalog;
- DBElement currentDBSchema;
+ reverseEngineeringController.dbModel = new DbModel(reverseEngineeringController.dataSourceKey);
+ DbElement currentDBCatalog;
+ DbElement currentDBSchema;
for (CatalogFilter catalog : config.getFiltersConfig().getCatalogs()) {
for (SchemaFilter schema : catalog.schemas) {
- List<DbEntity> entityList =
+ List<org.apache.cayenne.map.DbEntity> entityList =
createTableLoader(catalog.name, schema.name, schema.tables)
.loadDbEntities(dataMap, config, types);
- for (DbEntity dbEntity : entityList) {
+ for (org.apache.cayenne.map.DbEntity dbEntity : entityList) {
if (supportCatalogs()) {
String dbCatalogName = dbEntity.getCatalog();
- DBElement dbCatalog = reverseEngineeringController.dbModel.getExistingElement(dbCatalogName);
+ DbElement dbCatalog = reverseEngineeringController.dbModel.getExistingElement(dbCatalogName);
if (dbCatalog != null) {
currentDBCatalog = dbCatalog;
} else {
- currentDBCatalog = new DBCatalog(dbCatalogName);
+ currentDBCatalog = new DbCatalog(dbCatalogName);
reverseEngineeringController.dbModel.addElement(currentDBCatalog);
}
if (supportSchemas()) {
String dbSchemaName = dbEntity.getSchema();
- DBElement dbSchema = currentDBCatalog.getExistingElement(dbSchemaName);
+ DbElement dbSchema = currentDBCatalog.getExistingElement(dbSchemaName);
if (dbSchema != null) {
currentDBSchema = dbSchema;
} else {
- currentDBSchema = new DBSchema(dbSchemaName);
+ currentDBSchema = new DbSchema(dbSchemaName);
currentDBCatalog.addElement(currentDBSchema);
}
- DBEntity currentDBEntity = new DBEntity(dbEntity.getName());
+ DbEntity currentDBEntity = new DbEntity(dbEntity.getName());
currentDBSchema.addElement(currentDBEntity);
for (DbAttribute dbColumn : dbEntity.getAttributes()) {
- currentDBEntity.addElement(new DBColumn(dbColumn.getName()));
+ currentDBEntity.addElement(new DbColumn(dbColumn.getName()));
}
} else {
- DBEntity currentDBEntity = new DBEntity(dbEntity.getName());
+ DbEntity currentDBEntity = new DbEntity(dbEntity.getName());
currentDBCatalog.addElement(currentDBEntity);
for (DbAttribute dbColumn : dbEntity.getAttributes()) {
- currentDBEntity.addElement(new DBColumn(dbColumn.getName()));
+ currentDBEntity.addElement(new DbColumn(dbColumn.getName()));
}
}
} else {
if (supportSchemas()) {
String dbSchemaName = dbEntity.getSchema();
- DBElement dbSchema = reverseEngineeringController.dbModel.getExistingElement(dbSchemaName);
+ DbElement dbSchema = reverseEngineeringController.dbModel.getExistingElement(dbSchemaName);
if (dbSchema != null) {
currentDBSchema = dbSchema;
} else {
- currentDBSchema = new DBSchema(dbSchemaName);
+ currentDBSchema = new DbSchema(dbSchemaName);
reverseEngineeringController.dbModel.addElement(currentDBSchema);
}
- DBEntity currentDBEntity = new DBEntity(dbEntity.getName());
+ DbEntity currentDBEntity = new DbEntity(dbEntity.getName());
currentDBSchema.addElement(currentDBEntity);
for (DbAttribute dbColumn : dbEntity.getAttributes()) {
- currentDBEntity.addElement(new DBColumn(dbColumn.getName()));
+ currentDBEntity.addElement(new DbColumn(dbColumn.getName()));
}
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ReverseEngineeringController.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ReverseEngineeringController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ReverseEngineeringController.java
index 92027f4..cbce494 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ReverseEngineeringController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ReverseEngineeringController.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.dbsync.reverse.FiltersConfigBuilder;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.modeler.ClassLoadingService;
import org.apache.cayenne.modeler.ProjectController;
-import org.apache.cayenne.modeler.dialog.db.model.DBModel;
+import org.apache.cayenne.modeler.dialog.db.model.DbModel;
import org.apache.cayenne.modeler.dialog.pref.PreferenceDialog;
import org.apache.cayenne.modeler.dialog.pref.TreeEditor;
import org.apache.cayenne.modeler.dialog.pref.XMLFileEditor;
@@ -57,7 +57,7 @@ public class ReverseEngineeringController extends CayenneController {
protected ProjectController projectController;
protected ReverseEngineeringView view;
protected Map<String, DataMapViewModel> reverseEngineeringMap;
- protected DBModel dbModel;
+ protected DbModel dbModel;
protected DataSource dataSource;
protected DbAdapter adapter;
@@ -119,7 +119,7 @@ public class ReverseEngineeringController extends CayenneController {
String mapName = projectController.getCurrentDataMap().getName();
- DataMapViewModel dataMapViewModel = new DataMapViewModel(mapName);
+ DataMapViewModel dataMapViewModel = new DataMapViewModel();
dataMapViewModel.setReverseEngineeringTree(dbModel);
dataMapViewModel.setReverseEngineeringText(xmlFileEditor.getView().getEditorPane().getText());
reverseEngineeringMap.put(mapName, dataMapViewModel);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ReverseEngineeringView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ReverseEngineeringView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ReverseEngineeringView.java
index 3b3fad9..917c50a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ReverseEngineeringView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/ReverseEngineeringView.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.dbimport.ReverseEngineering;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.modeler.CayenneModelerController;
import org.apache.cayenne.modeler.ProjectController;
-import org.apache.cayenne.modeler.dialog.db.model.DBModel;
+import org.apache.cayenne.modeler.dialog.db.model.DbModel;
import org.apache.cayenne.modeler.dialog.pref.TreeEditor;
import org.apache.cayenne.modeler.dialog.pref.XMLFileEditor;
import org.apache.cayenne.modeler.event.DataMapDisplayEvent;
@@ -170,7 +170,7 @@ public class ReverseEngineeringView extends JPanel {
if (tempDataMap != null) {
String mapName = tempDataMap.getName();
- DataMapViewModel dataMapViewModel = new DataMapViewModel(mapName);
+ DataMapViewModel dataMapViewModel = new DataMapViewModel();
String xmlText = xmlFileEditor.getView().getEditorPane().getText();
dataMapViewModel.setReverseEngineeringText(xmlText);
if (reverseEngineeringViewMap.containsKey(mapName)) {
@@ -178,10 +178,10 @@ public class ReverseEngineeringView extends JPanel {
if (dataMapViewPrevious.getReverseEngineeringTree() != null) {
dataMapViewModel.setReverseEngineeringTree(dataMapViewPrevious.getReverseEngineeringTree());
} else {
- dataMapViewModel.setReverseEngineeringTree(new DBModel(""));
+ dataMapViewModel.setReverseEngineeringTree(new DbModel(""));
}
} else {
- dataMapViewModel.setReverseEngineeringTree(new DBModel(""));
+ dataMapViewModel.setReverseEngineeringTree(new DbModel(""));
}
reverseEngineeringViewMap.put(mapName, dataMapViewModel);
}
@@ -222,7 +222,7 @@ public class ReverseEngineeringView extends JPanel {
if (reverseEngineeringViewMap.containsKey(dataMap.getName())) {
if (reverseEngineeringViewMap.get(dataMap.getName()).getReverseEngineeringTree() != null) {
- DBModel loadedPreviousTree = reverseEngineeringViewMap
+ DbModel loadedPreviousTree = reverseEngineeringViewMap
.get(dataMap.getName()).getReverseEngineeringTree();
treeEditor.convertTreeViewIntoTreeNode(loadedPreviousTree);
} else {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBCatalog.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBCatalog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBCatalog.java
deleted file mode 100644
index c7e1416..0000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBCatalog.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cayenne.modeler.dialog.db.model;
-
-/**
- * @since 4.0
- */
-public class DBCatalog extends DBElement{
- public DBCatalog(String name) {
- super(name);
- }
-
- public void addElement(DBElement dbElement){
- dbElements.add(dbElement);
- }
-
- @Override
- public String toString() {
- return name;
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBColumn.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBColumn.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBColumn.java
deleted file mode 100644
index ed083c9..0000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBColumn.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cayenne.modeler.dialog.db.model;
-
-/**
- * @since 4.0
- */
-public class DBColumn extends DBElement{
-
- public DBColumn(String name) {
- super(name);
- }
-
- @Override
- public String toString() {
- return name;
- }
-
- @Override
- public void addElement(DBElement dbElement) {
- throw new UnsupportedOperationException();
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBElement.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBElement.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBElement.java
deleted file mode 100644
index c9c9411..0000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBElement.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cayenne.modeler.dialog.db.model;
-
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @since 4.0
- */
-public abstract class DBElement {
- protected String name;
- protected List<DBElement> dbElements;
-
- public DBElement(String name) {
- this.name = name;
- dbElements = new LinkedList<>();
- }
-
- public List<DBElement> getDbElements() {
- return dbElements;
- }
-
- public DBElement getExistingElement(String name) {
- for (DBElement dbElement : dbElements) {
- if (dbElement.name.equals(name)) {
- return dbElement;
- }
- }
- return null;
- }
-
- public abstract void addElement(DBElement dbElement);
-
- public String getName() {
- return name;
- }
-
- @Override
- public String toString() {
- return name;
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBEntity.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBEntity.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBEntity.java
deleted file mode 100644
index 069a398..0000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBEntity.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cayenne.modeler.dialog.db.model;
-
-/**
- * @since 4.0
- */
-public class DBEntity extends DBElement{
- public DBEntity(String name) {
- super(name);
- }
-
- public void addElement(DBElement dbElement){
- dbElements.add(dbElement);
- }
-
- @Override
- public String toString() {
- return name;
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBModel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBModel.java
deleted file mode 100644
index 449f436..0000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBModel.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cayenne.modeler.dialog.db.model;
-
-/**
- * @since 4.0
- */
-public class DBModel extends DBElement {
- public DBModel(String name) {
- super(name);
- }
-
- @Override
- public void addElement(DBElement dbElement) {
- dbElements.add(dbElement);
- }
-
- @Override
- public String toString() {
- return name;
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBProcedure.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBProcedure.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBProcedure.java
deleted file mode 100644
index 268eaf4..0000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBProcedure.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cayenne.modeler.dialog.db.model;
-
-/**
- * @since 4.0
- */
-public class DBProcedure extends DBElement{
- public DBProcedure(String name) {
- super(name);
- }
-
- @Override
- public void addElement(DBElement dbElement) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public String toString() {
- return name;
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBSchema.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBSchema.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBSchema.java
deleted file mode 100644
index c6a7d34..0000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DBSchema.java
+++ /dev/null
@@ -1,48 +0,0 @@
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cayenne.modeler.dialog.db.model;
-
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @since 4.0
- */
-public class DBSchema extends DBElement{
- public List<DBElement> getDbElements() {
- return dbElements;
- }
-
- protected List<DBElement> dbElements;
-
- public DBSchema(String name) {
- super(name);
- dbElements = new LinkedList<>();
- }
-
- public void addElement(DBElement dbElement){
- dbElements.add(dbElement);
- }
-
- @Override
- public String toString() {
- return name;
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbCatalog.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbCatalog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbCatalog.java
new file mode 100644
index 0000000..5313ffa
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbCatalog.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cayenne.modeler.dialog.db.model;
+
+/**
+ * @since 4.0
+ */
+public class DbCatalog extends DbElement {
+
+ public DbCatalog(String name) {
+ super(name);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbColumn.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbColumn.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbColumn.java
new file mode 100644
index 0000000..a86fa94
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbColumn.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cayenne.modeler.dialog.db.model;
+
+/**
+ * @since 4.0
+ */
+public class DbColumn extends DbElement {
+
+ public DbColumn(String name) {
+ super(name);
+ }
+
+ @Override
+ public void addElement(DbElement dbElement) {
+ throw new UnsupportedOperationException();
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbElement.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbElement.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbElement.java
new file mode 100644
index 0000000..fd82cd0
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbElement.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cayenne.modeler.dialog.db.model;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * @since 4.0
+ */
+public abstract class DbElement {
+
+ protected String name;
+ protected List<DbElement> elements;
+
+ public DbElement(String name) {
+ this.name = name;
+ this.elements = new LinkedList<>();
+ }
+
+ public List<DbElement> getElements() {
+ return elements;
+ }
+
+ public DbElement getExistingElement(String name) {
+ for (DbElement dbElement : elements) {
+ if (dbElement.name.equals(name)) {
+ return dbElement;
+ }
+ }
+ return null;
+ }
+
+ public void addElement(DbElement dbElement) {
+ elements.add(dbElement);
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public String toString() {
+ return name;
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbEntity.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbEntity.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbEntity.java
new file mode 100644
index 0000000..7e5a6d2
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbEntity.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cayenne.modeler.dialog.db.model;
+
+/**
+ * @since 4.0
+ */
+public class DbEntity extends DbElement {
+ public DbEntity(String name) {
+ super(name);
+ }
+
+ public void addElement(DbElement dbElement){
+ elements.add(dbElement);
+ }
+
+ @Override
+ public String toString() {
+ return name;
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbModel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbModel.java
new file mode 100644
index 0000000..adbd792
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbModel.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cayenne.modeler.dialog.db.model;
+
+/**
+ * @since 4.0
+ */
+public class DbModel extends DbElement {
+
+ public DbModel(String name) {
+ super(name);
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbProcedure.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbProcedure.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbProcedure.java
new file mode 100644
index 0000000..f933aba
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbProcedure.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cayenne.modeler.dialog.db.model;
+
+/**
+ * @since 4.0
+ */
+public class DbProcedure extends DbElement {
+ public DbProcedure(String name) {
+ super(name);
+ }
+
+ @Override
+ public void addElement(DbElement dbElement) {
+ throw new UnsupportedOperationException();
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbSchema.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbSchema.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbSchema.java
new file mode 100644
index 0000000..d1c2481
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/model/DbSchema.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cayenne.modeler.dialog.db.model;
+
+/**
+ * @since 4.0
+ */
+public class DbSchema extends DbElement {
+
+ public DbSchema(String name) {
+ super(name);
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/FilteredTreeCellRenderer.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/FilteredTreeCellRenderer.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/FilteredTreeCellRenderer.java
index c831f23..10c07b2 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/FilteredTreeCellRenderer.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/FilteredTreeCellRenderer.java
@@ -18,11 +18,11 @@
****************************************************************/
package org.apache.cayenne.modeler.dialog.pref;
-import org.apache.cayenne.modeler.dialog.db.model.DBCatalog;
-import org.apache.cayenne.modeler.dialog.db.model.DBColumn;
-import org.apache.cayenne.modeler.dialog.db.model.DBEntity;
-import org.apache.cayenne.modeler.dialog.db.model.DBProcedure;
-import org.apache.cayenne.modeler.dialog.db.model.DBSchema;
+import org.apache.cayenne.modeler.dialog.db.model.DbCatalog;
+import org.apache.cayenne.modeler.dialog.db.model.DbColumn;
+import org.apache.cayenne.modeler.dialog.db.model.DbEntity;
+import org.apache.cayenne.modeler.dialog.db.model.DbProcedure;
+import org.apache.cayenne.modeler.dialog.db.model.DbSchema;
import org.apache.cayenne.modeler.util.CellRenderers;
import javax.swing.ImageIcon;
@@ -55,28 +55,28 @@ public class FilteredTreeCellRenderer extends DefaultTreeCellRenderer {
.getUserObject();
ImageIcon imageIcon = CellRenderers.iconForObject(userObject);
- if (userObject instanceof DBCatalog) {
- setText(((DBCatalog) userObject).getName());
+ if (userObject instanceof DbCatalog) {
+ setText(((DbCatalog) userObject).getName());
setIcon(imageIcon);
}
- if (userObject instanceof DBSchema) {
- setText(((DBSchema) userObject).getName());
+ if (userObject instanceof DbSchema) {
+ setText(((DbSchema) userObject).getName());
setIcon(imageIcon);
}
- if (userObject instanceof DBEntity) {
- setText(((DBEntity) userObject).getName());
+ if (userObject instanceof DbEntity) {
+ setText(((DbEntity) userObject).getName());
setIcon(imageIcon);
}
- if (userObject instanceof DBColumn) {
- setText(((DBColumn) userObject).getName());
+ if (userObject instanceof DbColumn) {
+ setText(((DbColumn) userObject).getName());
setIcon(imageIcon);
}
- if (userObject instanceof DBProcedure) {
- setText(((DBProcedure) userObject).getName());
+ if (userObject instanceof DbProcedure) {
+ setText(((DbProcedure) userObject).getName());
setIcon(imageIcon);
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TreeEditor.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TreeEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TreeEditor.java
index f3791f7..c3afba3 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TreeEditor.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TreeEditor.java
@@ -18,11 +18,11 @@
****************************************************************/
package org.apache.cayenne.modeler.dialog.pref;
-import org.apache.cayenne.modeler.dialog.db.model.DBCatalog;
-import org.apache.cayenne.modeler.dialog.db.model.DBElement;
-import org.apache.cayenne.modeler.dialog.db.model.DBEntity;
-import org.apache.cayenne.modeler.dialog.db.model.DBModel;
-import org.apache.cayenne.modeler.dialog.db.model.DBSchema;
+import org.apache.cayenne.modeler.dialog.db.model.DbCatalog;
+import org.apache.cayenne.modeler.dialog.db.model.DbElement;
+import org.apache.cayenne.modeler.dialog.db.model.DbEntity;
+import org.apache.cayenne.modeler.dialog.db.model.DbModel;
+import org.apache.cayenne.modeler.dialog.db.model.DbSchema;
import org.apache.cayenne.modeler.util.CayenneController;
import javax.swing.tree.DefaultMutableTreeNode;
@@ -52,14 +52,14 @@ public class TreeEditor extends CayenneController {
model.setRoot(root);
}
- public void convertTreeViewIntoTreeNode(DBModel dbModel) {
+ public void convertTreeViewIntoTreeNode(DbModel dbModel) {
DefaultMutableTreeNode modelNode = new DefaultMutableTreeNode(dbModel);
- for (DBElement dbElement: dbModel.getDbElements()) {
+ for (DbElement dbElement: dbModel.getElements()) {
DefaultMutableTreeNode elementNode = new DefaultMutableTreeNode(dbElement);
- if (dbElement instanceof DBCatalog) {
+ if (dbElement instanceof DbCatalog) {
parseCatalog(dbElement, elementNode);
}
- if (dbElement instanceof DBSchema) {
+ if (dbElement instanceof DbSchema) {
parseSchema(dbElement, elementNode);
}
modelNode.add(elementNode);
@@ -69,31 +69,31 @@ public class TreeEditor extends CayenneController {
model.setRoot(root);
}
- public void parseCatalog(DBElement catalog, DefaultMutableTreeNode elementNode) {
- for (DBElement dbElement: catalog.getDbElements()) {
+ public void parseCatalog(DbElement catalog, DefaultMutableTreeNode elementNode) {
+ for (DbElement dbElement: catalog.getElements()) {
DefaultMutableTreeNode element = new DefaultMutableTreeNode(dbElement);
- if (dbElement instanceof DBSchema) {
+ if (dbElement instanceof DbSchema) {
parseSchema(dbElement, element);
}
- if (dbElement instanceof DBEntity){
+ if (dbElement instanceof DbEntity){
parseEntity(dbElement, element);
}
elementNode.add(element);
}
}
- public void parseSchema(DBElement schema, DefaultMutableTreeNode elementNode) {
- for (DBElement element: schema.getDbElements()) {
+ public void parseSchema(DbElement schema, DefaultMutableTreeNode elementNode) {
+ for (DbElement element: schema.getElements()) {
DefaultMutableTreeNode entityNode = new DefaultMutableTreeNode(element);
- if (element instanceof DBEntity) {
+ if (element instanceof DbEntity) {
parseEntity(element, entityNode);
}
elementNode.add(entityNode);
}
}
- private void parseEntity(DBElement entity, DefaultMutableTreeNode entityNode) {
- for (DBElement column: entity.getDbElements()) {
+ private void parseEntity(DbElement entity, DefaultMutableTreeNode entityNode) {
+ for (DbElement column: entity.getElements()) {
DefaultMutableTreeNode columnNode = new DefaultMutableTreeNode(column);
entityNode.add(columnNode);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b849c73/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellRenderers.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellRenderers.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellRenderers.java
index fddf615..dc57b10 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellRenderers.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellRenderers.java
@@ -37,7 +37,6 @@ import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.map.Attribute;
import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.Embeddable;
import org.apache.cayenne.map.Entity;
import org.apache.cayenne.map.MappingNamespace;
@@ -100,7 +99,7 @@ public final class CellRenderers {
}
else if (object instanceof Entity) {
Entity entity = (Entity) object;
- if (entity instanceof DbEntity) {
+ if (entity instanceof org.apache.cayenne.map.DbEntity) {
return dbEntityIcon;
}
else if (entity instanceof ObjEntity) {
@@ -122,16 +121,16 @@ public final class CellRenderers {
else if (object instanceof Embeddable) {
return embeddableIcon;
}
- else if (object instanceof DBColumn) {
+ else if (object instanceof DbColumn) {
return attributeIcon;
}
- else if (object instanceof DBProcedure) {
+ else if (object instanceof DbProcedure) {
return procedureIcon;
}
- else if (object instanceof DBEntity) {
+ else if (object instanceof DbEntity) {
return dbEntityIcon;
}
- else if (object instanceof DBCatalog) {
+ else if (object instanceof DbCatalog) {
return catalogIcon;
}
return null;