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/09/19 06:51:27 UTC
[1/2] cayenne git commit: Update text color of dbType column in
objAttrTable
Repository: cayenne
Updated Branches:
refs/heads/master ad4d2006a -> 417f176a6
Update text color of dbType column in objAttrTable
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/debbf986
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/debbf986
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/debbf986
Branch: refs/heads/master
Commit: debbf986d72c85a6d071d4b1ecdde5c058859ef0
Parents: 6221d5e
Author: Arseni Bulatski <an...@gmail.com>
Authored: Thu Sep 13 17:42:22 2018 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Thu Sep 13 17:45:29 2018 +0300
----------------------------------------------------------------------
.../cayenne/modeler/editor/ObjEntityAttributePanel.java | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/debbf986/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 13aab58..2f3f9ea 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
@@ -46,22 +46,20 @@ import org.apache.cayenne.modeler.pref.TableColumnPreferences;
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.DbAttributePathComboBoxRenderer;
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 org.apache.cayenne.swing.components.image.FilteredIconFactory;
import javax.swing.BorderFactory;
import javax.swing.Icon;
-import javax.swing.ImageIcon;
import javax.swing.JComboBox;
import javax.swing.JDialog;
-import javax.swing.JOptionPane;
import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JTable;
@@ -76,14 +74,13 @@ import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.Font;
-import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -449,7 +446,7 @@ public class ObjEntityAttributePanel extends JPanel implements ObjEntityDisplayL
if (column != ObjAttributeTableModel.INHERITED) {
if (!model.isCellEditable(row, column)) {
- setForeground(Color.GRAY);
+ setForeground(isSelected ? new Color(0xCECECE) : Color.GRAY);
} else {
setForeground(isSelected && !hasFocus ? table.getSelectionForeground() : table.getForeground());
}
[2/2] cayenne git commit: Merge PR #316
Posted by nt...@apache.org.
Merge PR #316
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/417f176a
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/417f176a
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/417f176a
Branch: refs/heads/master
Commit: 417f176a61642634b29fb7aa8cf0869a0256b58d
Parents: ad4d200 debbf98
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Sep 19 09:51:14 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Sep 19 09:51:14 2018 +0300
----------------------------------------------------------------------
.../cayenne/modeler/editor/ObjEntityAttributePanel.java | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------