Removed occurrences of makeForTesting, which are no longer needed now that we use JSON to convert from Strings to AbstractDescription. The testing framework persists in using old-style String syntax, which is converted to JSON-style syntax before converting to AbstractDescriptions.

Signed-off-by: Jim Burton <j.burton@brighton.ac.uk>
removed unused import statements

Signed-off-by: Jim Burton <j.burton@brighton.ac.uk>
removed unused import statements, unused code, accessed static data in a static way

Signed-off-by: Jim Burton <j.burton@brighton.ac.uk>
Added a use of unused member data (by writing a DEB.out statement which will warn us if we get to code which perhaps ought to use its changed value).

Signed-off-by: Jim Burton <j.burton@brighton.ac.uk>
added use of unused data - unused Colors arrays (tiny, med, …) are referenced as we use an int index to specify which will be assigned as the default Colors array.

Signed-off-by: Jim Burton <j.burton@brighton.ac.uk>
Fixed typo in buildfile description

Signed-off-by: Jim Burton <j.burton@brighton.ac.uk>
Fixed an incorrect comment from TestDatum::toJSON. Made some methods of TestDatum static (they referred to no class data). Added comments for TestDatum::getContoursJSON, getZonesJSON, getShadedZonesJSON.

Signed-off-by: Jim Burton <j.burton@brighton.ac.uk>
Removed some unused import statements. Initialised a local variable (for the compiler). Added usage of some unused variables (for the compiler). Reformatted some code so it fits on my screen. Fixed an incorrect comment.

Signed-off-by: Jim Burton <j.burton@brighton.ac.uk>
Removed unused code.

Signed-off-by: Jim Burton <j.burton@brighton.ac.uk>
Refactoring of DiagramCreator code. Added comment for AngleIterator. Renamed AngleIterator::next_angle as AngleIterator::nextAngle. Added a new interface called GuideSizeStrategy and extracted some code from DiagramCreator to write a GuideSizeStrategy implementation (for the moment, called JeansGuideSizeStrategy). Give a DiagramCreator one of these implementations in its constructor (in future, we could implement other strategies and add a set-method for this strategy).

Signed-off-by: Jim Burton <j.burton@brighton.ac.uk>
Further refactoring of DiagramCreator. Added a new interface BuildStepMaker whose responsibility is to make a linked list of BuildSteps (e.g. from a sequence of RecompositionSteps). A good strategy for making build steps will collect together similar contours into a single build step so that we can make matching placement decisions and create symmetric diagrams.

Signed-off-by: Jim Burton <j.burton@brighton.ac.uk>
This is a trivial submission. No behaviour change.

Signed-off-by: Jim Burton <j.burton@brighton.ac.uk>
left over spurious diff from merge with Aidan's stuff
Nudging labels for contours until they don't overlap with each other or the bounding box. Not done same for spiders yet.
Working on label placement for spiders, still not right.
Spiders are shown with right habitat but will only appear if the class within which they are defined is in the diagram. Showing them in superclasses is still TODO.
Merge branch 'master' of https://github.com/jimburton/iCircles
Merge branch 'development' into dev-merge

Conflicts:
	devel/iCircles/src/icircles/gui/CirclesSVGGenerator.java
Added missing data files