Modeler: Adjust disabled selection foreground color
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4be0bea1 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4be0bea1 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4be0bea1 Branch: refs/heads/STABLE-4.0 Commit: 4be0bea1b26dfc0b08727eeb8e43fa54234eb8de Parents: 3285651 Author: Nikita Timofeev <stari...@gmail.com> Authored: Wed Sep 19 10:29:59 2018 +0300 Committer: Arseni Bulatski <ancars...@gmail.com> Committed: Tue Sep 25 12:14:53 2018 +0300 ---------------------------------------------------------------------- .../modeler/editor/ObjEntityAttributePanel.java | 52 +++++++++++++++++--- .../editor/ObjEntityRelationshipPanel.java | 2 +- 2 files changed, 45 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/4be0bea1/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java index 4df7ba3..229b68c 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java @@ -29,29 +29,65 @@ import org.apache.cayenne.map.event.ObjAttributeListener; import org.apache.cayenne.map.event.ObjEntityListener; import org.apache.cayenne.modeler.Application; import org.apache.cayenne.modeler.ProjectController; -import org.apache.cayenne.modeler.action.*; +import org.apache.cayenne.modeler.action.ActionManager; +import org.apache.cayenne.modeler.action.CopyAttributeRelationshipAction; +import org.apache.cayenne.modeler.action.CutAttributeRelationshipAction; +import org.apache.cayenne.modeler.action.ObjEntityToSuperEntityAction; +import org.apache.cayenne.modeler.action.PasteAction; +import org.apache.cayenne.modeler.action.RemoveAttributeRelationshipAction; import org.apache.cayenne.modeler.dialog.objentity.ObjAttributeInfoDialog; import org.apache.cayenne.modeler.editor.wrapper.ObjAttributeWrapper; -import org.apache.cayenne.modeler.event.*; +import org.apache.cayenne.modeler.event.EntityDisplayEvent; +import org.apache.cayenne.modeler.event.ObjEntityDisplayListener; +import org.apache.cayenne.modeler.event.ProjectOnSaveEvent; +import org.apache.cayenne.modeler.event.ProjectOnSaveListener; +import org.apache.cayenne.modeler.event.TablePopupHandler; import org.apache.cayenne.modeler.pref.TableColumnPreferences; -import org.apache.cayenne.modeler.util.*; +import org.apache.cayenne.modeler.util.CayenneAction; +import org.apache.cayenne.modeler.util.CayenneTable; +import org.apache.cayenne.modeler.util.CayenneTableModel; +import org.apache.cayenne.modeler.util.DbAttributePathComboBoxEditor; +import org.apache.cayenne.modeler.util.DbAttributePathComboBoxRenderer; +import org.apache.cayenne.modeler.util.ModelerUtil; +import org.apache.cayenne.modeler.util.PanelFactory; +import org.apache.cayenne.modeler.util.ProjectUtil; +import org.apache.cayenne.modeler.util.UIUtil; import org.apache.cayenne.modeler.util.combo.AutoCompletion; -import javax.swing.*; +import javax.swing.BorderFactory; +import javax.swing.Icon; +import javax.swing.ImageIcon; +import javax.swing.JComboBox; +import javax.swing.JDialog; +import javax.swing.JMenuItem; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JPopupMenu; +import javax.swing.JTable; +import javax.swing.ListSelectionModel; +import javax.swing.UIManager; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Component; +import java.awt.Font; +import java.awt.Point; +import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; import java.util.List; - +import java.util.Map; /** * Detail view of the ObjEntity attributes. @@ -412,7 +448,7 @@ public class ObjEntityAttributePanel extends JPanel implements ObjEntityDisplayL ObjAttribute attribute = model.getAttribute(row).getValue(); if (!model.isCellEditable(row, column)) { - setForeground(isSelected ? new Color(0xCECECE) : Color.GRAY); + setForeground(isSelected ? new Color(0xEEEEEE) : Color.GRAY); } else { setForeground(isSelected && !hasFocus ? table.getSelectionForeground() : table.getForeground()); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/4be0bea1/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java index 8dec1bf..b3102ce 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java @@ -454,7 +454,7 @@ public class ObjEntityRelationshipPanel extends JPanel implements ObjEntityDispl column = table.getColumnModel().getColumn(column).getModelIndex(); if (relationship != null && relationship.getSourceEntity() != model.getEntity()) { - setForeground(isSelected ? new Color(0xCECECE) : Color.GRAY); + setForeground(isSelected ? new Color(0xEEEEEE) : Color.GRAY); if(column == ObjRelationshipTableModel.REL_NAME) { ImageIcon icon = ModelerUtil.buildIcon("icon-inheritance.png"); setIcon(icon);
