(cayenne) branch master updated: Modeler cleanup

[aadamchik]

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits 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 031dc1a93 Modeler cleanup
031dc1a93 is described below

commit 031dc1a93ac848d97b7a4672eda11cd7127cf26a
Author: Andrus Adamchik <and...@objectstyle.com>
AuthorDate: Tue Apr 21 17:01:35 2026 -0400

    Modeler cleanup
---
 .../java/org/apache/cayenne/modeler/CayenneModelerController.java    | 5 ++++-
 .../src/main/java/org/apache/cayenne/modeler/ProjectController.java  | 1 +
 .../java/org/apache/cayenne/modeler/action/CollapseTreeAction.java   | 2 +-
 .../main/java/org/apache/cayenne/modeler/action/FilterAction.java    | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java
index f7622b0ed..c70b82f08 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java
@@ -184,6 +184,7 @@ public class CayenneModelerController extends 
RootController {
         projectController.projectOpened(project);
         frame.setTitle(getProjectLocationString());
 
+        // TODO: ProjectView should be owned by ProjectController
         projectView = new ProjectView(projectController);
         frame.setEditorPanel(projectView);
 
@@ -225,7 +226,9 @@ public class CayenneModelerController extends 
RootController {
         }
     }
 
-    public ProjectView getEditorView() {
+    // TODO: ProjectView should be owned by ProjectController
+    @Deprecated
+    public ProjectView getProjectView() {
         return projectView;
     }
 
diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
index b9e3b44d2..fd302ce18 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
@@ -110,6 +110,7 @@ public class ProjectController extends 
ChildController<CayenneModelerController>
         this.history = new NavigationHistory();
     }
 
+    // TODO: this is wrong. ProjectController should own and return ProjectView
     @Override
     public Component getView() {
         return parent.getView();
diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CollapseTreeAction.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CollapseTreeAction.java
index 065e74c41..d9e80dbeb 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CollapseTreeAction.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CollapseTreeAction.java
@@ -40,6 +40,6 @@ public class CollapseTreeAction extends CayenneAction {
 
        @Override
        public void performAction(ActionEvent e) {      
-               
getApplication().getFrameController().getEditorView().getFilterController().treeExpOrCollPath(COLLAPSE);
                
+               
getApplication().getFrameController().getProjectView().getFilterController().treeExpOrCollPath(COLLAPSE);
        }
 }
diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FilterAction.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FilterAction.java
index dc99b1305..72e03208d 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FilterAction.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FilterAction.java
@@ -45,7 +45,7 @@ public class FilterAction extends CayenneAction {
         JButton source = (JButton) e.getSource();
         FilterDialog dialog = getApplication()
                 .getFrameController()
-                .getEditorView()
+                .getProjectView()
                 .getFilterController()
                 .getView();