(cayenne) 07/08: Modeler refactoring

[aa...@apache.org]

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

commit 18c7c1d858c9fb230964f4a96ae385f548a8ec65
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Fri Apr 24 12:56:39 2026 -0400

    Modeler refactoring
---
 .../display/EmbeddableAttributeDisplayEvent.java   |  4 +-
 .../ui/project/editor/datamap/DataMapView.java     | 43 ++++------------------
 2 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayEvent.java
index ebc40ef54..ee94a44aa 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayEvent.java
@@ -27,8 +27,8 @@ public class EmbeddableAttributeDisplayEvent extends EmbeddableDisplayEvent {
 
     protected final EmbeddableAttribute[] embeddableAttributes;
 
-    public EmbeddableAttributeDisplayEvent(Object src, Embeddable embeddable, EmbeddableAttribute attr, DataMap dataMap, DataChannelDescriptor dataChannelDescriptor) {
-        super(src, embeddable, dataMap, dataChannelDescriptor);
+    public EmbeddableAttributeDisplayEvent(Object src, Embeddable embeddable, EmbeddableAttribute attr, DataMap dataMap, DataChannelDescriptor domain) {
+        super(src, embeddable, dataMap, domain);
         embeddableAttributes = new EmbeddableAttribute[]{attr};
     }
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/DataMapView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/DataMapView.java
index 59f96b8c2..8f85c76d3 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/DataMapView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/DataMapView.java
@@ -18,59 +18,32 @@
  ****************************************************************/
 package org.apache.cayenne.modeler.ui.project.editor.datamap;
 
+import org.apache.cayenne.modeler.event.display.DataMapDisplayEvent;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.CgenController;
-import org.apache.cayenne.modeler.ui.project.editor.datadomain.cgen.CgenTab;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportView;
-import org.apache.cayenne.modeler.ui.project.editor.datadomain.dbimport.DbImportTab;
-import org.apache.cayenne.modeler.event.display.DataMapDisplayEvent;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.main.DataMapMainView;
 
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.event.ChangeEvent;
+import javax.swing.*;
 
 public class DataMapView extends JTabbedPane {
 
-    private final JScrollPane dbImportPane;
-    private final JScrollPane cgenPane;
-
-    private int lastTabIndex;
-
     public DataMapView(ProjectController controller) {
 
         setTabPlacement(JTabbedPane.TOP);
+        
+        addTab("DataMap", new JScrollPane(new DataMapMainView(controller)));
+        addTab("DB Import", new JScrollPane(new DbImportView(controller)));
+        addTab("Class Generation", new JScrollPane(new CgenController(controller).getView()));
 
-        // add panels to tabs
-        // note that those panels that have no internal scrollable tables
-        // must be wrapped in a scroll pane
-        JScrollPane dataMapScrollPane = new JScrollPane(new DataMapMainView(controller));
-        dbImportPane = new JScrollPane(new DbImportView(controller));
-        cgenPane = new JScrollPane(new CgenController(controller).getView());
-        addTab("DataMap", dataMapScrollPane);
-        addTab("DB Import", dbImportPane);
-        addTab("Class Generation", cgenPane);
-
-        addChangeListener(this::stateChanged);
         controller.addDataMapDisplayListener(this::currentDataMapChanged);
     }
 
     private void currentDataMapChanged(DataMapDisplayEvent e) {
-        if (e.getSource() instanceof CgenTab) {
-            setSelectedComponent(cgenPane);
-        } else if (e.getSource() instanceof DbImportTab) {
-            setSelectedComponent(dbImportPane);
-        } else {
-            if (e.isMainTabFocus()) {
-                lastTabIndex = 0;
-            }
 
-            setSelectedIndex(lastTabIndex);
+        if (e.isMainTabFocus()) {
+            setSelectedIndex(0);
         }
     }
-
-    private void stateChanged(ChangeEvent e) {
-        lastTabIndex = getSelectedIndex();
-    }
 }