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 2020/01/27 14:34:12 UTC
[cayenne] branch master updated: CAY-2646 Wrong target path
selection logic in cgen config
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
The following commit(s) were added to refs/heads/master by this push:
new 45c922b CAY-2646 Wrong target path selection logic in cgen config
45c922b is described below
commit 45c922bc03154767d083d542292d592562d3f5b0
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Mon Jan 27 17:34:05 2020 +0300
CAY-2646 Wrong target path selection logic in cgen config
---
RELEASE-NOTES.txt | 1 +
.../src/main/java/org/apache/cayenne/gen/xml/CgenSaverDelegate.java | 1 +
.../src/main/java/org/apache/cayenne/modeler/action/SaveAsAction.java | 1 +
3 files changed, 3 insertions(+)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 60e568f..c731172 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -107,6 +107,7 @@ CAY-2632 Modeler: issue saving cgen path for maven project
CAY-2633 Modeler: attribute sorting logic in cgen can corrupt model
CAY-2634 Minor inconsistencies in Modeler "DB Import"
CAY-2635 Lambda expressions break ROP serialization
+CAY-2646 Wrong target path selection logic in cgen config
----------------------------------
Release: 4.1.B1
diff --git a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/xml/CgenSaverDelegate.java b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/xml/CgenSaverDelegate.java
index 5467617..ea94c72 100644
--- a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/xml/CgenSaverDelegate.java
+++ b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/xml/CgenSaverDelegate.java
@@ -84,5 +84,6 @@ public class CgenSaverDelegate extends BaseSaverDelegate {
cgenConfiguration.setSuperTemplate(resourcePath.relativize(superTemplatePath).normalize().toString());
}
}
+ cgenConfiguration.setRootPath(resourcePath);
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SaveAsAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SaveAsAction.java
index 27089a5..07778ff 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SaveAsAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SaveAsAction.java
@@ -129,6 +129,7 @@ public class SaveAsAction extends CayenneAction {
RenamedPreferences.copyPreferences(newPref, tempOldPref, false);
tempOldPref.removeNode();
+ Application.getInstance().getFrameController().getLastDirectory().setDirectory(projectDir);
}
}
}