Author: daceywang
Date: Tue Apr 28 10:58:20 2009
New Revision: 3025
Modified:
trunk/src/ca/sqlpower/architect/swingui/RelationshipEditPanel.java
Log:
Fixed a bug I made in last commit for relationship line color chooser.
Sorry about that.
Modified: trunk/src/ca/sqlpower/architect/swingui/RelationshipEditPanel.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/RelationshipEditPanel.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/RelationshipEditPanel.java Tue
Apr 28 10:58:20 2009
@@ -441,8 +441,10 @@
Action customColour = new AbstractAction("Custom Colour...") {
public void actionPerformed(ActionEvent arg0) {
Color colour =
session.getCustomColour(relationshipLines.get(0).getForegroundColor());
- if (colour != null
&& !containsColor(Relationship.SUGGESTED_COLOURS, colour)) {
- relationLineColor.addItem(colour);
+ if (colour != null) {
+ if (!containsColor(Relationship.SUGGESTED_COLOURS,
colour)) {
+ relationLineColor.addItem(colour);
+ }
relationLineColor.setSelectedItem(colour);
}
}