[cayenne] 01/02: CAY-2785 Modeler: improve folder selection for cgen - refactor output-dir related methods 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 6ebf49b43eeff411d8862aae46a360c224d63ccf
Author: Nikita Timofeev <stari...@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));