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 2022/09/02 13:27:53 UTC
[cayenne] branch master updated: CAY-2756 fix unsaved preferences on cgen page
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 6eda40e83 CAY-2756 fix unsaved preferences on cgen page
new a08d54c9c Merge pull request #518 from Ivan-nikitko/CAY-2756_simplify_cgen_UI
6eda40e83 is described below
commit 6eda40e83b85e7f9ef21681a5e70b2e1a50b286a
Author: Ivan-nikitko <70...@users.noreply.github.com>
AuthorDate: Fri Sep 2 10:45:44 2022 +0200
CAY-2756 fix unsaved preferences on cgen page
---
.../cayenne/modeler/editor/cgen/StandardModeController.java | 10 ++++++++--
.../apache/cayenne/modeler/editor/cgen/StandardModePanel.java | 3 +++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/StandardModeController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/StandardModeController.java
index 86ee80fd6..0e2a298d0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/StandardModeController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/StandardModeController.java
@@ -179,6 +179,8 @@ public class StandardModeController extends GeneratorController {
}
+
+
private void updateComboBoxes() {
Path rootPath = cgenConfiguration.getRootPath();
@@ -230,7 +232,6 @@ public class StandardModeController extends GeneratorController {
}
view.getDataMapTemplate().setItem(dataMapTemplateName);
view.getDataMapSuperTemplate().setItem(dataMapSuperTemplateName);
-
view.setDisableSuperComboBoxes(view.getPairs().isSelected());
}
@@ -239,7 +240,12 @@ public class StandardModeController extends GeneratorController {
super.initForm(cgenConfiguration);
updateTemplates();
view.getOutputPattern().setText(cgenConfiguration.getOutputPattern());
+ view.getPairs().setSelected(cgenConfiguration.isMakePairs());
+ view.getUsePackagePath().setSelected(cgenConfiguration.isUsePkgPath());
+ view.getOverwrite().setSelected(cgenConfiguration.isOverwrite());
+ view.getCreatePropertyNames().setSelected(cgenConfiguration.isCreatePropertyNames());
+ view.getPkProperties().setSelected(cgenConfiguration.isCreatePKProperties());
+ view.getSuperPkg().setText(cgenConfiguration.getSuperPkg());
updateComboBoxes();
}
-
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/StandardModePanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/StandardModePanel.java
index e40ec3f8c..37d35be92 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/StandardModePanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/StandardModePanel.java
@@ -246,4 +246,7 @@ public class StandardModePanel extends GeneratorControllerPanel {
return dataMapSuperTemplate;
}
+ public TextAdapter getSuperPkg() {
+ return superPkg;
+ }
}
\ No newline at end of file