Demo cleanup.
Some changes to match the current file in JFreeChart 1.0.x.