astgui: make sure colour is matched correctly

pwdraper · pwdraper · commit b903c7931879 · 2012-02-09T13:38:32.000Z
diff --git a/astgui/src/main/uk/ac/starlink/ast/gui/ComponentColourControls.java b/astgui/src/main/uk/ac/starlink/ast/gui/ComponentColourControls.java
@@ -148,6 +148,7 @@ public void setColourStore( ColourStore colourStore )
     {
         this.colourStore = colourStore;
         colourStore.addChangeListener( this );
+        matchColour();
     }
 
     /**
@@ -190,11 +191,10 @@ public String getDescription()
      */
     protected void chooseColour()
     {
-        Color[] newColour = new Color[1];
-        newColour[0] = JColorChooser.showDialog( this, "Select Colour",
-                                                 colourIcon.getMainColour() );
+        Color newColour = JColorChooser.showDialog( this, "Select Colour",
+                                                    colourStore.getColour() );
         if ( newColour != null ) {
-            colourStore.setColor( newColour[0] );
+            colourStore.setColor( newColour );
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,7 @@ public void setColourStore( ColourStore colourStore )`
`148`	`148`	`{`
`149`	`149`	`this.colourStore = colourStore;`
`150`	`150`	`colourStore.addChangeListener( this );`
	`151`	`+ matchColour();`
`151`	`152`	`}`
`152`	`153`
`153`	`154`	`/**`
`@@ -190,11 +191,10 @@ public String getDescription()`
`190`	`191`	`*/`
`191`	`192`	`protected void chooseColour()`
`192`	`193`	`{`
`193`		`- Color[] newColour = new Color[1];`
`194`		`- newColour[0] = JColorChooser.showDialog( this, "Select Colour",`
`195`		`- colourIcon.getMainColour() );`
	`194`	`+ Color newColour = JColorChooser.showDialog( this, "Select Colour",`
	`195`	`+ colourStore.getColour() );`
`196`	`196`	`if ( newColour != null ) {`
`197`		`- colourStore.setColor( newColour[0] );`
	`197`	`+ colourStore.setColor( newColour );`
`198`	`198`	`}`
`199`	`199`	`}`
`200`	`200`