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:04 UTC
[5/7] cayenne git commit: CAY-2496 Set colors for table elements with
UIManager.
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;
- }
- }
}