Merge remote-tracking branch 'remotes/parent/pr/234' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f3b90506 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f3b90506 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f3b90506 Branch: refs/heads/master Commit: f3b90506a1386c3af246ca9c3c1e6a7efff31bf9 Parents: 055cb41 33e9b4b Author: Nikita Timofeev <stari...@gmail.com> Authored: Fri Jun 30 18:07:45 2017 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Fri Jun 30 18:07:45 2017 +0300 ---------------------------------------------------------------------- .../action/CreateProcedureParameterAction.java | 23 ++-- .../cayenne/modeler/editor/DataDomainView.java | 21 ++-- .../cayenne/modeler/editor/DataMapView.java | 24 ++-- .../cayenne/modeler/editor/ObjEntityTab.java | 46 ++++--- .../editor/ObjectQueryPropertiesPanel.java | 12 +- .../cayenne/modeler/editor/ProcedureTab.java | 3 +- .../modeler/editor/RawQueryPropertiesPanel.java | 10 +- .../modeler/editor/SelectQueryMainTab.java | 10 +- .../CreateProcedureParameterUndoableEdit.java | 74 +++++++++++ .../modeler/undo/JCheckBoxUndoListener.java | 36 ++++++ .../modeler/undo/JUndoableCheckBoxEdit.java | 124 +++++++++++++++++++ .../swing/components/JCayenneCheckBox.java | 35 ++++++ 12 files changed, 363 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3b90506/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapView.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/f3b90506/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java ---------------------------------------------------------------------- diff --cc modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java index 796d9bb,9c31e33..d67437b --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java @@@ -24,8 -24,9 +24,10 @@@ import java.awt.Color import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; + import java.awt.event.ItemEvent; + import java.awt.event.ItemListener; import java.util.Arrays; +import java.util.Collection; import java.util.EventObject; import java.util.LinkedList; import java.util.List; @@@ -178,9 -199,10 +182,9 @@@ public class ObjEntityTab extends JPane tableLabel.setBorder(null); - isAbstract = new JCheckBox(); - serverOnly = new JCheckBox(); + isAbstract = new JCayenneCheckBox(); + serverOnly = new JCayenneCheckBox(); clientClassName = new TextAdapter(new JTextField()) { - @Override protected void updateModel(String text) { setClientClassName(text); @@@ -343,23 -387,27 +349,25 @@@ } }); - excludeSuperclassListeners.addActionListener(new ActionListener() { + excludeSuperclassListeners.addItemListener(new ItemListener() { - public void actionPerformed(ActionEvent e) { + @Override + public void itemStateChanged(ItemEvent e) { ObjEntity entity = mediator.getCurrentObjEntity(); if (entity != null) { - entity.setExcludingSuperclassListeners(excludeSuperclassListeners - .isSelected()); + entity.setExcludingSuperclassListeners(excludeSuperclassListeners.isSelected()); mediator.fireObjEntityEvent(new EntityEvent(this, entity)); } } }); - excludeDefaultListeners.addActionListener(new ActionListener() { + excludeDefaultListeners.addItemListener(new ItemListener() { - public void actionPerformed(ActionEvent e) { + @Override + public void itemStateChanged(ItemEvent e) { ObjEntity entity = mediator.getCurrentObjEntity(); if (entity != null) { - entity.setExcludingDefaultListeners(excludeDefaultListeners - .isSelected()); + entity.setExcludingDefaultListeners(excludeDefaultListeners.isSelected()); mediator.fireObjEntityEvent(new EntityEvent(this, entity)); } }
