You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2016/11/11 18:17:11 UTC

[1/2] cayenne git commit: Overwrite checkbox not active when make pair is selected as it has no effect in this case

Repository: cayenne
Updated Branches:
  refs/heads/master 740a6e1aa -> 1e25df75d


Overwrite checkbox not active when make pair is selected as it has no effect in this case


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/9102ddb4
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/9102ddb4
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/9102ddb4

Branch: refs/heads/master
Commit: 9102ddb46a6fe321b5334cdd0814332885b118b4
Parents: 2dc30c8
Author: Nikita Timofeev <st...@gmail.com>
Authored: Fri Nov 4 16:18:57 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Fri Nov 4 16:18:57 2016 +0300

----------------------------------------------------------------------
 .../org/apache/cayenne/modeler/dialog/codegen/CustomModePanel.java  | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/9102ddb4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/CustomModePanel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/CustomModePanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/CustomModePanel.java
index 8998e09..dcf8767 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/CustomModePanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/CustomModePanel.java
@@ -64,6 +64,7 @@ public class CustomModePanel extends GeneratorControllerPanel {
 
             public void stateChanged(ChangeEvent e) {
                 superclassTemplate.setEnabled(pairs.isSelected());
+                overwrite.setEnabled(!pairs.isSelected());
             }
         });
 


[2/2] cayenne git commit: Merge branch '119'

Posted by sk...@apache.org.
Merge branch '119'


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/1e25df75
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/1e25df75
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/1e25df75

Branch: refs/heads/master
Commit: 1e25df75d0e235d64b78f5e4f36235be8980b599
Parents: 740a6e1 9102ddb
Author: Savva Kolbachev <s....@gmail.com>
Authored: Fri Nov 11 21:15:02 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Fri Nov 11 21:15:02 2016 +0300

----------------------------------------------------------------------
 .../org/apache/cayenne/modeler/dialog/codegen/CustomModePanel.java  | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------