From: David G. <mu...@us...> - 2007-04-30 21:16:35
|
Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/axis In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv19712/source/org/jfree/chart/axis Modified Files: Tag: STABLE_1-0-0 ColorBar.java Log Message: Source reformatting. Index: ColorBar.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/axis/ColorBar.java,v retrieving revision 1.6.2.4 retrieving revision 1.6.2.5 diff -C2 -d -r1.6.2.4 -r1.6.2.5 *** ColorBar.java 4 Apr 2007 09:05:22 -0000 1.6.2.4 --- ColorBar.java 30 Apr 2007 21:16:23 -0000 1.6.2.5 *************** *** 103,107 **** */ private double colorBarThicknessPercent ! = DEFAULT_COLORBAR_THICKNESS_PERCENT; /** The color palette. */ --- 103,107 ---- */ private double colorBarThicknessPercent ! = DEFAULT_COLORBAR_THICKNESS_PERCENT; /** The color palette. */ *************** *** 215,246 **** if (edge == RectangleEdge.BOTTOM) { ! colorBarArea = new Rectangle2D.Double( ! dataArea.getX(), plotArea.getMaxY() + this.outerGap, ! length, thickness ! ); } else if (edge == RectangleEdge.TOP) { ! colorBarArea = new Rectangle2D.Double( ! dataArea.getX(), reservedArea.getMinY() + this.outerGap, ! length, thickness ! ); } else if (edge == RectangleEdge.LEFT) { ! colorBarArea = new Rectangle2D.Double( ! plotArea.getX() - thickness - this.outerGap , ! dataArea.getMinY(), thickness, length ! ); } else if (edge == RectangleEdge.RIGHT) { ! colorBarArea = new Rectangle2D.Double( ! plotArea.getMaxX() + this.outerGap, dataArea.getMinY(), ! thickness, length ! ); } // update, but dont draw tick marks (needed for stepped colors) ! this.axis.refreshTicks( ! g2, new AxisState(), colorBarArea, edge ! ); drawColorBar(g2, colorBarArea, edge); --- 215,236 ---- if (edge == RectangleEdge.BOTTOM) { ! colorBarArea = new Rectangle2D.Double(dataArea.getX(), ! plotArea.getMaxY() + this.outerGap, length, thickness); } else if (edge == RectangleEdge.TOP) { ! colorBarArea = new Rectangle2D.Double(dataArea.getX(), ! reservedArea.getMinY() + this.outerGap, length, thickness); } else if (edge == RectangleEdge.LEFT) { ! colorBarArea = new Rectangle2D.Double(plotArea.getX() - thickness ! - this.outerGap, dataArea.getMinY(), thickness, length); } else if (edge == RectangleEdge.RIGHT) { ! colorBarArea = new Rectangle2D.Double(plotArea.getMaxX() ! + this.outerGap, dataArea.getMinY(), thickness, length); } // update, but dont draw tick marks (needed for stepped colors) ! this.axis.refreshTicks(g2, new AxisState(), colorBarArea, edge); drawColorBar(g2, colorBarArea, edge); *************** *** 249,275 **** if (edge == RectangleEdge.TOP) { cursor = colorBarArea.getMinY(); ! state = this.axis.draw( ! g2, cursor, reservedArea, colorBarArea, RectangleEdge.TOP, null ! ); } else if (edge == RectangleEdge.BOTTOM) { cursor = colorBarArea.getMaxY(); ! state = this.axis.draw( ! g2, cursor, reservedArea, colorBarArea, RectangleEdge.BOTTOM, ! null ! ); } else if (edge == RectangleEdge.LEFT) { cursor = colorBarArea.getMinX(); ! state = this.axis.draw( ! g2, cursor, reservedArea, colorBarArea, RectangleEdge.LEFT, null ! ); } else if (edge == RectangleEdge.RIGHT) { cursor = colorBarArea.getMaxX(); ! state = this.axis.draw( ! g2, cursor, reservedArea, colorBarArea, RectangleEdge.RIGHT, ! null ! ); } return state.getCursor(); --- 239,259 ---- if (edge == RectangleEdge.TOP) { cursor = colorBarArea.getMinY(); ! state = this.axis.draw(g2, cursor, reservedArea, colorBarArea, ! RectangleEdge.TOP, null); } else if (edge == RectangleEdge.BOTTOM) { cursor = colorBarArea.getMaxY(); ! state = this.axis.draw(g2, cursor, reservedArea, colorBarArea, ! RectangleEdge.BOTTOM, null); } else if (edge == RectangleEdge.LEFT) { cursor = colorBarArea.getMinX(); ! state = this.axis.draw(g2, cursor, reservedArea, colorBarArea, ! RectangleEdge.LEFT, null); } else if (edge == RectangleEdge.RIGHT) { cursor = colorBarArea.getMaxX(); ! state = this.axis.draw(g2, cursor, reservedArea, colorBarArea, ! RectangleEdge.RIGHT, null); } return state.getCursor(); *************** *** 396,402 **** AxisSpace space) { ! AxisSpace result = this.axis.reserveSpace( ! g2, plot, plotArea, edge, space ! ); double thickness = calculateBarThickness(dataArea, edge); result.add(thickness + 2 * this.outerGap, edge); --- 380,385 ---- AxisSpace space) { ! AxisSpace result = this.axis.reserveSpace(g2, plot, plotArea, edge, ! space); double thickness = calculateBarThickness(dataArea, edge); result.add(thickness + 2 * this.outerGap, edge); |