[Schmitzm-commits] r450 - in branches/1.0-gt2-2.6/src: schmitzm/jfree/chart/style schmitzm/jfree/feature/style skrueger/geotools

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2009-10-08 23:51:48 +0200 (Thu, 08 Oct 2009)
New Revision: 450

Modified:
   branches/1.0-gt2-2.6/src/schmitzm/jfree/chart/style/ChartLabelStyle.java
   branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/style/FeatureChartStyle.java
   branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/style/FeatureScatterChartStyle.java
   branches/1.0-gt2-2.6/src/skrueger/geotools/Copyable.java
Log:
* DesignAtlasChartDialog now tries to backup nd restore the ChartStyles. This doesn't yet work. Commiting it for Martin to test it.

Modified: branches/1.0-gt2-2.6/src/schmitzm/jfree/chart/style/ChartLabelStyle.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/jfree/chart/style/ChartLabelStyle.java	2009-10-08 19:41:57 UTC (rev 449)
+++ branches/1.0-gt2-2.6/src/schmitzm/jfree/chart/style/ChartLabelStyle.java	2009-10-08 21:51:48 UTC (rev 450)
@@ -56,6 +56,13 @@
   /** Holds the text color of the label. */
   protected Color paint = null;
   
+  @Override
+	public String toString() {
+		if (label != null && paint != null)
+			return "'" + label + "' in " + paint;
+		return super.toString();
+	}
+  
   /**
    * Creates a new style with default values (empty label, color undefined).
    */

Modified: branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/style/FeatureChartStyle.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/style/FeatureChartStyle.java	2009-10-08 19:41:57 UTC (rev 449)
+++ branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/style/FeatureChartStyle.java	2009-10-08 21:51:48 UTC (rev 450)
@@ -235,6 +235,8 @@
      * @return {@code dest} or the new instance
      */
     public Dummy copyTo(Dummy dest) {
+      super.copyTo(dest);	
+    	
       // !! do NOT copy the super class properties !!
       // !! copy only this classes properties !!
       dest.setSortDomainAxis( isSortDomainAxis() );

Modified: branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/style/FeatureScatterChartStyle.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/style/FeatureScatterChartStyle.java	2009-10-08 19:41:57 UTC (rev 449)
+++ branches/1.0-gt2-2.6/src/schmitzm/jfree/feature/style/FeatureScatterChartStyle.java	2009-10-08 21:51:48 UTC (rev 450)
@@ -90,7 +90,9 @@
   public FeatureScatterChartStyle copyTo(FeatureScatterChartStyle dest) {
     // copy the super class properties
     dest = (FeatureScatterChartStyle)copyTo((ScatterChartStyle)dest);
-    // copy this classes properties
+    
+// Hey Martin! Die nächste line überschreibt alles mit null... wenn ich sie rausnehme     
+//    // copy this classes properties
     dummyFeatureChartStyle.copyTo(dest);
 
     return dest;

Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/Copyable.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/Copyable.java	2009-10-08 19:41:57 UTC (rev 449)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/Copyable.java	2009-10-08 21:51:48 UTC (rev 450)
@@ -1,6 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Martin O. J. Schmitz.
+ * 
+ * This file is part of the SCHMITZM library - a collection of utility 
+ * classes based on Java 1.6, focusing (not only) on Java Swing 
+ * and the Geotools library.
+ * 
+ * The SCHMITZM project is hosted at:
+ * http://wald.intevation.org/projects/schmitzm/
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License (license.txt)
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * or try this link: http://www.gnu.org/licenses/lgpl.html
+ * 
+ * Contributors:
+ *     Stefan A. Krüger - initial API 
+ ******************************************************************************/
+
 package skrueger.geotools;
 
-
 public interface Copyable<T> {
 	
 	/**