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/25 13:07:31 UTC

(cayenne) branch master updated (0a4a3e72c -> b2d2e4d45)

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

asf-gitbox-commits pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git


    from 0a4a3e72c Modeler Cleanup
     new 7a60f4683 Modeler cleanup
     new 882ba2b3c Modeler cleanup
     new 1dce27aa9 Modeler cleanup
     new b2d2e4d45 CAY-2923 Modeler: Restore table cell editor borders

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 RELEASE-NOTES.txt                                  |   1 +
 .../cayenne/modeler/win/WinCustomTextFieldUI.java  |   2 +-
 .../org/apache/cayenne/modeler/Application.java    |   5 -
 .../org/apache/cayenne/modeler/ModelerModule.java  |   3 -
 .../apache/cayenne/modeler/action/CopyAction.java  |   2 +-
 .../action/CopyAttributeRelationshipAction.java    |   8 +-
 .../action/CutAttributeRelationshipAction.java     |   8 +-
 .../apache/cayenne/modeler/action/PasteAction.java |   2 +-
 .../action/RemoveAttributeRelationshipAction.java  |   8 +-
 .../{util => swing}/CayenneTransferable.java       |   2 +-
 .../swing}/JCayenneCheckBox.java                   |   2 +-
 .../{util => swing}/MultiColumnBrowser.java        |   5 +-
 .../modeler/{util => swing}/ProgressDialog.java    |   4 +-
 .../WidgetFactory.java}                            |  34 +-
 .../swing/border}/TopBorder.java                   |   2 +-
 .../{util => swing}/combo/AutoCompletion.java      |   2 +-
 .../{util => swing}/combo/ComboBoxCellEditor.java  |  14 +-
 .../combo/CustomTypeComboBoxEditor.java            |   2 +-
 .../{util => swing}/combo/EditorTextField.java     |   2 +-
 .../{util => swing}/combo/SuggestionList.java      |   2 +-
 .../swing}/image/FilteredIconFactory.java          |   2 +-
 .../table}/BoardTableCellRenderer.java             |   2 +-
 .../{util => swing/table}/CayenneCellEditor.java   |  15 +-
 .../table}/CellEditorForAttributeTable.java        |   2 +-
 .../{util => swing/table}/CheckBoxHeader.java      |   2 +-
 .../{util => swing/table}/ImageRendererColumn.java |   2 +-
 .../{util => swing/table}/SortButtonRenderer.java  |   4 +-
 .../textpane => modeler/swing/text}/EditorKit.java |  10 +-
 .../swing/text}/JCayenneTextPane.java              |  26 +-
 .../{util => swing/text}/JTextFieldUndoable.java   |   2 +-
 .../swing/text}/LimitedTextField.java              |  11 +-
 .../swing/text}/LineNumberedBorder.java            |   2 +-
 .../swing/text}/TextPaneView.java                  |  37 +-
 .../swing/text}/TextPaneViewFactory.java           |  12 +-
 .../swing/text}/UnderlineHighlighterForText.java   |   2 +-
 .../{util => swing/text}/ValidatorTextAdapter.java |   3 +-
 .../swing/text}/style/SyntaxStyle.java             |   9 +-
 .../swing/text}/style/TextPaneStyleMap.java        |   6 +-
 .../swing/text}/style/TextPaneStyleTypes.java      |   2 +-
 .../swing/text/syntax/TextSyntax.java}             |  32 +-
 .../swing}/tree/ChangeOptimizingTreeModel.java     |   2 +-
 .../swing}/tree/CheckBoxNodeData.java              |   2 +-
 .../swing}/tree/CheckBoxTree.java                  |   2 +-
 .../swing}/tree/CheckBoxTreeCellEditor.java        |   2 +-
 .../swing}/tree/CheckBoxTreeCellRenderer.java      |   2 +-
 .../swing}/tree/LabelTreeCellRenderer.java         |   2 +-
 .../apache/cayenne/modeler/ui/ModelerFrame.java    |   2 +-
 .../modeler/ui/dbgen/DBGeneratorOptionsView.java   |   2 +-
 .../modeler/ui/dbmerge/MergerOptionsView.java      |   2 +-
 .../ui/dbmerge/MergerTokenSelectorController.java  |   3 +-
 .../DbRelationshipDialogController.java            |  11 +-
 .../cayenne/modeler/ui/find/FindDialogView.java    |   4 +-
 .../modeler/ui/logconsole/LogConsoleView.java      |   2 +-
 .../ui/preferences/PreferenceDialogView.java       |   2 +-
 .../project/editor/datadomain/DataDomainView.java  |   2 +-
 .../datadomain/graph/DataDomainGraphTab.java       | 415 +++++++++++----------
 .../validation/InspectionCheckBoxTree.java         |   6 +-
 .../validation/ValidationTabController.java        |   2 +-
 .../cgen/CgenArtefactSelectorController.java       |   4 +-
 .../editor/datamap/cgen/CgenConfigPanel.java       |   2 +-
 .../dbimport/ReverseEngineeringConfigPanel.java    |   5 +-
 .../editor/datamap/main/DataMapMainView.java       |   5 +-
 .../ui/project/editor/datanode/DataNodeView.java   |   9 +-
 .../datanode/custom/CustomDataSourceView.java      |   2 +-
 .../editor/datanode/jdbc/JDBCDataSourceView.java   |   2 +-
 ...tyAttributePanel.java => DbAttributePanel.java} |  32 +-
 .../editor/dbentity/DbAttributeTableModel.java     |  71 +---
 .../dbentity/DbEntityAttributeRelationshipTab.java |  14 +-
 .../editor/dbentity/DbEntityTabbedView.java        |   4 +-
 ...tionshipPanel.java => DbRelationshipPanel.java} |  24 +-
 .../attributes/EmbeddableAttributeTableModel.java  |   6 +-
 .../attributes/EmbeddableAttributesView.java       |   7 +-
 .../editor/objentity/ObjAttributeTableModel.java   |   6 +-
 .../editor/objentity/ObjEntityAttributePanel.java  |   7 +-
 .../ObjEntityAttributeRelationshipTab.java         |   2 +-
 .../objentity/ObjEntityRelationshipPanel.java      |   5 +-
 .../ui/project/editor/objentity/ObjEntityTab.java  |   9 +-
 .../attrinfo/ObjAttributeInfoDialogView.java       |   7 +-
 .../OverrideEmbeddableAttributeTableModel.java     |   8 +-
 .../duplicates/DuplicatedAttributesDialog.java     |   5 +-
 .../relinfo/ObjRelationshipInfoController.java     |   2 +-
 .../objentity/relinfo/ObjRelationshipInfoView.java |  19 +-
 .../relinfo/ObjRelationshipPathBrowser.java        |   2 +-
 .../editor/procedure/ProcedureParameterTab.java    |  19 +-
 .../editor/procedure/ProcedureQueryView.java       |   5 +-
 .../ui/project/editor/procedure/ProcedureTab.java  |   2 +-
 .../ui/project/editor/query/BaseQueryMainTab.java  |   5 +-
 .../editor/query/ObjectQueryPropertiesPanel.java   |   2 +-
 .../editor/query/RawQueryPropertiesPanel.java      |   5 +-
 .../editor/query/SelectPropertiesPanel.java        |   3 +-
 .../editor/query/ejbql/EjbqlQueryScriptsTab.java   |   5 +-
 .../ui/project/editor/query/ejbql/EjbqlSyntax.java |  67 ++++
 .../query/selectquery/SelectQueryMainTab.java      |   4 +-
 .../query/selectquery/SelectQueryOrderingTab.java  |   4 +-
 .../query/selectquery/SelectQueryPrefetchTab.java  |   2 +-
 .../editor/query/sqltemplate/SQLSyntax.java        | 121 ++++++
 .../query/sqltemplate/SQLTemplateMainTab.java      |   3 +-
 .../query/sqltemplate/SQLTemplatePrefetchTab.java  |   4 +-
 .../query/sqltemplate/SQLTemplateScriptsTab.java   |   7 +-
 .../modeler/ui/project/tree/ProjectTreeView.java   |   2 +-
 .../apache/cayenne/modeler/util/CayenneAction.java |   2 +-
 .../apache/cayenne/modeler/util/CayenneDialog.java |  19 +-
 .../apache/cayenne/modeler/util/CayenneTable.java  |  17 +-
 .../modeler/util/JUndoableCayenneTextPane.java     |   8 +-
 .../cayenne/modeler/util/LongRunningTask.java      |   1 +
 .../util/PathChooserComboBoxCellEditor.java        |   5 +-
 .../cayenne/modeler/util/TableHeaderListener.java  |   1 +
 .../apache/cayenne/modeler/util/WidgetFactory.java |  68 ----
 .../textpane/syntax/EJBQLSyntaxConstant.java       |  63 ----
 .../textpane/syntax/SQLSyntaxConstants.java        | 117 ------
 .../components/textpane/syntax/SyntaxConstant.java |  49 ---
 111 files changed, 734 insertions(+), 893 deletions(-)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{util => swing}/CayenneTransferable.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/{swing/components => modeler/swing}/JCayenneCheckBox.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{util => swing}/MultiColumnBrowser.java (99%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{util => swing}/ProgressDialog.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{util/DefaultWidgetFactory.java => swing/WidgetFactory.java} (78%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/{swing/components => modeler/swing/border}/TopBorder.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{util => swing}/combo/AutoCompletion.java (99%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{util => swing}/combo/ComboBoxCellEditor.java (91%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{util => swing}/combo/CustomTypeComboBoxEditor.java (99%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{util => swing}/combo/EditorTextField.java (99%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{util => swing}/combo/SuggestionList.java (99%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/{swing/components => modeler/swing}/image/FilteredIconFactory.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{util => swing/table}/BoardTableCellRenderer.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{util => swing/table}/CayenneCellEditor.java (86%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{util => swing/table}/CellEditorForAttributeTable.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{util => swing/table}/CheckBoxHeader.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{util => swing/table}/ImageRendererColumn.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{util => swing/table}/SortButtonRenderer.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/{swing/components/textpane => modeler/swing/text}/EditorKit.java (81%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/{swing/components/textpane => modeler/swing/text}/JCayenneTextPane.java (94%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{util => swing/text}/JTextFieldUndoable.java (95%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/{swing/components => modeler/swing/text}/LimitedTextField.java (81%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/{swing/components/textpane => modeler/swing/text}/LineNumberedBorder.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/{swing/components/textpane => modeler/swing/text}/TextPaneView.java (87%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/{swing/components/textpane => modeler/swing/text}/TextPaneViewFactory.java (78%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/{swing/components/textpane => modeler/swing/text}/UnderlineHighlighterForText.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{util => swing/text}/ValidatorTextAdapter.java (98%)
 copy modeler/cayenne-modeler/src/main/java/org/apache/cayenne/{swing/components/textpane => modeler/swing/text}/style/SyntaxStyle.java (88%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/{swing/components/textpane => modeler/swing/text}/style/TextPaneStyleMap.java (92%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/{swing/components/textpane => modeler/swing/text}/style/TextPaneStyleTypes.java (95%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/{swing/components/textpane/style/SyntaxStyle.java => modeler/swing/text/syntax/TextSyntax.java} (64%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/{swing/components => modeler/swing}/tree/ChangeOptimizingTreeModel.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/{swing/components => modeler/swing}/tree/CheckBoxNodeData.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/{swing/components => modeler/swing}/tree/CheckBoxTree.java (99%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/{swing/components => modeler/swing}/tree/CheckBoxTreeCellEditor.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/{swing/components => modeler/swing}/tree/CheckBoxTreeCellRenderer.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/{swing/components => modeler/swing}/tree/LabelTreeCellRenderer.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/{DbEntityAttributePanel.java => DbAttributePanel.java} (88%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/{DbEntityRelationshipPanel.java => DbRelationshipPanel.java} (94%)
 create mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlSyntax.java
 create mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLSyntax.java
 delete mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/WidgetFactory.java
 delete mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/EJBQLSyntaxConstant.java
 delete mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/SQLSyntaxConstants.java
 delete mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/SyntaxConstant.java


(cayenne) 03/04: Modeler cleanup

Posted by 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 1dce27aa9f29071309cf4253f36d20175c7d4852
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sat Apr 25 08:01:13 2026 -0400

    Modeler cleanup
    
    WidgetFactory can be static
---
 .../org/apache/cayenne/modeler/Application.java    |   5 -
 .../org/apache/cayenne/modeler/ModelerModule.java  |   3 -
 .../action/CopyAttributeRelationshipAction.java    |   8 +-
 .../action/CutAttributeRelationshipAction.java     |   8 +-
 .../action/RemoveAttributeRelationshipAction.java  |   8 +-
 .../modeler/swing/DefaultWidgetFactory.java        | 109 ------
 .../cayenne/modeler/swing/WidgetFactory.java       |  73 +++-
 .../modeler/swing/text/LimitedTextField.java       |   9 +-
 .../ui/dbmerge/MergerTokenSelectorController.java  |   3 +-
 .../DbRelationshipDialogController.java            |   9 +-
 .../datadomain/graph/DataDomainGraphTab.java       | 415 +++++++++++----------
 .../dbimport/ReverseEngineeringConfigPanel.java    |   3 +-
 .../editor/datamap/main/DataMapMainView.java       |   3 +-
 .../ui/project/editor/datanode/DataNodeView.java   |   7 +-
 ...tyAttributePanel.java => DbAttributePanel.java} |  26 +-
 .../editor/dbentity/DbAttributeTableModel.java     |  71 +---
 .../dbentity/DbEntityAttributeRelationshipTab.java |  12 +-
 .../editor/dbentity/DbEntityTabbedView.java        |   4 +-
 ...tionshipPanel.java => DbRelationshipPanel.java} |  20 +-
 .../attributes/EmbeddableAttributeTableModel.java  |   4 +-
 .../attributes/EmbeddableAttributesView.java       |   5 +-
 .../editor/objentity/ObjAttributeTableModel.java   |   4 +-
 .../editor/objentity/ObjEntityAttributePanel.java  |   5 +-
 .../objentity/ObjEntityRelationshipPanel.java      |   5 +-
 .../ui/project/editor/objentity/ObjEntityTab.java  |   5 +-
 .../attrinfo/ObjAttributeInfoDialogView.java       |   3 +-
 .../OverrideEmbeddableAttributeTableModel.java     |   6 +-
 .../duplicates/DuplicatedAttributesDialog.java     |   5 +-
 .../objentity/relinfo/ObjRelationshipInfoView.java |  17 +-
 .../editor/procedure/ProcedureParameterTab.java    |  11 +-
 .../editor/procedure/ProcedureQueryView.java       |   5 +-
 .../ui/project/editor/query/BaseQueryMainTab.java  |   3 +-
 .../editor/query/RawQueryPropertiesPanel.java      |   3 +-
 .../editor/query/SelectPropertiesPanel.java        |   3 +-
 .../query/sqltemplate/SQLTemplateMainTab.java      |   3 +-
 .../apache/cayenne/modeler/util/CayenneTable.java  |   3 +-
 .../util/PathChooserComboBoxCellEditor.java        |   3 +-
 37 files changed, 399 insertions(+), 490 deletions(-)

diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java
index 14860f3f7..4b10e558d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java
@@ -33,7 +33,6 @@ import org.apache.cayenne.modeler.ui.preferences.classpath.ClasspathPreferencesC
 import org.apache.cayenne.modeler.ui.preferences.general.GeneralPreferencesController;
 import org.apache.cayenne.modeler.undo.CayenneUndoManager;
 import org.apache.cayenne.modeler.util.AdapterMapping;
-import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.pref.CayennePreference;
 import org.apache.cayenne.modeler.pref.CayenneProjectPreferences;
 import org.apache.cayenne.project.Project;
@@ -89,10 +88,6 @@ public class Application {
         Application.instance = instance;
     }
 
-    public static WidgetFactory getWidgetFactory() {
-        return instance.getInjector().getInstance(WidgetFactory.class);
-    }
-
     // static methods that should probably go away eventually...
     public static ModelerFrame getFrame() {
         return (ModelerFrame) getInstance().getFrameController().getView();
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerModule.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerModule.java
index 37539496a..e3a7a06b1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerModule.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerModule.java
@@ -31,8 +31,6 @@ import org.apache.cayenne.modeler.action.DefaultActionManager;
 import org.apache.cayenne.modeler.graph.extension.GraphExtension;
 import org.apache.cayenne.modeler.platform.DefaultPlatformInitializer;
 import org.apache.cayenne.modeler.platform.PlatformInitializer;
-import org.apache.cayenne.modeler.swing.DefaultWidgetFactory;
-import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.validation.ConfigurableProjectValidator;
 import org.apache.cayenne.modeler.validation.extension.ValidationExtension;
 import org.apache.cayenne.project.ProjectModule;
@@ -51,7 +49,6 @@ public class ModelerModule implements Module {
         binder.bind(ActionManager.class).to(DefaultActionManager.class);
         binder.bind(Application.class).to(Application.class);
         binder.bind(PlatformInitializer.class).to(DefaultPlatformInitializer.class);
-        binder.bind(WidgetFactory.class).to(DefaultWidgetFactory.class);
         binder.bind(HandlerFactory.class).to(ExtensionAwareHandlerFactory.class);
         binder.bind(DataChannelMetaData.class).to(DefaultDataChannelMetaData.class);
         binder.bind(XMLReader.class).toProviderInstance(new XMLReaderProvider(true)).withoutScope();
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CopyAttributeRelationshipAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CopyAttributeRelationshipAction.java
index cd65121f3..6d4a53d33 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CopyAttributeRelationshipAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CopyAttributeRelationshipAction.java
@@ -22,7 +22,7 @@ import org.apache.cayenne.configuration.ConfigurationNode;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.ui.project.editor.objentity.ObjEntityAttributePanel;
-import org.apache.cayenne.modeler.ui.project.editor.dbentity.DbEntityAttributePanel;
+import org.apache.cayenne.modeler.ui.project.editor.dbentity.DbAttributePanel;
 import javax.swing.JComponent;
 
 public class CopyAttributeRelationshipAction extends CopyAction implements MultipleObjectsAction {
@@ -42,7 +42,7 @@ public class CopyAttributeRelationshipAction extends CopyAction implements Multi
     }
 
     public String getActionName(boolean multiple) {
-        if (currentSelectedPanel instanceof ObjEntityAttributePanel || currentSelectedPanel instanceof DbEntityAttributePanel) {
+        if (currentSelectedPanel instanceof ObjEntityAttributePanel || currentSelectedPanel instanceof DbAttributePanel) {
             return copyAttributeAction.getActionName(multiple);
         } else {
             return copyRelationshipAction.getActionName(multiple);
@@ -50,7 +50,7 @@ public class CopyAttributeRelationshipAction extends CopyAction implements Multi
     }
 
     public boolean enableForPath(ConfigurationNode object) {
-        if (currentSelectedPanel instanceof ObjEntityAttributePanel || currentSelectedPanel instanceof DbEntityAttributePanel) {
+        if (currentSelectedPanel instanceof ObjEntityAttributePanel || currentSelectedPanel instanceof DbAttributePanel) {
             return copyAttributeAction.enableForPath(object);
         } else {
             return copyRelationshipAction.enableForPath(object);
@@ -58,7 +58,7 @@ public class CopyAttributeRelationshipAction extends CopyAction implements Multi
     }
 
     public Object copy(ProjectController controller) {
-        if (currentSelectedPanel instanceof ObjEntityAttributePanel || currentSelectedPanel instanceof DbEntityAttributePanel) {
+        if (currentSelectedPanel instanceof ObjEntityAttributePanel || currentSelectedPanel instanceof DbAttributePanel) {
             return copyAttributeAction.copy(controller);
         } else {
             return copyRelationshipAction.copy(controller);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CutAttributeRelationshipAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CutAttributeRelationshipAction.java
index 89a7d034e..6d30a981b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CutAttributeRelationshipAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CutAttributeRelationshipAction.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.modeler.action;
 import org.apache.cayenne.configuration.ConfigurationNode;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.editor.objentity.ObjEntityAttributePanel;
-import org.apache.cayenne.modeler.ui.project.editor.dbentity.DbEntityAttributePanel;
+import org.apache.cayenne.modeler.ui.project.editor.dbentity.DbAttributePanel;
 
 import javax.swing.JComponent;
 import java.awt.event.ActionEvent;
@@ -44,7 +44,7 @@ public class CutAttributeRelationshipAction extends CutAction implements Multipl
     }
 
     public String getActionName(boolean multiple) {
-        if (currentSelectedPanel instanceof ObjEntityAttributePanel || currentSelectedPanel instanceof DbEntityAttributePanel) {
+        if (currentSelectedPanel instanceof ObjEntityAttributePanel || currentSelectedPanel instanceof DbAttributePanel) {
             return cutAttributeAction.getActionName(multiple);
         } else {
             return cutRelationshipAction.getActionName(multiple);
@@ -52,7 +52,7 @@ public class CutAttributeRelationshipAction extends CutAction implements Multipl
     }
 
     public boolean enableForPath(ConfigurationNode object) {
-        if (currentSelectedPanel instanceof ObjEntityAttributePanel || currentSelectedPanel instanceof DbEntityAttributePanel) {
+        if (currentSelectedPanel instanceof ObjEntityAttributePanel || currentSelectedPanel instanceof DbAttributePanel) {
             return cutAttributeAction.enableForPath(object);
         } else {
             return cutRelationshipAction.enableForPath(object);
@@ -60,7 +60,7 @@ public class CutAttributeRelationshipAction extends CutAction implements Multipl
     }
 
     public void performAction(ActionEvent e) {
-        if (currentSelectedPanel instanceof ObjEntityAttributePanel || currentSelectedPanel instanceof DbEntityAttributePanel) {
+        if (currentSelectedPanel instanceof ObjEntityAttributePanel || currentSelectedPanel instanceof DbAttributePanel) {
             cutAttributeAction.performAction(e);
         } else {
             cutRelationshipAction.performAction(e);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAttributeRelationshipAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAttributeRelationshipAction.java
index 5724e6ccd..05e8117a1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAttributeRelationshipAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAttributeRelationshipAction.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.modeler.action;
 import org.apache.cayenne.configuration.ConfigurationNode;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.editor.objentity.ObjEntityAttributePanel;
-import org.apache.cayenne.modeler.ui.project.editor.dbentity.DbEntityAttributePanel;
+import org.apache.cayenne.modeler.ui.project.editor.dbentity.DbAttributePanel;
 
 import javax.swing.JComponent;
 import java.awt.event.ActionEvent;
@@ -45,7 +45,7 @@ public class RemoveAttributeRelationshipAction extends RemoveAction implements M
 
     @Override
     public String getActionName(boolean multiple) {
-        if (currentSelectedPanel instanceof ObjEntityAttributePanel || currentSelectedPanel instanceof DbEntityAttributePanel) {
+        if (currentSelectedPanel instanceof ObjEntityAttributePanel || currentSelectedPanel instanceof DbAttributePanel) {
             return removeAttributeAction.getActionName(multiple);
         } else {
             return removeRelationshipAction.getActionName(multiple);
@@ -54,7 +54,7 @@ public class RemoveAttributeRelationshipAction extends RemoveAction implements M
 
     @Override
     public boolean enableForPath(ConfigurationNode object) {
-        if (currentSelectedPanel instanceof ObjEntityAttributePanel || currentSelectedPanel instanceof DbEntityAttributePanel) {
+        if (currentSelectedPanel instanceof ObjEntityAttributePanel || currentSelectedPanel instanceof DbAttributePanel) {
             return removeAttributeAction.enableForPath(object);
         } else {
             return removeRelationshipAction.enableForPath(object);
@@ -63,7 +63,7 @@ public class RemoveAttributeRelationshipAction extends RemoveAction implements M
 
     @Override
     public void performAction(ActionEvent e, boolean allowAsking) {
-        if (currentSelectedPanel instanceof ObjEntityAttributePanel || currentSelectedPanel instanceof DbEntityAttributePanel) {
+        if (currentSelectedPanel instanceof ObjEntityAttributePanel || currentSelectedPanel instanceof DbAttributePanel) {
             removeAttributeAction.performAction(e, allowAsking);
         } else {
             removeRelationshipAction.performAction(e, allowAsking);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/DefaultWidgetFactory.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/DefaultWidgetFactory.java
deleted file mode 100644
index d1ec53bb7..000000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/DefaultWidgetFactory.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*****************************************************************
- *   Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- ****************************************************************/
-package org.apache.cayenne.modeler.swing;
-
-import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
-import org.apache.cayenne.modeler.swing.combo.ComboBoxCellEditor;
-import org.apache.cayenne.modeler.swing.table.CayenneCellEditor;
-import org.apache.cayenne.modeler.undo.JComboBoxUndoListener;
-
-import javax.swing.*;
-import javax.swing.table.TableCellEditor;
-import java.awt.*;
-import java.util.Arrays;
-import java.util.Collection;
-
-public class DefaultWidgetFactory implements WidgetFactory {
-
-    /**
-     * Number of items in combobox visible without scrolling
-     */
-    private static final int COMBOBOX_MAX_VISIBLE_SIZE = 12;
-
-    /**
-     * Creates a new JComboBox with a collection of model objects.
-     */
-    public JComboBox<String> createComboBox(Collection<String> model, boolean sort) {
-        return createComboBox(model.toArray(new String[0]), sort);
-    }
-
-    /**
-     * Creates a new JComboBox with an array of model objects.
-     */
-    public <T> JComboBox<T> createComboBox(T[] model, boolean sort) {
-        JComboBox<T> comboBox = createComboBox();
-
-        if (sort) {
-            Arrays.sort(model);
-        }
-
-        comboBox.setModel(new DefaultComboBoxModel<>(model));
-        return comboBox;
-    }
-
-    /**
-     * Creates a new JComboBox.
-     */
-    public <T> JComboBox<T> createComboBox() {
-        JComboBox<T> comboBox = new JComboBox<>();
-        comboBox.setFont(UIManager.getFont("Label.font"));
-        comboBox.setBackground(Color.WHITE);
-        comboBox.setMaximumRowCount(COMBOBOX_MAX_VISIBLE_SIZE);
-        return comboBox;
-    }
-
-    /**
-     * Creates undoable JComboBox.
-     * 
-     */
-    public <T> JComboBox<T> createUndoableComboBox() {
-        JComboBox<T> comboBox = new JComboBox<>();
-        comboBox.addItemListener(new JComboBoxUndoListener());
-        comboBox.setBackground(Color.WHITE);
-        comboBox.setMaximumRowCount(COMBOBOX_MAX_VISIBLE_SIZE);
-        return comboBox;
-    }
-
-    /**
-     * Creates cell editor for text field
-     */
-    public DefaultCellEditor createCellEditor(JTextField textField) {
-        textField.setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
-        return new CayenneCellEditor(textField);
-    }
-
-    /**
-     * Creates cell editor for a table with combo as editor component. Type of this editor
-     * depends on auto-completion behavior of JComboBox
-     * 
-     * @param combo JComboBox to be used as editor component
-     */
-    public TableCellEditor createCellEditor(JComboBox<?> combo) {
-        combo.setBorder(BorderFactory.createEmptyBorder(0,5,0,0));
-        if (Boolean.TRUE.equals(combo.getClientProperty(AutoCompletion.AUTOCOMPLETION_PROPERTY))) {
-            return new ComboBoxCellEditor(combo);
-        }
-
-        DefaultCellEditor editor = new DefaultCellEditor(combo);
-        editor.setClickCountToStart(1);
-
-        return editor;
-    }
-
-}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/WidgetFactory.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/WidgetFactory.java
index 4b9770729..950c32824 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/WidgetFactory.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/WidgetFactory.java
@@ -19,50 +19,101 @@
 
 package org.apache.cayenne.modeler.swing;
 
-import java.util.Collection;
+import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
+import org.apache.cayenne.modeler.swing.combo.ComboBoxCellEditor;
+import org.apache.cayenne.modeler.swing.table.CayenneCellEditor;
+import org.apache.cayenne.modeler.undo.JComboBoxUndoListener;
 
+import javax.swing.BorderFactory;
 import javax.swing.DefaultCellEditor;
+import javax.swing.DefaultComboBoxModel;
 import javax.swing.JComboBox;
 import javax.swing.JTextField;
+import javax.swing.UIManager;
 import javax.swing.table.TableCellEditor;
+import java.awt.Color;
+import java.util.Arrays;
+import java.util.Collection;
 
 /**
- * Utility class to create standard Swing widgets following default look-and-feel of
- * CayenneModeler.
+ * Utility class to create modeler-flavored Swing widgets.
  */
-public interface WidgetFactory {
+public final class WidgetFactory {
+
+    /**
+     * Number of items in combobox visible without scrolling
+     */
+    private static final int COMBOBOX_MAX_VISIBLE_SIZE = 12;
+
+    private WidgetFactory() {
+    }
 
     /**
      * Creates a new JComboBox with a collection of model objects.
      */
-    JComboBox<String> createComboBox(Collection<String> model, boolean sort);
+    public static JComboBox<String> createComboBox(Collection<String> model, boolean sort) {
+        return createComboBox(model.toArray(new String[0]), sort);
+    }
 
     /**
      * Creates a new JComboBox with an array of model objects.
      */
-    <E> JComboBox<E> createComboBox(E[] model, boolean sort);
+    public static <T> JComboBox<T> createComboBox(T[] model, boolean sort) {
+        JComboBox<T> comboBox = createComboBox();
+
+        if (sort) {
+            Arrays.sort(model);
+        }
+
+        comboBox.setModel(new DefaultComboBoxModel<>(model));
+        return comboBox;
+    }
 
     /**
      * Creates a new JComboBox.
      */
-    <E> JComboBox<E> createComboBox();
+    public static <T> JComboBox<T> createComboBox() {
+        JComboBox<T> comboBox = new JComboBox<>();
+        comboBox.setFont(UIManager.getFont("Label.font"));
+        comboBox.setBackground(Color.WHITE);
+        comboBox.setMaximumRowCount(COMBOBOX_MAX_VISIBLE_SIZE);
+        return comboBox;
+    }
 
     /**
      * Creates undoable JComboBox.
      */
-    <E> JComboBox<E> createUndoableComboBox();
+    public static <T> JComboBox<T> createUndoableComboBox() {
+        JComboBox<T> comboBox = new JComboBox<>();
+        comboBox.addItemListener(new JComboBoxUndoListener());
+        comboBox.setBackground(Color.WHITE);
+        comboBox.setMaximumRowCount(COMBOBOX_MAX_VISIBLE_SIZE);
+        return comboBox;
+    }
 
     /**
      * Creates cell editor for text field
      */
-    DefaultCellEditor createCellEditor(JTextField textField);
+    public static DefaultCellEditor createCellEditor(JTextField textField) {
+        textField.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
+        return new CayenneCellEditor(textField);
+    }
 
     /**
      * Creates cell editor for a table with combo as editor component. Type of this editor
      * depends on auto-completion behavior of JComboBox
-     * 
+     *
      * @param combo JComboBox to be used as editor component
      */
-    TableCellEditor createCellEditor(JComboBox<?> combo);
+    public static TableCellEditor createCellEditor(JComboBox<?> combo) {
+        combo.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
+        if (Boolean.TRUE.equals(combo.getClientProperty(AutoCompletion.AUTOCOMPLETION_PROPERTY))) {
+            return new ComboBoxCellEditor(combo);
+        }
+
+        DefaultCellEditor editor = new DefaultCellEditor(combo);
+        editor.setClickCountToStart(1);
 
+        return editor;
+    }
 }
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/LimitedTextField.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/LimitedTextField.java
index d38df2ee0..c6a6a86c8 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/LimitedTextField.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/LimitedTextField.java
@@ -25,23 +25,20 @@ import javax.swing.text.PlainDocument;
 
 public class LimitedTextField extends JTextField {
 
-    private static final long serialVersionUID = 5615520143950793884L;
-
     public LimitedTextField(int limit) {
         setDocument(new LimitedDocument(limit));
     }
 
     private static class LimitedDocument extends PlainDocument {
 
-        private static final long serialVersionUID = 2371422073526259311L;
-        private int limit;
+        private final int limit;
 
         LimitedDocument(int limit) {
-            super();
             this.limit = limit;
         }
 
-        public void insertString( int offset, String  str, AttributeSet attr ) throws BadLocationException {
+        @Override
+        public void insertString(int offset, String str, AttributeSet attr) throws BadLocationException {
             if (str == null) return;
 
             if ((getLength() + str.length()) <= limit) {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenSelectorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenSelectorController.java
index dc28e36ec..57deec466 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenSelectorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenSelectorController.java
@@ -23,6 +23,7 @@ import org.apache.cayenne.dbsync.merge.context.MergeDirection;
 import org.apache.cayenne.dbsync.merge.token.MergerToken;
 import org.apache.cayenne.dbsync.merge.factory.MergerTokenFactory;
 import org.apache.cayenne.modeler.Application;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.mvc.ChildController;
 import org.apache.cayenne.modeler.mvc.RootController;
 import org.apache.cayenne.modeler.util.ModelerUtil;
@@ -162,7 +163,7 @@ public class MergerTokenSelectorController extends ChildController<RootControlle
         final TableColumnModel columnModel = view.getTokens().getColumnModel();
 
         // dropdown for direction column
-        final JComboBox directionCombo = Application.getWidgetFactory().createComboBox(dirs, false);
+        final JComboBox directionCombo = WidgetFactory.createComboBox(dirs, false);
         directionCombo.setEditable(false);
         final TableColumn directionColumn = columnModel.getColumn(
                 MergerTokenTableModel.COL_DIRECTION);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogController.java
index 54c6f073d..34c990564 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogController.java
@@ -36,6 +36,7 @@ import org.apache.cayenne.modeler.mvc.ChildController;
 import org.apache.cayenne.modeler.undo.CreateRelationshipUndoableEdit;
 import org.apache.cayenne.modeler.undo.RelationshipUndoableEdit;
 import org.apache.cayenne.modeler.util.ModelerUtil;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
 import org.apache.cayenne.project.extension.info.ObjectInfo;
 import org.apache.cayenne.util.Util;
@@ -234,18 +235,18 @@ public class DbRelationshipDialogController extends ChildController<ProjectContr
         });
 
         TableColumn sourceColumn = view.getTable().getColumnModel().getColumn(DbJoinTableModel.SOURCE);
-        JComboBox comboBox = Application.getWidgetFactory().createComboBox(
+        JComboBox comboBox = WidgetFactory.createComboBox(
                 ModelerUtil.getDbAttributeNames(relationship.getSourceEntity()), true);
 
         AutoCompletion.enable(comboBox);
-        sourceColumn.setCellEditor(Application.getWidgetFactory().createCellEditor(comboBox));
+        sourceColumn.setCellEditor(WidgetFactory.createCellEditor(comboBox));
 
         TableColumn targetColumn = view.getTable().getColumnModel().getColumn(DbJoinTableModel.TARGET);
-        comboBox = Application.getWidgetFactory().createComboBox(
+        comboBox = WidgetFactory.createComboBox(
                 ModelerUtil.getDbAttributeNames(relationship.getTargetEntity()), true);
         AutoCompletion.enable(comboBox);
 
-        targetColumn.setCellEditor(Application.getWidgetFactory().createCellEditor(comboBox));
+        targetColumn.setCellEditor(WidgetFactory.createCellEditor(comboBox));
 
         view.getTablePreferences().bind(view.getTable(), null, null, null, DbJoinTableModel.SOURCE, true);
     }
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/DataDomainGraphTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/DataDomainGraphTab.java
index ef805a1ad..81ff1242b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/DataDomainGraphTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/DataDomainGraphTab.java
@@ -1,207 +1,208 @@
-/*****************************************************************
- *   Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- ****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.datadomain.graph;
-
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-
-import javax.swing.JComboBox;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JToolBar;
-
-import org.apache.cayenne.configuration.DataChannelDescriptor;
-import org.apache.cayenne.map.Entity;
-import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.event.display.DomainDisplayEvent;
-import org.apache.cayenne.modeler.event.display.DomainDisplayListener;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
-import org.apache.cayenne.modeler.graph.GraphBuilder;
-import org.apache.cayenne.modeler.graph.GraphMap;
-import org.apache.cayenne.modeler.graph.GraphRegistry;
-import org.apache.cayenne.modeler.graph.GraphType;
-import org.apache.cayenne.modeler.ui.project.editor.datadomain.graph.action.RebuildGraphAction;
-import org.apache.cayenne.modeler.ui.project.editor.datadomain.graph.action.SaveAsImageAction;
-import org.apache.cayenne.modeler.ui.project.editor.datadomain.graph.action.ZoomInAction;
-import org.apache.cayenne.modeler.ui.project.editor.datadomain.graph.action.ZoomOutAction;
-import org.jgraph.JGraph;
-
-/**
- * Tab for editing graphical representation of a dataDomain
- */
-public class DataDomainGraphTab extends JPanel implements DomainDisplayListener, ItemListener {
-
-    /**
-     * mediator instance
-     */
-    ProjectController mediator;
-
-    /**
-     * Diagram selection combo
-     */
-    JComboBox<String> diagramCombo;
-
-    /**
-     * Scrollpane that the graph will be added to
-     */
-    JScrollPane scrollPane;
-
-    /**
-     * Current graph
-     */
-    JGraph graph;
-
-    /**
-     * Current domain
-     */
-    DataChannelDescriptor domain;
-
-    /**
-     * True to invoke rebuild next time component becomes visible
-     */
-    boolean needRebuild;
-
-    GraphRegistry graphRegistry;
-
-    public DataDomainGraphTab(ProjectController mediator) {
-        this.mediator = mediator;
-        initView();
-    }
-
-    private void initView() {
-        needRebuild = true;
-        mediator.addDomainDisplayListener(this);
-
-        setLayout(new BorderLayout());
-        JToolBar toolbar = new JToolBar();
-        toolbar.setFloatable(false);
-        toolbar.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
-
-        GraphType[] types = GraphType.values();
-        String[] names = new String[types.length];
-        for (int i = 0; i < types.length; i++) {
-            names[i] = types[i].getName();
-        }
-
-        diagramCombo = Application.getWidgetFactory().createComboBox(names, false);
-        diagramCombo.addItemListener(this);
-
-        toolbar.add(new RebuildGraphAction(this, Application.getInstance()).buildButton(1));
-        toolbar.add(new SaveAsImageAction(this, Application.getInstance()).buildButton(3));
-        toolbar.addSeparator();
-        toolbar.add(new ZoomInAction(this, Application.getInstance()).buildButton(1));
-        toolbar.add(new ZoomOutAction(this, Application.getInstance()).buildButton(3));
-
-        toolbar.addSeparator();
-        toolbar.add(new JLabel("Diagram: "));
-        toolbar.add(diagramCombo);
-        add(toolbar, BorderLayout.NORTH);
-
-        scrollPane = new JScrollPane();
-        add(scrollPane);
-    }
-
-    public void domainSelected(DomainDisplayEvent e) {
-        if (e instanceof EntityDisplayEvent) {
-            // selecting an event
-
-            // choose type of diagram
-            Entity<?,?,?> entity = ((EntityDisplayEvent) e).getEntity();
-            diagramCombo.setSelectedIndex(entity instanceof ObjEntity ? 1 : 0);
-            refresh();
-
-            GraphBuilder builder = getGraphRegistry().getGraphMap(domain).get(getSelectedType());
-
-            Object cell = builder.getEntityCell(entity.getName());
-
-            if (cell != null) {
-                graph.setSelectionCell(cell);
-                graph.scrollCellToVisible(cell);
-            }
-        } else if (domain != e.getDomain()) {
-            needRebuild = true;
-            domain = e.getDomain();
-
-            if (isVisible()) {
-                refresh();
-            }
-        }
-    }
-
-    /**
-     * Rebuilds graph from a domain, if it is not yet built Otherwise, takes it
-     * from cache
-     */
-    public void refresh() {
-        if (needRebuild && domain != null) {
-            graph = getGraphRegistry().loadGraph(mediator, domain, getSelectedType());
-            scrollPane.setViewportView(graph);
-
-            needRebuild = false;
-        }
-    }
-
-    private GraphType getSelectedType() {
-        return GraphType.values()[diagramCombo.getSelectedIndex()];
-    }
-
-    /**
-     * Rebuilds graph, deleting existing if needed
-     */
-    public void rebuild() {
-        if (domain != null) {
-            JOptionPane pane = new JOptionPane("Rebuilding graph from domain will cause all user"
-                    + " changes to be lost. Continue?", JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_NO_OPTION);
-
-            JDialog dialog = pane.createDialog(Application.getFrame(), "Confirm Rebuild");
-            dialog.setVisible(true);
-
-            if (pane.getValue().equals(JOptionPane.YES_OPTION)) {
-                getGraphRegistry().getGraphMap(domain).remove(getSelectedType());
-                itemStateChanged(null);
-            }
-        }
-    }
-
-    public void itemStateChanged(ItemEvent e) {
-        needRebuild = true;
-        refresh();
-    }
-
-    public JGraph getGraph() {
-        return graph;
-    }
-
-    GraphRegistry getGraphRegistry() {
-        graphRegistry = mediator.getApplication().getMetaData().get(domain, GraphRegistry.class);
-        if (graphRegistry == null) {
-            graphRegistry = new GraphRegistry();
-            mediator.getApplication().getMetaData().add(domain, graphRegistry);
-        }
-
-        return graphRegistry;
-    }
-}
+/*****************************************************************
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ ****************************************************************/
+package org.apache.cayenne.modeler.ui.project.editor.datadomain.graph;
+
+import java.awt.BorderLayout;
+import java.awt.FlowLayout;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JToolBar;
+
+import org.apache.cayenne.configuration.DataChannelDescriptor;
+import org.apache.cayenne.map.Entity;
+import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.modeler.Application;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
+import org.apache.cayenne.modeler.ui.project.ProjectController;
+import org.apache.cayenne.modeler.event.display.DomainDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DomainDisplayListener;
+import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
+import org.apache.cayenne.modeler.graph.GraphBuilder;
+import org.apache.cayenne.modeler.graph.GraphMap;
+import org.apache.cayenne.modeler.graph.GraphRegistry;
+import org.apache.cayenne.modeler.graph.GraphType;
+import org.apache.cayenne.modeler.ui.project.editor.datadomain.graph.action.RebuildGraphAction;
+import org.apache.cayenne.modeler.ui.project.editor.datadomain.graph.action.SaveAsImageAction;
+import org.apache.cayenne.modeler.ui.project.editor.datadomain.graph.action.ZoomInAction;
+import org.apache.cayenne.modeler.ui.project.editor.datadomain.graph.action.ZoomOutAction;
+import org.jgraph.JGraph;
+
+/**
+ * Tab for editing graphical representation of a dataDomain
+ */
+public class DataDomainGraphTab extends JPanel implements DomainDisplayListener, ItemListener {
+
+    /**
+     * mediator instance
+     */
+    ProjectController mediator;
+
+    /**
+     * Diagram selection combo
+     */
+    JComboBox<String> diagramCombo;
+
+    /**
+     * Scrollpane that the graph will be added to
+     */
+    JScrollPane scrollPane;
+
+    /**
+     * Current graph
+     */
+    JGraph graph;
+
+    /**
+     * Current domain
+     */
+    DataChannelDescriptor domain;
+
+    /**
+     * True to invoke rebuild next time component becomes visible
+     */
+    boolean needRebuild;
+
+    GraphRegistry graphRegistry;
+
+    public DataDomainGraphTab(ProjectController mediator) {
+        this.mediator = mediator;
+        initView();
+    }
+
+    private void initView() {
+        needRebuild = true;
+        mediator.addDomainDisplayListener(this);
+
+        setLayout(new BorderLayout());
+        JToolBar toolbar = new JToolBar();
+        toolbar.setFloatable(false);
+        toolbar.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
+
+        GraphType[] types = GraphType.values();
+        String[] names = new String[types.length];
+        for (int i = 0; i < types.length; i++) {
+            names[i] = types[i].getName();
+        }
+
+        diagramCombo = WidgetFactory.createComboBox(names, false);
+        diagramCombo.addItemListener(this);
+
+        toolbar.add(new RebuildGraphAction(this, Application.getInstance()).buildButton(1));
+        toolbar.add(new SaveAsImageAction(this, Application.getInstance()).buildButton(3));
+        toolbar.addSeparator();
+        toolbar.add(new ZoomInAction(this, Application.getInstance()).buildButton(1));
+        toolbar.add(new ZoomOutAction(this, Application.getInstance()).buildButton(3));
+
+        toolbar.addSeparator();
+        toolbar.add(new JLabel("Diagram: "));
+        toolbar.add(diagramCombo);
+        add(toolbar, BorderLayout.NORTH);
+
+        scrollPane = new JScrollPane();
+        add(scrollPane);
+    }
+
+    public void domainSelected(DomainDisplayEvent e) {
+        if (e instanceof EntityDisplayEvent) {
+            // selecting an event
+
+            // choose type of diagram
+            Entity<?,?,?> entity = ((EntityDisplayEvent) e).getEntity();
+            diagramCombo.setSelectedIndex(entity instanceof ObjEntity ? 1 : 0);
+            refresh();
+
+            GraphBuilder builder = getGraphRegistry().getGraphMap(domain).get(getSelectedType());
+
+            Object cell = builder.getEntityCell(entity.getName());
+
+            if (cell != null) {
+                graph.setSelectionCell(cell);
+                graph.scrollCellToVisible(cell);
+            }
+        } else if (domain != e.getDomain()) {
+            needRebuild = true;
+            domain = e.getDomain();
+
+            if (isVisible()) {
+                refresh();
+            }
+        }
+    }
+
+    /**
+     * Rebuilds graph from a domain, if it is not yet built Otherwise, takes it
+     * from cache
+     */
+    public void refresh() {
+        if (needRebuild && domain != null) {
+            graph = getGraphRegistry().loadGraph(mediator, domain, getSelectedType());
+            scrollPane.setViewportView(graph);
+
+            needRebuild = false;
+        }
+    }
+
+    private GraphType getSelectedType() {
+        return GraphType.values()[diagramCombo.getSelectedIndex()];
+    }
+
+    /**
+     * Rebuilds graph, deleting existing if needed
+     */
+    public void rebuild() {
+        if (domain != null) {
+            JOptionPane pane = new JOptionPane("Rebuilding graph from domain will cause all user"
+                    + " changes to be lost. Continue?", JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_NO_OPTION);
+
+            JDialog dialog = pane.createDialog(Application.getFrame(), "Confirm Rebuild");
+            dialog.setVisible(true);
+
+            if (pane.getValue().equals(JOptionPane.YES_OPTION)) {
+                getGraphRegistry().getGraphMap(domain).remove(getSelectedType());
+                itemStateChanged(null);
+            }
+        }
+    }
+
+    public void itemStateChanged(ItemEvent e) {
+        needRebuild = true;
+        refresh();
+    }
+
+    public JGraph getGraph() {
+        return graph;
+    }
+
+    GraphRegistry getGraphRegistry() {
+        graphRegistry = mediator.getApplication().getMetaData().get(domain, GraphRegistry.class);
+        if (graphRegistry == null) {
+            graphRegistry = new GraphRegistry();
+            mediator.getApplication().getMetaData().add(domain, graphRegistry);
+        }
+
+        return graphRegistry;
+    }
+}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringConfigPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringConfigPanel.java
index 93708a362..9647ccfb9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringConfigPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringConfigPanel.java
@@ -35,6 +35,7 @@ import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.util.NameGeneratorPreferences;
 import org.apache.cayenne.modeler.util.TextAdapter;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
 import org.apache.cayenne.validation.ValidationException;
 
@@ -113,7 +114,7 @@ public class ReverseEngineeringConfigPanel extends JPanel {
     }
 
     private void initFormElements() {
-        strategyCombo = Application.getWidgetFactory().createComboBox();
+        strategyCombo = WidgetFactory.createComboBox();
         AutoCompletion.enable(strategyCombo, false, true);
         strategyCombo.setToolTipText("Naming strategy to use");
 
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 cb0c29f16..5c947358f 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
@@ -41,6 +41,7 @@ import org.apache.cayenne.modeler.util.Comparators;
 import org.apache.cayenne.modeler.util.TextAdapter;
 import org.apache.cayenne.project.extension.info.ObjectInfo;
 import org.apache.cayenne.modeler.swing.JCayenneCheckBox;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.util.Util;
 import org.apache.cayenne.validation.ValidationException;
 
@@ -87,7 +88,7 @@ public class DataMapMainView extends JPanel {
         };
 
         location = new JLabel();
-        nodeSelector = Application.getWidgetFactory().createUndoableComboBox();
+        nodeSelector = WidgetFactory.createUndoableComboBox();
         nodeSelector.setRenderer(CellRenderers.listRendererWithIcons());
 
         JButton updateDefaultCatalog = new JButton("Update...");
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/DataNodeView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/DataNodeView.java
index a679fca5e..6564b34cf 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/DataNodeView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/DataNodeView.java
@@ -22,6 +22,7 @@ package org.apache.cayenne.modeler.ui.project.editor.datanode;
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
 import org.apache.cayenne.modeler.Application;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.swing.text.JTextFieldUndoable;
 
 import javax.swing.JButton;
@@ -49,11 +50,11 @@ public class DataNodeView extends JPanel {
         // create widgets
         this.dataNodeName = new JTextFieldUndoable();
 
-        this.factories = Application.getWidgetFactory().createUndoableComboBox();
+        this.factories = WidgetFactory.createUndoableComboBox();
 
-        this.localDataSources = Application.getWidgetFactory().createUndoableComboBox();
+        this.localDataSources = WidgetFactory.createUndoableComboBox();
 
-        this.schemaUpdateStrategy = Application.getWidgetFactory().createUndoableComboBox();
+        this.schemaUpdateStrategy = WidgetFactory.createUndoableComboBox();
         this.dataSourceDetailLayout = new CardLayout();
         this.dataSourceDetail = new JPanel(dataSourceDetailLayout);
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityAttributePanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbAttributePanel.java
similarity index 90%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityAttributePanel.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbAttributePanel.java
index a2b7faf80..11793a2c9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityAttributePanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbAttributePanel.java
@@ -35,6 +35,7 @@ import org.apache.cayenne.modeler.event.display.DbEntityDisplayListener;
 import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
 import org.apache.cayenne.modeler.event.display.TablePopupHandler;
 import org.apache.cayenne.modeler.pref.TableColumnPreferences;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.swing.table.BoardTableCellRenderer;
 import org.apache.cayenne.modeler.util.CayenneTable;
 import org.apache.cayenne.modeler.util.PanelFactory;
@@ -52,14 +53,14 @@ import java.util.List;
 /**
  * Detail view of the DbEntity attributes.
  */
-public class DbEntityAttributePanel extends JPanel implements DbEntityDisplayListener, DbAttributeListener {
+public class DbAttributePanel extends JPanel implements DbEntityDisplayListener, DbAttributeListener {
 
     private final ProjectController controller;
     private final CayenneTable table;
     private final TableColumnPreferences tablePreferences;
     private final DbEntityAttributeRelationshipTab parentPanel;
 
-    public DbEntityAttributePanel(ProjectController controller, DbEntityAttributeRelationshipTab parentPanel) {
+    public DbAttributePanel(ProjectController controller, DbEntityAttributeRelationshipTab parentPanel) {
         this.controller = controller;
         this.parentPanel = parentPanel;
 
@@ -163,6 +164,7 @@ public class DbEntityAttributePanel extends JPanel implements DbEntityDisplayLis
     }
 
     protected void rebuildTable(DbEntity ent) {
+
         if (table.getEditingRow() != -1 && table.getEditingColumn() != -1) {
             TableCellEditor cellEditor = table.getCellEditor(table.getEditingRow(), table.getEditingColumn());
             cellEditor.stopCellEditing();
@@ -173,27 +175,23 @@ public class DbEntityAttributePanel extends JPanel implements DbEntityDisplayLis
         table.setRowHeight(25);
         table.setRowMargin(3);
 
-        TableColumn col = table.getColumnModel().getColumn(model.typeColumnInd());
-
         String[] types = TypesMapping.getDatabaseTypes();
-        JComboBox comboBox = Application.getWidgetFactory().createComboBox(types, true);
+        JComboBox comboBox = WidgetFactory.createComboBox(types, true);
 
         // Types.NULL makes no sense as a column type
         comboBox.removeItem("NULL");
-
         AutoCompletion.enable(comboBox);
 
-        col.setCellEditor(Application.getWidgetFactory().createCellEditor(comboBox));
+        TableColumn typeColumn = table.getColumnModel().getColumn(DbAttributeTableModel.DB_ATTRIBUTE_TYPE);
+        typeColumn.setCellEditor(WidgetFactory.createCellEditor(comboBox));
 
-        TableColumn lengthColumn = table.getColumnModel().getColumn(model.lengthColumnId());
-        LimitedTextField limitedLengthField = new LimitedTextField(10);
-        lengthColumn.setCellEditor(Application.getWidgetFactory().createCellEditor(limitedLengthField));
+        TableColumn lengthColumn = table.getColumnModel().getColumn(DbAttributeTableModel.DB_ATTRIBUTE_MAX);
+        lengthColumn.setCellEditor(WidgetFactory.createCellEditor(new LimitedTextField(10)));
 
-        TableColumn scaleColumn = table.getColumnModel().getColumn(model.scaleColumnId());
-        LimitedTextField limitedScaleField = new LimitedTextField(10);
-        scaleColumn.setCellEditor(Application.getWidgetFactory().createCellEditor(limitedScaleField));
+        TableColumn scaleColumn = table.getColumnModel().getColumn(DbAttributeTableModel.DB_ATTRIBUTE_SCALE);
+        scaleColumn.setCellEditor(WidgetFactory.createCellEditor(new LimitedTextField(10)));
 
-        tablePreferences.bind(table, null, null, null, model.nameColumnInd(), true);
+        tablePreferences.bind(table, null, null, null, DbAttributeTableModel.DB_ATTRIBUTE_NAME, true);
     }
 
     private void valueChanged(ListSelectionEvent e) {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbAttributeTableModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbAttributeTableModel.java
index 8602333e1..4a6dcf66a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbAttributeTableModel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbAttributeTableModel.java
@@ -31,70 +31,37 @@ import org.apache.cayenne.modeler.util.ProjectUtil;
 import org.apache.cayenne.project.extension.info.ObjectInfo;
 import org.apache.cayenne.util.Util;
 
-import javax.swing.JOptionPane;
+import javax.swing.*;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 
 /**
  * Model for DbEntity attributes. Allows adding/removing attributes, modifying types and names.
  */
 public class DbAttributeTableModel extends CayenneTableModel<DbAttribute> {
 
-    // Columns
-    private static final int DB_ATTRIBUTE_NAME = 0;
-    private static final int DB_ATTRIBUTE_TYPE = 1;
-    private static final int DB_ATTRIBUTE_PRIMARY_KEY = 2;
-    private static final int DB_ATTRIBUTE_MANDATORY = 3;
-    private static final int DB_ATTRIBUTE_MAX = 4;
-    private static final int DB_ATTRIBUTE_SCALE = 5;
-    private static final int DB_ATTRIBUTE_COMMENT = 6;
+    static final int DB_ATTRIBUTE_NAME = 0;
+    static final int DB_ATTRIBUTE_TYPE = 1;
+    static final int DB_ATTRIBUTE_PRIMARY_KEY = 2;
+    static final int DB_ATTRIBUTE_MANDATORY = 3;
+    static final int DB_ATTRIBUTE_MAX = 4;
+    static final int DB_ATTRIBUTE_SCALE = 5;
+    static final int DB_ATTRIBUTE_COMMENT = 6;
 
-    protected DbEntity entity;
+    private final DbEntity entity;
 
-    public DbAttributeTableModel(DbEntity entity, ProjectController mediator,
-            Object eventSource) {
-        this(entity, mediator, eventSource, new ArrayList<>(entity.getAttributes()));
-    }
-
-    public DbAttributeTableModel(DbEntity entity, ProjectController mediator,
-            Object eventSource, List<DbAttribute> objectList) {
-        super(mediator, eventSource, objectList);
+    public DbAttributeTableModel(DbEntity entity, ProjectController controller, Object eventSource) {
+        super(controller, eventSource, new ArrayList<>(entity.getAttributes()));
         this.entity = entity;
     }
 
-    public int nameColumnInd() {
-        return DB_ATTRIBUTE_NAME;
-    }
-
-    public int typeColumnInd() {
-        return DB_ATTRIBUTE_TYPE;
-    }
-
-    public int lengthColumnId(){
-        return DB_ATTRIBUTE_MAX;
-    }
-
-    public int scaleColumnId(){
-        return DB_ATTRIBUTE_SCALE;
-    }
-
-    public int mandatoryColumnInd() {
-        return DB_ATTRIBUTE_MANDATORY;
-    }
-
-    /**
-     * Returns DbAttribute class.
-     */
     @Override
     public Class<?> getElementsClass() {
         return DbAttribute.class;
     }
 
-    /**
-     * Returns the number of columns in the table.
-     */
+    @Override
     public int getColumnCount() {
         return 7;
     }
@@ -297,15 +264,15 @@ public class DbAttributeTableModel extends CayenneTableModel<DbAttribute> {
             relationships
                     .addAll(ProjectUtil.getRelationshipsUsingAttributeAsSource(attr));
 
-            if (relationships.size() > 0) {
+            if (!relationships.isEmpty()) {
                 relationships.removeIf(relationship -> !relationship.isToDependentPK());
 
                 // filtered only those that are to dep PK
-                if (relationships.size() > 0) {
+                if (!relationships.isEmpty()) {
                     String message = (relationships.size() == 1)
                             ? "Fix \"To Dep PK\" relationship using this attribute?"
                             : "Fix " + relationships.size()
-                                     + " \"To Dep PK\" relationships using this attribute?";
+                            + " \"To Dep PK\" relationships using this attribute?";
 
                     int answer = JOptionPane.showConfirmDialog(
                             Application.getFrame(),
@@ -335,10 +302,6 @@ public class DbAttributeTableModel extends CayenneTableModel<DbAttribute> {
         attr.setMandatory(newVal);
     }
 
-    public void setGenerated(Boolean newVal, DbAttribute attr) {
-        attr.setGenerated(newVal);
-    }
-
     public void setComment(String newVal, DbAttribute attr) {
         ObjectInfo.putToMetaData(controller.getApplication().getMetaData(), attr, ObjectInfo.COMMENT, newVal);
     }
@@ -347,7 +310,7 @@ public class DbAttributeTableModel extends CayenneTableModel<DbAttribute> {
         DbAttribute attrib = getAttribute(row);
         if (null == attrib) {
             return false;
-        } else if (col == mandatoryColumnInd()) {
+        } else if (col == DB_ATTRIBUTE_MANDATORY) {
             return !attrib.isPrimaryKey();
         }
         return true;
@@ -360,7 +323,7 @@ public class DbAttributeTableModel extends CayenneTableModel<DbAttribute> {
 
     @Override
     public void sortByColumn(int sortCol, boolean isAscent) {
-        switch(sortCol){
+        switch (sortCol) {
             case DB_ATTRIBUTE_NAME:
                 sortByElementProperty("name", isAscent);
                 break;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityAttributeRelationshipTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityAttributeRelationshipTab.java
index e05e31b0e..8a095c90b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityAttributeRelationshipTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityAttributeRelationshipTab.java
@@ -55,8 +55,8 @@ import java.awt.event.ActionListener;
  */
 public class DbEntityAttributeRelationshipTab extends JPanel implements DbEntityDisplayListener, DbEntityListener {
 
-    private final DbEntityAttributePanel attributePanel;
-    private final DbEntityRelationshipPanel relationshipPanel;
+    private final DbAttributePanel attributePanel;
+    private final DbRelationshipPanel relationshipPanel;
     private final JButton editButton;
     private final JSplitPane splitPane;
     private final JToolBar toolBar;
@@ -67,8 +67,8 @@ public class DbEntityAttributeRelationshipTab extends JPanel implements DbEntity
 
         editButton = new CayenneAction.CayenneToolbarButton(null, 0);
 
-        attributePanel = new DbEntityAttributePanel(controller, this);
-        relationshipPanel = new DbEntityRelationshipPanel(controller, this);
+        attributePanel = new DbAttributePanel(controller, this);
+        relationshipPanel = new DbRelationshipPanel(controller, this);
 
         splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, attributePanel, relationshipPanel);
         splitPane.setOneTouchExpandable(true);
@@ -139,11 +139,11 @@ public class DbEntityAttributeRelationshipTab extends JPanel implements DbEntity
         return splitPane;
     }
 
-    public DbEntityAttributePanel getAttributePanel() {
+    public DbAttributePanel getAttributePanel() {
         return attributePanel;
     }
 
-    public DbEntityRelationshipPanel getRelationshipPanel() {
+    public DbRelationshipPanel getRelationshipPanel() {
         return relationshipPanel;
     }
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityTabbedView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityTabbedView.java
index 7f4432c3c..37c7d888b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityTabbedView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityTabbedView.java
@@ -108,7 +108,7 @@ public class DbEntityTabbedView extends JTabbedPane {
             attributeRelationshipTab.getSplitPane().getComponent(1).setVisible(true);
         }
 
-        ((DbEntityRelationshipPanel) attributeRelationshipTab.getSplitPane().getComponent(1)).selectRelationships(dbRels);
+        ((DbRelationshipPanel) attributeRelationshipTab.getSplitPane().getComponent(1)).selectRelationships(dbRels);
         attributeRelationshipTab.updateActions(dbRels);
     }
 
@@ -127,7 +127,7 @@ public class DbEntityTabbedView extends JTabbedPane {
             attributeRelationshipTab.getSplitPane().getComponent(0).setVisible(true);
         }
 
-        ((DbEntityAttributePanel) attributeRelationshipTab.getSplitPane().getComponent(0)).selectAttributes(dbAttrs);
+        ((DbAttributePanel) attributeRelationshipTab.getSplitPane().getComponent(0)).selectAttributes(dbAttrs);
         attributeRelationshipTab.updateActions(dbAttrs);
     }
 }
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityRelationshipPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbRelationshipPanel.java
similarity index 95%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityRelationshipPanel.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbRelationshipPanel.java
index d8a47c8b8..bbeaa6032 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityRelationshipPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbRelationshipPanel.java
@@ -38,6 +38,7 @@ import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
 import org.apache.cayenne.modeler.event.display.RelationshipDisplayEvent;
 import org.apache.cayenne.modeler.event.display.TablePopupHandler;
 import org.apache.cayenne.modeler.pref.TableColumnPreferences;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.swing.table.BoardTableCellRenderer;
 import org.apache.cayenne.modeler.util.CayenneTable;
 import org.apache.cayenne.modeler.util.CellRenderers;
@@ -59,7 +60,7 @@ import java.util.List;
 /**
  * Displays DbRelationships for the current DbEntity.
  */
-public class DbEntityRelationshipPanel extends JPanel implements DbEntityDisplayListener,
+public class DbRelationshipPanel extends JPanel implements DbEntityDisplayListener,
         DbEntityListener, DbRelationshipListener, TableModelListener {
 
     private final ProjectController controller;
@@ -69,7 +70,7 @@ public class DbEntityRelationshipPanel extends JPanel implements DbEntityDisplay
     private final JMenuItem editMenu;
     private JComboBox<DbEntity> targetCombo;
 
-    public DbEntityRelationshipPanel(ProjectController controller, DbEntityAttributeRelationshipTab parentPanel) {
+    public DbRelationshipPanel(ProjectController controller, DbEntityAttributeRelationshipTab parentPanel) {
         this.controller = controller;
         this.parentPanel = parentPanel;
 
@@ -177,18 +178,17 @@ public class DbEntityRelationshipPanel extends JPanel implements DbEntityDisplay
         table.setRowHeight(25);
         table.setRowMargin(3);
 
-        TableColumn col = table.getColumnModel().getColumn(
-                DbRelationshipTableModel.TARGET);
-
-        targetCombo = Application.getWidgetFactory().createComboBox();
+        targetCombo = WidgetFactory.createComboBox();
         AutoCompletion.enable(targetCombo);
 
-        table.getColumnModel().getColumn(DbRelationshipTableModel.TO_DEPENDENT_KEY)
-                .setCellRenderer(new CheckBoxCellRenderer());
-
         targetCombo.setRenderer(CellRenderers.entityListRendererWithIcons(entity.getDataMap()));
         targetCombo.setModel(createComboModel());
-        col.setCellEditor(Application.getWidgetFactory().createCellEditor(targetCombo));
+
+        TableColumn targetColumn = table.getColumnModel().getColumn(DbRelationshipTableModel.TARGET);
+        targetColumn.setCellEditor(WidgetFactory.createCellEditor(targetCombo));
+
+        TableColumn toDepPkColumn = table.getColumnModel().getColumn(DbRelationshipTableModel.TO_DEPENDENT_KEY);
+        toDepPkColumn.setCellRenderer(new CheckBoxCellRenderer());
 
         tablePreferences.bind(
                 table,
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributeTableModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributeTableModel.java
index 2bad7b4f7..d5f711afc 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributeTableModel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributeTableModel.java
@@ -25,6 +25,7 @@ import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.util.CayenneTable;
 import org.apache.cayenne.modeler.util.CayenneTableModel;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.swing.table.CellEditorForAttributeTable;
 import org.apache.cayenne.util.Util;
 
@@ -136,8 +137,7 @@ public class EmbeddableAttributeTableModel extends CayenneTableModel {
     public CellEditorForAttributeTable setCellEditor(
             Collection<String> nameAttr,
             CayenneTable table) {
-        this.cellEditor = new CellEditorForAttributeTable(table, Application
-                .getWidgetFactory()
+        this.cellEditor = new CellEditorForAttributeTable(table, WidgetFactory
                 .createComboBox(nameAttr, true));
         return cellEditor;
     }
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java
index e4a85f301..657f9bd54 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java
@@ -44,6 +44,7 @@ import org.apache.cayenne.modeler.util.CayenneTable;
 import org.apache.cayenne.modeler.util.ModelerUtil;
 import org.apache.cayenne.modeler.util.PanelFactory;
 import org.apache.cayenne.modeler.util.UIUtil;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
 
 import javax.swing.*;
@@ -166,11 +167,11 @@ public class EmbeddableAttributesView extends JPanel implements
     private void setUpTableStructure() {
 
         TableColumn typeColumn = table.getColumnModel().getColumn(EmbeddableAttributeTableModel.OBJ_ATTRIBUTE_TYPE);
-        JComboBox javaTypesCombo = Application.getWidgetFactory().createComboBox(
+        JComboBox javaTypesCombo = WidgetFactory.createComboBox(
                 ModelerUtil.getRegisteredTypeNames(),
                 false);
         AutoCompletion.enable(javaTypesCombo, false, true);
-        typeColumn.setCellEditor(Application.getWidgetFactory().createCellEditor(
+        typeColumn.setCellEditor(WidgetFactory.createCellEditor(
                 javaTypesCombo));
 
         tablePreferences.bind(
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjAttributeTableModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjAttributeTableModel.java
index d6d040f94..6c80098a9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjAttributeTableModel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjAttributeTableModel.java
@@ -38,6 +38,7 @@ import org.apache.cayenne.modeler.event.display.AttributeDisplayEvent;
 import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
 import org.apache.cayenne.modeler.util.CayenneTable;
 import org.apache.cayenne.modeler.util.CayenneTableModel;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.swing.table.CellEditorForAttributeTable;
 import org.apache.cayenne.modeler.util.ModelerUtil;
 import org.apache.cayenne.modeler.util.ProjectUtil;
@@ -237,8 +238,7 @@ public class ObjAttributeTableModel extends CayenneTableModel<ObjAttribute> {
     public CellEditorForAttributeTable setCellEditor(
             Collection<String> nameAttr,
             CayenneTable table) {
-        this.cellEditor = new CellEditorForAttributeTable(table, Application
-                .getWidgetFactory()
+        this.cellEditor = new CellEditorForAttributeTable(table, WidgetFactory
                 .createComboBox(nameAttr, true));
         this.table = table;
         return cellEditor;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityAttributePanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityAttributePanel.java
index d19eb99a3..0f09601ab 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityAttributePanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityAttributePanel.java
@@ -51,6 +51,7 @@ import org.apache.cayenne.modeler.util.ModelerUtil;
 import org.apache.cayenne.modeler.util.PanelFactory;
 import org.apache.cayenne.modeler.util.ProjectUtil;
 import org.apache.cayenne.modeler.util.UIUtil;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
 
 import javax.swing.*;
@@ -165,9 +166,9 @@ public class ObjEntityAttributePanel extends JPanel implements ObjEntityDisplayL
 
         TableColumn typeColumn = table.getColumnModel().getColumn(ObjAttributeTableModel.OBJ_ATTRIBUTE_TYPE);
 
-        JComboBox<String> javaTypesCombo = Application.getWidgetFactory().createComboBox(typeNames.toArray(new String[0]), false);
+        JComboBox<String> javaTypesCombo = WidgetFactory.createComboBox(typeNames.toArray(new String[0]), false);
         AutoCompletion.enable(javaTypesCombo, false, true);
-        typeColumn.setCellEditor(Application.getWidgetFactory().createCellEditor(javaTypesCombo));
+        typeColumn.setCellEditor(WidgetFactory.createCellEditor(javaTypesCombo));
     }
 
     /**
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityRelationshipPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityRelationshipPanel.java
index 8269edbfa..585658e43 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityRelationshipPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityRelationshipPanel.java
@@ -26,6 +26,7 @@ import org.apache.cayenne.map.event.ObjEntityListener;
 import org.apache.cayenne.map.event.ObjRelationshipListener;
 import org.apache.cayenne.map.event.RelationshipEvent;
 import org.apache.cayenne.modeler.Application;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.action.ActionManager;
 import org.apache.cayenne.modeler.action.CopyAttributeRelationshipAction;
@@ -269,7 +270,7 @@ public class ObjEntityRelationshipPanel extends JPanel implements ObjEntityDispl
         });
 
         col = table.getColumnModel().getColumn(ObjRelationshipTableModel.REL_DELETE_RULE);
-        JComboBox deleteRulesCombo = Application.getWidgetFactory().createComboBox(
+        JComboBox deleteRulesCombo = WidgetFactory.createComboBox(
                 DELETE_RULES,
                 false);
         deleteRulesCombo.setFocusable(false);
@@ -277,7 +278,7 @@ public class ObjEntityRelationshipPanel extends JPanel implements ObjEntityDispl
         ((JComponent) deleteRulesCombo.getEditor().getEditorComponent()).setBorder(null);
         deleteRulesCombo.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
         deleteRulesCombo.setSelectedIndex(0); // Default to the first value
-        col.setCellEditor(Application.getWidgetFactory().createCellEditor(
+        col.setCellEditor(WidgetFactory.createCellEditor(
                 deleteRulesCombo));
 
         tablePreferences.bind(
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityTab.java
index 106a7850d..d55ee9089 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityTab.java
@@ -46,6 +46,7 @@ import org.apache.cayenne.modeler.util.CellRenderers;
 import org.apache.cayenne.modeler.util.Comparators;
 import org.apache.cayenne.modeler.util.ExpressionConvertor;
 import org.apache.cayenne.modeler.util.TextAdapter;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
 import org.apache.cayenne.project.extension.info.ObjectInfo;
 import org.apache.cayenne.modeler.swing.JCayenneCheckBox;
@@ -125,8 +126,8 @@ public class ObjEntityTab extends JPanel implements ObjEntityDisplayListener, Ex
             }
         };
 
-        dbEntityCombo = Application.getWidgetFactory().createComboBox();
-        superEntityCombo = Application.getWidgetFactory().createComboBox();
+        dbEntityCombo = WidgetFactory.createComboBox();
+        superEntityCombo = WidgetFactory.createComboBox();
 
         AutoCompletion.enable(dbEntityCombo);
         AutoCompletion.enable(superEntityCombo);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialogView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialogView.java
index 1a959be5c..f737e20f7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialogView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialogView.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.modeler.util.CayenneTable;
 import org.apache.cayenne.modeler.util.ModelerUtil;
 import org.apache.cayenne.modeler.swing.MultiColumnBrowser;
 import org.apache.cayenne.modeler.util.PanelFactory;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
 
 import javax.swing.JButton;
@@ -83,7 +84,7 @@ public class ObjAttributeInfoDialogView extends JDialog {
         this.currentPathLabel = new JLabel();
         this.sourceEntityLabel = new JLabel();
 
-        this.typeComboBox = Application.getWidgetFactory().createComboBox(ModelerUtil.getRegisteredTypeNames(), false);
+        this.typeComboBox = WidgetFactory.createComboBox(ModelerUtil.getRegisteredTypeNames(), false);
         AutoCompletion.enable(typeComboBox, false, true);
         typeComboBox.getRenderer();
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/OverrideEmbeddableAttributeTableModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/OverrideEmbeddableAttributeTableModel.java
index 01c83df09..028928f82 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/OverrideEmbeddableAttributeTableModel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/OverrideEmbeddableAttributeTableModel.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.util.CayenneTable;
 import org.apache.cayenne.modeler.util.CayenneTableModel;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.swing.table.CellEditorForAttributeTable;
 
 import javax.swing.*;
@@ -130,8 +131,7 @@ public class OverrideEmbeddableAttributeTableModel extends CayenneTableModel {
             Collection<String> nameAttr,
             CayenneTable table) {
         this.table = table;
-        this.cellEditor = new CellEditorForAttributeTable(table, Application
-                .getWidgetFactory()
+        this.cellEditor = new CellEditorForAttributeTable(table, WidgetFactory
                 .createComboBox(nameAttr, true));
         return cellEditor;
     }
@@ -216,7 +216,7 @@ public class OverrideEmbeddableAttributeTableModel extends CayenneTableModel {
                 Collection<String> attributeComboForRow = new ArrayList<String>();
                 attributeComboForRow.addAll(nameAttr);
                 attributeComboForRow.add(embAt.getDbAttributeName());
-                JComboBox comboBoxForRow = Application.getWidgetFactory().createComboBox(
+                JComboBox comboBoxForRow = WidgetFactory.createComboBox(
                         attributeComboForRow,
                         true);
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/duplicates/DuplicatedAttributesDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/duplicates/DuplicatedAttributesDialog.java
index f6d851504..cd2ef3dc3 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/duplicates/DuplicatedAttributesDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/duplicates/DuplicatedAttributesDialog.java
@@ -24,6 +24,7 @@ import com.jgoodies.forms.layout.FormLayout;
 import org.apache.cayenne.map.ObjAttribute;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.modeler.Application;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.ui.ModelerFrame;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.util.CayenneDialog;
@@ -141,9 +142,9 @@ public class DuplicatedAttributesDialog extends CayenneDialog {
 
     private void updateTable() {
         TableColumn actionColumn = attributesTable.getColumnModel().getColumn(DuplicatedAttributeTableModel.ACTION);
-        JComboBox actionsCombo = Application.getWidgetFactory().createComboBox(
+        JComboBox actionsCombo = WidgetFactory.createComboBox(
                 new String[] { DELETE_ACTION, RENAME_ACTION }, false);
-        actionColumn.setCellEditor(Application.getWidgetFactory().createCellEditor(actionsCombo));
+        actionColumn.setCellEditor(WidgetFactory.createCellEditor(actionsCombo));
     }
 
     private void applyChanges() {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoView.java
index e47777f90..ea4d86a15 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoView.java
@@ -23,10 +23,9 @@ import com.jgoodies.forms.layout.CellConstraints;
 import com.jgoodies.forms.layout.FormLayout;
 import org.apache.cayenne.map.DeleteRule;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.swing.DefaultWidgetFactory;
 import org.apache.cayenne.modeler.swing.MultiColumnBrowser;
-import org.apache.cayenne.modeler.util.PanelFactory;
 import org.apache.cayenne.modeler.swing.WidgetFactory;
+import org.apache.cayenne.modeler.util.PanelFactory;
 
 import javax.swing.*;
 import java.awt.*;
@@ -65,25 +64,23 @@ public class ObjRelationshipInfoView extends JDialog{
     public ObjRelationshipInfoView() {
         super(Application.getFrame());
 
-        WidgetFactory widgetFactory = new DefaultWidgetFactory();
-        
         this.cancelButton = new JButton("Cancel");
         this.saveButton = new JButton("Done");
         this.newRelButton = new JButton("New DbRelationship");
         this.relationshipName = new JTextField(25);
         this.semanticsLabel = new JLabel();
         this.sourceEntityLabel = new JLabel();
-        
+
         cancelButton.setEnabled(true);
         getRootPane().setDefaultButton(saveButton);
         saveButton.setEnabled(true);
         newRelButton.setEnabled(true);
-        collectionTypeCombo = widgetFactory.createComboBox();
+        collectionTypeCombo = WidgetFactory.createComboBox();
         collectionTypeCombo.setVisible(true);
-        this.targetCombo = widgetFactory.createComboBox();
+        this.targetCombo = WidgetFactory.createComboBox();
         targetCombo.setVisible(true);
-        
-        this.mapKeysCombo = widgetFactory.createComboBox();
+
+        this.mapKeysCombo = WidgetFactory.createComboBox();
         mapKeysCombo.setVisible(true);
       
         
@@ -91,7 +88,7 @@ public class ObjRelationshipInfoView extends JDialog{
         pathBrowser.setPreferredColumnSize(BROWSER_CELL_DIM);
         pathBrowser.setDefaultRenderer();
 
-        this.deleteRule = Application.getWidgetFactory().createComboBox(DELETE_RULES, false);
+        this.deleteRule = WidgetFactory.createComboBox(DELETE_RULES, false);
         this.usedForLocking = new JCheckBox();
         this.comment = new JTextField();
         
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java
index 71d82fdeb..638893939 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java
@@ -42,6 +42,7 @@ import org.apache.cayenne.modeler.event.display.ProcedureParameterDisplayEvent;
 import org.apache.cayenne.modeler.event.display.TablePopupHandler;
 import org.apache.cayenne.modeler.pref.TableColumnPreferences;
 import org.apache.cayenne.modeler.util.CayenneAction;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.swing.table.CayenneCellEditor;
 import org.apache.cayenne.modeler.util.CayenneTable;
 import org.apache.cayenne.modeler.util.ModelerUtil;
@@ -290,27 +291,27 @@ public class ProcedureParameterTab extends JPanel implements ProcedureParameterL
 
         TableColumn typesColumn = table.getColumnModel()
                 .getColumn(ProcedureParameterTableModel.PARAMETER_TYPE);
-        JComboBox typesEditor = Application.getWidgetFactory()
+        JComboBox typesEditor = WidgetFactory
                 .createComboBox(TypesMapping.getDatabaseTypes(), true);
         AutoCompletion.enable(typesEditor);
-        typesColumn.setCellEditor(Application.getWidgetFactory()
+        typesColumn.setCellEditor(WidgetFactory
                 .createCellEditor(typesEditor));
 
         // direction column tweaking
         TableColumn directionColumn = table.getColumnModel()
                 .getColumn(ProcedureParameterTableModel.PARAMETER_DIRECTION);
-        JComboBox directionEditor = Application.getWidgetFactory()
+        JComboBox directionEditor = WidgetFactory
                 .createComboBox(ProcedureParameterTableModel.PARAMETER_DIRECTION_NAMES, false);
         directionEditor.setEditable(false);
         directionColumn.setCellEditor(new CayenneCellEditor(directionEditor));
 
         TableColumn precisionColumn = table.getColumnModel().getColumn(ProcedureParameterTableModel.PARAMETER_PRECISION);
         LimitedTextField limitedPrecisionField = new LimitedTextField(10);
-        precisionColumn.setCellEditor(Application.getWidgetFactory().createCellEditor(limitedPrecisionField));
+        precisionColumn.setCellEditor(WidgetFactory.createCellEditor(limitedPrecisionField));
 
         TableColumn lengthColumn = table.getColumnModel().getColumn(ProcedureParameterTableModel.PARAMETER_LENGTH);
         LimitedTextField limitedLengthField = new LimitedTextField(10);
-        lengthColumn.setCellEditor(Application.getWidgetFactory().createCellEditor(limitedLengthField));
+        lengthColumn.setCellEditor(WidgetFactory.createCellEditor(limitedLengthField));
 
         moveUp.setEnabled(false);
         moveDown.setEnabled(false);
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 b10195712..b7e46c264 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
@@ -34,6 +34,7 @@ import org.apache.cayenne.map.Procedure;
 import org.apache.cayenne.map.ProcedureQueryDescriptor;
 import org.apache.cayenne.map.QueryDescriptor;
 import org.apache.cayenne.modeler.Application;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.util.CellRenderers;
 import org.apache.cayenne.modeler.util.Comparators;
@@ -100,7 +101,7 @@ public class ProcedureQueryView extends JPanel {
             }
         };
 
-        queryRoot = Application.getWidgetFactory().createUndoableComboBox();
+        queryRoot = WidgetFactory.createUndoableComboBox();
         queryRoot.setRenderer(CellRenderers.listRendererWithIcons());
         properties = new ProcedureQueryPropertiesPanel(mediator);
 
@@ -282,7 +283,7 @@ public class ProcedureQueryView extends JPanel {
         }
 
         protected PanelBuilder createPanelBuilder() {
-            labelCase = Application.getWidgetFactory().createUndoableComboBox();
+            labelCase = WidgetFactory.createUndoableComboBox();
             labelCase.setRenderer(new LabelCapsRenderer());
             labelCase.addActionListener(event -> {
                 String value = labelCase.getModel().getSelectedItem().toString();
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/BaseQueryMainTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/BaseQueryMainTab.java
index 1dbd6133b..61065189a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/BaseQueryMainTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/BaseQueryMainTab.java
@@ -29,6 +29,7 @@ import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.util.CellRenderers;
 import org.apache.cayenne.modeler.util.TextAdapter;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
 import org.apache.cayenne.util.Util;
 import org.apache.cayenne.validation.ValidationException;
@@ -45,7 +46,7 @@ public abstract class BaseQueryMainTab extends JPanel {
     }
 
     protected void initQueryRoot() {
-        queryRoot = Application.getWidgetFactory().createComboBox();
+        queryRoot = WidgetFactory.createComboBox();
         AutoCompletion.enable(queryRoot);
         queryRoot.setRenderer(CellRenderers.listRendererWithIcons());
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/RawQueryPropertiesPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/RawQueryPropertiesPanel.java
index 6ef0cbed3..074098012 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/RawQueryPropertiesPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/RawQueryPropertiesPanel.java
@@ -31,6 +31,7 @@ import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.swing.JCayenneCheckBox;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.util.CellRenderers;
 import org.apache.cayenne.modeler.util.Comparators;
@@ -98,7 +99,7 @@ public abstract class RawQueryPropertiesPanel extends SelectPropertiesPanel {
 
         persistentObjects = new JCayenneCheckBox();
 
-        entities = Application.getWidgetFactory().createUndoableComboBox();
+        entities = WidgetFactory.createUndoableComboBox();
         entities.setRenderer(CellRenderers.listRendererWithIcons());
 
         this.setLayout(new BorderLayout());
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/SelectPropertiesPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/SelectPropertiesPanel.java
index 4af802300..18c18c459 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/SelectPropertiesPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/SelectPropertiesPanel.java
@@ -34,6 +34,7 @@ import javax.swing.JTextField;
 
 import org.apache.cayenne.modeler.event.model.QueryEvent;
 import org.apache.cayenne.modeler.Application;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.util.TextAdapter;
 import org.apache.cayenne.query.QueryCacheStrategy;
@@ -109,7 +110,7 @@ public abstract class SelectPropertiesPanel extends JPanel {
             }
         };
 
-        cacheStrategy = Application.getWidgetFactory().createUndoableComboBox();
+        cacheStrategy = WidgetFactory.createUndoableComboBox();
         cacheStrategy.setRenderer(new CacheStrategyRenderer());
         cacheGroups = new TextAdapter(new JTextField()) {
             protected void updateModel(String text) {
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 9823bd6ce..bca0cb4c7 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
@@ -32,6 +32,7 @@ import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.QueryDescriptor;
 import org.apache.cayenne.modeler.Application;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.util.Comparators;
 import org.apache.cayenne.modeler.util.TextAdapter;
@@ -212,7 +213,7 @@ public class SQLTemplateMainTab extends BaseQueryMainTab {
 
         @Override
         protected PanelBuilder createPanelBuilder() {
-            labelCase = Application.getWidgetFactory().createUndoableComboBox();
+            labelCase = WidgetFactory.createUndoableComboBox();
             labelCase.setRenderer(new LabelCapsRenderer());
 
             labelCase.addActionListener(event -> {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
index b8bb63c6b..0deb806c2 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
@@ -21,6 +21,7 @@ package org.apache.cayenne.modeler.util;
 
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.pref.TableColumnPreferences;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.swing.table.SortButtonRenderer;
 
 import javax.swing.*;
@@ -75,7 +76,7 @@ public class CayenneTable extends JTable {
         super.createDefaultEditors();
 
         JTextField textField = new JTextField(20);
-        DefaultCellEditor textEditor = Application.getWidgetFactory().createCellEditor(textField);
+        DefaultCellEditor textEditor = WidgetFactory.createCellEditor(textField);
         textEditor.setClickCountToStart(1);
 
         setDefaultEditor(Object.class, textEditor);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PathChooserComboBoxCellEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PathChooserComboBoxCellEditor.java
index aa39b5c9e..076b78ad0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PathChooserComboBoxCellEditor.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PathChooserComboBoxCellEditor.java
@@ -21,6 +21,7 @@ package org.apache.cayenne.modeler.util;
 
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.modeler.Application;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
 import org.apache.cayenne.util.Util;
 
@@ -75,7 +76,7 @@ public abstract class PathChooserComboBoxCellEditor<T extends CayenneTableModel<
         String dbAttributePath = getPathToInitializeCombo(model, row);
         List<String> nodeChildren = getChildren(currentNode, dbAttributePath);
         this.table = table;
-        comboBoxPathChooser = Application.getWidgetFactory().createComboBox(
+        comboBoxPathChooser = WidgetFactory.createComboBox(
                 nodeChildren,
                 false);
         comboBoxPathChooser.getEditor().getEditorComponent().addKeyListener(new KeyAdapter() {


(cayenne) 01/04: Modeler cleanup

Posted by 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 7a60f4683c0f219b289131509e791690efb85856
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sat Apr 25 08:01:13 2026 -0400

    Modeler cleanup
---
 .../editor/query/ejbql/EjbqlQueryScriptsTab.java   |   3 +-
 .../ui/project/editor/query/ejbql/EjbqlSyntax.java |  67 ++++++++++++
 .../editor/query/sqltemplate/SQLSyntax.java        | 121 +++++++++++++++++++++
 .../query/sqltemplate/SQLTemplateScriptsTab.java   |   5 +-
 .../modeler/util/JUndoableCayenneTextPane.java     |   6 +-
 .../swing/components/textpane/EditorKit.java       |   8 +-
 .../components/textpane/JCayenneTextPane.java      |  24 +---
 .../swing/components/textpane/TextPaneView.java    |  29 +++--
 .../components/textpane/TextPaneViewFactory.java   |  10 +-
 .../components/textpane/style/SyntaxStyle.java     |   7 +-
 .../textpane/style/TextPaneStyleMap.java           |   4 +-
 .../textpane/syntax/EJBQLSyntaxConstant.java       |  63 -----------
 .../textpane/syntax/SQLSyntaxConstants.java        | 117 --------------------
 .../{SyntaxConstant.java => TextSyntax.java}       |  29 ++---
 14 files changed, 240 insertions(+), 253 deletions(-)

diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryScriptsTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryScriptsTab.java
index f9a25d795..ed55e0a46 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryScriptsTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryScriptsTab.java
@@ -39,7 +39,6 @@ import org.apache.cayenne.project.validation.EJBQLStatementValidator.PositionExc
 import org.apache.cayenne.map.EJBQLQueryDescriptor;
 import org.apache.cayenne.map.QueryDescriptor;
 import org.apache.cayenne.swing.components.textpane.JCayenneTextPane;
-import org.apache.cayenne.swing.components.textpane.syntax.EJBQLSyntaxConstant;
 import org.apache.cayenne.util.Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -65,7 +64,7 @@ public class EjbqlQueryScriptsTab extends JPanel implements DocumentListener {
 
     private void initView() {
 
-        scriptArea = new JUndoableCayenneTextPane(new EJBQLSyntaxConstant());
+        scriptArea = new JUndoableCayenneTextPane(new EjbqlSyntax());
         scriptArea.getDocument().addDocumentListener(this);
         scriptArea.getDocument().addDocumentListener(new DocumentListener() {
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlSyntax.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlSyntax.java
new file mode 100644
index 000000000..c52ef67e1
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlSyntax.java
@@ -0,0 +1,67 @@
+/*****************************************************************
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ ****************************************************************/
+package org.apache.cayenne.modeler.ui.project.editor.query.ejbql;
+
+import org.apache.cayenne.swing.components.textpane.syntax.TextSyntax;
+
+class EjbqlSyntax implements TextSyntax {
+    private static final String[] KEYWORDS = {"AS", "ABS", "ASC", "AVG", "BETWEEN",
+            "BOTH", "BIT_LENGTH", "CHARACTER_LENGTH", "CHAR_LENGTH", "COUNT",
+            "CONCAT", "CURRENT_TIME", "CURRENT_DATE", "CURRENT_TIMESTAMP",
+            "DELETE", "DESC", "DISTINCT", "EMPTY", "ESCAPE", "FALSE", "FETCH",
+            "FROM", "GROUP", "HAVING", "IS", "INNER", "LOCATE", "LOWER",
+            "LEADING", "LEFT", "LENGTH", "MAX", "MEMBER", "MIN", "MOD", "NEW",
+            "NULL", "OBJECT", "OF", "ORDER", "POSITION", "SELECT", "SOME",
+            "SUM", "SIZE", "SQRT", "SUBSTR", "TRAILING", "TRUE", "TRIM",
+            "UNKNOWN", "UPDATE", "UPPER", "USER", "WHERE", "JOIN"};
+
+    private static final String[] KEYWORDS2 = {};
+
+    private static final String[] TYPES = {};
+
+    private static final String[] OPERATORS = {"ALL", "AND", "ANY", "BETWEEN", "BY",
+            "EXISTS", "IN", "LIKE", "NOT", "NULL", "OR"};
+
+
+    @Override
+    public String[] keywords() {
+        return KEYWORDS;
+    }
+
+    @Override
+    public String[] keywords2() {
+        return KEYWORDS2;
+    }
+
+    @Override
+    public String[] types() {
+        return TYPES;
+    }
+
+    @Override
+    public String[] operators() {
+        return OPERATORS;
+    }
+
+    @Override
+    public String contentType() {
+        return "text/ejbql";
+    }
+
+}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLSyntax.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLSyntax.java
new file mode 100644
index 000000000..86d8999c4
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLSyntax.java
@@ -0,0 +1,121 @@
+/*****************************************************************
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ ****************************************************************/
+package org.apache.cayenne.modeler.ui.project.editor.query.sqltemplate;
+
+
+import org.apache.cayenne.swing.components.textpane.syntax.TextSyntax;
+
+class SQLSyntax implements TextSyntax {
+
+    private static final String[] KEYWORDS = {
+
+            "ABORT", "ACCESS", "ADD", "ALTER", "ARRAY", "ARRAY_LEN", "AS", "ASC",
+            "ASSERT", "ASSIGN", "AT", "AUDIT", "AUTHORIZATION",
+            "AUTHORIZATION", "AVG", "BASE_TABLE", "BEGIN", "BODY", "CASE",
+            "CHAR", "CHAR_BASE", "CHECK", "CLOSE", "CLUSTER", "CLUSTERS",
+            "COLAUTH", "COLAUTH", "COLUMN", "COMMIT", "COMPRESS", "CONSTANT",
+            "CONSTRAINT", "CONSTRAINT", "COUNT", "CREATE", "CURRENT",
+            "CURRVAL", "CURSOR", "DATABASE", "DATA_BASE", "DATE", "DBA",
+            "DEBUGOFF", "DEBUGON", "DECLARE", "DEFAULT", "DEFINITION", "DELAY",
+            "DELETE", "DESC", "DIGITS", "DISPOSE", "DISTINCT", "DO", "DROP",
+            "DUMP", "ELSE", "ELSIF", "END", "ENTRY", "EXCEPTION",
+            "EXCEPTION_INIT", "EXCLUSIVE", "EXIT", "FALSE", "FETCH", "FILE",
+            "FOR", "FORM", "FROM", "FUNCTION", "GENERIC", "GOTO", "GRANT",
+            "GREATEST", "GROUP", "HAVING", "IDENTIFIED", "IDENTITYCOL", "IF",
+            "IMMEDIATE", "INCREMENT", "INDEX", "INDEXES", "INDICATOR",
+            "INITIAL", "INSERT", "INTERFACE", "INTO", "IS", "LEAST", "LEVEL",
+            "LIMITED", "LOCK", "LONG", "LOOP", "MAX", "MAXEXTENTS", "MIN",
+            "MINUS", "MLSLABEL", "MOD", "MORE", "NEW", "NEXTVAL", "NOAUDIT",
+            "NOCOMPRESS", "NOWAIT", "NULL", "NUMBER_BASE", "OF", "OFFLINE",
+            "ON", "OFF", "ONLINE", "OPEN", "OPTION", "ORDER", "OTHERS", "OUT",
+            "PACKAGE", "PARTITION", "PCTFREE", "PRAGMA", "PRIVATE",
+            "PRIVILEGES", "PROCEDURE", "PUBLIC", "QUOTED_IDENTIFIER", "RAISE",
+            "RANGE", "RECORD", "REF", "RELEASE", "REMR", "RENAME", "RESOURCE",
+            "RETURN", "REVERSE", "REVOKE", "ROLLBACK", "ROW", "ROWLABEL",
+            "ROWNUM", "ROWS", "ROWTYPE", "RUN", "SAVEPOINT", "SCHEMA",
+            "SELECT", "SEPERATE", "SESSION", "SET", "SHARE", "SPACE", "SQL",
+            "SQLCODE", "SQLERRM", "STATEMENT", "STDDEV", "SUBTYPE",
+            "SUCCESSFULL", "SUM", "SYNONYM", "SYSDATE", "TABAUTH", "TABLE",
+            "TABLES", "TASK", "TERMINATE", "THEN", "TO", "TRIGGER", "TRUE",
+            "TYPE", "UID", "UNION", "UNIQUE", "UPDATE", "UPDATETEXT", "USE",
+            "USER", "USING", "VALIDATE", "VALUES", "VARIANCE", "VIEW", "VIEWS",
+            "WHEN", "WHENEVER", "WHERE", "WHILE", "WITH", "WORK", "WRITE",
+            "XOR",
+
+            "UPPER", "VERIFY", "SERVEROUTPUT", "PAGESIZE", "LINESIZE",
+            "ARRAYSIZE", "DBMS_OUTPUT", "PUT_LINE", "ENABLE",
+
+            "FIRST", "LIMIT", "OFFSET", "TOP"
+
+    };
+
+    private static final String[] KEYWORDS2 = {"ABS", "ACOS", "ADD_MONTHS", "ASCII",
+            "ASIN", "ATAN", "ATAN2", "CEIL", "CHARTOROWID", "CHR", "CONCAT",
+            "CONVERT", "COS", "COSH", "DECODE", "DEFINE", "FLOOR", "HEXTORAW",
+            "INITCAP", "INSTR", "INSTRB", "LAST_DAY", "LENGTH", "LENGTHB",
+            "LN", "LOG", "LOWER", "LPAD", "LTRIM", "MOD", "MONTHS_BETWEEN",
+            "NEW_TIME", "NEXT_DAY", "NLSSORT", "NSL_INITCAP", "NLS_LOWER",
+            "NLS_UPPER", "NVL", "POWER", "RAWTOHEX", "REPLACE", "ROUND",
+            "ROWIDTOCHAR", "RPAD", "RTRIM", "SIGN", "SOUNDEX", "SIN", "SINH",
+            "SQRT", "SUBSTR", "SUBSTRB", "TAN", "TANH", "TO_CHAR", "TO_DATE",
+            "TO_MULTIBYTE", "TO_NUMBER", "TO_SINGLE_BYTE", "TRANSLATE",
+            "TRUNC",
+            "#bind", "#bindEqual", "#bindNotEqual", "#bindObjectEqual",
+            "#bindObjectNotEqual", "#chain", "#chunk", "#end", "#result"
+
+    };
+
+    private static final String[] TYPES = {"binary", "bit", "blob", "boolean",
+            "char", "character", "DATE", "datetime", "DEC", "decimal",
+            "DOUBLE PRECISION", "float", "image", "int", "integer", "money",
+            "name", "NATURAL", "NATURALN", "NUMBER", "numeric", "nchar",
+            "nvarchar", "ntext", "pls_integer", "POSITIVE", "POSITIVEN", "RAW",
+            "real", "ROWID", "SIGNTYPE", "smalldatetime", "smallint",
+            "smallmoney", "text", "timestamp", "tinyint", "uniqueidentifier",
+            "UROWID", "varbinary", "varchar", "varchar2"};
+
+    private static final String[] OPERATORS = {"ALL", "AND", "ANY", "BETWEEN", "BY",
+            "CONNECT", "EXISTS", "IN", "INTERSECT", "LIKE", "NOT", "NULL",
+            "OR", "START", "UNION", "WITH"};
+
+    @Override
+    public String[] keywords() {
+        return KEYWORDS;
+    }
+
+    @Override
+    public String[] keywords2() {
+        return KEYWORDS2;
+    }
+
+    @Override
+    public String[] types() {
+        return TYPES;
+    }
+
+    @Override
+    public String[] operators() {
+        return OPERATORS;
+    }
+
+    @Override
+    public String contentType() {
+        return "text/sql";
+    }
+}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateScriptsTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateScriptsTab.java
index ab378b100..8512810ac 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateScriptsTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateScriptsTab.java
@@ -29,7 +29,6 @@ import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.util.DbAdapterInfo;
 import org.apache.cayenne.modeler.util.JUndoableCayenneTextPane;
 import org.apache.cayenne.swing.components.textpane.JCayenneTextPane;
-import org.apache.cayenne.swing.components.textpane.syntax.SQLSyntaxConstants;
 import org.apache.cayenne.util.Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -82,7 +81,7 @@ public class SQLTemplateScriptsTab extends JPanel {
 
     private void prepareScriptAreas() {
         for(String key : DbAdapterInfo.getStandardAdapters()) {
-            JCayenneTextPane currPane = new JUndoableCayenneTextPane(new SQLSyntaxConstants());
+            JCayenneTextPane currPane = new JUndoableCayenneTextPane(new SQLSyntax());
             currPane.setName(key);
             currPane.getDocument().addDocumentListener(new CustomListener(currPane.getName()));
             builder.add(currPane.getScrollPane(), cc.xy(3, 2));
@@ -115,7 +114,7 @@ public class SQLTemplateScriptsTab extends JPanel {
         // assemble
         cc = new CellConstraints();
 
-        textPane = new JUndoableCayenneTextPane(new SQLSyntaxConstants());
+        textPane = new JUndoableCayenneTextPane(new SQLSyntax());
         textPane.setName(DEFAULT_LABEL);
         textPane.getDocument().addDocumentListener(new CustomListener(textPane.getName()));
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/JUndoableCayenneTextPane.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/JUndoableCayenneTextPane.java
index aa9995867..80d0a1e52 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/JUndoableCayenneTextPane.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/JUndoableCayenneTextPane.java
@@ -22,14 +22,14 @@ import javax.swing.event.UndoableEditListener;
 
 import org.apache.cayenne.modeler.undo.JTextFieldUndoListener;
 import org.apache.cayenne.swing.components.textpane.JCayenneTextPane;
-import org.apache.cayenne.swing.components.textpane.syntax.SyntaxConstant;
+import org.apache.cayenne.swing.components.textpane.syntax.TextSyntax;
 
 public class JUndoableCayenneTextPane extends JCayenneTextPane {
 
     private UndoableEditListener undoListener;
 
-    public JUndoableCayenneTextPane(SyntaxConstant syntaxConstant) {
-        super(syntaxConstant);
+    public JUndoableCayenneTextPane(TextSyntax syntax) {
+        super(syntax);
 
         this.undoListener = new JTextFieldUndoListener(this.getPane());
         getDocument().addUndoableEditListener(this.undoListener);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/EditorKit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/EditorKit.java
index 91f9d009c..dcf992a81 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/EditorKit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/EditorKit.java
@@ -20,16 +20,16 @@ package org.apache.cayenne.swing.components.textpane;
 
 import javax.swing.text.StyledEditorKit;
 import javax.swing.text.ViewFactory;
-import org.apache.cayenne.swing.components.textpane.syntax.SyntaxConstant;
+import org.apache.cayenne.swing.components.textpane.syntax.TextSyntax;
 
 public class EditorKit extends StyledEditorKit {
 
     private ViewFactory xmlViewFactory;
     private String contentType;
 
-    public EditorKit(SyntaxConstant syntaxConstant) {
-        contentType = syntaxConstant.getContentType();
-        xmlViewFactory = new TextPaneViewFactory(syntaxConstant);
+    public EditorKit(TextSyntax syntax) {
+        contentType = syntax.contentType();
+        xmlViewFactory = new TextPaneViewFactory(syntax);
     }
 
     @Override
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/JCayenneTextPane.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/JCayenneTextPane.java
index 753ceeb3f..2bf13f00f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/JCayenneTextPane.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/JCayenneTextPane.java
@@ -18,31 +18,19 @@
  ****************************************************************/
 package org.apache.cayenne.swing.components.textpane;
 
-import org.apache.cayenne.modeler.Main;
 import org.apache.cayenne.modeler.util.ModelerUtil;
-import org.apache.cayenne.swing.components.textpane.syntax.SQLSyntaxConstants;
-import org.apache.cayenne.swing.components.textpane.syntax.SyntaxConstant;
+import org.apache.cayenne.swing.components.textpane.syntax.TextSyntax;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextPane;
-import javax.swing.JViewport;
+import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import javax.swing.text.Highlighter;
 import javax.swing.text.JTextComponent;
-import java.awt.Color;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Image;
-import java.awt.Point;
-import java.awt.Rectangle;
+import java.awt.*;
 import java.awt.event.MouseEvent;
 import java.awt.geom.Rectangle2D;
 
@@ -143,7 +131,7 @@ public class JCayenneTextPane extends JPanel {
         return position + posInLine;
     }
 
-    public JCayenneTextPane(SyntaxConstant syntaxConstant) {
+    public JCayenneTextPane(TextSyntax syntax) {
         super();
 
         Dimension dimension = new Dimension(15, 15);
@@ -152,14 +140,14 @@ public class JCayenneTextPane extends JPanel {
         setMinimumSize(dimension);
         setBorder(null);
 
-        pane = new JTextPaneScrollable(new EditorKit(syntaxConstant)) {
+        pane = new JTextPaneScrollable(new EditorKit(syntax)) {
             public void paint(Graphics g) {
                 super.paint(g);
                 JCayenneTextPane.this.repaint();
             }
         };
 
-        pane.setFont(SQLSyntaxConstants.DEFAULT_FONT);
+        pane.setFont(TextSyntax.DEFAULT_FONT);
         pane.setBorder(new LineNumberedBorder(this));
 
         scrollPane = new JScrollPane(pane);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/TextPaneView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/TextPaneView.java
index 9354f46e6..f36bf7bba 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/TextPaneView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/TextPaneView.java
@@ -21,8 +21,7 @@ package org.apache.cayenne.swing.components.textpane;
 import org.apache.cayenne.swing.components.textpane.style.SyntaxStyle;
 import org.apache.cayenne.swing.components.textpane.style.TextPaneStyleMap;
 import org.apache.cayenne.swing.components.textpane.style.TextPaneStyleTypes;
-import org.apache.cayenne.swing.components.textpane.syntax.SQLSyntaxConstants;
-import org.apache.cayenne.swing.components.textpane.syntax.SyntaxConstant;
+import org.apache.cayenne.swing.components.textpane.syntax.TextSyntax;
 
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Element;
@@ -31,7 +30,7 @@ import javax.swing.text.PlainView;
 import javax.swing.text.Segment;
 import javax.swing.text.StyledDocument;
 import javax.swing.text.Utilities;
-import java.awt.Graphics2D;
+import java.awt.*;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.SortedMap;
@@ -52,27 +51,27 @@ public class TextPaneView extends PlainView {
     static {
         patternSyntaxStyle = new HashMap<>();
         patternValue = new HashMap<>();
-        patternComment = Pattern.compile(SQLSyntaxConstants.COMMENT_TEXT,
+        patternComment = Pattern.compile(TextSyntax.COMMENT_TEXT,
                                          Pattern.UNICODE_CASE | Pattern.CASE_INSENSITIVE);
-        patternCommentStart = Pattern.compile(SQLSyntaxConstants.COMMENT_TEXT_START,
+        patternCommentStart = Pattern.compile(TextSyntax.COMMENT_TEXT_START,
                                               Pattern.UNICODE_CASE | Pattern.CASE_INSENSITIVE);
         syntaxStyleComment = style.syntaxStyleMap.get(TextPaneStyleTypes.COMMENT);
     }
 
-    public TextPaneView(Element elem, SyntaxConstant syntaxConstants) {
+    public TextPaneView(Element elem, TextSyntax syntax) {
         super(elem);
         getDocument().putProperty(PlainDocument.tabSizeAttribute, 4);
 
         if (patternSyntaxStyle.isEmpty()) {
-            addConstants(syntaxConstants.getKEYWORDS(), TextPaneStyleTypes.KEYWORDS);
-            addConstants(syntaxConstants.getKEYWORDS2(), TextPaneStyleTypes.KEYWORDS2);
-            addConstants(syntaxConstants.getOPERATORS(), TextPaneStyleTypes.KEYWORDS);
-            addConstants(syntaxConstants.getTYPES(), TextPaneStyleTypes.TYPE);
+            addConstants(syntax.keywords(), TextPaneStyleTypes.KEYWORDS);
+            addConstants(syntax.keywords2(), TextPaneStyleTypes.KEYWORDS2);
+            addConstants(syntax.operators(), TextPaneStyleTypes.KEYWORDS);
+            addConstants(syntax.types(), TextPaneStyleTypes.TYPE);
         }
 
         if (patternValue.isEmpty()) {
             patternValue.put(
-                Pattern.compile(SQLSyntaxConstants.NUMBER_TEXT),
+                Pattern.compile(TextSyntax.NUMBER_TEXT),
                 style.syntaxStyleMap.get(TextPaneStyleTypes.NUMBER));
         }
     }
@@ -204,8 +203,8 @@ public class TextPaneView extends PlainView {
             int end = entry.getValue();
 
             if (i < start) {
-                graphics.setColor(SQLSyntaxConstants.DEFAULT_COLOR);
-                graphics.setFont(SQLSyntaxConstants.DEFAULT_FONT);
+                graphics.setColor(TextSyntax.DEFAULT_COLOR);
+                graphics.setFont(TextSyntax.DEFAULT_FONT);
                 doc.getText(p0 + i, start - i, segment);
                 x = Utilities.drawTabbedText(segment, x, y, graphics, this, i);
             }
@@ -220,8 +219,8 @@ public class TextPaneView extends PlainView {
 
         // Paint possible remaining text black
         if (i < text.length()) {
-            graphics.setColor(SQLSyntaxConstants.DEFAULT_COLOR);
-            graphics.setFont(SQLSyntaxConstants.DEFAULT_FONT);
+            graphics.setColor(TextSyntax.DEFAULT_COLOR);
+            graphics.setFont(TextSyntax.DEFAULT_FONT);
             doc.getText(p0 + i, text.length() - i, segment);
             x = Utilities.drawTabbedText(segment, x, y, graphics, this, i);
         }
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/TextPaneViewFactory.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/TextPaneViewFactory.java
index 1bb459cd3..f5a376809 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/TextPaneViewFactory.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/TextPaneViewFactory.java
@@ -22,16 +22,16 @@ import javax.swing.text.Element;
 import javax.swing.text.View;
 import javax.swing.text.ViewFactory;
 
-import org.apache.cayenne.swing.components.textpane.syntax.SyntaxConstant;
+import org.apache.cayenne.swing.components.textpane.syntax.TextSyntax;
 
 public class TextPaneViewFactory extends Object implements ViewFactory {
 
-    SyntaxConstant syntaxConstant;
-    public TextPaneViewFactory(SyntaxConstant syntaxConstant) {
-        this.syntaxConstant = syntaxConstant;
+    TextSyntax syntax;
+    public TextPaneViewFactory(TextSyntax syntax) {
+        this.syntax = syntax;
     }
 
     public View create(Element elem) {
-        return new TextPaneView(elem, syntaxConstant);
+        return new TextPaneView(elem, syntax);
     }
 }
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/SyntaxStyle.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/SyntaxStyle.java
index 06c86d387..2c32601f1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/SyntaxStyle.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/SyntaxStyle.java
@@ -21,13 +21,12 @@ package org.apache.cayenne.swing.components.textpane.style;
 import java.awt.Color;
 import java.awt.Font;
 
-public final class SyntaxStyle {
+public class SyntaxStyle {
 
-    private Color color;
-    private Font font;
+    private final Color color;
+    private final Font font;
 
     public SyntaxStyle(Color color, Font fontStyle) {
-        super();
         this.color = color;
         this.font = fontStyle;
     }
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/TextPaneStyleMap.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/TextPaneStyleMap.java
index 2e80d56ff..d925040f9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/TextPaneStyleMap.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/TextPaneStyleMap.java
@@ -18,7 +18,7 @@
  ****************************************************************/
 package org.apache.cayenne.swing.components.textpane.style;
 
-import org.apache.cayenne.swing.components.textpane.syntax.SQLSyntaxConstants;
+import org.apache.cayenne.swing.components.textpane.syntax.TextSyntax;
 
 import java.awt.*;
 import java.util.HashMap;
@@ -30,7 +30,7 @@ public class TextPaneStyleMap {
 	public Map<TextPaneStyleTypes, SyntaxStyle> syntaxStyleMap = new HashMap<>();
 	
 	public TextPaneStyleMap() {
-		Font plainFont = SQLSyntaxConstants.DEFAULT_FONT;
+		Font plainFont = TextSyntax.DEFAULT_FONT;
 		Font boldFont = new Font(plainFont.getFamily(), Font.BOLD , plainFont.getSize());
 		Font italicFont = new Font(plainFont.getFamily(), Font.ITALIC, plainFont.getSize());
 		
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/EJBQLSyntaxConstant.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/EJBQLSyntaxConstant.java
deleted file mode 100644
index d2fadca95..000000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/EJBQLSyntaxConstant.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************
- *   Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- ****************************************************************/
-package org.apache.cayenne.swing.components.textpane.syntax;
-
-public class EJBQLSyntaxConstant extends SyntaxConstant{
-	private static String[] KEYWORDS = { "AS", "ABS", "ASC", "AVG", "BETWEEN",
-			"BOTH", "BIT_LENGTH", "CHARACTER_LENGTH", "CHAR_LENGTH", "COUNT",
-			"CONCAT", "CURRENT_TIME", "CURRENT_DATE", "CURRENT_TIMESTAMP",
-			"DELETE", "DESC", "DISTINCT", "EMPTY", "ESCAPE", "FALSE", "FETCH",
-			"FROM", "GROUP", "HAVING", "IS", "INNER", "LOCATE", "LOWER",
-			"LEADING", "LEFT", "LENGTH", "MAX", "MEMBER", "MIN", "MOD", "NEW",
-			"NULL", "OBJECT", "OF", "ORDER", "POSITION", "SELECT", "SOME",
-			"SUM", "SIZE", "SQRT", "SUBSTR", "TRAILING", "TRUE", "TRIM",
-			"UNKNOWN", "UPDATE", "UPPER", "USER", "WHERE", "JOIN" };
-
-	private static String[] KEYWORDS2 = {};
-
-	private static String[] TYPES = {};
-
-	private static String[] OPERATORS = { "ALL", "AND", "ANY", "BETWEEN", "BY",
-			"EXISTS", "IN", "LIKE", "NOT", "NULL", "OR" };
-
-    
-    public String[] getKEYWORDS() {
-        return KEYWORDS;
-    }
-
-    
-    public String[] getKEYWORDS2() {
-        return KEYWORDS2;
-    }
-
-    
-    public String[] getTYPES() {
-        return TYPES;
-    }
-
-    
-    public String[] getOPERATORS() {
-        return OPERATORS;
-    }
-    
-    public String getContentType() {
-        return "text/ejbql";
-    }
-
-}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/SQLSyntaxConstants.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/SQLSyntaxConstants.java
deleted file mode 100644
index 02d4e2fda..000000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/SQLSyntaxConstants.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*****************************************************************
- *   Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- ****************************************************************/
-package org.apache.cayenne.swing.components.textpane.syntax;
-
-
-public class SQLSyntaxConstants extends SyntaxConstant{
-
-	private static String[] KEYWORDS = {
-
-	"ABORT", "ACCESS", "ADD", "ALTER", "ARRAY", "ARRAY_LEN", "AS", "ASC",
-			"ASSERT", "ASSIGN", "AT", "AUDIT", "AUTHORIZATION",
-			"AUTHORIZATION", "AVG", "BASE_TABLE", "BEGIN", "BODY", "CASE",
-			"CHAR", "CHAR_BASE", "CHECK", "CLOSE", "CLUSTER", "CLUSTERS",
-			"COLAUTH", "COLAUTH", "COLUMN", "COMMIT", "COMPRESS", "CONSTANT",
-			"CONSTRAINT", "CONSTRAINT", "COUNT", "CREATE", "CURRENT",
-			"CURRVAL", "CURSOR", "DATABASE", "DATA_BASE", "DATE", "DBA",
-			"DEBUGOFF", "DEBUGON", "DECLARE", "DEFAULT", "DEFINITION", "DELAY",
-			"DELETE", "DESC", "DIGITS", "DISPOSE", "DISTINCT", "DO", "DROP",
-			"DUMP", "ELSE", "ELSIF", "END", "ENTRY", "EXCEPTION",
-			"EXCEPTION_INIT", "EXCLUSIVE", "EXIT", "FALSE", "FETCH", "FILE",
-			"FOR", "FORM", "FROM", "FUNCTION", "GENERIC", "GOTO", "GRANT",
-			"GREATEST", "GROUP", "HAVING", "IDENTIFIED", "IDENTITYCOL", "IF",
-			"IMMEDIATE", "INCREMENT", "INDEX", "INDEXES", "INDICATOR",
-			"INITIAL", "INSERT", "INTERFACE", "INTO", "IS", "LEAST", "LEVEL",
-			"LIMITED", "LOCK", "LONG", "LOOP", "MAX", "MAXEXTENTS", "MIN",
-			"MINUS", "MLSLABEL", "MOD", "MORE", "NEW", "NEXTVAL", "NOAUDIT",
-			"NOCOMPRESS", "NOWAIT", "NULL", "NUMBER_BASE", "OF", "OFFLINE",
-			"ON", "OFF", "ONLINE", "OPEN", "OPTION", "ORDER", "OTHERS", "OUT",
-			"PACKAGE", "PARTITION", "PCTFREE", "PRAGMA", "PRIVATE",
-			"PRIVILEGES", "PROCEDURE", "PUBLIC", "QUOTED_IDENTIFIER", "RAISE",
-			"RANGE", "RECORD", "REF", "RELEASE", "REMR", "RENAME", "RESOURCE",
-			"RETURN", "REVERSE", "REVOKE", "ROLLBACK", "ROW", "ROWLABEL",
-			"ROWNUM", "ROWS", "ROWTYPE", "RUN", "SAVEPOINT", "SCHEMA",
-			"SELECT", "SEPERATE", "SESSION", "SET", "SHARE", "SPACE", "SQL",
-			"SQLCODE", "SQLERRM", "STATEMENT", "STDDEV", "SUBTYPE",
-			"SUCCESSFULL", "SUM", "SYNONYM", "SYSDATE", "TABAUTH", "TABLE",
-			"TABLES", "TASK", "TERMINATE", "THEN", "TO", "TRIGGER", "TRUE",
-			"TYPE", "UID", "UNION", "UNIQUE", "UPDATE", "UPDATETEXT", "USE",
-			"USER", "USING", "VALIDATE", "VALUES", "VARIANCE", "VIEW", "VIEWS",
-			"WHEN", "WHENEVER", "WHERE", "WHILE", "WITH", "WORK", "WRITE",
-			"XOR",
-
-			"UPPER", "VERIFY", "SERVEROUTPUT", "PAGESIZE", "LINESIZE",
-			"ARRAYSIZE", "DBMS_OUTPUT", "PUT_LINE", "ENABLE",
-
-			"FIRST", "LIMIT", "OFFSET", "TOP"
-
-	};
-
-	private static String[] KEYWORDS2 = { "ABS", "ACOS", "ADD_MONTHS", "ASCII",
-			"ASIN", "ATAN", "ATAN2", "CEIL", "CHARTOROWID", "CHR", "CONCAT",
-			"CONVERT", "COS", "COSH", "DECODE", "DEFINE", "FLOOR", "HEXTORAW",
-			"INITCAP", "INSTR", "INSTRB", "LAST_DAY", "LENGTH", "LENGTHB",
-			"LN", "LOG", "LOWER", "LPAD", "LTRIM", "MOD", "MONTHS_BETWEEN",
-			"NEW_TIME", "NEXT_DAY", "NLSSORT", "NSL_INITCAP", "NLS_LOWER",
-			"NLS_UPPER", "NVL", "POWER", "RAWTOHEX", "REPLACE", "ROUND",
-			"ROWIDTOCHAR", "RPAD", "RTRIM", "SIGN", "SOUNDEX", "SIN", "SINH",
-			"SQRT", "SUBSTR", "SUBSTRB", "TAN", "TANH", "TO_CHAR", "TO_DATE",
-			"TO_MULTIBYTE", "TO_NUMBER", "TO_SINGLE_BYTE", "TRANSLATE",
-			"TRUNC", 
-			"#bind", "#bindEqual", "#bindNotEqual", "#bindObjectEqual",
-			"#bindObjectNotEqual", "#chain", "#chunk", "#end", "#result"
-
-	};
-
-	private static String[] TYPES = { "binary", "bit", "blob", "boolean",
-			"char", "character", "DATE", "datetime", "DEC", "decimal",
-			"DOUBLE PRECISION", "float", "image", "int", "integer", "money",
-			"name", "NATURAL", "NATURALN", "NUMBER", "numeric", "nchar",
-			"nvarchar", "ntext", "pls_integer", "POSITIVE", "POSITIVEN", "RAW",
-			"real", "ROWID", "SIGNTYPE", "smalldatetime", "smallint",
-			"smallmoney", "text", "timestamp", "tinyint", "uniqueidentifier",
-			"UROWID", "varbinary", "varchar", "varchar2" };
-
-	private static String[] OPERATORS = { "ALL", "AND", "ANY", "BETWEEN", "BY",
-			"CONNECT", "EXISTS", "IN", "INTERSECT", "LIKE", "NOT", "NULL",
-			"OR", "START", "UNION", "WITH" };
-	
-	public String[] getKEYWORDS() {
-        return KEYWORDS;
-    }
-
-    
-    public String[] getKEYWORDS2() {
-        return KEYWORDS2;
-    }
-
-    
-    public String[] getTYPES() {
-        return TYPES;
-    }
-
-    
-    public String[] getOPERATORS() {
-        return OPERATORS;
-    }
-    
-    public String getContentType() {
-        return "text/sql";
-    }
-}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/SyntaxConstant.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/TextSyntax.java
similarity index 56%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/SyntaxConstant.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/TextSyntax.java
index 59c66b963..59c365151 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/SyntaxConstant.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/TextSyntax.java
@@ -21,29 +21,24 @@ package org.apache.cayenne.swing.components.textpane.syntax;
 import java.awt.Color;
 import java.awt.Font;
 
-public abstract class SyntaxConstant {
+public interface TextSyntax {
 
-    public static final Font DEFAULT_FONT;
-    static {
-        String fontName = System.getProperty("os.name").toLowerCase().contains("win")
-                ? "Courier New" : "Courier";
-        DEFAULT_FONT = new Font(fontName, Font.PLAIN, 14);
-    }
+    Font DEFAULT_FONT = new Font(System.getProperty("os.name").toLowerCase().contains("win")
+            ? "Courier New" : "Courier", Font.PLAIN, 14);
 
-    public static final Color DEFAULT_COLOR = Color.black;
-    public static final String COMMENT_TEXT = "(?:/\\*(?:[^*]|(?:\\*+[^*/]))*\\*+/)|(?://.*)";
-    public static final String COMMENT_TEXT_START = "/\\*.?";
-    public static final String STRING_TEXT = "'[^']*'";
-    public static final String NUMBER_TEXT = "\\d+";
 
-    public abstract String[] getKEYWORDS();
+    Color DEFAULT_COLOR = Color.black;
+    String COMMENT_TEXT = "(?:/\\*(?:[^*]|(?:\\*+[^*/]))*\\*+/)|(?://.*)";
+    String COMMENT_TEXT_START = "/\\*.?";
+    String NUMBER_TEXT = "\\d+";
 
-    public abstract String[] getKEYWORDS2();
+    String[] keywords();
 
-    public abstract String[] getTYPES();
+    String[] keywords2();
 
-    public abstract String[] getOPERATORS();
+    String[] types();
 
-    public abstract String getContentType();
+    String[] operators();
 
+    String contentType();
 }


(cayenne) 02/04: Modeler cleanup

Posted by 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 882ba2b3c1419013e64746fdfdc584c8f35df178
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sat Apr 25 08:01:13 2026 -0400

    Modeler cleanup
    
    orgamizing reusable widgets
---
 .../cayenne/modeler/win/WinCustomTextFieldUI.java     |  2 +-
 .../java/org/apache/cayenne/modeler/Application.java  |  2 +-
 .../org/apache/cayenne/modeler/ModelerModule.java     |  4 ++--
 .../org/apache/cayenne/modeler/action/CopyAction.java |  2 +-
 .../apache/cayenne/modeler/action/PasteAction.java    |  2 +-
 .../modeler/{util => swing}/CayenneTransferable.java  |  2 +-
 .../modeler/{util => swing}/DefaultWidgetFactory.java |  7 ++++---
 .../swing}/JCayenneCheckBox.java                      |  2 +-
 .../modeler/{util => swing}/MultiColumnBrowser.java   |  5 ++++-
 .../modeler/{util => swing}/ProgressDialog.java       |  4 +++-
 .../modeler/{util => swing}/WidgetFactory.java        |  2 +-
 .../swing/border}/TopBorder.java                      |  2 +-
 .../modeler/{util => swing}/combo/AutoCompletion.java |  2 +-
 .../{util => swing}/combo/ComboBoxCellEditor.java     |  2 +-
 .../combo/CustomTypeComboBoxEditor.java               |  2 +-
 .../{util => swing}/combo/EditorTextField.java        |  2 +-
 .../modeler/{util => swing}/combo/SuggestionList.java |  2 +-
 .../swing}/image/FilteredIconFactory.java             |  2 +-
 .../{util => swing/table}/BoardTableCellRenderer.java |  2 +-
 .../{util => swing/table}/CayenneCellEditor.java      |  2 +-
 .../table}/CellEditorForAttributeTable.java           |  2 +-
 .../modeler/{util => swing/table}/CheckBoxHeader.java |  2 +-
 .../{util => swing/table}/ImageRendererColumn.java    |  2 +-
 .../{util => swing/table}/SortButtonRenderer.java     |  4 +++-
 .../textpane => modeler/swing/text}/EditorKit.java    |  4 ++--
 .../swing/text}/JCayenneTextPane.java                 |  4 ++--
 .../{util => swing/text}/JTextFieldUndoable.java      |  2 +-
 .../swing/text}/LimitedTextField.java                 |  2 +-
 .../swing/text}/LineNumberedBorder.java               |  2 +-
 .../textpane => modeler/swing/text}/TextPaneView.java | 10 +++++-----
 .../swing/text}/TextPaneViewFactory.java              |  4 ++--
 .../swing/text}/UnderlineHighlighterForText.java      |  2 +-
 .../{util => swing/text}/ValidatorTextAdapter.java    |  3 ++-
 .../swing/text}/style/SyntaxStyle.java                |  2 +-
 .../swing/text}/style/TextPaneStyleMap.java           |  4 ++--
 .../swing/text}/style/TextPaneStyleTypes.java         |  2 +-
 .../swing/text}/syntax/TextSyntax.java                |  2 +-
 .../swing}/tree/ChangeOptimizingTreeModel.java        |  2 +-
 .../swing}/tree/CheckBoxNodeData.java                 |  2 +-
 .../swing}/tree/CheckBoxTree.java                     |  2 +-
 .../swing}/tree/CheckBoxTreeCellEditor.java           |  2 +-
 .../swing}/tree/CheckBoxTreeCellRenderer.java         |  2 +-
 .../swing}/tree/LabelTreeCellRenderer.java            |  2 +-
 .../org/apache/cayenne/modeler/ui/ModelerFrame.java   |  2 +-
 .../modeler/ui/dbgen/DBGeneratorOptionsView.java      |  2 +-
 .../cayenne/modeler/ui/dbmerge/MergerOptionsView.java |  2 +-
 .../DbRelationshipDialogController.java               |  2 +-
 .../cayenne/modeler/ui/find/FindDialogView.java       |  4 ++--
 .../cayenne/modeler/ui/logconsole/LogConsoleView.java |  2 +-
 .../modeler/ui/preferences/PreferenceDialogView.java  |  2 +-
 .../ui/project/editor/datadomain/DataDomainView.java  |  2 +-
 .../datadomain/validation/InspectionCheckBoxTree.java |  6 +++---
 .../validation/ValidationTabController.java           |  2 +-
 .../datamap/cgen/CgenArtefactSelectorController.java  |  4 ++--
 .../project/editor/datamap/cgen/CgenConfigPanel.java  |  2 +-
 .../dbimport/ReverseEngineeringConfigPanel.java       |  2 +-
 .../project/editor/datamap/main/DataMapMainView.java  |  2 +-
 .../ui/project/editor/datanode/DataNodeView.java      |  2 +-
 .../editor/datanode/custom/CustomDataSourceView.java  |  2 +-
 .../editor/datanode/jdbc/JDBCDataSourceView.java      |  2 +-
 .../editor/dbentity/DbEntityAttributePanel.java       |  6 +++---
 .../dbentity/DbEntityAttributeRelationshipTab.java    |  2 +-
 .../editor/dbentity/DbEntityRelationshipPanel.java    |  4 ++--
 .../attributes/EmbeddableAttributeTableModel.java     |  2 +-
 .../attributes/EmbeddableAttributesView.java          |  2 +-
 .../editor/objentity/ObjAttributeTableModel.java      |  2 +-
 .../editor/objentity/ObjEntityAttributePanel.java     |  2 +-
 .../objentity/ObjEntityAttributeRelationshipTab.java  |  2 +-
 .../ui/project/editor/objentity/ObjEntityTab.java     |  4 ++--
 .../attrinfo/ObjAttributeInfoDialogView.java          |  4 ++--
 .../OverrideEmbeddableAttributeTableModel.java        |  2 +-
 .../relinfo/ObjRelationshipInfoController.java        |  2 +-
 .../objentity/relinfo/ObjRelationshipInfoView.java    |  6 +++---
 .../objentity/relinfo/ObjRelationshipPathBrowser.java |  2 +-
 .../editor/procedure/ProcedureParameterTab.java       |  8 ++++----
 .../ui/project/editor/procedure/ProcedureTab.java     |  2 +-
 .../ui/project/editor/query/BaseQueryMainTab.java     |  2 +-
 .../editor/query/ObjectQueryPropertiesPanel.java      |  2 +-
 .../project/editor/query/RawQueryPropertiesPanel.java |  2 +-
 .../editor/query/ejbql/EjbqlQueryScriptsTab.java      |  2 +-
 .../ui/project/editor/query/ejbql/EjbqlSyntax.java    |  2 +-
 .../editor/query/selectquery/SelectQueryMainTab.java  |  4 ++--
 .../query/selectquery/SelectQueryOrderingTab.java     |  4 ++--
 .../query/selectquery/SelectQueryPrefetchTab.java     |  2 +-
 .../project/editor/query/sqltemplate/SQLSyntax.java   |  2 +-
 .../query/sqltemplate/SQLTemplatePrefetchTab.java     |  4 ++--
 .../query/sqltemplate/SQLTemplateScriptsTab.java      |  2 +-
 .../modeler/ui/project/tree/ProjectTreeView.java      |  2 +-
 .../apache/cayenne/modeler/util/CayenneAction.java    |  2 +-
 .../apache/cayenne/modeler/util/CayenneDialog.java    | 19 ++++++-------------
 .../org/apache/cayenne/modeler/util/CayenneTable.java | 16 +++++++++-------
 .../modeler/util/JUndoableCayenneTextPane.java        |  4 ++--
 .../apache/cayenne/modeler/util/LongRunningTask.java  |  1 +
 .../modeler/util/PathChooserComboBoxCellEditor.java   |  2 +-
 .../cayenne/modeler/util/TableHeaderListener.java     |  1 +
 95 files changed, 146 insertions(+), 140 deletions(-)

diff --git a/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinCustomTextFieldUI.java b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinCustomTextFieldUI.java
index 430901caf..fb90001a7 100644
--- a/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinCustomTextFieldUI.java
+++ b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinCustomTextFieldUI.java
@@ -24,7 +24,7 @@ import javax.swing.JComponent;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicTextFieldUI;
 
-import org.apache.cayenne.modeler.util.combo.EditorTextField;
+import org.apache.cayenne.modeler.swing.combo.EditorTextField;
 
 /**
  * @since 4.0
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java
index 1b1da5d47..14860f3f7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java
@@ -33,7 +33,7 @@ import org.apache.cayenne.modeler.ui.preferences.classpath.ClasspathPreferencesC
 import org.apache.cayenne.modeler.ui.preferences.general.GeneralPreferencesController;
 import org.apache.cayenne.modeler.undo.CayenneUndoManager;
 import org.apache.cayenne.modeler.util.AdapterMapping;
-import org.apache.cayenne.modeler.util.WidgetFactory;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.pref.CayennePreference;
 import org.apache.cayenne.modeler.pref.CayenneProjectPreferences;
 import org.apache.cayenne.project.Project;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerModule.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerModule.java
index a81a97451..37539496a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerModule.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerModule.java
@@ -31,8 +31,8 @@ import org.apache.cayenne.modeler.action.DefaultActionManager;
 import org.apache.cayenne.modeler.graph.extension.GraphExtension;
 import org.apache.cayenne.modeler.platform.DefaultPlatformInitializer;
 import org.apache.cayenne.modeler.platform.PlatformInitializer;
-import org.apache.cayenne.modeler.util.DefaultWidgetFactory;
-import org.apache.cayenne.modeler.util.WidgetFactory;
+import org.apache.cayenne.modeler.swing.DefaultWidgetFactory;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 import org.apache.cayenne.modeler.validation.ConfigurableProjectValidator;
 import org.apache.cayenne.modeler.validation.extension.ValidationExtension;
 import org.apache.cayenne.project.ProjectModule;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CopyAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CopyAction.java
index 09ed893d5..fd7440483 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CopyAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CopyAction.java
@@ -35,7 +35,7 @@ import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.ui.project.editor.objentity.ObjCallbackMethod;
 import org.apache.cayenne.modeler.util.CayenneAction;
-import org.apache.cayenne.modeler.util.CayenneTransferable;
+import org.apache.cayenne.modeler.swing.CayenneTransferable;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
index 5b2cb1d76..9964d3bb9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
@@ -46,7 +46,7 @@ import org.apache.cayenne.modeler.event.model.CallbackMethodEvent;
 import org.apache.cayenne.modeler.undo.PasteCompoundUndoableEdit;
 import org.apache.cayenne.modeler.undo.PasteUndoableEdit;
 import org.apache.cayenne.modeler.util.CayenneAction;
-import org.apache.cayenne.modeler.util.CayenneTransferable;
+import org.apache.cayenne.modeler.swing.CayenneTransferable;
 import org.apache.cayenne.query.Query;
 
 import javax.swing.KeyStroke;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTransferable.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/CayenneTransferable.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTransferable.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/CayenneTransferable.java
index 632946f70..513de794d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTransferable.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/CayenneTransferable.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.util;
+package org.apache.cayenne.modeler.swing;
 
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DefaultWidgetFactory.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/DefaultWidgetFactory.java
similarity index 93%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DefaultWidgetFactory.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/DefaultWidgetFactory.java
index 2c304c249..d1ec53bb7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DefaultWidgetFactory.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/DefaultWidgetFactory.java
@@ -16,11 +16,12 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.util;
+package org.apache.cayenne.modeler.swing;
 
+import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
+import org.apache.cayenne.modeler.swing.combo.ComboBoxCellEditor;
+import org.apache.cayenne.modeler.swing.table.CayenneCellEditor;
 import org.apache.cayenne.modeler.undo.JComboBoxUndoListener;
-import org.apache.cayenne.modeler.util.combo.AutoCompletion;
-import org.apache.cayenne.modeler.util.combo.ComboBoxCellEditor;
 
 import javax.swing.*;
 import javax.swing.table.TableCellEditor;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/JCayenneCheckBox.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/JCayenneCheckBox.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/JCayenneCheckBox.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/JCayenneCheckBox.java
index b452a3547..cc7fe66cc 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/JCayenneCheckBox.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/JCayenneCheckBox.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.swing.components;
+package org.apache.cayenne.modeler.swing;
 
 import org.apache.cayenne.modeler.undo.JCheckBoxUndoListener;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/MultiColumnBrowser.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/MultiColumnBrowser.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/MultiColumnBrowser.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/MultiColumnBrowser.java
index 4b55428a6..f281a402c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/MultiColumnBrowser.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/MultiColumnBrowser.java
@@ -17,7 +17,10 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.util;
+package org.apache.cayenne.modeler.swing;
+
+import org.apache.cayenne.modeler.util.CellRenderers;
+import org.apache.cayenne.modeler.util.ModelerUtil;
 
 import javax.swing.AbstractListModel;
 import javax.swing.DefaultListCellRenderer;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProgressDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/ProgressDialog.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProgressDialog.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/ProgressDialog.java
index 36f28980c..cae60631c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ProgressDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/ProgressDialog.java
@@ -17,7 +17,9 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.util;
+package org.apache.cayenne.modeler.swing;
+
+import org.apache.cayenne.modeler.util.ModelerUtil;
 
 import com.jgoodies.forms.builder.PanelBuilder;
 import com.jgoodies.forms.layout.CellConstraints;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/WidgetFactory.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/WidgetFactory.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/WidgetFactory.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/WidgetFactory.java
index 6c34b0ce5..4b9770729 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/WidgetFactory.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/WidgetFactory.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.util;
+package org.apache.cayenne.modeler.swing;
 
 import java.util.Collection;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/TopBorder.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/border/TopBorder.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/TopBorder.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/border/TopBorder.java
index a6a03a38c..c72a75b94 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/TopBorder.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/border/TopBorder.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.swing.components;
+package org.apache.cayenne.modeler.swing.border;
 
 import java.awt.Color;
 import java.awt.Component;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/combo/AutoCompletion.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/combo/AutoCompletion.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/combo/AutoCompletion.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/combo/AutoCompletion.java
index 6048a83f9..5acb3261a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/combo/AutoCompletion.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/combo/AutoCompletion.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.util.combo;
+package org.apache.cayenne.modeler.swing.combo;
 
 import javax.swing.JComboBox;
 import javax.swing.JList;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/combo/ComboBoxCellEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/combo/ComboBoxCellEditor.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/combo/ComboBoxCellEditor.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/combo/ComboBoxCellEditor.java
index 845cb34a4..bdb2535c8 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/combo/ComboBoxCellEditor.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/combo/ComboBoxCellEditor.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.util.combo;
+package org.apache.cayenne.modeler.swing.combo;
 
 import java.awt.Component;
 import java.awt.event.ActionEvent;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/combo/CustomTypeComboBoxEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/combo/CustomTypeComboBoxEditor.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/combo/CustomTypeComboBoxEditor.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/combo/CustomTypeComboBoxEditor.java
index 78e06ad7f..b9bd5660d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/combo/CustomTypeComboBoxEditor.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/combo/CustomTypeComboBoxEditor.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.util.combo;
+package org.apache.cayenne.modeler.swing.combo;
 
 import java.lang.reflect.Method;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/combo/EditorTextField.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/combo/EditorTextField.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/combo/EditorTextField.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/combo/EditorTextField.java
index 0a6d1f75c..6f72c2ec4 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/combo/EditorTextField.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/combo/EditorTextField.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.util.combo;
+package org.apache.cayenne.modeler.swing.combo;
 
 import java.awt.Color;
 import java.awt.Component;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/combo/SuggestionList.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/combo/SuggestionList.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/combo/SuggestionList.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/combo/SuggestionList.java
index 730f9ef64..c57423ed1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/combo/SuggestionList.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/combo/SuggestionList.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.util.combo;
+package org.apache.cayenne.modeler.swing.combo;
 
 import java.awt.Color;
 import java.awt.event.ItemListener;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/image/FilteredIconFactory.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/image/FilteredIconFactory.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/image/FilteredIconFactory.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/image/FilteredIconFactory.java
index 0c0050b9d..ba06810b8 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/image/FilteredIconFactory.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/image/FilteredIconFactory.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.swing.components.image;
+package org.apache.cayenne.modeler.swing.image;
 
 import java.awt.Image;
 import java.awt.image.BufferedImage;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/BoardTableCellRenderer.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/BoardTableCellRenderer.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/BoardTableCellRenderer.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/BoardTableCellRenderer.java
index 18f478f33..32af68795 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/BoardTableCellRenderer.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/BoardTableCellRenderer.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.util;
+package org.apache.cayenne.modeler.swing.table;
 
 import javax.swing.BorderFactory;
 import javax.swing.JTable;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneCellEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/CayenneCellEditor.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneCellEditor.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/CayenneCellEditor.java
index 9214b556c..020dffc06 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneCellEditor.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/CayenneCellEditor.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.util;
+package org.apache.cayenne.modeler.swing.table;
 
 import java.awt.event.MouseEvent;
 import java.util.EventObject;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellEditorForAttributeTable.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/CellEditorForAttributeTable.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellEditorForAttributeTable.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/CellEditorForAttributeTable.java
index b0a199186..8c341a9d1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CellEditorForAttributeTable.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/CellEditorForAttributeTable.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.util;
+package org.apache.cayenne.modeler.swing.table;
 
 import java.awt.Component;
 import java.awt.event.MouseEvent;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CheckBoxHeader.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/CheckBoxHeader.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CheckBoxHeader.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/CheckBoxHeader.java
index 61fc16a34..a405722df 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CheckBoxHeader.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/CheckBoxHeader.java
@@ -18,7 +18,7 @@
  ****************************************************************/
 
 
-package org.apache.cayenne.modeler.util;
+package org.apache.cayenne.modeler.swing.table;
 
 import javax.swing.JCheckBox;
 import javax.swing.JTable;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ImageRendererColumn.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/ImageRendererColumn.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ImageRendererColumn.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/ImageRendererColumn.java
index b2a4329a1..266caef6d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ImageRendererColumn.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/ImageRendererColumn.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.util;
+package org.apache.cayenne.modeler.swing.table;
 
 import javax.swing.*;
 import javax.swing.table.DefaultTableCellRenderer;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/SortButtonRenderer.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/SortButtonRenderer.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/SortButtonRenderer.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/SortButtonRenderer.java
index 0ce42b12f..971348966 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/SortButtonRenderer.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/SortButtonRenderer.java
@@ -16,7 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.util;
+package org.apache.cayenne.modeler.swing.table;
+
+import org.apache.cayenne.modeler.util.ModelerUtil;
 
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/EditorKit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/EditorKit.java
similarity index 92%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/EditorKit.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/EditorKit.java
index dcf992a81..e16ae4f6b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/EditorKit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/EditorKit.java
@@ -16,11 +16,11 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.swing.components.textpane;
+package org.apache.cayenne.modeler.swing.text;
 
 import javax.swing.text.StyledEditorKit;
 import javax.swing.text.ViewFactory;
-import org.apache.cayenne.swing.components.textpane.syntax.TextSyntax;
+import org.apache.cayenne.modeler.swing.text.syntax.TextSyntax;
 
 public class EditorKit extends StyledEditorKit {
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/JCayenneTextPane.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/JCayenneTextPane.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/JCayenneTextPane.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/JCayenneTextPane.java
index 2bf13f00f..cc1f56334 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/JCayenneTextPane.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/JCayenneTextPane.java
@@ -16,10 +16,10 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.swing.components.textpane;
+package org.apache.cayenne.modeler.swing.text;
 
 import org.apache.cayenne.modeler.util.ModelerUtil;
-import org.apache.cayenne.swing.components.textpane.syntax.TextSyntax;
+import org.apache.cayenne.modeler.swing.text.syntax.TextSyntax;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/JTextFieldUndoable.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/JTextFieldUndoable.java
similarity index 95%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/JTextFieldUndoable.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/JTextFieldUndoable.java
index f175aae4d..0e46c215d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/JTextFieldUndoable.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/JTextFieldUndoable.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.util;
+package org.apache.cayenne.modeler.swing.text;
 
 import javax.swing.JTextField;
 import javax.swing.event.UndoableEditListener;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/LimitedTextField.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/LimitedTextField.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/LimitedTextField.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/LimitedTextField.java
index 432b21098..d38df2ee0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/LimitedTextField.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/LimitedTextField.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.swing.components;
+package org.apache.cayenne.modeler.swing.text;
 
 import javax.swing.JTextField;
 import javax.swing.text.AttributeSet;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/LineNumberedBorder.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/LineNumberedBorder.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/LineNumberedBorder.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/LineNumberedBorder.java
index 7c6f29e10..90d80cf79 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/LineNumberedBorder.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/LineNumberedBorder.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.swing.components.textpane;
+package org.apache.cayenne.modeler.swing.text;
 
 import java.awt.Color;
 import java.awt.Component;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/TextPaneView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/TextPaneView.java
similarity index 96%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/TextPaneView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/TextPaneView.java
index f36bf7bba..b15efc21e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/TextPaneView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/TextPaneView.java
@@ -16,12 +16,12 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.swing.components.textpane;
+package org.apache.cayenne.modeler.swing.text;
 
-import org.apache.cayenne.swing.components.textpane.style.SyntaxStyle;
-import org.apache.cayenne.swing.components.textpane.style.TextPaneStyleMap;
-import org.apache.cayenne.swing.components.textpane.style.TextPaneStyleTypes;
-import org.apache.cayenne.swing.components.textpane.syntax.TextSyntax;
+import org.apache.cayenne.modeler.swing.text.style.SyntaxStyle;
+import org.apache.cayenne.modeler.swing.text.style.TextPaneStyleMap;
+import org.apache.cayenne.modeler.swing.text.style.TextPaneStyleTypes;
+import org.apache.cayenne.modeler.swing.text.syntax.TextSyntax;
 
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Element;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/TextPaneViewFactory.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/TextPaneViewFactory.java
similarity index 91%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/TextPaneViewFactory.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/TextPaneViewFactory.java
index f5a376809..69170d78c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/TextPaneViewFactory.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/TextPaneViewFactory.java
@@ -16,13 +16,13 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.swing.components.textpane;
+package org.apache.cayenne.modeler.swing.text;
 
 import javax.swing.text.Element;
 import javax.swing.text.View;
 import javax.swing.text.ViewFactory;
 
-import org.apache.cayenne.swing.components.textpane.syntax.TextSyntax;
+import org.apache.cayenne.modeler.swing.text.syntax.TextSyntax;
 
 public class TextPaneViewFactory extends Object implements ViewFactory {
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/UnderlineHighlighterForText.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/UnderlineHighlighterForText.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/UnderlineHighlighterForText.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/UnderlineHighlighterForText.java
index 64f84f316..8f83f5fa1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/UnderlineHighlighterForText.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/UnderlineHighlighterForText.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.swing.components.textpane;
+package org.apache.cayenne.modeler.swing.text;
 
 import java.awt.Color;
 import java.awt.FontMetrics;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ValidatorTextAdapter.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/ValidatorTextAdapter.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ValidatorTextAdapter.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/ValidatorTextAdapter.java
index 84ba50ff0..141a1ca82 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ValidatorTextAdapter.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/ValidatorTextAdapter.java
@@ -16,8 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.util;
+package org.apache.cayenne.modeler.swing.text;
 
+import org.apache.cayenne.modeler.util.TextAdapter;
 import org.apache.cayenne.validation.ValidationException;
 
 import javax.swing.*;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/SyntaxStyle.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/style/SyntaxStyle.java
similarity index 95%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/SyntaxStyle.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/style/SyntaxStyle.java
index 2c32601f1..fca42b1b0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/SyntaxStyle.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/style/SyntaxStyle.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.swing.components.textpane.style;
+package org.apache.cayenne.modeler.swing.text.style;
 
 import java.awt.Color;
 import java.awt.Font;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/TextPaneStyleMap.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/style/TextPaneStyleMap.java
similarity index 94%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/TextPaneStyleMap.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/style/TextPaneStyleMap.java
index d925040f9..13227240b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/TextPaneStyleMap.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/style/TextPaneStyleMap.java
@@ -16,9 +16,9 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.swing.components.textpane.style;
+package org.apache.cayenne.modeler.swing.text.style;
 
-import org.apache.cayenne.swing.components.textpane.syntax.TextSyntax;
+import org.apache.cayenne.modeler.swing.text.syntax.TextSyntax;
 
 import java.awt.*;
 import java.util.HashMap;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/TextPaneStyleTypes.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/style/TextPaneStyleTypes.java
similarity index 95%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/TextPaneStyleTypes.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/style/TextPaneStyleTypes.java
index 987247512..419f8ca95 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/style/TextPaneStyleTypes.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/style/TextPaneStyleTypes.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.swing.components.textpane.style;
+package org.apache.cayenne.modeler.swing.text.style;
 
 public enum TextPaneStyleTypes {
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/TextSyntax.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/syntax/TextSyntax.java
similarity index 96%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/TextSyntax.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/syntax/TextSyntax.java
index 59c365151..e96953e27 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/TextSyntax.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/text/syntax/TextSyntax.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.swing.components.textpane.syntax;
+package org.apache.cayenne.modeler.swing.text.syntax;
 
 import java.awt.Color;
 import java.awt.Font;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/tree/ChangeOptimizingTreeModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/tree/ChangeOptimizingTreeModel.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/tree/ChangeOptimizingTreeModel.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/tree/ChangeOptimizingTreeModel.java
index 8ec6c1ad9..2cf8af4f0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/tree/ChangeOptimizingTreeModel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/tree/ChangeOptimizingTreeModel.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.swing.components.tree;
+package org.apache.cayenne.modeler.swing.tree;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/tree/CheckBoxNodeData.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/tree/CheckBoxNodeData.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/tree/CheckBoxNodeData.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/tree/CheckBoxNodeData.java
index c1bc3a832..9ba2a33c8 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/tree/CheckBoxNodeData.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/tree/CheckBoxNodeData.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.swing.components.tree;
+package org.apache.cayenne.modeler.swing.tree;
 
 import java.util.Objects;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/tree/CheckBoxTree.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/tree/CheckBoxTree.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/tree/CheckBoxTree.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/tree/CheckBoxTree.java
index 1ec1ef3a9..215c38e28 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/tree/CheckBoxTree.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/tree/CheckBoxTree.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.swing.components.tree;
+package org.apache.cayenne.modeler.swing.tree;
 
 import javax.swing.*;
 import javax.swing.event.TreeExpansionEvent;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/tree/CheckBoxTreeCellEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/tree/CheckBoxTreeCellEditor.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/tree/CheckBoxTreeCellEditor.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/tree/CheckBoxTreeCellEditor.java
index 625d2f16a..ce541f094 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/tree/CheckBoxTreeCellEditor.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/tree/CheckBoxTreeCellEditor.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.swing.components.tree;
+package org.apache.cayenne.modeler.swing.tree;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/tree/CheckBoxTreeCellRenderer.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/tree/CheckBoxTreeCellRenderer.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/tree/CheckBoxTreeCellRenderer.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/tree/CheckBoxTreeCellRenderer.java
index 8aa064245..862bad219 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/tree/CheckBoxTreeCellRenderer.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/tree/CheckBoxTreeCellRenderer.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.swing.components.tree;
+package org.apache.cayenne.modeler.swing.tree;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/tree/LabelTreeCellRenderer.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/tree/LabelTreeCellRenderer.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/tree/LabelTreeCellRenderer.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/tree/LabelTreeCellRenderer.java
index b5fe0d09b..9542e351c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/tree/LabelTreeCellRenderer.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/tree/LabelTreeCellRenderer.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.swing.components.tree;
+package org.apache.cayenne.modeler.swing.tree;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/ModelerFrame.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/ModelerFrame.java
index 38dc59070..c5ff4c796 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/ModelerFrame.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/ModelerFrame.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.modeler.event.model.RecentFileListListener;
 import org.apache.cayenne.modeler.pref.ComponentGeometry;
 import org.apache.cayenne.modeler.util.ModelerUtil;
 import org.apache.cayenne.modeler.util.RecentFileMenu;
-import org.apache.cayenne.swing.components.TopBorder;
+import org.apache.cayenne.modeler.swing.border.TopBorder;
 import org.slf4j.LoggerFactory;
 
 import javax.swing.*;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsView.java
index d91a36214..d9eb4a47a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsView.java
@@ -43,7 +43,7 @@ import com.jgoodies.forms.builder.PanelBuilder;
 import com.jgoodies.forms.factories.Borders;
 import com.jgoodies.forms.layout.CellConstraints;
 import com.jgoodies.forms.layout.FormLayout;
-import org.apache.cayenne.swing.components.TopBorder;
+import org.apache.cayenne.modeler.swing.border.TopBorder;
 
 /**
  * Wizard for generating the database from the data map.
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerOptionsView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerOptionsView.java
index 91fd1f4c5..5f561b2d6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerOptionsView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerOptionsView.java
@@ -24,7 +24,7 @@ import com.jgoodies.forms.factories.Borders;
 import com.jgoodies.forms.layout.CellConstraints;
 import com.jgoodies.forms.layout.FormLayout;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.swing.components.TopBorder;
+import org.apache.cayenne.modeler.swing.border.TopBorder;
 
 import javax.swing.Box;
 import javax.swing.JButton;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogController.java
index 20bf7e7d8..54c6f073d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogController.java
@@ -36,7 +36,7 @@ import org.apache.cayenne.modeler.mvc.ChildController;
 import org.apache.cayenne.modeler.undo.CreateRelationshipUndoableEdit;
 import org.apache.cayenne.modeler.undo.RelationshipUndoableEdit;
 import org.apache.cayenne.modeler.util.ModelerUtil;
-import org.apache.cayenne.modeler.util.combo.AutoCompletion;
+import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
 import org.apache.cayenne.project.extension.info.ObjectInfo;
 import org.apache.cayenne.util.Util;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/find/FindDialogView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/find/FindDialogView.java
index f18dbced9..f1050b86b 100755
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/find/FindDialogView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/find/FindDialogView.java
@@ -20,8 +20,8 @@ package org.apache.cayenne.modeler.ui.find;
 
 import org.apache.cayenne.modeler.action.FindAction;
 import org.apache.cayenne.modeler.util.CellRenderers;
-import org.apache.cayenne.modeler.util.ImageRendererColumn;
-import org.apache.cayenne.swing.components.TopBorder;
+import org.apache.cayenne.modeler.swing.table.ImageRendererColumn;
+import org.apache.cayenne.modeler.swing.border.TopBorder;
 
 import javax.swing.*;
 import javax.swing.table.DefaultTableModel;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/logconsole/LogConsoleView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/logconsole/LogConsoleView.java
index b5f07acbf..662a9a962 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/logconsole/LogConsoleView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/logconsole/LogConsoleView.java
@@ -23,7 +23,7 @@ import javax.swing.text.JTextComponent;
 
 import org.apache.cayenne.modeler.util.CayenneAction;
 import org.apache.cayenne.modeler.util.ModelerUtil;
-import org.apache.cayenne.swing.components.TopBorder;
+import org.apache.cayenne.modeler.swing.border.TopBorder;
 
 import java.awt.*;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialogView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialogView.java
index 6679a9b46..cb9ca3047 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialogView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialogView.java
@@ -19,7 +19,7 @@
 
 package org.apache.cayenne.modeler.ui.preferences;
 
-import org.apache.cayenne.swing.components.TopBorder;
+import org.apache.cayenne.modeler.swing.border.TopBorder;
 
 import javax.swing.BorderFactory;
 import javax.swing.DefaultListCellRenderer;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainView.java
index c07c0395a..d8b665276 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainView.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.access.DataDomain;
 import org.apache.cayenne.configuration.DataChannelDescriptor;
 import org.apache.cayenne.modeler.event.model.DomainEvent;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.swing.components.JCayenneCheckBox;
+import org.apache.cayenne.modeler.swing.JCayenneCheckBox;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.event.display.DomainDisplayEvent;
 import org.apache.cayenne.modeler.event.display.DomainDisplayListener;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/validation/InspectionCheckBoxTree.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/validation/InspectionCheckBoxTree.java
index 4a0519744..d68c66b7d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/validation/InspectionCheckBoxTree.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/validation/InspectionCheckBoxTree.java
@@ -19,9 +19,9 @@
 package org.apache.cayenne.modeler.ui.project.editor.datadomain.validation;
 
 import org.apache.cayenne.project.validation.Inspection;
-import org.apache.cayenne.swing.components.tree.ChangeOptimizingTreeModel;
-import org.apache.cayenne.swing.components.tree.CheckBoxNodeData;
-import org.apache.cayenne.swing.components.tree.CheckBoxTree;
+import org.apache.cayenne.modeler.swing.tree.ChangeOptimizingTreeModel;
+import org.apache.cayenne.modeler.swing.tree.CheckBoxNodeData;
+import org.apache.cayenne.modeler.swing.tree.CheckBoxTree;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/validation/ValidationTabController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/validation/ValidationTabController.java
index 2f50579d7..c278e4636 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/validation/ValidationTabController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/validation/ValidationTabController.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.modeler.event.display.ValidationConfigDisplayEvent;
 import org.apache.cayenne.modeler.event.display.ValidationConfigDisplayListener;
 import org.apache.cayenne.project.validation.Inspection;
 import org.apache.cayenne.project.validation.ValidationConfig;
-import org.apache.cayenne.swing.components.tree.CheckBoxNodeData;
+import org.apache.cayenne.modeler.swing.tree.CheckBoxNodeData;
 
 import javax.swing.event.TreeModelEvent;
 import javax.swing.event.TreeModelListener;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenArtefactSelectorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenArtefactSelectorController.java
index 88bda5f12..dfd52bfb4 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenArtefactSelectorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenArtefactSelectorController.java
@@ -25,8 +25,8 @@ import org.apache.cayenne.map.Embeddable;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.modeler.mvc.ChildController;
 import org.apache.cayenne.modeler.util.CellRenderers;
-import org.apache.cayenne.modeler.util.CheckBoxHeader;
-import org.apache.cayenne.modeler.util.ImageRendererColumn;
+import org.apache.cayenne.modeler.swing.table.CheckBoxHeader;
+import org.apache.cayenne.modeler.swing.table.ImageRendererColumn;
 import org.apache.cayenne.modeler.util.ModelerUtil;
 import org.apache.cayenne.modeler.util.TableSizer;
 import org.apache.cayenne.validation.ValidationFailure;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenConfigPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenConfigPanel.java
index d9a0c3c84..b1a915a22 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenConfigPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenConfigPanel.java
@@ -25,7 +25,7 @@ import com.jgoodies.forms.layout.FormLayout;
 import org.apache.cayenne.gen.CgenConfiguration;
 import org.apache.cayenne.gen.TemplateType;
 import org.apache.cayenne.modeler.util.TextAdapter;
-import org.apache.cayenne.swing.components.JCayenneCheckBox;
+import org.apache.cayenne.modeler.swing.JCayenneCheckBox;
 import org.apache.cayenne.validation.ValidationException;
 
 import javax.swing.BorderFactory;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringConfigPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringConfigPanel.java
index 1904df485..93708a362 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringConfigPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringConfigPanel.java
@@ -35,7 +35,7 @@ import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.util.NameGeneratorPreferences;
 import org.apache.cayenne.modeler.util.TextAdapter;
-import org.apache.cayenne.modeler.util.combo.AutoCompletion;
+import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
 import org.apache.cayenne.validation.ValidationException;
 
 /**
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 74765b80b..cb0c29f16 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
@@ -40,7 +40,7 @@ import org.apache.cayenne.modeler.util.CellRenderers;
 import org.apache.cayenne.modeler.util.Comparators;
 import org.apache.cayenne.modeler.util.TextAdapter;
 import org.apache.cayenne.project.extension.info.ObjectInfo;
-import org.apache.cayenne.swing.components.JCayenneCheckBox;
+import org.apache.cayenne.modeler.swing.JCayenneCheckBox;
 import org.apache.cayenne.util.Util;
 import org.apache.cayenne.validation.ValidationException;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/DataNodeView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/DataNodeView.java
index 470135040..a679fca5e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/DataNodeView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/DataNodeView.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.modeler.ui.project.editor.datanode;
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.util.JTextFieldUndoable;
+import org.apache.cayenne.modeler.swing.text.JTextFieldUndoable;
 
 import javax.swing.JButton;
 import javax.swing.JComboBox;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/custom/CustomDataSourceView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/custom/CustomDataSourceView.java
index 43c53faf2..3d1f57d05 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/custom/CustomDataSourceView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/custom/CustomDataSourceView.java
@@ -24,7 +24,7 @@ import java.awt.BorderLayout;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
-import org.apache.cayenne.modeler.util.JTextFieldUndoable;
+import org.apache.cayenne.modeler.swing.text.JTextFieldUndoable;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/jdbc/JDBCDataSourceView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/jdbc/JDBCDataSourceView.java
index 9a1976ce6..7466968ac 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/jdbc/JDBCDataSourceView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/jdbc/JDBCDataSourceView.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.modeler.ui.project.editor.datanode.jdbc;
 import com.jgoodies.forms.builder.PanelBuilder;
 import com.jgoodies.forms.layout.CellConstraints;
 import com.jgoodies.forms.layout.FormLayout;
-import org.apache.cayenne.modeler.util.JTextFieldUndoable;
+import org.apache.cayenne.modeler.swing.text.JTextFieldUndoable;
 import org.apache.cayenne.modeler.util.JTextFieldValidator;
 
 import javax.swing.*;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityAttributePanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityAttributePanel.java
index b1fbb9fcc..a2b7faf80 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityAttributePanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityAttributePanel.java
@@ -35,12 +35,12 @@ import org.apache.cayenne.modeler.event.display.DbEntityDisplayListener;
 import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
 import org.apache.cayenne.modeler.event.display.TablePopupHandler;
 import org.apache.cayenne.modeler.pref.TableColumnPreferences;
-import org.apache.cayenne.modeler.util.BoardTableCellRenderer;
+import org.apache.cayenne.modeler.swing.table.BoardTableCellRenderer;
 import org.apache.cayenne.modeler.util.CayenneTable;
 import org.apache.cayenne.modeler.util.PanelFactory;
 import org.apache.cayenne.modeler.util.UIUtil;
-import org.apache.cayenne.modeler.util.combo.AutoCompletion;
-import org.apache.cayenne.swing.components.LimitedTextField;
+import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
+import org.apache.cayenne.modeler.swing.text.LimitedTextField;
 
 import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityAttributeRelationshipTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityAttributeRelationshipTab.java
index aa06f1684..e05e31b0e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityAttributeRelationshipTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityAttributeRelationshipTab.java
@@ -39,7 +39,7 @@ import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
 import org.apache.cayenne.modeler.pref.ComponentGeometry;
 import org.apache.cayenne.modeler.util.CayenneAction;
 import org.apache.cayenne.modeler.util.ModelerUtil;
-import org.apache.cayenne.swing.components.image.FilteredIconFactory;
+import org.apache.cayenne.modeler.swing.image.FilteredIconFactory;
 import org.slf4j.LoggerFactory;
 
 import javax.swing.Icon;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityRelationshipPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityRelationshipPanel.java
index 5a551aefe..d8a47c8b8 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityRelationshipPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityRelationshipPanel.java
@@ -38,13 +38,13 @@ import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
 import org.apache.cayenne.modeler.event.display.RelationshipDisplayEvent;
 import org.apache.cayenne.modeler.event.display.TablePopupHandler;
 import org.apache.cayenne.modeler.pref.TableColumnPreferences;
-import org.apache.cayenne.modeler.util.BoardTableCellRenderer;
+import org.apache.cayenne.modeler.swing.table.BoardTableCellRenderer;
 import org.apache.cayenne.modeler.util.CayenneTable;
 import org.apache.cayenne.modeler.util.CellRenderers;
 import org.apache.cayenne.modeler.util.ModelerUtil;
 import org.apache.cayenne.modeler.util.PanelFactory;
 import org.apache.cayenne.modeler.util.UIUtil;
-import org.apache.cayenne.modeler.util.combo.AutoCompletion;
+import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
 
 import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributeTableModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributeTableModel.java
index a2ab39536..2bad7b4f7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributeTableModel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributeTableModel.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.util.CayenneTable;
 import org.apache.cayenne.modeler.util.CayenneTableModel;
-import org.apache.cayenne.modeler.util.CellEditorForAttributeTable;
+import org.apache.cayenne.modeler.swing.table.CellEditorForAttributeTable;
 import org.apache.cayenne.util.Util;
 
 import java.util.ArrayList;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java
index 8883bf5b3..e4a85f301 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java
@@ -44,7 +44,7 @@ import org.apache.cayenne.modeler.util.CayenneTable;
 import org.apache.cayenne.modeler.util.ModelerUtil;
 import org.apache.cayenne.modeler.util.PanelFactory;
 import org.apache.cayenne.modeler.util.UIUtil;
-import org.apache.cayenne.modeler.util.combo.AutoCompletion;
+import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjAttributeTableModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjAttributeTableModel.java
index ba7e83346..d6d040f94 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjAttributeTableModel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjAttributeTableModel.java
@@ -38,7 +38,7 @@ import org.apache.cayenne.modeler.event.display.AttributeDisplayEvent;
 import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
 import org.apache.cayenne.modeler.util.CayenneTable;
 import org.apache.cayenne.modeler.util.CayenneTableModel;
-import org.apache.cayenne.modeler.util.CellEditorForAttributeTable;
+import org.apache.cayenne.modeler.swing.table.CellEditorForAttributeTable;
 import org.apache.cayenne.modeler.util.ModelerUtil;
 import org.apache.cayenne.modeler.util.ProjectUtil;
 import org.apache.cayenne.project.extension.info.ObjectInfo;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityAttributePanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityAttributePanel.java
index c09a61632..d19eb99a3 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityAttributePanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityAttributePanel.java
@@ -51,7 +51,7 @@ import org.apache.cayenne.modeler.util.ModelerUtil;
 import org.apache.cayenne.modeler.util.PanelFactory;
 import org.apache.cayenne.modeler.util.ProjectUtil;
 import org.apache.cayenne.modeler.util.UIUtil;
-import org.apache.cayenne.modeler.util.combo.AutoCompletion;
+import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
 
 import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityAttributeRelationshipTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityAttributeRelationshipTab.java
index b3d4c8313..4f92e83fb 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityAttributeRelationshipTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityAttributeRelationshipTab.java
@@ -36,7 +36,7 @@ import org.apache.cayenne.modeler.event.display.ObjEntityDisplayListener;
 import org.apache.cayenne.modeler.pref.ComponentGeometry;
 import org.apache.cayenne.modeler.util.CayenneAction;
 import org.apache.cayenne.modeler.util.ModelerUtil;
-import org.apache.cayenne.swing.components.image.FilteredIconFactory;
+import org.apache.cayenne.modeler.swing.image.FilteredIconFactory;
 import org.slf4j.LoggerFactory;
 
 import javax.swing.Icon;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityTab.java
index 357c9f43e..106a7850d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityTab.java
@@ -46,9 +46,9 @@ import org.apache.cayenne.modeler.util.CellRenderers;
 import org.apache.cayenne.modeler.util.Comparators;
 import org.apache.cayenne.modeler.util.ExpressionConvertor;
 import org.apache.cayenne.modeler.util.TextAdapter;
-import org.apache.cayenne.modeler.util.combo.AutoCompletion;
+import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
 import org.apache.cayenne.project.extension.info.ObjectInfo;
-import org.apache.cayenne.swing.components.JCayenneCheckBox;
+import org.apache.cayenne.modeler.swing.JCayenneCheckBox;
 import org.apache.cayenne.util.Util;
 import org.apache.cayenne.validation.ValidationException;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialogView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialogView.java
index 8ba578e02..1a959be5c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialogView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialogView.java
@@ -26,9 +26,9 @@ import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.pref.TableColumnPreferences;
 import org.apache.cayenne.modeler.util.CayenneTable;
 import org.apache.cayenne.modeler.util.ModelerUtil;
-import org.apache.cayenne.modeler.util.MultiColumnBrowser;
+import org.apache.cayenne.modeler.swing.MultiColumnBrowser;
 import org.apache.cayenne.modeler.util.PanelFactory;
-import org.apache.cayenne.modeler.util.combo.AutoCompletion;
+import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
 
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/OverrideEmbeddableAttributeTableModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/OverrideEmbeddableAttributeTableModel.java
index e03250c77..01c83df09 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/OverrideEmbeddableAttributeTableModel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/OverrideEmbeddableAttributeTableModel.java
@@ -28,7 +28,7 @@ import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.util.CayenneTable;
 import org.apache.cayenne.modeler.util.CayenneTableModel;
-import org.apache.cayenne.modeler.util.CellEditorForAttributeTable;
+import org.apache.cayenne.modeler.swing.table.CellEditorForAttributeTable;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoController.java
index 66013da78..4f4769f93 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoController.java
@@ -39,7 +39,7 @@ import org.apache.cayenne.modeler.undo.RelationshipUndoableEdit;
 import org.apache.cayenne.modeler.util.Comparators;
 import org.apache.cayenne.modeler.util.EntityTreeModel;
 import org.apache.cayenne.modeler.util.EntityTreeRelationshipFilter;
-import org.apache.cayenne.modeler.util.MultiColumnBrowser;
+import org.apache.cayenne.modeler.swing.MultiColumnBrowser;
 import org.apache.cayenne.project.extension.info.ObjectInfo;
 import org.apache.cayenne.util.DeleteRuleUpdater;
 import org.apache.cayenne.util.Util;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoView.java
index 1cb1036f2..e47777f90 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoView.java
@@ -23,10 +23,10 @@ import com.jgoodies.forms.layout.CellConstraints;
 import com.jgoodies.forms.layout.FormLayout;
 import org.apache.cayenne.map.DeleteRule;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.util.DefaultWidgetFactory;
-import org.apache.cayenne.modeler.util.MultiColumnBrowser;
+import org.apache.cayenne.modeler.swing.DefaultWidgetFactory;
+import org.apache.cayenne.modeler.swing.MultiColumnBrowser;
 import org.apache.cayenne.modeler.util.PanelFactory;
-import org.apache.cayenne.modeler.util.WidgetFactory;
+import org.apache.cayenne.modeler.swing.WidgetFactory;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipPathBrowser.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipPathBrowser.java
index 791b16c57..3416ffae8 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipPathBrowser.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipPathBrowser.java
@@ -28,7 +28,7 @@ import javax.swing.event.ListSelectionListener;
 import javax.swing.tree.TreePath;
 
 import org.apache.cayenne.map.DbRelationship;
-import org.apache.cayenne.modeler.util.MultiColumnBrowser;
+import org.apache.cayenne.modeler.swing.MultiColumnBrowser;
 
 /**
  * Multi-column browser for obj relationships
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java
index c7b229391..71d82fdeb 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java
@@ -42,14 +42,14 @@ import org.apache.cayenne.modeler.event.display.ProcedureParameterDisplayEvent;
 import org.apache.cayenne.modeler.event.display.TablePopupHandler;
 import org.apache.cayenne.modeler.pref.TableColumnPreferences;
 import org.apache.cayenne.modeler.util.CayenneAction;
-import org.apache.cayenne.modeler.util.CayenneCellEditor;
+import org.apache.cayenne.modeler.swing.table.CayenneCellEditor;
 import org.apache.cayenne.modeler.util.CayenneTable;
 import org.apache.cayenne.modeler.util.ModelerUtil;
 import org.apache.cayenne.modeler.util.PanelFactory;
 import org.apache.cayenne.modeler.util.UIUtil;
-import org.apache.cayenne.modeler.util.combo.AutoCompletion;
-import org.apache.cayenne.swing.components.LimitedTextField;
-import org.apache.cayenne.swing.components.image.FilteredIconFactory;
+import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
+import org.apache.cayenne.modeler.swing.text.LimitedTextField;
+import org.apache.cayenne.modeler.swing.image.FilteredIconFactory;
 
 import javax.swing.Icon;
 import javax.swing.JButton;
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 26505bd4e..a9ed159f2 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
@@ -33,7 +33,7 @@ import org.apache.cayenne.map.MappingNamespace;
 import org.apache.cayenne.modeler.event.model.ProcedureEvent;
 import org.apache.cayenne.modeler.util.TextAdapter;
 import org.apache.cayenne.project.extension.info.ObjectInfo;
-import org.apache.cayenne.swing.components.JCayenneCheckBox;
+import org.apache.cayenne.modeler.swing.JCayenneCheckBox;
 import org.apache.cayenne.util.Util;
 import org.apache.cayenne.validation.ValidationException;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/BaseQueryMainTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/BaseQueryMainTab.java
index bd9e2b9ca..1dbd6133b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/BaseQueryMainTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/BaseQueryMainTab.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.util.CellRenderers;
 import org.apache.cayenne.modeler.util.TextAdapter;
-import org.apache.cayenne.modeler.util.combo.AutoCompletion;
+import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
 import org.apache.cayenne.util.Util;
 import org.apache.cayenne.validation.ValidationException;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ObjectQueryPropertiesPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ObjectQueryPropertiesPanel.java
index fe13d885b..725140550 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ObjectQueryPropertiesPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ObjectQueryPropertiesPanel.java
@@ -23,7 +23,7 @@ import java.awt.BorderLayout;
 
 import javax.swing.JCheckBox;
 
-import org.apache.cayenne.swing.components.JCayenneCheckBox;
+import org.apache.cayenne.modeler.swing.JCayenneCheckBox;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.map.QueryDescriptor;
 import org.apache.cayenne.query.QueryMetadata;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/RawQueryPropertiesPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/RawQueryPropertiesPanel.java
index 1e2b227c5..6ef0cbed3 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/RawQueryPropertiesPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/RawQueryPropertiesPanel.java
@@ -30,7 +30,7 @@ import javax.swing.JComboBox;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.swing.components.JCayenneCheckBox;
+import org.apache.cayenne.modeler.swing.JCayenneCheckBox;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.util.CellRenderers;
 import org.apache.cayenne.modeler.util.Comparators;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryScriptsTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryScriptsTab.java
index ed55e0a46..c00c1476f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryScriptsTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlQueryScriptsTab.java
@@ -38,7 +38,7 @@ import org.apache.cayenne.project.validation.EJBQLStatementValidator;
 import org.apache.cayenne.project.validation.EJBQLStatementValidator.PositionException;
 import org.apache.cayenne.map.EJBQLQueryDescriptor;
 import org.apache.cayenne.map.QueryDescriptor;
-import org.apache.cayenne.swing.components.textpane.JCayenneTextPane;
+import org.apache.cayenne.modeler.swing.text.JCayenneTextPane;
 import org.apache.cayenne.util.Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlSyntax.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlSyntax.java
index c52ef67e1..58e2fda16 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlSyntax.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/ejbql/EjbqlSyntax.java
@@ -18,7 +18,7 @@
  ****************************************************************/
 package org.apache.cayenne.modeler.ui.project.editor.query.ejbql;
 
-import org.apache.cayenne.swing.components.textpane.syntax.TextSyntax;
+import org.apache.cayenne.modeler.swing.text.syntax.TextSyntax;
 
 class EjbqlSyntax implements TextSyntax {
     private static final String[] KEYWORDS = {"AS", "ABS", "ASC", "AVG", "BETWEEN",
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 ebf37c12d..52ae835b5 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
@@ -39,12 +39,12 @@ import org.apache.cayenne.map.Entity;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.QueryDescriptor;
 import org.apache.cayenne.map.SelectQueryDescriptor;
-import org.apache.cayenne.swing.components.JCayenneCheckBox;
+import org.apache.cayenne.modeler.swing.JCayenneCheckBox;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.util.Comparators;
 import org.apache.cayenne.modeler.util.ExpressionConvertor;
 import org.apache.cayenne.modeler.util.TextAdapter;
-import org.apache.cayenne.modeler.util.ValidatorTextAdapter;
+import org.apache.cayenne.modeler.swing.text.ValidatorTextAdapter;
 import org.apache.cayenne.project.extension.info.ObjectInfo;
 import org.apache.cayenne.util.CayenneMapEntry;
 import org.apache.cayenne.util.Util;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryOrderingTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryOrderingTab.java
index 7356a2306..8e19739a9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryOrderingTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryOrderingTab.java
@@ -28,11 +28,11 @@ import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.util.CayenneAction;
 import org.apache.cayenne.modeler.util.EntityTreeModel;
 import org.apache.cayenne.modeler.util.ModelerUtil;
-import org.apache.cayenne.modeler.util.MultiColumnBrowser;
+import org.apache.cayenne.modeler.swing.MultiColumnBrowser;
 import org.apache.cayenne.modeler.util.UIUtil;
 import org.apache.cayenne.query.Ordering;
 import org.apache.cayenne.query.SortOrder;
-import org.apache.cayenne.swing.components.image.FilteredIconFactory;
+import org.apache.cayenne.modeler.swing.image.FilteredIconFactory;
 import org.apache.cayenne.util.CayenneMapEntry;
 
 import javax.swing.BorderFactory;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryPrefetchTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryPrefetchTab.java
index fc73da4d7..2d669f4f0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryPrefetchTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryPrefetchTab.java
@@ -31,7 +31,7 @@ import org.apache.cayenne.modeler.util.CayenneAction;
 import org.apache.cayenne.modeler.util.EntityTreeFilter;
 import org.apache.cayenne.modeler.util.EntityTreeModel;
 import org.apache.cayenne.modeler.util.ModelerUtil;
-import org.apache.cayenne.swing.components.image.FilteredIconFactory;
+import org.apache.cayenne.modeler.swing.image.FilteredIconFactory;
 
 import javax.swing.BorderFactory;
 import javax.swing.DefaultCellEditor;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLSyntax.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLSyntax.java
index 86d8999c4..594cace3d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLSyntax.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLSyntax.java
@@ -19,7 +19,7 @@
 package org.apache.cayenne.modeler.ui.project.editor.query.sqltemplate;
 
 
-import org.apache.cayenne.swing.components.textpane.syntax.TextSyntax;
+import org.apache.cayenne.modeler.swing.text.syntax.TextSyntax;
 
 class SQLSyntax implements TextSyntax {
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplatePrefetchTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplatePrefetchTab.java
index 98fc5c166..fbf4acde1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplatePrefetchTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplatePrefetchTab.java
@@ -34,9 +34,9 @@ import org.apache.cayenne.modeler.util.CayenneAction;
 import org.apache.cayenne.modeler.util.EntityTreeFilter;
 import org.apache.cayenne.modeler.util.EntityTreeModel;
 import org.apache.cayenne.modeler.util.ModelerUtil;
-import org.apache.cayenne.modeler.util.MultiColumnBrowser;
+import org.apache.cayenne.modeler.swing.MultiColumnBrowser;
 import org.apache.cayenne.modeler.util.UIUtil;
-import org.apache.cayenne.swing.components.image.FilteredIconFactory;
+import org.apache.cayenne.modeler.swing.image.FilteredIconFactory;
 import org.apache.cayenne.util.CayenneMapEntry;
 
 import javax.swing.BorderFactory;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateScriptsTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateScriptsTab.java
index 8512810ac..a3af9906f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateScriptsTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplateScriptsTab.java
@@ -28,7 +28,7 @@ import org.apache.cayenne.map.SQLTemplateDescriptor;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.util.DbAdapterInfo;
 import org.apache.cayenne.modeler.util.JUndoableCayenneTextPane;
-import org.apache.cayenne.swing.components.textpane.JCayenneTextPane;
+import org.apache.cayenne.modeler.swing.text.JCayenneTextPane;
 import org.apache.cayenne.util.Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeView.java
index 1dd98681d..cb9790360 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeView.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.modeler.util.CellRenderers;
 import org.apache.cayenne.project.Project;
 import org.apache.cayenne.reflect.PropertyUtils;
 import org.apache.cayenne.resource.Resource;
-import org.apache.cayenne.swing.components.TopBorder;
+import org.apache.cayenne.modeler.swing.border.TopBorder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
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 4633bccf5..225273cb2 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
@@ -27,7 +27,7 @@ import org.apache.cayenne.modeler.ui.errors.ErrorsController;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.ui.project.ProjectView;
 import org.apache.cayenne.project.Project;
-import org.apache.cayenne.swing.components.image.FilteredIconFactory;
+import org.apache.cayenne.modeler.swing.image.FilteredIconFactory;
 import org.apache.cayenne.util.Util;
 
 import javax.swing.*;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneDialog.java
index 3ed2e5b23..412cbb2b9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneDialog.java
@@ -27,7 +27,6 @@ import javax.swing.*;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
 import java.awt.*;
-import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowEvent;
@@ -57,10 +56,6 @@ public class CayenneDialog extends JDialog implements HyperlinkListener {
         super(owner, title, modal);
     }
 
-    public CayenneDialog(ModelerFrame frame, String title, boolean modal) {
-        super(frame, title, modal);
-    }
-
     /**
      * Makes dialog closeable when ESC button is clicked.
      */
@@ -74,14 +69,12 @@ public class CayenneDialog extends JDialog implements HyperlinkListener {
         //   http://www.eos.dk/pipermail/swing/2001-June/000789.html
 
         KeyStroke escReleased = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0, true);
-        ActionListener closeAction = new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                if (CayenneDialog.this.isVisible()) {
-                    // dispatch window closing event
-                    WindowEvent windowClosing =
-                        new WindowEvent(CayenneDialog.this, WindowEvent.WINDOW_CLOSING);
-                    CayenneDialog.super.processWindowEvent(windowClosing);
-                }
+        ActionListener closeAction = e -> {
+            if (CayenneDialog.this.isVisible()) {
+                // dispatch window closing event
+                WindowEvent windowClosing =
+                    new WindowEvent(CayenneDialog.this, WindowEvent.WINDOW_CLOSING);
+                CayenneDialog.super.processWindowEvent(windowClosing);
             }
         };
         getRootPane().registerKeyboardAction(
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
index f72fc9e48..b8bb63c6b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
@@ -21,6 +21,7 @@ package org.apache.cayenne.modeler.util;
 
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.pref.TableColumnPreferences;
+import org.apache.cayenne.modeler.swing.table.SortButtonRenderer;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -41,14 +42,15 @@ import java.util.EventObject;
  */
 public class CayenneTable extends JTable {
 
-    private SortButtonRenderer renderer = new SortButtonRenderer();
+    private final SortButtonRenderer renderer;
     protected TableHeaderListener tableHeaderListener;
     private boolean isColumnWidthChanged;
 
     public CayenneTable() {
-        super();
-        this.setRowHeight(25);
-        this.setRowMargin(3);
+        setRowHeight(25);
+        setRowMargin(3);
+
+        renderer = new SortButtonRenderer();
         JTableHeader header = getTableHeader();
         tableHeaderListener = new TableHeaderListener(header, renderer);
         header.addMouseListener(tableHeaderListener);
@@ -73,7 +75,7 @@ public class CayenneTable extends JTable {
         super.createDefaultEditors();
 
         JTextField textField = new JTextField(20);
-        final DefaultCellEditor textEditor = Application.getWidgetFactory().createCellEditor(textField);
+        DefaultCellEditor textEditor = Application.getWidgetFactory().createCellEditor(textField);
         textEditor.setClickCountToStart(1);
 
         setDefaultEditor(Object.class, textEditor);
@@ -85,7 +87,7 @@ public class CayenneTable extends JTable {
      */
     public CayenneTableModel getCayenneModel() {
         TableModel model = getModel();
-        if(model instanceof CayenneTableModel) {
+        if (model instanceof CayenneTableModel) {
             return (CayenneTableModel) model;
         }
         return null;
@@ -244,7 +246,7 @@ public class CayenneTable extends JTable {
     public void setSortPreferenceSaver(TableColumnPreferences tableColumnPreferences) {
         tableHeaderListener.setPreferences(tableColumnPreferences);
     }
-    
+
     public boolean getColumnWidthChanged() {
         return isColumnWidthChanged;
     }
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/JUndoableCayenneTextPane.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/JUndoableCayenneTextPane.java
index 80d0a1e52..7cfb2db3c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/JUndoableCayenneTextPane.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/JUndoableCayenneTextPane.java
@@ -21,8 +21,8 @@ package org.apache.cayenne.modeler.util;
 import javax.swing.event.UndoableEditListener;
 
 import org.apache.cayenne.modeler.undo.JTextFieldUndoListener;
-import org.apache.cayenne.swing.components.textpane.JCayenneTextPane;
-import org.apache.cayenne.swing.components.textpane.syntax.TextSyntax;
+import org.apache.cayenne.modeler.swing.text.JCayenneTextPane;
+import org.apache.cayenne.modeler.swing.text.syntax.TextSyntax;
 
 public class JUndoableCayenneTextPane extends JCayenneTextPane {
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/LongRunningTask.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/LongRunningTask.java
index df17dc46a..5d18b040d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/LongRunningTask.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/LongRunningTask.java
@@ -22,6 +22,7 @@ package org.apache.cayenne.modeler.util;
 import javax.swing.*;
 
 import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.modeler.swing.ProgressDialog;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PathChooserComboBoxCellEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PathChooserComboBoxCellEditor.java
index 90b20df4e..aa39b5c9e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PathChooserComboBoxCellEditor.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PathChooserComboBoxCellEditor.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.modeler.util;
 
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.util.combo.AutoCompletion;
+import org.apache.cayenne.modeler.swing.combo.AutoCompletion;
 import org.apache.cayenne.util.Util;
 
 import javax.swing.AbstractCellEditor;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/TableHeaderListener.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/TableHeaderListener.java
index d932a1763..0bec364b7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/TableHeaderListener.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/TableHeaderListener.java
@@ -19,6 +19,7 @@
 package org.apache.cayenne.modeler.util;
 
 import org.apache.cayenne.modeler.pref.TableColumnPreferences;
+import org.apache.cayenne.modeler.swing.table.SortButtonRenderer;
 
 import javax.swing.JTable;
 import javax.swing.table.JTableHeader;


(cayenne) 04/04: CAY-2923 Modeler: Restore table cell editor borders

Posted by 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 b2d2e4d456b9de113fcb5d0a4479d892ab98e44d
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sat Apr 25 09:01:02 2026 -0400

    CAY-2923 Modeler: Restore table cell editor borders
---
 RELEASE-NOTES.txt                                           |  1 +
 .../org/apache/cayenne/modeler/swing/WidgetFactory.java     | 11 ++---------
 .../cayenne/modeler/swing/combo/ComboBoxCellEditor.java     | 12 +++---------
 .../cayenne/modeler/swing/table/CayenneCellEditor.java      | 13 +++----------
 4 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 4f54f70e2..818804e1a 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -26,6 +26,7 @@ CAY-2917 Add Qualifier Joins Before Depenent Table Joins
 CAY-2918 Remove OGNL Binding Architecture from CayenneModeler
 CAY-2920 Remove "Reengineer Database Schema" menu
 CAY-2922 Modeler: remove support for upgrading from file-based preferences
+CAY-2923 Modeler: Restore table cell editor borders
 
 Bug Fixes:
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/WidgetFactory.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/WidgetFactory.java
index 950c32824..84e03827a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/WidgetFactory.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/WidgetFactory.java
@@ -24,14 +24,9 @@ import org.apache.cayenne.modeler.swing.combo.ComboBoxCellEditor;
 import org.apache.cayenne.modeler.swing.table.CayenneCellEditor;
 import org.apache.cayenne.modeler.undo.JComboBoxUndoListener;
 
-import javax.swing.BorderFactory;
-import javax.swing.DefaultCellEditor;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JComboBox;
-import javax.swing.JTextField;
-import javax.swing.UIManager;
+import javax.swing.*;
 import javax.swing.table.TableCellEditor;
-import java.awt.Color;
+import java.awt.*;
 import java.util.Arrays;
 import java.util.Collection;
 
@@ -95,7 +90,6 @@ public final class WidgetFactory {
      * Creates cell editor for text field
      */
     public static DefaultCellEditor createCellEditor(JTextField textField) {
-        textField.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
         return new CayenneCellEditor(textField);
     }
 
@@ -106,7 +100,6 @@ public final class WidgetFactory {
      * @param combo JComboBox to be used as editor component
      */
     public static TableCellEditor createCellEditor(JComboBox<?> combo) {
-        combo.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
         if (Boolean.TRUE.equals(combo.getClientProperty(AutoCompletion.AUTOCOMPLETION_PROPERTY))) {
             return new ComboBoxCellEditor(combo);
         }
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/combo/ComboBoxCellEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/combo/ComboBoxCellEditor.java
index bdb2535c8..c38414823 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/combo/ComboBoxCellEditor.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/combo/ComboBoxCellEditor.java
@@ -19,18 +19,15 @@
 
 package org.apache.cayenne.modeler.swing.combo;
 
-import java.awt.Component;
+import javax.swing.*;
+import javax.swing.table.TableCellEditor;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
 import java.io.Serializable;
 import java.util.EventObject;
 
-import javax.swing.AbstractCellEditor;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.table.TableCellEditor;
-
 /**
  * ComboBoxCellEditor class is a workaround of collision between DefaultCellEditor and 
  * AutoCompletion behavior. Using DefaultCellEditor will cause combo popup to close
@@ -56,9 +53,6 @@ public class ComboBoxCellEditor extends AbstractCellEditor
         //  LATER: this turned out to be the wrong fix, so I commented 
         //  out the code in focusLost to fix CAY-1719 and fixed CAY-1104 differently.
         // this.comboBox.getEditor().getEditorComponent().addFocusListener(this);
-
-        // remove the editor's border - the cell itself already has one
-        ((JComponent) comboBox.getEditor().getEditorComponent()).setBorder(null);
     }
     
     // Implementing ActionListener
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/CayenneCellEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/CayenneCellEditor.java
index 020dffc06..b692d5b8c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/CayenneCellEditor.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/swing/table/CayenneCellEditor.java
@@ -18,28 +18,21 @@
  ****************************************************************/
 package org.apache.cayenne.modeler.swing.table;
 
+import javax.swing.*;
 import java.awt.event.MouseEvent;
 import java.util.EventObject;
 
-import javax.swing.DefaultCellEditor;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JTextField;
-
 /**
  * Overrides CellEditor to allow multiple selection in table
  * without bothering the editor.
  * 
  */
 public class CayenneCellEditor extends DefaultCellEditor {
+
     public CayenneCellEditor(final JTextField textField) {
         super(textField);
     }
-    
-    public CayenneCellEditor(final JCheckBox checkBox) {
-        super(checkBox);
-    }
-    
+
     public CayenneCellEditor(final JComboBox comboBox) {
         super(comboBox);
     }