fg color of pk+fk column is red

Wisser · Aug 19, 2023 · ff822a2 · ff822a2
1 parent 6caef55
commit ff822a2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/gui/net/sf/jailer/ui/databrowser/BrowserContentPane.java b/src/main/gui/net/sf/jailer/ui/databrowser/BrowserContentPane.java
@@ -1724,7 +1724,7 @@ && isPKComplete(type, r) && !rowIdSupport.getPrimaryKey(type, BrowserContentPane
 						render.setName("final");
 					}
 					((JLabel) render).setForeground(
-							renderRowAsPK || pkColumns.contains(convertedColumnIndex) || (pkColumnsConsole.contains(convertedColumnIndex) && !fkColumnsConsole.contains(convertedColumnIndex)) ? FG1 :
+							renderRowAsPK || pkColumns.contains(convertedColumnIndex) || (pkColumnsConsole.contains(convertedColumnIndex) /* && !fkColumnsConsole.contains(convertedColumnIndex) */)? FG1 :
 								fkColumns.contains(convertedColumnIndex) || fkColumnsConsole.contains(convertedColumnIndex) ? FG2 :
 										Color.BLACK);
 					boolean isNull = false;
@@ -5869,7 +5869,7 @@ public Component getTableCellRendererComponent(JTable table, Object value, boole
 				try {
 					dontPaintSortIcon = ignoreSortKey;
 					int convertedColumnIndex = rowsTable.convertColumnIndexToModel(column);
-					Color fg = pkColumns.contains(convertedColumnIndex) || (pkColumnsConsole.contains(convertedColumnIndex) && !fkColumnsConsole.contains(convertedColumnIndex)) ? UIUtil.FG_PK :
+					Color fg = pkColumns.contains(convertedColumnIndex) || (pkColumnsConsole.contains(convertedColumnIndex) /* && !fkColumnsConsole.contains(convertedColumnIndex) */) ? UIUtil.FG_PK :
 						fkColumns.contains(convertedColumnIndex) || fkColumnsConsole.contains(convertedColumnIndex) ? UIUtil.FG_FK : null;
 					Component render = origRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
 					if (fg != null) {