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/12/07 15:13:54 UTC
[cayenne] branch master updated (f5f910e5e -> 8255d5405)
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 f5f910e5e CAY-2785 Modeler: improve folder selection for cgen - refactor output-dir related methods in cgen
new 6ebf49b43 CAY-2785 Modeler: improve folder selection for cgen - refactor output-dir related methods in cgen
new 8255d5405 minor refactoring in cgen
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:
.../org/apache/cayenne/gen/CgenConfiguration.java | 4 ++--
.../modeler/editor/cgen/CodeGeneratorController.java | 19 +++++++------------
.../modeler/editor/cgen/domain/CgenTabController.java | 3 +--
3 files changed, 10 insertions(+), 16 deletions(-)
[cayenne] 02/02: minor refactoring in cgen
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 8255d54054627ff48157ae6a0fc7e2ad30197f76
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Wed Dec 7 18:13:45 2022 +0300
minor refactoring in cgen
---
.../main/java/org/apache/cayenne/gen/CgenConfiguration.java | 4 ++--
.../cayenne/modeler/editor/cgen/CodeGeneratorController.java | 10 +++++-----
2 files changed, 7 insertions(+), 7 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 2b735713d..a0bbd5214 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
@@ -396,8 +396,8 @@ public class CgenConfiguration implements Serializable, XMLSerializable {
}
}
- public void loadEmbeddable(String name) {
- embeddableArtifacts.add(name);
+ public void loadEmbeddable(Embeddable embeddable) {
+ embeddableArtifacts.add(embeddable.getClassName());
}
public void loadEntities(String entities) {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java
index d724c01cc..904d8585d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java
@@ -304,7 +304,7 @@ public class CodeGeneratorController extends CayenneController implements ObjEnt
configuration.setDataMap(map);
map.getObjEntities().forEach(configuration::loadEntity);
- map.getEmbeddables().forEach(embeddable -> configuration.loadEmbeddable(embeddable.getClassName()));
+ map.getEmbeddables().forEach(configuration::loadEmbeddable);
if (map.getLocation() != null) {
Path basePath = Paths.get(ModelerUtil.initOutputFolder());
configuration.updateOutputPath(basePath);
@@ -391,7 +391,7 @@ public class CodeGeneratorController extends CayenneController implements ObjEnt
if (cgenConfiguration != null) {
cgenConfiguration.getEmbeddables().clear();
for (Embeddable embeddable : selectionModel.getSelectedEmbeddables(classes)) {
- cgenConfiguration.loadEmbeddable(embeddable.getClassName());
+ cgenConfiguration.loadEmbeddable(embeddable);
}
}
checkCgenConfigDirty();
@@ -477,10 +477,10 @@ public class CodeGeneratorController extends CayenneController implements ObjEnt
@Override
public void embeddableAdded(EmbeddableEvent e, DataMap map) {
prepareClasses(map);
- String embeddableClassName = e.getEmbeddable().getClassName();
- selectionModel.addSelectedEmbeddable(embeddableClassName);
+ Embeddable embeddable = e.getEmbeddable();
+ selectionModel.addSelectedEmbeddable(embeddable.getClassName());
if (cgenConfiguration != null) {
- cgenConfiguration.loadEmbeddable(embeddableClassName);
+ cgenConfiguration.loadEmbeddable(embeddable);
}
checkCgenConfigDirty();
}
[cayenne] 01/02: CAY-2785 Modeler: improve folder selection for cgen - refactor output-dir related methods in cgen
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 6ebf49b43eeff411d8862aae46a360c224d63ccf
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Wed Dec 7 18:09:26 2022 +0300
CAY-2785 Modeler: improve folder selection for cgen
- refactor output-dir related methods in cgen
---
.../cayenne/modeler/editor/cgen/CodeGeneratorController.java | 9 ++-------
.../cayenne/modeler/editor/cgen/domain/CgenTabController.java | 3 +--
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java
index ae4e32e10..d724c01cc 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java
@@ -287,10 +287,6 @@ public class CodeGeneratorController extends CayenneController implements ObjEnt
}
cgenConfiguration = createDefaultCgenConfiguration(dataMap);
- if (cgenConfiguration == null) {
- return;
- }
-
addToSelectedEntities(dataMap.getObjEntities()
.stream()
.map(Entity::getName)
@@ -309,10 +305,9 @@ public class CodeGeneratorController extends CayenneController implements ObjEnt
map.getObjEntities().forEach(configuration::loadEntity);
map.getEmbeddables().forEach(embeddable -> configuration.loadEmbeddable(embeddable.getClassName()));
-
- Path basePath = Paths.get(ModelerUtil.initOutputFolder());
if (map.getLocation() != null) {
- configuration.setRootPath(basePath);
+ Path basePath = Paths.get(ModelerUtil.initOutputFolder());
+ configuration.updateOutputPath(basePath);
}
Preferences preferences = application.getPreferencesNode(GeneralPreferences.class, "");
if (preferences != null) {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java
index fd542b7bc..762cdc758 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java
@@ -89,8 +89,7 @@ public class CgenTabController extends GeneratorsTabController<CgenConfiguration
public CgenConfiguration createConfiguration(DataMap dataMap) {
CgenConfiguration cgenConfiguration = new CgenConfiguration();
cgenConfiguration.setDataMap(dataMap);
- Path basePath = Paths.get(ModelerUtil.initOutputFolder());
- cgenConfiguration.setRootPath(basePath);
+ cgenConfiguration.updateOutputPath(Paths.get(ModelerUtil.initOutputFolder()));
Preferences preferences = Application.getInstance().getPreferencesNode(GeneralPreferences.class, "");
if (preferences != null) {
cgenConfiguration.setEncoding(preferences.get(GeneralPreferences.ENCODING_PREFERENCE, null));