[Schmitzm-commits] r411 - in branches/1.0-gt2-2.6/src: junit/skrueger/i8n schmitzm/geotools/feature schmitzm/geotools/gui schmitzm/geotools/styling

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2009-09-22 08:55:30 +0200 (Tue, 22 Sep 2009)
New Revision: 411

Modified:
   branches/1.0-gt2-2.6/src/junit/skrueger/i8n/SwitchLanguageDialogTest.java
   branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/AttributeTypeFilter.java
   branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GridPanel.java
   branches/1.0-gt2-2.6/src/schmitzm/geotools/styling/StylingUtil.java
Log:


Modified: branches/1.0-gt2-2.6/src/junit/skrueger/i8n/SwitchLanguageDialogTest.java
===================================================================
--- branches/1.0-gt2-2.6/src/junit/skrueger/i8n/SwitchLanguageDialogTest.java	2009-09-21 16:44:30 UTC (rev 410)
+++ branches/1.0-gt2-2.6/src/junit/skrueger/i8n/SwitchLanguageDialogTest.java	2009-09-22 06:55:30 UTC (rev 411)
@@ -32,7 +32,6 @@
 import java.util.ArrayList;
 
 import junit.framework.TestCase;
-
 import skrueger.i8n.SwitchLanguageDialog;
 
 public class SwitchLanguageDialogTest extends TestCase {

Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/AttributeTypeFilter.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/AttributeTypeFilter.java	2009-09-21 16:44:30 UTC (rev 410)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/AttributeTypeFilter.java	2009-09-22 06:55:30 UTC (rev 411)
@@ -29,10 +29,7 @@
  ******************************************************************************/
 package schmitzm.geotools.feature;
 
-import org.geotools.feature.GeometryAttributeType;
-import org.geotools.feature.type.GeometricAttributeType;
 import org.opengis.feature.type.AttributeDescriptor;
-import org.opengis.feature.type.AttributeType;
 import org.opengis.feature.type.GeometryDescriptor;
 
 import schmitzm.geotools.gui.FeatureFilterPanel;

Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GridPanel.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GridPanel.java	2009-09-21 16:44:30 UTC (rev 410)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GridPanel.java	2009-09-22 06:55:30 UTC (rev 411)
@@ -32,12 +32,9 @@
 import java.awt.Color;
 import java.awt.Graphics;
 import java.awt.geom.AffineTransform;
-import java.text.DecimalFormat;
 
 import org.apache.log4j.Logger;
-import org.geotools.factory.Hints;
 import org.geotools.referencing.CRS;
-import org.geotools.referencing.crs.DefaultGeographicCRS;
 import org.geotools.referencing.operation.projection.PointOutsideEnvelopeException;
 import org.opengis.referencing.FactoryException;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
@@ -45,7 +42,6 @@
 import org.opengis.referencing.operation.MathTransform;
 
 import schmitzm.lang.LangUtil;
-import schmitzm.lang.ResourceProvider;
 import schmitzm.swing.JPanel;
 import schmitzm.swing.SwingUtil;
 

Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/styling/StylingUtil.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/styling/StylingUtil.java	2009-09-21 16:44:30 UTC (rev 410)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/styling/StylingUtil.java	2009-09-22 06:55:30 UTC (rev 411)
@@ -66,9 +66,7 @@
 import org.geotools.feature.FeatureCollection;
 import org.geotools.feature.GeometryAttributeType;
 import org.geotools.filter.ConstantExpression;
-import org.geotools.filter.visitor.ExtractBoundsFilterVisitor;
 import org.geotools.renderer.lite.RendererUtilities;
-import org.geotools.renderer.lite.gridcoverage2d.StyleVisitorAdapter;
 import org.geotools.resources.i18n.Vocabulary;
 import org.geotools.resources.i18n.VocabularyKeys;
 import org.geotools.styling.ColorMap;
@@ -94,7 +92,6 @@
 import org.geotools.styling.Style;
 import org.geotools.styling.StyleBuilder;
 import org.geotools.styling.StyleFactory;
-import org.geotools.styling.StyleVisitor;
 import org.geotools.styling.Symbolizer;
 import org.geotools.styling.TextSymbolizer;
 import org.geotools.styling.visitor.DuplicatingStyleVisitor;
@@ -1853,11 +1850,11 @@
 			fill.setColor(STYLE_BUILDER.colorExpression(newColor));
 
 		replaceGraphicColor(fill.getGraphicFill(), oldColor, newColor);
-
-		if ((fill.getBackgroundColor() != null)
-				&& (getColorFromExpression(fill.getBackgroundColor())
-						.equals(oldColor)))
-			fill.setBackgroundColor(STYLE_BUILDER.colorExpression(newColor));
+//
+//		if ((fill.getBackgroundColor() != null)
+//				&& (getColorFromExpression(fill.getBackgroundColor())
+//						.equals(oldColor)))
+//			fill.setBackgroundColor(STYLE_BUILDER.colorExpression(newColor));
 	}
 
 	/**