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 2018/11/17 13:53:00 UTC
[1/7] cayenne git commit: CAY-2496 Added selection color for
CayenneTable same as used for trees.
Repository: cayenne
Updated Branches:
refs/heads/master 0c335d5e4 -> 2cf132bf2
CAY-2496 Added selection color for CayenneTable same as used for trees.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8e3d8c5c
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8e3d8c5c
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8e3d8c5c
Branch: refs/heads/master
Commit: 8e3d8c5c6204960f476abd2cfe1ad7ccd9c89ecd
Parents: 1edb4ee
Author: kkomyak <co...@gmail.com>
Authored: Wed Nov 14 11:08:49 2018 +0300
Committer: kkomyak <co...@gmail.com>
Committed: Wed Nov 14 11:10:53 2018 +0300
----------------------------------------------------------------------
.../cayenne/modeler/generic/GenericPlatformInitializer.java | 2 ++
.../org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java | 2 ++
.../org/apache/cayenne/modeler/win/WinPlatformInitializer.java | 6 +++---
.../java/org/apache/cayenne/modeler/util/CayenneTable.java | 4 ++++
4 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8e3d8c5c/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java b/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
index d2dc486..2af2190 100644
--- a/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
+++ b/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
@@ -74,6 +74,8 @@ public class GenericPlatformInitializer implements PlatformInitializer {
UIManager.put("Tree.selectionForeground", Color.BLACK);
UIManager.put("Tree.selectionBackground", greyHighlight);
UIManager.put("Tree.selectionBorderColor", UIManager.get("Tree.selectionBackground"));
+ UIManager.put("Table.selectionForeground", Color.BLACK);
+ UIManager.put("Table.selectionBackground", greyHighlight);
UIManager.put("ScrollPane.border", BorderFactory.createEmptyBorder());
UIManager.put("Table.scrollPaneBorder", BorderFactory.createEmptyBorder());
UIManager.put("SplitPane.border", BorderFactory.createEmptyBorder());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8e3d8c5c/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java b/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java
index 0578b9d..651eb96 100644
--- a/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java
+++ b/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java
@@ -94,6 +94,8 @@ public class OSXPlatformInitializer implements PlatformInitializer {
UIManager.put("Tree.selectionForeground", Color.BLACK);
UIManager.put("Tree.selectionBackground", lightGrey);
UIManager.put("Tree.selectionBorderColor", lightGrey);
+ UIManager.put("Table.selectionForeground", Color.BLACK);
+ UIManager.put("Table.selectionBackground", lightGrey);
Border backgroundPainter = new AbstractBorder() {
@Override
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8e3d8c5c/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
index fff78c1..009fc56 100644
--- a/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
+++ b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
@@ -27,9 +27,7 @@ import org.slf4j.LoggerFactory;
import javax.swing.JFrame;
import javax.swing.UIManager;
import javax.swing.BorderFactory;
-import javax.swing.border.AbstractBorder;
-import javax.swing.border.Border;
-import java.awt.*;
+import java.awt.Color;
public class WinPlatformInitializer implements PlatformInitializer {
@@ -59,6 +57,8 @@ public class WinPlatformInitializer implements PlatformInitializer {
UIManager.put("Tree.selectionBackground", darkGrey);
UIManager.put("Tree.selectionForeground", Color.BLACK);
UIManager.put("Tree.selectionBorderColor", UIManager.get("Tree.selectionBackground"));
+ UIManager.put("Table.selectionForeground", Color.BLACK);
+ UIManager.put("Table.selectionBackground", darkGrey);
UIManager.put("ScrollPane.border", BorderFactory.createEmptyBorder());
UIManager.put("Table.scrollPaneBorder", BorderFactory.createEmptyBorder());
UIManager.put("SplitPane.border", BorderFactory.createEmptyBorder());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/8e3d8c5c/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
index 53ed7e4..6676743 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
@@ -26,6 +26,7 @@ import javax.swing.DefaultCellEditor;
import javax.swing.DefaultListSelectionModel;
import javax.swing.JTable;
import javax.swing.JTextField;
+import javax.swing.UIManager;
import javax.swing.event.ChangeEvent;
import javax.swing.event.TableModelEvent;
import javax.swing.table.DefaultTableModel;
@@ -34,6 +35,7 @@ import javax.swing.table.TableCellEditor;
import javax.swing.table.TableColumnModel;
import javax.swing.table.TableModel;
import javax.swing.text.JTextComponent;
+import java.awt.Color;
import java.awt.Component;
/**
@@ -42,6 +44,7 @@ import java.awt.Component;
*
*/
public class CayenneTable extends JTable {
+ private static final Color SELECTION_COLOR = UIManager.getColor("Table.selectionBackground");
private SortButtonRenderer renderer = new SortButtonRenderer();
protected TableHeaderListener tableHeaderListener;
@@ -49,6 +52,7 @@ public class CayenneTable extends JTable {
public CayenneTable() {
super();
+ this.selectionBackground = SELECTION_COLOR;
this.setRowHeight(25);
this.setRowMargin(3);
JTableHeader header = getTableHeader();
[3/7] cayenne git commit: CAY-2496 Attache DB_ATTRIBUTE_PATH_COLUMN
constant to ObjAttributeTableModel.DB_ATTRIBUTE constant.
Posted by nt...@apache.org.
CAY-2496 Attache DB_ATTRIBUTE_PATH_COLUMN constant to ObjAttributeTableModel.DB_ATTRIBUTE constant.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a40e8eb6
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a40e8eb6
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a40e8eb6
Branch: refs/heads/master
Commit: a40e8eb69f40607615b0fa2031888c309b015f36
Parents: 60c5a6a
Author: kkomyak <co...@gmail.com>
Authored: Wed Nov 14 15:35:19 2018 +0300
Committer: kkomyak <co...@gmail.com>
Committed: Wed Nov 14 15:38:31 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
.../cayenne/modeler/util/DbAttributePathComboBoxEditor.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a40e8eb6/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index fd08cdc..b80db16 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -46,6 +46,7 @@ CAY-2476 Modeller: Fixed wrong behaviour of code generation dialog
CAY-2480 cayenne:cdbgen and cayenne:cgen have identical text in cayenne-maven-plugin
CAY-2484 maven plugins missing in 4.1.M2 release
CAY-2490 Added dbEntities from other datamaps in dbRelationship dialog.
+CAY-2496 Fixed wrong table behavior: focus color, cleanup DBAttribute Path cell on select.
----------------------------------
Release: 4.1.M2
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a40e8eb6/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAttributePathComboBoxEditor.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAttributePathComboBoxEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAttributePathComboBoxEditor.java
index 2d5ba8a..0685ca9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAttributePathComboBoxEditor.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAttributePathComboBoxEditor.java
@@ -32,7 +32,6 @@ import org.apache.cayenne.util.Util;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JLabel;
import javax.swing.JTable;
-import javax.swing.table.TableModel;
import javax.swing.text.JTextComponent;
import java.awt.Component;
import java.util.ArrayList;
@@ -43,7 +42,7 @@ import java.util.regex.Pattern;
public class DbAttributePathComboBoxEditor extends PathChooserComboBoxCellEditor {
- private static final int DB_ATTRIBUTE_PATH_COLUMN = 2;
+ private static final int DB_ATTRIBUTE_PATH_COLUMN = ObjAttributeTableModel.DB_ATTRIBUTE;
private String savePath;
private ObjAttributeTableModel model;
[4/7] cayenne git commit: CAY-2496 Removed blue border on selected
element in CayenneTable.
Posted by nt...@apache.org.
CAY-2496 Removed blue border on selected element in CayenneTable.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4ba179cb
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4ba179cb
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4ba179cb
Branch: refs/heads/master
Commit: 4ba179cb98e195d200173d6b91764f9720b7e876
Parents: a40e8eb
Author: kkomyak <co...@gmail.com>
Authored: Thu Nov 15 10:45:38 2018 +0300
Committer: kkomyak <co...@gmail.com>
Committed: Thu Nov 15 10:45:38 2018 +0300
----------------------------------------------------------------------
.../generic/GenericPlatformInitializer.java | 1 +
.../modeler/dialog/codegen/ClassesTabPanel.java | 3 +-
.../dialog/db/gen/TableSelectorView.java | 3 +-
.../objentity/ObjAttributeInfoDialog.java | 2 +-
.../dialog/pref/ClasspathPreferencesView.java | 3 +-
.../dialog/pref/TemplatePreferencesView.java | 3 +-
.../editor/AbstractCallbackMethodsTab.java | 1 +
.../cayenne/modeler/util/CayenneTable.java | 37 ++++++++++++++++++--
.../util/DbAttributePathComboBoxEditor.java | 5 ++-
9 files changed, 48 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4ba179cb/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java b/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
index 2af2190..4d12f6c 100644
--- a/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
+++ b/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
@@ -76,6 +76,7 @@ public class GenericPlatformInitializer implements PlatformInitializer {
UIManager.put("Tree.selectionBorderColor", UIManager.get("Tree.selectionBackground"));
UIManager.put("Table.selectionForeground", Color.BLACK);
UIManager.put("Table.selectionBackground", greyHighlight);
+ UIManager.put("Table.selectionBorderColor", greyHighlight);
UIManager.put("ScrollPane.border", BorderFactory.createEmptyBorder());
UIManager.put("Table.scrollPaneBorder", BorderFactory.createEmptyBorder());
UIManager.put("SplitPane.border", BorderFactory.createEmptyBorder());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4ba179cb/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/ClassesTabPanel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/ClassesTabPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/ClassesTabPanel.java
index f1a8132..c1796d3 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/ClassesTabPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/ClassesTabPanel.java
@@ -20,6 +20,7 @@
package org.apache.cayenne.modeler.dialog.codegen;
import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.modeler.util.CayenneTable;
import javax.swing.BoxLayout;
import javax.swing.JCheckBox;
@@ -78,7 +79,7 @@ public class ClassesTabPanel extends JPanel {
JPanel panel = new JPanel();
panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
for(DataMap dataMap : dataMaps) {
- JTable table = new JTable();
+ JTable table = new CayenneTable();
table.setRowHeight(22);
dataMapTables.put(dataMap, table);
JPanel scrollTable = new JPanel(new BorderLayout());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4ba179cb/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/TableSelectorView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/TableSelectorView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/TableSelectorView.java
index 08b1a7c..eea3519 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/TableSelectorView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/TableSelectorView.java
@@ -31,6 +31,7 @@ import javax.swing.JTable;
import com.jgoodies.forms.builder.PanelBuilder;
import com.jgoodies.forms.layout.CellConstraints;
import com.jgoodies.forms.layout.FormLayout;
+import org.apache.cayenne.modeler.util.CayenneTable;
/**
*/
@@ -58,7 +59,7 @@ public class TableSelectorView extends JPanel {
topPanel.add(checkAll);
topPanel.add(checkAllLabel);
- tables = new JTable();
+ tables = new CayenneTable();
tables.setRowHeight(25);
tables.setRowMargin(3);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4ba179cb/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
index 46ff9b0..1b05ff4 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjAttributeInfoDialog.java
@@ -587,7 +587,7 @@ public class ObjAttributeInfoDialog extends CayenneController implements TreeSel
OverrideEmbeddableAttributeTableModel model = (OverrideEmbeddableAttributeTableModel) table.getModel();
if (!model.isCellEditable(row, column)) {
- setForeground(Color.GRAY);
+ setForeground(Color.DARK_GRAY);
} else {
setForeground(isSelected && !hasFocus ? table.getSelectionForeground() : table.getForeground());
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4ba179cb/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/ClasspathPreferencesView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/ClasspathPreferencesView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/ClasspathPreferencesView.java
index c3e0373..ddfc998 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/ClasspathPreferencesView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/ClasspathPreferencesView.java
@@ -29,6 +29,7 @@ import javax.swing.JTable;
import com.jgoodies.forms.builder.DefaultFormBuilder;
import com.jgoodies.forms.layout.FormLayout;
+import org.apache.cayenne.modeler.util.CayenneTable;
/**
*/
@@ -46,7 +47,7 @@ public class ClasspathPreferencesView extends JPanel {
addDirButton = new JButton("Add Class Folder");
removeEntryButton = new JButton("Remove");
- table = new JTable();
+ table = new CayenneTable();
table.setRowMargin(3);
table.setRowHeight(25);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4ba179cb/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplatePreferencesView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplatePreferencesView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplatePreferencesView.java
index e29801e..93da852 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplatePreferencesView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplatePreferencesView.java
@@ -29,6 +29,7 @@ import javax.swing.JTable;
import com.jgoodies.forms.builder.DefaultFormBuilder;
import com.jgoodies.forms.layout.FormLayout;
+import org.apache.cayenne.modeler.util.CayenneTable;
public class TemplatePreferencesView extends JPanel {
@@ -42,7 +43,7 @@ public class TemplatePreferencesView extends JPanel {
addButton = new JButton("Add Template");
removeButton = new JButton("Remove Template");
- table = new JTable();
+ table = new CayenneTable();
table.setRowMargin(3);
table.setRowHeight(25);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4ba179cb/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackMethodsTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackMethodsTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackMethodsTab.java
index 00eb888..b40037c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackMethodsTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackMethodsTab.java
@@ -403,6 +403,7 @@ public abstract class AbstractCallbackMethodsTab extends JPanel {
CallbackDescriptorTableModel.METHOD_NAME)
&& tables[i].getEditorComponent() != null) {
tables[i].changeSelection(tables[i].getRowCount() - 1, 0, false, false);
+ tables[i].editCellAt(tables[i].getRowCount() - 1, 0);
tables[i].getCellEditor().stopCellEditing();
return;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4ba179cb/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
index 0a3a6b9..dedc229 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
@@ -22,6 +22,7 @@ package org.apache.cayenne.modeler.util;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.pref.TableColumnPreferences;
+import javax.swing.BorderFactory;
import javax.swing.DefaultCellEditor;
import javax.swing.DefaultListSelectionModel;
import javax.swing.JTable;
@@ -29,9 +30,11 @@ import javax.swing.JTextField;
import javax.swing.UIManager;
import javax.swing.event.ChangeEvent;
import javax.swing.event.TableModelEvent;
+import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.DefaultTableModel;
import javax.swing.table.JTableHeader;
import javax.swing.table.TableCellEditor;
+import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
import javax.swing.table.TableModel;
import javax.swing.text.JTextComponent;
@@ -45,7 +48,7 @@ import java.util.EventObject;
*
*/
public class CayenneTable extends JTable {
- private static final Color SELECTION_COLOR = UIManager.getColor("Table.selectionBackground");
+ private static final Color SELECTION_BACKGROUND_COLOR = UIManager.getColor("Table.selectionBackground");
private SortButtonRenderer renderer = new SortButtonRenderer();
protected TableHeaderListener tableHeaderListener;
@@ -53,7 +56,7 @@ public class CayenneTable extends JTable {
public CayenneTable() {
super();
- this.selectionBackground = SELECTION_COLOR;
+ this.selectionBackground = SELECTION_BACKGROUND_COLOR;
this.setRowHeight(25);
this.setRowMargin(3);
JTableHeader header = getTableHeader();
@@ -266,4 +269,34 @@ public class CayenneTable extends JTable {
public void setSortable(boolean sortable) {
renderer.setSortingEnabled(sortable);
}
+
+ @Override
+ public void createDefaultColumnsFromModel() {
+ TableModel m = getModel();
+ if (m != null) {
+ // Remove any current columns
+ TableColumnModel cm = getColumnModel();
+ while (cm.getColumnCount() > 0) {
+ cm.removeColumn(cm.getColumn(0));
+ }
+
+ // Create new columns from the data model info
+ for (int i = 0; i < m.getColumnCount(); i++) {
+ TableColumn newColumn = new TableColumn(i, 75, new CellRenderer(), null);
+ addColumn(newColumn);
+ }
+ }
+ }
+ // custom renderer used for inherited attributes highlighting
+ final class CellRenderer extends DefaultTableCellRenderer {
+
+ @Override
+ public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
+ boolean hasFocus, int row, int column) {
+
+ super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+ setBorder(BorderFactory.createEmptyBorder());
+ return this;
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4ba179cb/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAttributePathComboBoxEditor.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAttributePathComboBoxEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAttributePathComboBoxEditor.java
index 0685ca9..0bb095f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAttributePathComboBoxEditor.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAttributePathComboBoxEditor.java
@@ -96,7 +96,6 @@ public class DbAttributePathComboBoxEditor extends PathChooserComboBoxCellEditor
String dbAttributePath =((JTextComponent) comboBoxPathChooser.
getEditor().getEditorComponent()).getText();
Object currentNode = getCurrentNode(dbAttributePath);
- ObjAttributeTableModel currentModel = (ObjAttributeTableModel) table.getModel();
String[] pathStrings = dbAttributePath.split(Pattern.quote("."));
String lastStringInPath = pathStrings[pathStrings.length - 1];
if (ModelerUtil.getObjectName(currentNode).equals(lastStringInPath) &&
@@ -108,8 +107,8 @@ public class DbAttributePathComboBoxEditor extends PathChooserComboBoxCellEditor
if (dbAttributePath.equals(savePath)) {
return;
}
- currentModel.setUpdatedValueAt(dbAttributePath, row, DB_ATTRIBUTE_PATH_COLUMN);
- currentModel.getAttribute(row).getValue().setDbAttributePath(dbAttributePath);
+ model.setUpdatedValueAt(dbAttributePath, row, DB_ATTRIBUTE_PATH_COLUMN);
+ model.getAttribute(row).getValue().setDbAttributePath(dbAttributePath);
}
}else if (ModelerUtil.getObjectName(currentNode).equals(lastStringInPath) &&
currentNode instanceof DbRelationship) {
[7/7] cayenne git commit: Merge PR #346
Posted by nt...@apache.org.
Merge PR #346
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2cf132bf
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2cf132bf
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2cf132bf
Branch: refs/heads/master
Commit: 2cf132bf2ffbf1c30ac0a865595efcfde08e4aba
Parents: 0c335d5 71fa8dc
Author: Nikita Timofeev <st...@gmail.com>
Authored: Sat Nov 17 16:13:42 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Sat Nov 17 16:13:42 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
.../generic/GenericPlatformInitializer.java | 3 +++
.../modeler/osx/OSXPlatformInitializer.java | 3 +++
.../modeler/win/WinPlatformInitializer.java | 11 ++++++-----
.../dialog/db/gen/TableSelectorView.java | 3 ++-
.../objentity/ObjAttributeInfoDialog.java | 2 +-
.../dialog/pref/ClasspathPreferencesView.java | 3 ++-
.../dialog/pref/TemplatePreferencesView.java | 3 ++-
.../editor/AbstractCallbackMethodsTab.java | 1 +
.../cayenne/modeler/util/CayenneTable.java | 20 ++++++++++++++------
.../util/DbAttributePathComboBoxEditor.java | 3 +--
11 files changed, 36 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2cf132bf/RELEASE-NOTES.txt
----------------------------------------------------------------------
[2/7] cayenne git commit: CAY-2496 Fixed cleanup DBAttribute Path
cell after selection.
Posted by nt...@apache.org.
CAY-2496 Fixed cleanup DBAttribute Path cell after selection.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/60c5a6a6
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/60c5a6a6
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/60c5a6a6
Branch: refs/heads/master
Commit: 60c5a6a681d8306e913daa275643afed4330d57e
Parents: 8e3d8c5
Author: kkomyak <co...@gmail.com>
Authored: Wed Nov 14 15:25:46 2018 +0300
Committer: kkomyak <co...@gmail.com>
Committed: Wed Nov 14 15:31:31 2018 +0300
----------------------------------------------------------------------
.../apache/cayenne/modeler/util/CayenneTable.java | 15 +++++++++------
.../modeler/util/DbAttributePathComboBoxEditor.java | 9 +++++----
2 files changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/60c5a6a6/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
index 6676743..0a3a6b9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
@@ -37,6 +37,7 @@ import javax.swing.table.TableModel;
import javax.swing.text.JTextComponent;
import java.awt.Color;
import java.awt.Component;
+import java.util.EventObject;
/**
* Common superclass of tables used in Cayenne. Contains some common configuration
@@ -226,16 +227,18 @@ public class CayenneTable extends JTable {
}
}
- public void changeSelection(final int row, final int column, boolean toggle, boolean extend) {
- super.changeSelection(row, column, toggle, extend);
- startCellEditingOnTabPressed(row, column);
- }
+ public boolean editCellAt(int row, int column, EventObject e) {
- private void startCellEditingOnTabPressed(final int row, final int column) {
+ boolean result = false;
if (isCellEditable(row, column)) {
- this.editCellAt(row, column);
+ result = super.editCellAt(row, column, null);
editorComp.requestFocus();
}
+ return result;
+ }
+
+ public void changeSelection(final int row, final int column, boolean toggle, boolean extend) {
+ super.changeSelection(row, column, toggle, extend);
}
public void sort(int column, boolean isAscend) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/60c5a6a6/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAttributePathComboBoxEditor.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAttributePathComboBoxEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAttributePathComboBoxEditor.java
index 7794d87..2d5ba8a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAttributePathComboBoxEditor.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbAttributePathComboBoxEditor.java
@@ -32,6 +32,7 @@ import org.apache.cayenne.util.Util;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JLabel;
import javax.swing.JTable;
+import javax.swing.table.TableModel;
import javax.swing.text.JTextComponent;
import java.awt.Component;
import java.util.ArrayList;
@@ -42,7 +43,7 @@ import java.util.regex.Pattern;
public class DbAttributePathComboBoxEditor extends PathChooserComboBoxCellEditor {
- private static final int DB_ATTRIBUTE_PATH_COLUMN = 3;
+ private static final int DB_ATTRIBUTE_PATH_COLUMN = 2;
private String savePath;
private ObjAttributeTableModel model;
@@ -96,7 +97,7 @@ public class DbAttributePathComboBoxEditor extends PathChooserComboBoxCellEditor
String dbAttributePath =((JTextComponent) comboBoxPathChooser.
getEditor().getEditorComponent()).getText();
Object currentNode = getCurrentNode(dbAttributePath);
-
+ ObjAttributeTableModel currentModel = (ObjAttributeTableModel) table.getModel();
String[] pathStrings = dbAttributePath.split(Pattern.quote("."));
String lastStringInPath = pathStrings[pathStrings.length - 1];
if (ModelerUtil.getObjectName(currentNode).equals(lastStringInPath) &&
@@ -108,8 +109,8 @@ public class DbAttributePathComboBoxEditor extends PathChooserComboBoxCellEditor
if (dbAttributePath.equals(savePath)) {
return;
}
- model.setUpdatedValueAt(dbAttributePath, row, DB_ATTRIBUTE_PATH_COLUMN);
- model.getAttribute(row).getValue().setDbAttributePath(dbAttributePath);
+ currentModel.setUpdatedValueAt(dbAttributePath, row, DB_ATTRIBUTE_PATH_COLUMN);
+ currentModel.getAttribute(row).getValue().setDbAttributePath(dbAttributePath);
}
}else if (ModelerUtil.getObjectName(currentNode).equals(lastStringInPath) &&
currentNode instanceof DbRelationship) {
[5/7] cayenne git commit: CAY-2496 Set colors for table elements with
UIManager.
Posted by nt...@apache.org.
CAY-2496 Set colors for table elements with UIManager.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c4f4c997
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c4f4c997
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c4f4c997
Branch: refs/heads/master
Commit: c4f4c99721037d3f9ce9b6a20dbe034caa6753da
Parents: 4ba179c
Author: kkomyak <co...@gmail.com>
Authored: Thu Nov 15 13:32:31 2018 +0300
Committer: kkomyak <co...@gmail.com>
Committed: Thu Nov 15 13:32:31 2018 +0300
----------------------------------------------------------------------
.../generic/GenericPlatformInitializer.java | 2 +-
.../modeler/osx/OSXPlatformInitializer.java | 1 +
.../modeler/win/WinPlatformInitializer.java | 1 +
.../cayenne/modeler/util/CayenneTable.java | 32 --------------------
4 files changed, 3 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c4f4c997/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java b/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
index 4d12f6c..a8eccd8 100644
--- a/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
+++ b/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
@@ -76,7 +76,7 @@ public class GenericPlatformInitializer implements PlatformInitializer {
UIManager.put("Tree.selectionBorderColor", UIManager.get("Tree.selectionBackground"));
UIManager.put("Table.selectionForeground", Color.BLACK);
UIManager.put("Table.selectionBackground", greyHighlight);
- UIManager.put("Table.selectionBorderColor", greyHighlight);
+ UIManager.put("Table.focusCellHighlightBorder", BorderFactory.createEmptyBorder());
UIManager.put("ScrollPane.border", BorderFactory.createEmptyBorder());
UIManager.put("Table.scrollPaneBorder", BorderFactory.createEmptyBorder());
UIManager.put("SplitPane.border", BorderFactory.createEmptyBorder());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c4f4c997/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java b/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java
index 651eb96..cecebcf 100644
--- a/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java
+++ b/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java
@@ -96,6 +96,7 @@ public class OSXPlatformInitializer implements PlatformInitializer {
UIManager.put("Tree.selectionBorderColor", lightGrey);
UIManager.put("Table.selectionForeground", Color.BLACK);
UIManager.put("Table.selectionBackground", lightGrey);
+ UIManager.put("Table.focusCellHighlightBorder", BorderFactory.createEmptyBorder());
Border backgroundPainter = new AbstractBorder() {
@Override
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c4f4c997/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
index 009fc56..e62b775 100644
--- a/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
+++ b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
@@ -59,6 +59,7 @@ public class WinPlatformInitializer implements PlatformInitializer {
UIManager.put("Tree.selectionBorderColor", UIManager.get("Tree.selectionBackground"));
UIManager.put("Table.selectionForeground", Color.BLACK);
UIManager.put("Table.selectionBackground", darkGrey);
+ UIManager.put("Table.focusCellHighlightBorder", BorderFactory.createEmptyBorder());
UIManager.put("ScrollPane.border", BorderFactory.createEmptyBorder());
UIManager.put("Table.scrollPaneBorder", BorderFactory.createEmptyBorder());
UIManager.put("SplitPane.border", BorderFactory.createEmptyBorder());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c4f4c997/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
index dedc229..033ecd7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTable.java
@@ -48,7 +48,6 @@ import java.util.EventObject;
*
*/
public class CayenneTable extends JTable {
- private static final Color SELECTION_BACKGROUND_COLOR = UIManager.getColor("Table.selectionBackground");
private SortButtonRenderer renderer = new SortButtonRenderer();
protected TableHeaderListener tableHeaderListener;
@@ -56,7 +55,6 @@ public class CayenneTable extends JTable {
public CayenneTable() {
super();
- this.selectionBackground = SELECTION_BACKGROUND_COLOR;
this.setRowHeight(25);
this.setRowMargin(3);
JTableHeader header = getTableHeader();
@@ -269,34 +267,4 @@ public class CayenneTable extends JTable {
public void setSortable(boolean sortable) {
renderer.setSortingEnabled(sortable);
}
-
- @Override
- public void createDefaultColumnsFromModel() {
- TableModel m = getModel();
- if (m != null) {
- // Remove any current columns
- TableColumnModel cm = getColumnModel();
- while (cm.getColumnCount() > 0) {
- cm.removeColumn(cm.getColumn(0));
- }
-
- // Create new columns from the data model info
- for (int i = 0; i < m.getColumnCount(); i++) {
- TableColumn newColumn = new TableColumn(i, 75, new CellRenderer(), null);
- addColumn(newColumn);
- }
- }
- }
- // custom renderer used for inherited attributes highlighting
- final class CellRenderer extends DefaultTableCellRenderer {
-
- @Override
- public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
- boolean hasFocus, int row, int column) {
-
- super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
- setBorder(BorderFactory.createEmptyBorder());
- return this;
- }
- }
}
[6/7] cayenne git commit: CAY-2496 Changed selection color in table
for windows.
Posted by nt...@apache.org.
CAY-2496 Changed selection color in table for windows.
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/71fa8dc8
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/71fa8dc8
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/71fa8dc8
Branch: refs/heads/master
Commit: 71fa8dc810564494b5cef3fc76cf60a733e2bc4c
Parents: c4f4c99
Author: kkomyak <co...@gmail.com>
Authored: Thu Nov 15 14:43:01 2018 +0300
Committer: kkomyak <co...@gmail.com>
Committed: Thu Nov 15 14:43:01 2018 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/modeler/win/WinPlatformInitializer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/71fa8dc8/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
index e62b775..352cddb 100644
--- a/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
+++ b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
@@ -47,7 +47,7 @@ public class WinPlatformInitializer implements PlatformInitializer {
}
private void overrideUIDefaults() {
- Color darkGrey = new Color(225, 225, 225);
+ Color darkGrey = new Color(203, 203, 203);
UIManager.put("TextFieldUI", WinCustomTextFieldUI.class.getName());
UIManager.put("Tree.expandedIcon", ModelerUtil.buildIcon("icon-arrow-open.png"));
@@ -70,6 +70,6 @@ public class WinPlatformInitializer implements PlatformInitializer {
UIManager.put("MenuItem.selectionBackground", darkGrey);
UIManager.put("MenuItem.selectionForeground", Color.BLACK);
UIManager.put("MenuItem.opaque", Boolean.TRUE);
- UIManager.put("Button.border", BorderFactory.createEmptyBorder(2, 2, 2, 2));
+ UIManager.put("Button.border", BorderFactory.createEmptyBorder());
}
}