[cayenne] branch master updated: cleanup

[nt...@apache.org]

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


The following commit(s) were added to refs/heads/master by this push:
     new 067bf41  cleanup
067bf41 is described below

commit 067bf4147358f8088d858c7ddf600e61686998f9
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Wed Feb 5 18:41:53 2020 +0300

    cleanup
---
 .../java/org/apache/cayenne/modeler/editor/DataMapTabbedView.java   | 4 ++--
 .../apache/cayenne/modeler/editor/cgen/ClassesTabController.java    | 6 +++---
 .../apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapTabbedView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapTabbedView.java
index e949078..05f88cd 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapTabbedView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapTabbedView.java
@@ -32,7 +32,7 @@ import javax.swing.JTabbedPane;
  * Data map editing tabs container
  *
  */
-public class DataMapTabbedView extends JTabbedPane{
+public class DataMapTabbedView extends JTabbedPane {
 
     ProjectController mediator;
     private DbImportView dbImportView;
@@ -63,7 +63,7 @@ public class DataMapTabbedView extends JTabbedPane{
         JScrollPane dataMapScrollPane = new JScrollPane(new DataMapView(mediator));
         dbImportView = new DbImportView(mediator);
         dbImportScrollPane = new JScrollPane(dbImportView);
-        codeGeneratorController = new CodeGeneratorController(Application.getInstance().getFrameController(), mediator);
+        codeGeneratorController = new CodeGeneratorController(mediator);
         cgenView = new JScrollPane(codeGeneratorController.getView());
         addTab("DataMap", dataMapScrollPane);
         addTab("DB Import", dbImportScrollPane);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/ClassesTabController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/ClassesTabController.java
index 0739a69..0ea0850 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/ClassesTabController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/ClassesTabController.java
@@ -60,7 +60,7 @@ public class ClassesTabController extends CayenneController {
     }
 
     protected void initBindings() {
-        builder.bindToAction(((CodeGeneratorPane)parent.getView()).getCheckAll(), "checkAllAction()");
+        builder.bindToAction(getParentController().getView().getCheckAll(), "checkAllAction()");
 
         TableBindingBuilder tableBuilder = new TableBindingBuilder(builder);
 
@@ -119,10 +119,10 @@ public class ClassesTabController extends CayenneController {
      */
     @SuppressWarnings("unused")
     public void checkAllAction() {
-        if (getParentController().updateSelection(((CodeGeneratorPane)parent.getView()).getCheckAll().isSelected() ? o -> true : o -> false)) {
+        if (getParentController().updateSelection(getParentController().getView().getCheckAll().isSelected() ? o -> true : o -> false)) {
             tableBinding.updateView();
             getParentController().updateSelectedEntities();
-            if(((CodeGeneratorPane)parent.getView()).getCheckAll().isSelected()) {
+            if(getParentController().getView().getCheckAll().isSelected()) {
                 getParentController().enableGenerateButton(true);
             } else {
                 getParentController().enableGenerateButton(false);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java
index afa8e82..de1a276 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java
@@ -92,8 +92,8 @@ public class CodeGeneratorController extends CayenneController implements ObjEnt
     protected GeneratorTabController generatorSelector;
     private ConcurrentMap<DataMap, GeneratorController> prevGeneratorController;
 
-    public CodeGeneratorController(CayenneController parent, ProjectController projectController) {
-        super(parent);
+    public CodeGeneratorController(ProjectController projectController) {
+        super(projectController);
         this.classesSelector = new ClassesTabController(this);
         this.generatorSelector = new GeneratorTabController(this);
         this.view = new CodeGeneratorPane(generatorSelector.getView(), classesSelector.getView());