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/07/11 20:40:14 UTC
(cayenne) 01/02: Modeler labels tweaking
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 e0cf8cec23c7e27c006de1250925f97996d9aa6f
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sat Jul 11 15:30:50 2026 -0400
Modeler labels tweaking
---
.../editor/datadomain/main/DataDomainMainView.java | 2 +-
.../editor/datamap/main/DataMapMainView.java | 2 +-
.../ui/project/editor/dbentity/DbEntityView.java | 2 +-
.../editor/dbentity/main/DbEntityMainView.java | 18 ++++++------------
.../ui/project/editor/objentity/ObjEntityView.java | 2 +-
.../editor/objentity/main/ObjEntityMainView.java | 22 +++++++++++-----------
.../editor/procedure/ProcedureQueryView.java | 2 +-
.../ui/project/editor/procedure/ProcedureTab.java | 2 +-
.../editor/query/ejbql/EjbqlQueryMainTab.java | 2 +-
.../query/selectquery/SelectQueryMainTab.java | 6 +++---
.../query/sqltemplate/SQLTemplateMainTab.java | 10 +++++-----
11 files changed, 32 insertions(+), 38 deletions(-)
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/main/DataDomainMainView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/main/DataDomainMainView.java
index 112efd8c8..0e35fff37 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/main/DataDomainMainView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/main/DataDomainMainView.java
@@ -76,7 +76,7 @@ public class DataDomainMainView extends ProjectPanel implements DomainDisplayLis
builder.setDefaultDialogBorder();
builder.addSeparator("DataDomain Configuration", cc.xywh(1, 1, 7, 1));
- builder.addLabel("DataDomain Name:", cc.xy(1, 3));
+ builder.addLabel("Name:", cc.xy(1, 3));
builder.add(name, cc.xywh(3, 3, 5, 1));
builder.addLabel("Object Validation:", cc.xy(1, 5));
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/DataMapMainView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/DataMapMainView.java
index 19f70f647..69ae7930a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/DataMapMainView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/DataMapMainView.java
@@ -102,7 +102,7 @@ public class DataMapMainView extends ProjectPanel {
builder.setDefaultDialogBorder();
builder.appendSeparator("DataMap Configuration");
- builder.append("DataMap Name:", name, 2);
+ builder.append("Name:", name, 2);
builder.append("Quote SQL Identifiers:", quoteSQLIdentifiers, 3);
builder.append("Comment:", comment, 2);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityView.java
index d595eb366..f0ad525c6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityView.java
@@ -55,7 +55,7 @@ public class DbEntityView extends ProjectTabbedPane {
private void initLayout() {
setTabPlacement(JTabbedPane.TOP);
- addTab("Entity", entityPanel);
+ addTab("DbEntity", entityPanel);
addTab("Properties", attributeRelationshipTab);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/DbEntityMainView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/DbEntityMainView.java
index 99dd2128c..9b1f4dbf5 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/DbEntityMainView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/DbEntityMainView.java
@@ -27,30 +27,24 @@ import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.DbEntityDisplayListener;
import org.apache.cayenne.modeler.event.model.DbEntityEvent;
+import org.apache.cayenne.modeler.project.ProjectSession;
import org.apache.cayenne.modeler.service.action.GlobalActions;
-import org.apache.cayenne.modeler.toolkit.text.CMUndoableTextField;
import org.apache.cayenne.modeler.toolkit.ProjectPanel;
+import org.apache.cayenne.modeler.toolkit.text.CMUndoableTextField;
import org.apache.cayenne.modeler.ui.action.CreateAttributeAction;
import org.apache.cayenne.modeler.ui.action.CreateObjEntityFromDbAction;
import org.apache.cayenne.modeler.ui.action.CreateRelationshipAction;
import org.apache.cayenne.modeler.ui.action.DbEntityCounterpartAction;
import org.apache.cayenne.modeler.ui.action.DbEntitySyncAction;
-import org.apache.cayenne.modeler.project.ProjectSession;
import org.apache.cayenne.modeler.ui.project.editor.ExpressionConvertor;
import org.apache.cayenne.modeler.ui.project.editor.query.ExistingSelectionProcessor;
import org.apache.cayenne.project.extension.info.ObjectInfo;
-import java.util.Objects;
import org.apache.cayenne.validation.ValidationException;
-import javax.swing.BorderFactory;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JToolBar;
-import java.awt.BorderLayout;
-import java.awt.CardLayout;
+import javax.swing.*;
+import java.awt.*;
import java.util.EventObject;
+import java.util.Objects;
public class DbEntityMainView extends ProjectPanel implements ExistingSelectionProcessor, DbEntityDisplayListener {
@@ -113,7 +107,7 @@ public class DbEntityMainView extends ProjectPanel implements ExistingSelectionP
DefaultFormBuilder builder = new DefaultFormBuilder(layout);
builder.setDefaultDialogBorder();
builder.appendSeparator("DbEntity Configuration");
- builder.append("DbEntity Name:", name);
+ builder.append("Name:", name);
builder.append(catalogLabel, catalog);
builder.append(schemaLabel, schema);
builder.append("Qualifier:", qualifier);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityView.java
index 9b46b7353..2d4857688 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityView.java
@@ -60,7 +60,7 @@ public class ObjEntityView extends ProjectTabbedPane {
private void initLayout() {
setTabPlacement(JTabbedPane.TOP);
- addTab("Entity", entityPanel);
+ addTab("ObjEntity", entityPanel);
addTab("Properties", attributeRelationshipTab);
addTab("Callbacks", callbacksPanel);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/main/ObjEntityMainView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/main/ObjEntityMainView.java
index 4782a8fed..ec585a35a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/main/ObjEntityMainView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/main/ObjEntityMainView.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.modeler.ui.project.editor.objentity.main;
-import org.apache.cayenne.modeler.event.model.ObjEntityEvent;
import com.jgoodies.forms.builder.DefaultFormBuilder;
import com.jgoodies.forms.layout.FormLayout;
import org.apache.cayenne.configuration.DataChannelDescriptor;
@@ -28,28 +27,28 @@ import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.modeler.service.action.GlobalActions;
-import org.apache.cayenne.modeler.ui.action.CreateAttributeAction;
-import org.apache.cayenne.modeler.ui.action.CreateRelationshipAction;
-import org.apache.cayenne.modeler.ui.action.ObjEntityCounterpartAction;
-import org.apache.cayenne.modeler.ui.action.ObjEntitySyncAction;
import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.ObjEntityDisplayListener;
+import org.apache.cayenne.modeler.event.model.ObjEntityEvent;
+import org.apache.cayenne.modeler.project.ProjectComparators;
+import org.apache.cayenne.modeler.project.ProjectSession;
+import org.apache.cayenne.modeler.service.action.GlobalActions;
+import org.apache.cayenne.modeler.toolkit.ProjectPanel;
import org.apache.cayenne.modeler.toolkit.Renderers;
import org.apache.cayenne.modeler.toolkit.checkbox.CMCheckBox;
import org.apache.cayenne.modeler.toolkit.combobox.AutoCompletion;
import org.apache.cayenne.modeler.toolkit.combobox.CMComboBox;
import org.apache.cayenne.modeler.toolkit.text.CMUndoableTextField;
-import org.apache.cayenne.modeler.toolkit.ProjectPanel;
-import org.apache.cayenne.modeler.project.ProjectSession;
+import org.apache.cayenne.modeler.ui.action.CreateAttributeAction;
+import org.apache.cayenne.modeler.ui.action.CreateRelationshipAction;
+import org.apache.cayenne.modeler.ui.action.ObjEntityCounterpartAction;
+import org.apache.cayenne.modeler.ui.action.ObjEntitySyncAction;
import org.apache.cayenne.modeler.ui.project.editor.ExpressionConvertor;
import org.apache.cayenne.modeler.ui.project.editor.objentity.classname.ClassNameUpdaterController;
import org.apache.cayenne.modeler.ui.project.editor.objentity.duplicates.DuplicatedAttributesDialog;
import org.apache.cayenne.modeler.ui.project.editor.query.ExistingSelectionProcessor;
-import org.apache.cayenne.modeler.project.ProjectComparators;
import org.apache.cayenne.project.extension.info.ObjectInfo;
-import java.util.Objects;
import org.apache.cayenne.validation.ValidationException;
import javax.swing.*;
@@ -58,6 +57,7 @@ import java.util.Arrays;
import java.util.EventObject;
import java.util.LinkedList;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
public class ObjEntityMainView extends ProjectPanel implements ObjEntityDisplayListener, ExistingSelectionProcessor {
@@ -121,7 +121,7 @@ public class ObjEntityMainView extends ProjectPanel implements ObjEntityDisplayL
builder.setDefaultDialogBorder();
builder.appendSeparator("ObjEntity Configuration");
- builder.append("ObjEntity Name:", name);
+ builder.append("Name:", name);
builder.append("Inheritance:", superEntityCombo);
builder.append(tableLabel, dbEntityCombo);
builder.append("Comment:", comment);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureQueryView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureQueryView.java
index 73c33b57d..be5b1fce5 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureQueryView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureQueryView.java
@@ -104,7 +104,7 @@ public class ProcedureQueryView extends ProjectPanel {
builder.setDefaultDialogBorder();
builder.addSeparator("ProcedureQuery Settings", cc.xywh(1, 1, 3, 1));
- builder.addLabel("Query Name:", cc.xy(1, 3));
+ builder.addLabel("Name:", cc.xy(1, 3));
builder.add(name, cc.xy(3, 3));
builder.addLabel("Procedure:", cc.xy(1, 5));
builder.add(queryRoot, cc.xy(3, 5));
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureTab.java
index 45c5be296..7f27b57d2 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureTab.java
@@ -84,7 +84,7 @@ public class ProcedureTab extends ProjectPanel implements ProcedureDisplayListen
builder.setDefaultDialogBorder();
builder.appendSeparator("Stored Procedure Configuration");
- builder.append("Procedure Name:", name);
+ builder.append("Name:", name);
builder.append("Catalog:", catalog);
builder.append("Schema:", schema);
builder.append("Returns Value:", returnsValue);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryMainTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryMainTab.java
index acf219b7c..38aea203e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryMainTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryMainTab.java
@@ -64,7 +64,7 @@ public class EjbqlQueryMainTab extends ProjectPanel {
PanelBuilder builder = new PanelBuilder(layout);
builder.setDefaultDialogBorder();
builder.addSeparator("EJBQL Query Settings", cc.xywh(1, 1, 3, 1));
- builder.addLabel("Query Name:", cc.xy(1, 3));
+ builder.addLabel("Name:", cc.xy(1, 3));
builder.add(name, cc.xy(3, 3));
builder.addLabel("Comment:", cc.xy(1, 5));
builder.add(comment, cc.xy(3, 5));
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryMainTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryMainTab.java
index 8dfb78c4a..e2e371aa6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryMainTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryMainTab.java
@@ -90,10 +90,10 @@ public class SelectQueryMainTab extends BaseQueryMainTab {
PanelBuilder builder = new PanelBuilder(layout);
builder.setDefaultDialogBorder();
- builder.addSeparator("SelectQuery Settings", cc.xywh(1, 1, 3, 1));
- builder.addLabel("Query Name:", cc.xy(1, 3));
+ builder.addSeparator("ObjectSelect Settings", cc.xywh(1, 1, 3, 1));
+ builder.addLabel("Name:", cc.xy(1, 3));
builder.add(name, cc.xy(3, 3));
- builder.addLabel("Query Root:", cc.xy(1, 5));
+ builder.addLabel("Root:", cc.xy(1, 5));
builder.add(queryRoot, cc.xy(3, 5));
builder.addLabel("Qualifier:", cc.xy(1, 7));
builder.add(qualifier, cc.xy(3, 7));
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateMainTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateMainTab.java
index fcfa2d3ab..ef7cc0023 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateMainTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateMainTab.java
@@ -100,12 +100,12 @@ public class SQLTemplateMainTab extends BaseQueryMainTab {
builder.setDefaultDialogBorder();
builder.addSeparator("SQLTemplate Settings", cc.xywh(1, 1, 3, 1));
- builder.addLabel("Query Name:", cc.xy(1, 3));
+ builder.addLabel("Name:", cc.xy(1, 3));
builder.add(name, cc.xy(3, 3));
- builder.addLabel("Comment:", cc.xy(1, 5));
- builder.add(comment, cc.xy(3, 5));
- builder.addLabel("Query Root:", cc.xy(1, 7));
- builder.add(queryRoot, cc.xy(3, 7));
+ builder.addLabel("Root:", cc.xy(1, 5));
+ builder.add(queryRoot, cc.xy(3, 5));
+ builder.addLabel("Comment:", cc.xy(1, 7));
+ builder.add(comment, cc.xy(3, 7));
this.setLayout(new BorderLayout());
this.add(builder.getPanel(), BorderLayout.NORTH);