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 <const1...@gmail.com> Authored: Wed Nov 14 11:08:49 2018 +0300 Committer: kkomyak <const1...@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();
