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 2026/04/21 22:32:53 UTC
(cayenne) 03/04: Modeler reorg..
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 dd4d268673149ca1a65a52deee11c1641bea0da3
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Tue Apr 21 17:27:48 2026 -0400
Modeler reorg..
* EditorPanel -> ProjectView
---
.../cayenne/modeler/CayenneModelerController.java | 11 +++++----
.../cayenne/modeler/CayenneModelerFrame.java | 15 ++++++-------
.../{editor/EditorPanel.java => ProjectView.java} | 17 +++++++++-----
.../apache/cayenne/modeler/action/FindAction.java | 20 ++++++++---------
.../graph/action/ShowGraphEntityAction.java | 4 ++--
.../modeler/undo/JUndoableCheckBoxEdit.java | 18 +++++++--------
.../cayenne/modeler/undo/TextCompoundEdit.java | 26 +++++++++++-----------
.../apache/cayenne/modeler/util/CayenneAction.java | 4 ++--
8 files changed, 60 insertions(+), 55 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 2c9032074..f7622b0ed 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
@@ -24,7 +24,6 @@ import org.apache.cayenne.modeler.action.ExitAction;
import org.apache.cayenne.modeler.action.OpenProjectAction;
import org.apache.cayenne.modeler.dialog.validator.ValidatorDialog;
import org.apache.cayenne.modeler.editor.DbImportController;
-import org.apache.cayenne.modeler.editor.EditorPanel;
import org.apache.cayenne.modeler.init.platform.PlatformInitializer;
import org.apache.cayenne.modeler.mvc.RootController;
import org.apache.cayenne.modeler.pref.ComponentGeometry;
@@ -61,7 +60,7 @@ public class CayenneModelerController extends RootController {
private final ProjectController projectController;
private final CayenneModelerFrame frame;
- private EditorPanel editorPanel;
+ private ProjectView projectView;
private final DbImportController dbImportController;
public CayenneModelerController(Application application) {
@@ -185,8 +184,8 @@ public class CayenneModelerController extends RootController {
projectController.projectOpened(project);
frame.setTitle(getProjectLocationString());
- editorPanel = new EditorPanel(projectController);
- frame.setEditorPanel(editorPanel);
+ projectView = new ProjectView(projectController);
+ frame.setEditorPanel(projectView);
projectController.restoreSelectionFromPrefs();
application.getActionManager().projectOpened();
@@ -226,8 +225,8 @@ public class CayenneModelerController extends RootController {
}
}
- public EditorPanel getEditorView() {
- return editorPanel;
+ public ProjectView getEditorView() {
+ return projectView;
}
/**
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
index 996c2b251..91203e026 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
@@ -22,7 +22,6 @@ package org.apache.cayenne.modeler;
import org.apache.cayenne.modeler.action.*;
import org.apache.cayenne.modeler.dialog.LogConsoleController;
import org.apache.cayenne.modeler.dialog.welcome.WelcomeScreen;
-import org.apache.cayenne.modeler.editor.EditorPanel;
import org.apache.cayenne.modeler.event.model.RecentFileListListener;
import org.apache.cayenne.modeler.pref.ComponentGeometry;
import org.apache.cayenne.modeler.util.ModelerUtil;
@@ -53,7 +52,7 @@ public class CayenneModelerFrame extends JFrame {
private final JLabel status;
private final WelcomeScreen welcomePanel;
- private EditorPanel editorPanel;
+ private ProjectView projectView;
private JCheckBoxMenuItem logMenu;
private Component dockComponent;
@@ -318,21 +317,21 @@ public class CayenneModelerFrame extends JFrame {
});
}
- public EditorPanel getEditorPanel() {
- return editorPanel;
+ public ProjectView getEditorPanel() {
+ return projectView;
}
public JLabel getStatus() {
return status;
}
- public void setEditorPanel(EditorPanel editorPanel) {
+ public void setEditorPanel(ProjectView projectView) {
int oldLocation = splitPane.getDividerLocation();
- this.editorPanel = editorPanel;
+ this.projectView = projectView;
- if (editorPanel != null) {
- splitPane.setTopComponent(editorPanel);
+ if (projectView != null) {
+ splitPane.setTopComponent(projectView);
} else {
splitPane.setTopComponent(welcomePanel);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectView.java
similarity index 93%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorPanel.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectView.java
index 78a704fa0..1efc2d25a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectView.java
@@ -17,15 +17,22 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.editor;
+package org.apache.cayenne.modeler;
import org.apache.cayenne.map.QueryDescriptor;
-import org.apache.cayenne.modeler.ProjectController;
-import org.apache.cayenne.modeler.ProjectTreeView;
import org.apache.cayenne.modeler.action.ActionManager;
import org.apache.cayenne.modeler.action.CollapseTreeAction;
import org.apache.cayenne.modeler.action.FilterAction;
import org.apache.cayenne.modeler.dialog.datadomain.FilterController;
+import org.apache.cayenne.modeler.editor.DataDomainTabbedView;
+import org.apache.cayenne.modeler.editor.DataMapTabbedView;
+import org.apache.cayenne.modeler.editor.EjbqlTabbedView;
+import org.apache.cayenne.modeler.editor.EmbeddableTabbedView;
+import org.apache.cayenne.modeler.editor.ObjEntityTabbedView;
+import org.apache.cayenne.modeler.editor.ProcedureQueryView;
+import org.apache.cayenne.modeler.editor.ProcedureTabbedView;
+import org.apache.cayenne.modeler.editor.SQLTemplateTabbedView;
+import org.apache.cayenne.modeler.editor.SelectQueryTabbedView;
import org.apache.cayenne.modeler.editor.datanode.DataNodeEditorController;
import org.apache.cayenne.modeler.editor.dbentity.DbEntityTabbedView;
import org.apache.cayenne.modeler.event.display.QueryDisplayEvent;
@@ -38,7 +45,7 @@ import java.awt.*;
/**
* Main display area split into the project navigation tree on the left and selected object editor on the right.
*/
-public class EditorPanel extends JPanel {
+public class ProjectView extends JPanel {
private static final String EMPTY_VIEW = "Empty";
private static final String DOMAIN_VIEW = "Domain";
@@ -113,7 +120,7 @@ public class EditorPanel extends JPanel {
return dataNodeView;
}
- public EditorPanel(ProjectController controller) {
+ public ProjectView(ProjectController controller) {
ActionManager actionManager = controller.getApplication().getActionManager();
actionManager.getAction(CollapseTreeAction.class).setAlwaysOn(true);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FindAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FindAction.java
index e345c7ff9..4bf283ce2 100755
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FindAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FindAction.java
@@ -45,7 +45,7 @@ import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.ProjectTreeModel;
import org.apache.cayenne.modeler.ProjectTreeView;
import org.apache.cayenne.modeler.dialog.FindDialogController;
-import org.apache.cayenne.modeler.editor.EditorPanel;
+import org.apache.cayenne.modeler.ProjectView;
import org.apache.cayenne.modeler.event.display.AttributeDisplayEvent;
import org.apache.cayenne.modeler.event.display.EmbeddableAttributeDisplayEvent;
import org.apache.cayenne.modeler.event.display.EmbeddableDisplayEvent;
@@ -139,7 +139,7 @@ public class FindAction extends CayenneAction {
* Used also in {@link org.apache.cayenne.modeler.graph.action.EntityDisplayAction}
*/
public static void jumpToResult(FindAction.SearchResultEntry searchResultEntry) {
- EditorPanel editor = ((CayenneModelerFrame) Application.getInstance().getFrameController().getView()).getEditorPanel();
+ ProjectView editor = ((CayenneModelerFrame) Application.getInstance().getFrameController().getView()).getEditorPanel();
DataChannelDescriptor domain = (DataChannelDescriptor) Application.getInstance().getProject().getRootNode();
ProjectController controller = Application.getInstance().getFrameController().getProjectController();
@@ -263,7 +263,7 @@ public class FindAction extends CayenneAction {
return pattern.matcher(entityName).find();
}
- private static void jumpToAttributeResult(SearchResultEntry searchResultEntry, EditorPanel editor, DataChannelDescriptor domain,
+ private static void jumpToAttributeResult(SearchResultEntry searchResultEntry, ProjectView editor, DataChannelDescriptor domain,
ProjectController controller) {
DataMap map;
Entity<?, ?, ?> entity;
@@ -303,7 +303,7 @@ public class FindAction extends CayenneAction {
private static void jumpToEmbeddableAttributeResult(
EmbeddableAttribute attribute,
- EditorPanel editor,
+ ProjectView editor,
DataChannelDescriptor domain,
ProjectController controller) {
@@ -316,7 +316,7 @@ public class FindAction extends CayenneAction {
editor.getEmbeddableView().repaint();
}
- private static void jumpToEmbeddableResult(Embeddable embeddable, EditorPanel editor, DataChannelDescriptor domain,
+ private static void jumpToEmbeddableResult(Embeddable embeddable, ProjectView editor, DataChannelDescriptor domain,
ProjectController controller) {
DataMap map = embeddable.getDataMap();
buildAndSelectTreePath(map, embeddable, editor);
@@ -325,14 +325,14 @@ public class FindAction extends CayenneAction {
controller.displayEmbeddable(event);
}
- private static void jumpToQueryResult(QueryDescriptor queryDescriptor, EditorPanel editor, DataChannelDescriptor domain, ProjectController controller) {
+ private static void jumpToQueryResult(QueryDescriptor queryDescriptor, ProjectView editor, DataChannelDescriptor domain, ProjectController controller) {
DataMap map = queryDescriptor.getDataMap();
buildAndSelectTreePath(map, queryDescriptor, editor);
QueryDisplayEvent event = new QueryDisplayEvent(editor.getProjectTreeView(), queryDescriptor, map, domain);
controller.displayQuery(event);
}
- private static void jumpToEntityResult(Entity<?, ?, ?> entity, EditorPanel editor, DataChannelDescriptor domain, ProjectController controller) {
+ private static void jumpToEntityResult(Entity<?, ?, ?> entity, ProjectView editor, DataChannelDescriptor domain, ProjectController controller) {
DataMap map = entity.getDataMap();
buildAndSelectTreePath(map, entity, editor);
EntityDisplayEvent event = new EntityDisplayEvent(editor.getProjectTreeView(), entity, map, domain);
@@ -345,7 +345,7 @@ public class FindAction extends CayenneAction {
}
}
- private static void jumpToProcedureResult(Procedure procedure, EditorPanel editor, DataChannelDescriptor domain,
+ private static void jumpToProcedureResult(Procedure procedure, ProjectView editor, DataChannelDescriptor domain,
ProjectController controller) {
DataMap map = procedure.getDataMap();
buildAndSelectTreePath(map, procedure, editor);
@@ -354,7 +354,7 @@ public class FindAction extends CayenneAction {
editor.getProcedureView().repaint();
}
- private static void jumpToProcedureResult(ProcedureParameter parameter, EditorPanel editor, DataChannelDescriptor domain,
+ private static void jumpToProcedureResult(ProcedureParameter parameter, ProjectView editor, DataChannelDescriptor domain,
ProjectController controller) {
Procedure procedure = parameter.getProcedure();
DataMap map = procedure.getDataMap();
@@ -368,7 +368,7 @@ public class FindAction extends CayenneAction {
/**
* Builds a tree path for a given path and make selection in it
*/
- private static void buildAndSelectTreePath(DataMap map, Object object, EditorPanel editor) {
+ private static void buildAndSelectTreePath(DataMap map, Object object, ProjectView editor) {
ProjectTreeView projectTreeView = editor.getProjectTreeView();
ProjectTreeModel treeModel = (ProjectTreeModel) projectTreeView.getModel();
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/action/ShowGraphEntityAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/action/ShowGraphEntityAction.java
index fb4d36561..8eeb40e13 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/action/ShowGraphEntityAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/action/ShowGraphEntityAction.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.map.Entity;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.CayenneModelerFrame;
import org.apache.cayenne.modeler.ProjectController;
-import org.apache.cayenne.modeler.editor.EditorPanel;
+import org.apache.cayenne.modeler.ProjectView;
import org.apache.cayenne.modeler.event.display.DomainDisplayEvent;
import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
import org.apache.cayenne.modeler.util.CayenneAction;
@@ -73,7 +73,7 @@ public class ShowGraphEntityAction extends CayenneAction {
void showEntity(Entity<?,?,?> entity) {
// we're always in same domain
- EditorPanel editor = ((CayenneModelerFrame) Application
+ ProjectView editor = ((CayenneModelerFrame) Application
.getInstance()
.getFrameController()
.getView()).getEditorPanel();
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/JUndoableCheckBoxEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/JUndoableCheckBoxEdit.java
index f5a5ad098..bdccbd187 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/JUndoableCheckBoxEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/JUndoableCheckBoxEdit.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.CayenneModelerFrame;
-import org.apache.cayenne.modeler.editor.EditorPanel;
+import org.apache.cayenne.modeler.ProjectView;
import org.apache.cayenne.query.SQLTemplate;
import javax.swing.*;
@@ -42,7 +42,7 @@ public class JUndoableCheckBoxEdit extends AbstractUndoableEdit {
private JTabbedPane tabbedPane;
private TreePath treePath;
private Object targetObject;
- private EditorPanel editorPanel;
+ private ProjectView projectView;
private int selectedTabIndex;
@@ -55,9 +55,9 @@ public class JUndoableCheckBoxEdit extends AbstractUndoableEdit {
this.actionListener = actionListener;
this.isSelected = checkBox.isSelected();
- editorPanel = ((CayenneModelerFrame) Application.getInstance().getFrameController().getView()).getEditorPanel();
+ projectView = ((CayenneModelerFrame) Application.getInstance().getFrameController().getView()).getEditorPanel();
- treePath = editorPanel.getProjectTreeView().getSelectionPath();
+ treePath = projectView.getProjectTreeView().getSelectionPath();
if (treePath != null) {
DefaultMutableTreeNode newPath = (DefaultMutableTreeNode) treePath.getLastPathComponent();
@@ -65,19 +65,19 @@ public class JUndoableCheckBoxEdit extends AbstractUndoableEdit {
}
if (targetObject instanceof DataChannelDescriptor) {
- tabbedPane = editorPanel.getDataDomainView();
+ tabbedPane = projectView.getDataDomainView();
}
if (targetObject instanceof DataMap) {
- tabbedPane = editorPanel.getDataMapView();
+ tabbedPane = projectView.getDataMapView();
}
if (targetObject instanceof ObjEntity) {
- tabbedPane = editorPanel.getObjDetailView();
+ tabbedPane = projectView.getObjDetailView();
}
if (targetObject instanceof SQLTemplate) {
- tabbedPane = editorPanel.getSqlTemplateView();
+ tabbedPane = projectView.getSqlTemplateView();
}
if (tabbedPane != null) {
@@ -87,7 +87,7 @@ public class JUndoableCheckBoxEdit extends AbstractUndoableEdit {
private void restoreSelections() {
- editorPanel.getProjectTreeView().getSelectionModel().setSelectionPath(treePath);
+ projectView.getProjectTreeView().getSelectionModel().setSelectionPath(treePath);
if (tabbedPane != null) {
tabbedPane.setSelectedIndex(selectedTabIndex);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/TextCompoundEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/TextCompoundEdit.java
index ac8bac4da..81d9a9671 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/TextCompoundEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/TextCompoundEdit.java
@@ -37,7 +37,7 @@ import org.apache.cayenne.map.Embeddable;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.CayenneModelerFrame;
-import org.apache.cayenne.modeler.editor.EditorPanel;
+import org.apache.cayenne.modeler.ProjectView;
import org.apache.cayenne.modeler.editor.SQLTemplateTabbedView;
import org.apache.cayenne.modeler.util.TextAdapter;
import org.apache.cayenne.query.EJBQLQuery;
@@ -71,10 +71,10 @@ public class TextCompoundEdit extends CompoundEdit implements DocumentListener {
this.editor = editor;
this.listener = listener;
- EditorPanel editorPanel = ((CayenneModelerFrame) Application.getInstance().getFrameController().getView())
+ ProjectView projectView = ((CayenneModelerFrame) Application.getInstance().getFrameController().getView())
.getEditorPanel();
- treePath = editorPanel.getProjectTreeView().getSelectionPath();
+ treePath = projectView.getProjectTreeView().getSelectionPath();
if(treePath != null) {
DefaultMutableTreeNode newPath = (DefaultMutableTreeNode) treePath.getLastPathComponent();
@@ -82,19 +82,19 @@ public class TextCompoundEdit extends CompoundEdit implements DocumentListener {
}
if (targetObject instanceof ObjEntity) {
- tabbedPane = editorPanel.getObjDetailView();
+ tabbedPane = projectView.getObjDetailView();
}
if (targetObject instanceof DbEntity) {
- tabbedPane = editorPanel.getDbDetailView();
+ tabbedPane = projectView.getDbDetailView();
}
if (targetObject instanceof Embeddable) {
- tabbedPane = editorPanel.getEmbeddableView();
+ tabbedPane = projectView.getEmbeddableView();
}
if (targetObject instanceof SQLTemplate) {
- tabbedPane = editorPanel.getSqlTemplateView();
+ tabbedPane = projectView.getSqlTemplateView();
if (tabbedPane != null) {
selectedItem = ((SQLTemplateTabbedView) tabbedPane).getScriptsTab().getSelectedIndex();
@@ -102,19 +102,19 @@ public class TextCompoundEdit extends CompoundEdit implements DocumentListener {
}
if (targetObject instanceof EJBQLQuery) {
- tabbedPane = editorPanel.getEjbqlQueryView();
+ tabbedPane = projectView.getEjbqlQueryView();
}
if (targetObject instanceof DataNodeDescriptor) {
- tabbedPane = editorPanel.getDataNodeView();
+ tabbedPane = projectView.getDataNodeView();
}
if (targetObject instanceof DataMap) {
- tabbedPane = editorPanel.getDataMapView();
+ tabbedPane = projectView.getDataMapView();
}
if (targetObject instanceof DataChannelDescriptor) {
- tabbedPane = editorPanel.getDataDomainView();
+ tabbedPane = projectView.getDataDomainView();
}
if (tabbedPane != null) {
@@ -124,10 +124,10 @@ public class TextCompoundEdit extends CompoundEdit implements DocumentListener {
private void restoreSelections() {
- EditorPanel editorPanel = ((CayenneModelerFrame) Application.getInstance().getFrameController().getView())
+ ProjectView projectView = ((CayenneModelerFrame) Application.getInstance().getFrameController().getView())
.getEditorPanel();
- editorPanel.getProjectTreeView().getSelectionModel().setSelectionPath(treePath);
+ projectView.getProjectTreeView().getSelectionModel().setSelectionPath(treePath);
if (tabbedPane != null) {
tabbedPane.setSelectedIndex(selectedTabIndex);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java
index a8aa0f809..1b39bdc62 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java
@@ -28,7 +28,7 @@ import org.apache.cayenne.modeler.CayenneModelerFrame;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.ProjectTreeModel;
import org.apache.cayenne.modeler.dialog.ErrorDebugDialog;
-import org.apache.cayenne.modeler.editor.EditorPanel;
+import org.apache.cayenne.modeler.ProjectView;
import org.apache.cayenne.project.Project;
import org.apache.cayenne.swing.components.image.FilteredIconFactory;
import org.apache.cayenne.util.Util;
@@ -258,7 +258,7 @@ public abstract class CayenneAction extends AbstractAction {
}
}
- protected static EditorPanel editor() {
+ protected static ProjectView editor() {
return ((CayenneModelerFrame) Application
.getInstance()
.getFrameController()