From: <jbo...@li...> - 2005-11-22 19:26:20
|
Author: aron.gombas Date: 2005-11-22 14:26:00 -0500 (Tue, 22 Nov 2005) New Revision: 1622 Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/util/ChartUtils.java Log: Cosmetic changes Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/util/ChartUtils.java =================================================================== --- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/util/ChartUtils.java 2005-11-22 19:03:27 UTC (rev 1621) +++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/util/ChartUtils.java 2005-11-22 19:26:00 UTC (rev 1622) @@ -36,15 +36,10 @@ */ public class ChartUtils { /** - * Max number of items in clamped datasets. + * Max number of items in trimmed datasets. * @see #collectionToPieDataset(Collection, int) */ public static final int MAX_ITEMS = 8; - /** - * Pass this as max number of items for unclamped datasets. - * @see #collectionToPieDataset(Collection, int) - */ - public static final int NO_CLAMP_MAX_ITEMS = -1; /** Horizontal resolution of chart images. */ protected static final int CHART_RESOLUTION_X = 320; @@ -103,18 +98,18 @@ } /** - * Returns the passed collection as unclamped pie-dataset. + * Returns the passed collection as untrimmed pie-dataset. * @see #collectionToPieDataset(Collection, int) */ public static PieDataset collectionToPieDataset(Collection items) { - return collectionToPieDataset(items, NO_CLAMP_MAX_ITEMS); + return collectionToPieDataset(items, -1); } /** * Returns the passed collection of <code>Map.Entry</code> objects as pie-dataset - * (equivalent key-value pairs), optionally clamped to a maximum number of items + * (equivalent key-value pairs), optionally trimmed to a maximum number of items * to prevent unreadably busy charts. - * @param maxItems the maximum number of items in the returned pie-dataset or <code>NO_CLAMP_MAX_ITEMS</code> if clamping is not needed. + * @param maxItems the maximum number of items in the returned pie-dataset or -1 if trimming is not needed. */ public static PieDataset collectionToPieDataset(Collection items, int maxItems) { DefaultPieDataset dataset = new DefaultPieDataset(); @@ -122,7 +117,7 @@ // generate dataset int counter = 0; for(Map.Entry<? extends Comparable, Integer> item : (Collection<Map.Entry<? extends Comparable, Integer>>)items) { - if((maxItems != NO_CLAMP_MAX_ITEMS) && (++counter > maxItems)) + if((maxItems != -1) && (++counter > maxItems)) break; dataset.setValue(item.getKey(), item.getValue()); } |