Generation all selection fix
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/d20a03f8 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/d20a03f8 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/d20a03f8 Branch: refs/heads/master Commit: d20a03f88c3b0f40d12644ae2a66d9a93aadb63e Parents: 51803e4 Author: Arseni Bulatski <ancars...@gmail.com> Authored: Wed Nov 14 17:09:44 2018 +0300 Committer: Arseni Bulatski <ancars...@gmail.com> Committed: Wed Nov 14 17:09:44 2018 +0300 ---------------------------------------------------------------------- .../apache/cayenne/modeler/editor/cgen/CustomModeController.java | 4 ---- .../apache/cayenne/modeler/editor/cgen/GeneratorController.java | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/d20a03f8/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CustomModeController.java ---------------------------------------------------------------------- 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 07f7828..e2d8408 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 @@ -177,10 +177,6 @@ public class CustomModeController extends GeneratorController { view.getOverwrite().setSelected(cgenConfiguration.isOverwrite()); view.getCreatePropertyNames().setSelected(cgenConfiguration.isCreatePropertyNames()); view.getPkProperties().setSelected(cgenConfiguration.isCreatePKProperties()); - if(cgenConfiguration.getArtifactsGenerationMode().equalsIgnoreCase("all")) { - ((CodeGeneratorControllerBase) parent).setCurrentClass(cgenConfiguration.getDataMap()); - ((CodeGeneratorControllerBase) parent).setSelected(true); - } updateComboBoxes(); getParentController().setInitFromModel(false); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/d20a03f8/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/GeneratorController.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/GeneratorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/GeneratorController.java index 1b49a46..58bc85e 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/GeneratorController.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/GeneratorController.java @@ -74,6 +74,10 @@ public abstract class GeneratorController extends CayenneController { protected void initForm(CgenConfiguration cgenConfiguration) { this.cgenConfiguration = cgenConfiguration; ((GeneratorControllerPanel)getView()).getOutputFolder().setText(cgenConfiguration.buildPath().toString()); + if(cgenConfiguration.getArtifactsGenerationMode().equalsIgnoreCase("all")) { + ((CodeGeneratorControllerBase) parent).setCurrentClass(cgenConfiguration.getDataMap()); + ((CodeGeneratorControllerBase) parent).setSelected(true); + } } public abstract void updateConfiguration(CgenConfiguration cgenConfiguration);
