[Jfreechart-patches] jfreechart/source/org/jfree/chart/renderer/category BarRenderer.java

[David G. <mu...@us...>]

Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/renderer/category
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9630/source/org/jfree/chart/renderer/category

Modified Files:
	BarRenderer.java 
Log Message:
30-Sep-2005  David Gilbert  <dav...@ob...>

	* source/org/jfree/chart/renderer/category/BarRenderer.java
	(maxBarWidth): renamed maximumBarWidth,
	(BarRenderer): update for renamed field,
	(getMaxBarWidth): renamed getMaximumBarWidth(),
	(setMaxBarWidth): renamed setMaximumBarWidth(),
	(calculateBarWidth): update for renamed method,
	(equals): update for renamed field,
	* source/org/jfree/data/general/DatasetUtilities.java
	(findStackedRangeBounds(CategoryDataset)): delegate to new method,
	(findStackedRangeBounds(CategoryDataset, double): new method.
----------------------------------------------------------------------


Index: BarRenderer.java
===================================================================
RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/renderer/category/BarRenderer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** BarRenderer.java	1 Jul 2005 14:57:39 -0000	1.15
--- BarRenderer.java	30 Sep 2005 10:23:21 -0000	1.16
***************
*** 69,72 ****
--- 69,73 ----
   * 20-Apr-2005 : Generate legend labels, tooltips and URLs (DG);
   * 18-May-2005 : Added configurable base value (DG);
+  * 09-Jun-2005 : Use addItemEntity() method from superclass (DG);
   * 
   */
***************
*** 128,132 ****
      
      /** The maximum bar width as a percentage of the available space. */
!     private double maxBarWidth;
      
      /** The minimum bar length (in Java2D units). */
--- 129,133 ----
      
      /** The maximum bar width as a percentage of the available space. */
!     private double maximumBarWidth;
      
      /** The minimum bar length (in Java2D units). */
***************
*** 169,173 ****
          this.itemMargin = DEFAULT_ITEM_MARGIN;
          this.drawBarOutline = true;
!         this.maxBarWidth = 1.0;  
              // 100 percent, so it will not apply unless changed
          this.positiveItemLabelPositionFallback = null;
--- 170,174 ----
          this.itemMargin = DEFAULT_ITEM_MARGIN;
          this.drawBarOutline = true;
!         this.maximumBarWidth = 1.0;  
              // 100 percent, so it will not apply unless changed
          this.positiveItemLabelPositionFallback = null;
***************
*** 246,251 ****
       * @return The maximum bar width.
       */
!     public double getMaxBarWidth() {
!         return this.maxBarWidth;
      }
      
--- 247,252 ----
       * @return The maximum bar width.
       */
!     public double getMaximumBarWidth() {
!         return this.maximumBarWidth;
      }
      
***************
*** 257,262 ****
       * @param percent  the percent (where 0.05 is five percent).
       */
!     public void setMaxBarWidth(double percent) {
!         this.maxBarWidth = percent;
          notifyListeners(new RendererChangeEvent(this));
      }
--- 258,263 ----
       * @param percent  the percent (where 0.05 is five percent).
       */
!     public void setMaximumBarWidth(double percent) {
!         this.maximumBarWidth = percent;
          notifyListeners(new RendererChangeEvent(this));
      }
***************
*** 435,439 ****
                  space = dataArea.getWidth();
              }
!             double maxWidth = space * getMaxBarWidth();
              double categoryMargin = 0.0;
              double currentItemMargin = 0.0;
--- 436,440 ----
                  space = dataArea.getWidth();
              }
!             double maxWidth = space * getMaximumBarWidth();
              double categoryMargin = 0.0;
              double currentItemMargin = 0.0;
***************
*** 684,688 ****
              );
          }        
!                 
          // add an item entity, if this information is being collected
          EntityCollection entities = state.getEntityCollection();
--- 685,689 ----
              );
          }        
! 
          // add an item entity, if this information is being collected
          EntityCollection entities = state.getEntityCollection();
***************
*** 960,964 ****
              return false;
          }
!         if (this.maxBarWidth != that.maxBarWidth) {
              return false;
          }
--- 961,965 ----
              return false;
          }
!         if (this.maximumBarWidth != that.maximumBarWidth) {
              return false;
          }