[cayenne] 02/02: minor refactoring in cgen

[ntimofeev]

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 <stari...@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();
     }