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 2017/06/08 08:39:28 UTC
[1/2] cayenne git commit: Save a cell change by mouse click in the
table
Repository: cayenne
Updated Branches:
refs/heads/master 1b91a9053 -> 2c301a93a
Save a cell change by mouse click in the table
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a663fa52
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a663fa52
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a663fa52
Branch: refs/heads/master
Commit: a663fa5269976b777bee3e785b45e0610a5c67f6
Parents: c299812
Author: Anton Dreka <dr...@gmail.com>
Authored: Wed May 31 14:10:47 2017 +0300
Committer: Anton Dreka <dr...@gmail.com>
Committed: Wed May 31 14:10:47 2017 +0300
----------------------------------------------------------------------
.../apache/cayenne/modeler/util/PanelFactory.java | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a663fa52/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PanelFactory.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PanelFactory.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PanelFactory.java
index 5277325..29d8425 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PanelFactory.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/PanelFactory.java
@@ -23,6 +23,9 @@ package org.apache.cayenne.modeler.util;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.FlowLayout;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
import javax.swing.BorderFactory;
import javax.swing.JButton;
@@ -118,16 +121,24 @@ public class PanelFactory {
* Also sets the resizing and selection policies of the table to
* AUTO_RESIZE_OFF and SINGLE_SELECTION respectively.
*/
- public static JPanel createTablePanel(JTable table, JButton[] buttons) {
+ public static JPanel createTablePanel(final JTable table, JButton[] buttons) {
JPanel panel = new JPanel();
panel.setLayout(new BorderLayout(5, 5));
-
// Create table with two columns and no rows.
table.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+ JScrollPane scrollPane = new JScrollPane(table);
+ scrollPane.addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ if(table.isEditing()) {
+ table.getCellEditor().stopCellEditing();
+ }
+ }
+ });
// Panel to add space between table and EAST/WEST borders
- panel.add(new JScrollPane(table), BorderLayout.CENTER);
+ panel.add(scrollPane, BorderLayout.CENTER);
// Add Add and Remove buttons
if (buttons != null) {
[2/2] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/225' into asf-master
Posted by nt...@apache.org.
Merge remote-tracking branch 'remotes/parent/pr/225' 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/2c301a93
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2c301a93
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2c301a93
Branch: refs/heads/master
Commit: 2c301a93aa66e6336af924cddd2001daa7f8135c
Parents: 1b91a90 a663fa5
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Jun 8 11:27:28 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Jun 8 11:27:28 2017 +0300
----------------------------------------------------------------------
.../apache/cayenne/modeler/util/PanelFactory.java | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------