You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2022/11/24 13:55:12 UTC
[cayenne] branch master updated (6ab2d90bc -> f95ed0b29)
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
from 6ab2d90bc Merge pull request #543 from apache/dependabot/maven/org.postgresql-postgresql-42.4.3
add c359e9739 CgenConfigList added
add 7778f494e saving/loading
add c07d6acd7 new GUI
add 9f0bc7c25 changing in controllers for using multiple config
add 61c79de61 Maven/Gradle/Ant plugins modifications
add 0b27fa381 remove CDATA for default templates in datamap.xml
add 6d722aa77 disable Ctrl+Z for initiation loading
add d15ba4335 cleanUp
new a80f94673 CAY-2780 Modeler: Multiple configurations for classes generation
new f95ed0b29 Merge branch 'pr/542' into asf-master
The 2 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:
.../apache/cayenne/tools/CayenneGeneratorTask.java | 82 ++++++-----
.../cayenne/tools/CayenneGeneratorTaskTest.java | 113 +++++++-------
.../org/apache/cayenne/gen/CgenConfigList.java | 66 +++++++++
.../org/apache/cayenne/gen/CgenConfiguration.java | 15 +-
.../java/org/apache/cayenne/gen/CgenTemplate.java | 23 ++-
.../java/org/apache/cayenne/gen/TemplateType.java | 10 +-
.../apache/cayenne/gen/xml/CgenConfigHandler.java | 30 +++-
.../apache/cayenne/gen/xml/CgenSaverDelegate.java | 15 +-
.../java/org/apache/cayenne/tools/CgenTask.java | 62 ++++----
.../org/apache/cayenne/tools/CgenTaskTest.java | 43 +++---
.../org/apache/cayenne/schema/11/cgen.xsd | 1 +
.../apache/cayenne/tools/CayenneGeneratorMojo.java | 83 ++++++-----
.../cayenne/tools/CayenneGeneratorMojoTest.java | 70 ++++-----
.../generic/GenericPlatformInitializer.java | 1 +
.../modeler/osx/OSXPlatformInitializer.java | 3 +-
.../modeler/win/WinPlatformInitializer.java | 1 +
.../modeler/editor/cgen/CheckBoxHeader.java | 82 +++++++++++
.../modeler/editor/cgen/ClassesTabController.java | 31 ++--
.../modeler/editor/cgen/ClassesTabPanel.java | 5 +
.../editor/cgen/CodeGeneratorController.java | 164 +++++++++++++++++----
.../modeler/editor/cgen/CodeGeneratorPane.java | 110 +++++++++-----
.../modeler/editor/cgen/SelectionModel.java | 6 +
.../editor/cgen/StandardModeController.java | 1 -
.../modeler/editor/cgen/StandardModePanel.java | 7 +-
.../editor/cgen/domain/CgenTabController.java | 41 +++---
.../cgen/templateeditor/EditorTemplateSaver.java | 12 +-
.../templateeditor/TemplateEditorController.java | 1 +
27 files changed, 728 insertions(+), 350 deletions(-)
create mode 100644 cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfigList.java
create mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CheckBoxHeader.java
[cayenne] 01/02: CAY-2780 Modeler: Multiple configurations for classes generation
Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit a80f946735c00e43203a25d55828a3d885191594
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Thu Nov 24 16:54:07 2022 +0300
CAY-2780 Modeler: Multiple configurations for classes generation
---
.../org/apache/cayenne/gen/CgenConfiguration.java | 5 +++--
.../java/org/apache/cayenne/gen/CgenTemplate.java | 23 ++++++++++++++++++----
2 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java
index 142e77be0..221b1adff 100644
--- a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java
+++ b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java
@@ -92,6 +92,7 @@ public class CgenConfiguration implements Serializable, XMLSerializable {
private String externalToolConfig;
public CgenConfiguration() {
+ this.name = CgenConfigList.DEFAULT_CONFIG_NAME;
/*
* {@link #isDefault()} method should be in sync with the following values
*/
@@ -451,8 +452,8 @@ public class CgenConfiguration implements Serializable, XMLSerializable {
&& !createPKProperties
&& !createPropertyNames
&& "*.java".equals(outputPattern)
- && template.equals(TemplateType.ENTITY_SUBCLASS.pathFromSourceRoot())
- && superTemplate.equals(TemplateType.ENTITY_SUPERCLASS.pathFromSourceRoot())
+ && template.equals(TemplateType.ENTITY_SUBCLASS.defaultTemplate())
+ && superTemplate.equals(TemplateType.ENTITY_SUPERCLASS.defaultTemplate())
&& (superPkg == null || superPkg.isEmpty())
&& (externalToolConfig == null || externalToolConfig.isEmpty());
}
diff --git a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenTemplate.java b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenTemplate.java
index 2100693cf..18e037968 100644
--- a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenTemplate.java
+++ b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenTemplate.java
@@ -19,18 +19,20 @@
package org.apache.cayenne.gen;
+import java.util.Objects;
+
/**
* @since 5.0
*/
public class CgenTemplate {
private final String data;
private final boolean isFile;
- private TemplateType type;
+ private final TemplateType type;
- public CgenTemplate(String data, Boolean isFile, TemplateType type) {
- this.data = data;
+ public CgenTemplate(String data, boolean isFile, TemplateType type) {
+ this.data = Objects.requireNonNull(data);
this.isFile = isFile;
- this.type = type;
+ this.type = Objects.requireNonNull(type);
}
public String getData() {
@@ -52,4 +54,17 @@ public class CgenTemplate {
public TemplateType getType() {
return type;
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ CgenTemplate that = (CgenTemplate) o;
+ return isFile == that.isFile && type == that.type && data.equals(that.data);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(data, isFile, type);
+ }
}
[cayenne] 02/02: Merge branch 'pr/542' into asf-master
Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit f95ed0b294a48f2c2415b8179be8e8c310258246
Merge: 6ab2d90bc a80f94673
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Thu Nov 24 16:54:47 2022 +0300
Merge branch 'pr/542' into asf-master
.../apache/cayenne/tools/CayenneGeneratorTask.java | 82 ++++++-----
.../cayenne/tools/CayenneGeneratorTaskTest.java | 113 +++++++-------
.../org/apache/cayenne/gen/CgenConfigList.java | 66 +++++++++
.../org/apache/cayenne/gen/CgenConfiguration.java | 15 +-
.../java/org/apache/cayenne/gen/CgenTemplate.java | 23 ++-
.../java/org/apache/cayenne/gen/TemplateType.java | 10 +-
.../apache/cayenne/gen/xml/CgenConfigHandler.java | 30 +++-
.../apache/cayenne/gen/xml/CgenSaverDelegate.java | 15 +-
.../java/org/apache/cayenne/tools/CgenTask.java | 62 ++++----
.../org/apache/cayenne/tools/CgenTaskTest.java | 43 +++---
.../org/apache/cayenne/schema/11/cgen.xsd | 1 +
.../apache/cayenne/tools/CayenneGeneratorMojo.java | 83 ++++++-----
.../cayenne/tools/CayenneGeneratorMojoTest.java | 70 ++++-----
.../generic/GenericPlatformInitializer.java | 1 +
.../modeler/osx/OSXPlatformInitializer.java | 3 +-
.../modeler/win/WinPlatformInitializer.java | 1 +
.../modeler/editor/cgen/CheckBoxHeader.java | 82 +++++++++++
.../modeler/editor/cgen/ClassesTabController.java | 31 ++--
.../modeler/editor/cgen/ClassesTabPanel.java | 5 +
.../editor/cgen/CodeGeneratorController.java | 164 +++++++++++++++++----
.../modeler/editor/cgen/CodeGeneratorPane.java | 110 +++++++++-----
.../modeler/editor/cgen/SelectionModel.java | 6 +
.../editor/cgen/StandardModeController.java | 1 -
.../modeler/editor/cgen/StandardModePanel.java | 7 +-
.../editor/cgen/domain/CgenTabController.java | 41 +++---
.../cgen/templateeditor/EditorTemplateSaver.java | 12 +-
.../templateeditor/TemplateEditorController.java | 1 +
27 files changed, 728 insertions(+), 350 deletions(-)