This is an automated email from the ASF dual-hosted git repository. abulatski pushed a commit to branch STABLE-4.1 in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/STABLE-4.1 by this push: new 3c23509 CAY-2561 Modeler: cgen type combobox doesn't set templates. 3c23509 is described below commit 3c235096382a95acac8ed43f08a5571a4b5a6730 Author: Arseni Bulatski <ancars...@gmail.com> AuthorDate: Tue Apr 9 10:01:17 2019 +0300 CAY-2561 Modeler: cgen type combobox doesn't set templates. --- RELEASE-NOTES.txt | 1 + .../modeler/editor/cgen/CustomModeController.java | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 96ea851..815be18 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -14,6 +14,7 @@ Date: Bug Fixes: CAY-2550 Modeler: ObjAttribute inspector modifies wrong columns in attribute table CAY-2559 Modeler: Warning dialog shows wrong information after changing target entity in dbRelationship +CAY-2561 Modeler: cgen type combobox doesn't set templates ---------------------------------- Release: 4.1.B1 diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CustomModeController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CustomModeController.java index e2d8408..f1d807b 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CustomModeController.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CustomModeController.java @@ -19,13 +19,6 @@ package org.apache.cayenne.modeler.editor.cgen; -import org.apache.cayenne.gen.CgenConfiguration; -import org.apache.cayenne.gen.ClassGenerationAction; -import org.apache.cayenne.modeler.CodeTemplateManager; -import org.apache.cayenne.modeler.dialog.cgen.TemplateDialog; -import org.apache.cayenne.modeler.dialog.pref.PreferenceDialog; -import org.apache.cayenne.swing.BindingBuilder; - import javax.swing.DefaultComboBoxModel; import java.awt.Component; import java.nio.file.Paths; @@ -33,6 +26,13 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.apache.cayenne.gen.CgenConfiguration; +import org.apache.cayenne.gen.ClassGenerationAction; +import org.apache.cayenne.modeler.CodeTemplateManager; +import org.apache.cayenne.modeler.dialog.cgen.TemplateDialog; +import org.apache.cayenne.modeler.dialog.pref.PreferenceDialog; +import org.apache.cayenne.swing.BindingBuilder; + /** * @since 4.1 * A controller for the custom generation mode. @@ -184,5 +184,7 @@ public class CustomModeController extends GeneratorController { @Override public void updateConfiguration(CgenConfiguration cgenConfiguration) { cgenConfiguration.setClient(false); + cgenConfiguration.setTemplate(ClassGenerationAction.SUBCLASS_TEMPLATE); + cgenConfiguration.setSuperTemplate(ClassGenerationAction.SUPERCLASS_TEMPLATE); } }