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

stariy95 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit 435d8bec91a888072f03b517cfd7569a01805298
Merge: a4dd27097 99541e5c6
Author: Nikita Timofeev <[email protected]>
AuthorDate: Thu Aug 20 14:42:11 2026 +0300

    Merge pull request #646 from m-dzianishchyts/flatlaf
    
    CAY-2941 Replace jgoodies-looks with FlatLaf

 .../main/resources/META-INF/cayenne/LICENSE.txt.vm | 205 +++++++++++++++++++++
 .../main/resources/META-INF/cayenne/NOTICE.txt.vm  |   3 +
 modeler/cayenne-modeler/pom.xml                    |   4 +-
 .../main/java/org/apache/cayenne/modeler/Main.java |   8 +-
 .../modeler/platform/FlatLafLayoutStyle.java       | 132 +++++++++++++
 ...IInitializer.java => GenericUIInitializer.java} |  74 ++++----
 .../modeler/platform/generic/GenericButtonUI.java  | 113 ------------
 .../platform/generic/GenericUIInitializer.java     |  98 ----------
 .../cayenne/modeler/platform/mac/MacPanelUI.java   |   8 +-
 .../platform/mac/MacToolBarSeparatorUI.java        |  61 ------
 .../modeler/platform/mac/MacUIInitializer.java     |  36 +---
 .../modeler/platform/win/WinCustomTextFieldUI.java |  61 ------
 .../apache/cayenne/modeler/project/CgenOps.java    |  14 ++
 .../apache/cayenne/modeler/toolkit/AppAction.java  |   2 +-
 .../modeler/toolkit/buttons/CMButtonPanel.java     |  12 +-
 .../cayenne/modeler/toolkit/tree/CheckBoxTree.java |   4 +
 .../org/apache/cayenne/modeler/ui/MainToolBar.java |   1 +
 .../org/apache/cayenne/modeler/ui/SearchPanel.java |  34 ++--
 .../modeler/ui/datasource/DataSourceDialog.java    |  10 +-
 .../ui/dbactionoptions/DbActionOptionsDialog.java  |   2 +-
 .../modeler/ui/dbgen/DBGeneratorOptionsDialog.java |   2 +-
 .../modeler/ui/dbgen/TableSelectorPanel.java       |   2 +-
 .../modeler/ui/dbmerge/MergerOptionsDialog.java    |   2 +-
 .../modeler/ui/dbmerge/MergerTokenSelector.java    |   2 +-
 .../ui/dbrelationship/DbRelationshipDialog.java    |   6 +-
 .../modeler/ui/entitysync/EntitySyncDialog.java    |   2 +-
 .../preferences/classpath/ClasspathPrefsPanel.java |   4 +-
 .../classpath/maven/MavenDependencyDialog.java     |   4 +-
 .../preferences/dbconnector/DBConnectorEditor.java |   2 +-
 .../dbconnector/DBConnectorPrefsPanel.java         |   4 +-
 .../creator/DBConnectorCreatorDialog.java          |   2 +-
 .../duplicator/DBConnectorDuplicatorDialog.java    |   2 +-
 .../ui/preferences/general/GeneralPrefsPanel.java  |   4 +-
 .../ui/preferences/more/MorePrefsPanel.java        |   2 +-
 .../datadomain/DataDomainGeneratorsPanel.java      |   2 +-
 .../editor/datadomain/DataDomainGeneratorsTab.java |   4 +-
 .../editor/datadomain/main/DataDomainMainView.java |   4 +-
 .../editor/datamap/cgen/CgenConfigPanel.java       |   4 +-
 .../ui/project/editor/datamap/cgen/CgenPanel.java  |  74 +-------
 .../datamap/cgen/action/AddCgenConfigAction.java   |  72 ++++++++
 .../datamap/cgen/action/EditCgenConfigAction.java  |  71 +++++++
 .../cgen/action/RemoveCgenConfigAction.java        |  69 +++++++
 .../cgen/templateeditor/TemplateEditor.java        |   2 +-
 .../templateeditor/TemplateEditorFindDialog.java   |   4 +-
 .../editor/datamap/dbimport/DbImportView.java      |   3 +
 .../dbimport/ReverseEngineeringConfigPanel.java    |   2 +-
 .../dbimport/progress/DbImportProgressDialog.java  |   2 +-
 .../datamap/defaults/DefaultsUpdateDialog.java     |   2 +-
 .../editor/datamap/main/DataMapMainView.java       |   2 +-
 .../datamap/main/locking/LockingUpdateDialog.java  |   2 +-
 .../editor/dbentity/main/DbEntityMainView.java     |   2 +-
 .../main/PKCustomSequenceGeneratorPanel.java       |   2 +-
 .../editor/dbentity/main/PKDBGeneratorPanel.java   |   2 +-
 .../editor/embeddable/main/EmbeddableMainView.java |   2 +-
 .../objentity/attrinfo/ObjAttributeInfoDialog.java |   6 +-
 .../duplicates/DuplicatedAttributesDialog.java     |   2 +-
 .../editor/objentity/main/ObjEntityMainView.java   |   3 +-
 .../relinfo/ObjRelationshipInfoDialog.java         |   4 +-
 .../editor/procedure/ProcedureQueryView.java       |   6 +-
 .../ui/project/editor/procedure/ProcedureTab.java  |   2 +-
 .../editor/query/ObjectQueryPropertiesPanel.java   |   4 +-
 .../editor/query/RawQueryPropertiesPanel.java      |   6 +-
 .../editor/query/ejbql/EjbqlQueryMainTab.java      |   4 +-
 .../query/ejbql/EjbqlQueryPropertiesPanel.java     |   6 +-
 .../query/selectquery/SelectQueryMainTab.java      |   4 +-
 .../query/sqltemplate/SQLTemplateMainTab.java      |   6 +-
 .../query/sqltemplate/SQLTemplateScriptsTab.java   |   4 +-
 .../project/validator/ProjectValidatorDialog.java  |  22 +--
 .../modeler/ui/validation/ValidationDialog.java    |   2 +-
 pom.xml                                            |   6 +-
 70 files changed, 735 insertions(+), 601 deletions(-)

Reply via email to