[Schmitzm-commits] r729 - in trunk/src: schmitzm/jfree/chart/style schmitzm/jfree/feature/style skrueger/swing

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2010-02-26 14:27:33 +0100 (Fri, 26 Feb 2010)
New Revision: 729

Modified:
   trunk/src/schmitzm/jfree/chart/style/ChartLabelStyle.java
   trunk/src/schmitzm/jfree/feature/style/FeatureChartStyle.java
   trunk/src/skrueger/swing/SmallButton.java
Log:
GP chart designer : theunit  metadata of the first range attribute is not used for the range axis description by default. aggregation method is also added to the unit automatically.

Modified: trunk/src/schmitzm/jfree/chart/style/ChartLabelStyle.java
===================================================================
--- trunk/src/schmitzm/jfree/chart/style/ChartLabelStyle.java	2010-02-26 12:20:46 UTC (rev 728)
+++ trunk/src/schmitzm/jfree/chart/style/ChartLabelStyle.java	2010-02-26 13:27:33 UTC (rev 729)
@@ -43,7 +43,7 @@
  * in a chart. This can be an localized text according to {@link Translation} or
  * a simple (unlocalized) String. The {@link #setLabel(String)} method will
  * try to decode the string for multiple languages. If this is not possible
- * the core string is taken as label.
+ * the core string is taken as label.	
  * @author <a href="mailto:Martin.Schmitz at koeln.de">Martin Schmitz</a>
  * @version 1.0
  */

Modified: trunk/src/schmitzm/jfree/feature/style/FeatureChartStyle.java
===================================================================
--- trunk/src/schmitzm/jfree/feature/style/FeatureChartStyle.java	2010-02-26 12:20:46 UTC (rev 728)
+++ trunk/src/schmitzm/jfree/feature/style/FeatureChartStyle.java	2010-02-26 13:27:33 UTC (rev 729)
@@ -64,7 +64,7 @@
  * @version 1.0
  */
 public interface FeatureChartStyle extends ChartStyle {
-	
+
 	/**
 	 * Defines possible aggregation function to calculate on attribute
 	 * categories.
@@ -77,12 +77,12 @@
 		COUNT,
 		/** Sum of the attribute values. */
 		SUM,
-//		/** Sum of the absolute attribute values. */
-//		SUM_ABS,
+		// /** Sum of the absolute attribute values. */
+		// SUM_ABS,
 		/** Average of the attribute values. */
 		AVG,
-//		/** Median of the attribute values. */
-//		MEDIAN,
+		// /** Median of the attribute values. */
+		// MEDIAN,
 		/** Minimum attribute value. */
 		MIN,
 		/** Maximum attribute value. */
@@ -127,8 +127,8 @@
 				return statistics.standardDeviation();
 			case VARIANCE:
 				return Math.pow(statistics.standardDeviation(), 2);
-//			case MEDIAN:
-//			case SUM_ABS:
+				// case MEDIAN:
+				// case SUM_ABS:
 			}
 			throw new UnsupportedOperationException(
 					"Aggregation function not yet supported: " + this);

Modified: trunk/src/skrueger/swing/SmallButton.java
===================================================================
--- trunk/src/skrueger/swing/SmallButton.java	2010-02-26 12:20:46 UTC (rev 728)
+++ trunk/src/skrueger/swing/SmallButton.java	2010-02-26 13:27:33 UTC (rev 729)
@@ -7,27 +7,26 @@
 public class SmallButton extends JButton {
 
 	public SmallButton() {
-		setBorder(BorderFactory.createEtchedBorder());
+		setBorder(BorderFactory.createCompoundBorder(BorderFactory
+				.createEtchedBorder(), BorderFactory.createEmptyBorder(0, 1, 0,
+				3)));
 	}
 
 	public SmallButton(Action action, String tooltip) {
 		this(action);
 		setToolTipText(tooltip);
 	}
-	
 
 	public SmallButton(String label) {
 		this();
 		setText(label);
 	}
-	
 
-
 	public SmallButton(String label, String toolTip) {
 		this();
 		setText(label);
 		setToolTipText(toolTip);
-	}	
+	}
 
 	public SmallButton(Action action) {
 		this();