Repository: cayenne Updated Branches: refs/heads/master b3b600bf9 -> b16ac50dd
CAY-2463 Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2f8dcfab Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2f8dcfab Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2f8dcfab Branch: refs/heads/master Commit: 2f8dcfab2334a7f3a607658439af8be52a1d8ce8 Parents: 36faff5 Author: Arseni Bulatski <ancars...@gmail.com> Authored: Wed Aug 22 12:14:35 2018 +0300 Committer: Arseni Bulatski <ancars...@gmail.com> Committed: Wed Aug 22 12:14:35 2018 +0300 ---------------------------------------------------------------------- RELEASE-NOTES.txt | 1 + .../apache/cayenne/modeler/action/DBWizardAction.java | 14 ++++++-------- .../cayenne/modeler/action/LoadDbSchemaAction.java | 1 - .../cayenne/modeler/dialog/db/DataSourceWizard.java | 5 +---- 4 files changed, 8 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/2f8dcfab/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index d2e5421..c56a872 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -20,6 +20,7 @@ Bug Fixes: CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation CAY-2445 Oracle: Problem with ExpressionFactory.notInExp() +CAY-2463 DB Schema generation doesn't work ---------------------------------- Release: 4.1.M2 http://git-wip-us.apache.org/repos/asf/cayenne/blob/2f8dcfab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java index 0fbaac3..4cace46 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java @@ -19,13 +19,6 @@ package org.apache.cayenne.modeler.action; -import java.sql.Connection; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - -import javax.swing.JOptionPane; - import org.apache.cayenne.dbsync.reverse.dbload.DbLoader; import org.apache.cayenne.modeler.Application; import org.apache.cayenne.modeler.dialog.db.DataSourceWizard; @@ -34,6 +27,12 @@ import org.apache.cayenne.modeler.util.CayenneAction; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.swing.*; +import java.sql.Connection; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + public abstract class DBWizardAction<T extends DbActionOptionsDialog> extends CayenneAction { private static Logger LOGGER = LoggerFactory.getLogger(DBWizardAction.class); @@ -44,7 +43,6 @@ public abstract class DBWizardAction<T extends DbActionOptionsDialog> extends Ca protected DataSourceWizard dataSourceWizardDialog(String title) { // connect DataSourceWizard connectWizard = new DataSourceWizard(getProjectController(), title); - connectWizard.setProjectController(getProjectController()); if (!connectWizard.startupAction()) { return null; } http://git-wip-us.apache.org/repos/asf/cayenne/blob/2f8dcfab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LoadDbSchemaAction.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LoadDbSchemaAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LoadDbSchemaAction.java index 45604fd..840ec40 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LoadDbSchemaAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LoadDbSchemaAction.java @@ -71,7 +71,6 @@ public class LoadDbSchemaAction extends CayenneAction { DBConnectionInfo connectionInfo; if (!datamapPreferencesExist()) { final DataSourceWizard connectWizard = new DataSourceWizard(getProjectController(), "Load Db Schema"); - connectWizard.setProjectController(getProjectController()); if (!connectWizard.startupAction()) { return; } http://git-wip-us.apache.org/repos/asf/cayenne/blob/2f8dcfab/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizard.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizard.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizard.java index 0e01c35..7ef6a1a 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizard.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizard.java @@ -81,6 +81,7 @@ public class DataSourceWizard extends CayenneController { this.view = createView(title); this.view.setTitle(title); this.connectionInfo = new DBConnectionInfo(); + this.projectController = (ProjectController) parent; initBindings(); initDataSourceListener(); @@ -317,8 +318,4 @@ public class DataSourceWizard extends CayenneController { public DbAdapter getAdapter() { return adapter; } - - public void setProjectController(final ProjectController projectController) { - this.projectController = projectController; - } }
