[Schmitzm-commits] r337 - in branches/1.0-gt2-2.6/src: org/geotools/renderer/lite/gridcoverage2d schmitzm/geotools/gui schmitzm/geotools/styling

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2009-08-27 11:22:45 +0200 (Thu, 27 Aug 2009)
New Revision: 337

Modified:
   branches/1.0-gt2-2.6/src/org/geotools/renderer/lite/gridcoverage2d/RasterSymbolizerSupport.java
   branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorPane.java
   branches/1.0-gt2-2.6/src/schmitzm/geotools/styling/StylingUtil.java
Log:
Migrating to GT2.6... only 100 compile errors left...

Modified: branches/1.0-gt2-2.6/src/org/geotools/renderer/lite/gridcoverage2d/RasterSymbolizerSupport.java
===================================================================
--- branches/1.0-gt2-2.6/src/org/geotools/renderer/lite/gridcoverage2d/RasterSymbolizerSupport.java	2009-08-27 09:10:10 UTC (rev 336)
+++ branches/1.0-gt2-2.6/src/org/geotools/renderer/lite/gridcoverage2d/RasterSymbolizerSupport.java	2009-08-27 09:22:45 UTC (rev 337)
@@ -444,7 +444,7 @@
         Category category;
         Color[] colors;
         final int length = categories.length;
-        Range range;
+        NumberRange range;
         int lower;
         int upper;
         for (int j = length; --j >= 0;) {

Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorPane.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorPane.java	2009-08-27 09:10:10 UTC (rev 336)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorPane.java	2009-08-27 09:22:45 UTC (rev 337)
@@ -137,7 +137,7 @@
   /** Holds the kind of geometry of the edited layer. */
   protected GeometryForm editorGeometryForm = null;
   /** Holds the {@link FeatureCollection} of the edited layer. */
-  protected DefaultFeatureCollection editorFeatureCollection = null;
+  protected FeatureCollection<SimpleFeatureType, SimpleFeature> editorFeatureCollection = null;
   /** Holds the edited layer. */
   protected MapLayer editorLayer = null;
 
@@ -342,7 +342,7 @@
   /**
    * Returns the {@link FeatureCollection} of the edited layer.
    */
-  public FeatureCollection getEditorFeatureCollection() {
+  public FeatureCollection<SimpleFeatureType, SimpleFeature> getEditorFeatureCollection() {
     return this.editorFeatureCollection;
   }
 
@@ -376,7 +376,7 @@
   /**
    * Called when the mouse is clicked on map during creating a new layer.
    * @param coord World coordinates of click position
-   * @param refresh indicates whether the visualisation will be refreshed
+   * @param refresh indicates whether the visualization will be refreshed
    * @param aClearRedo indicates whether the REDO-Stack is cleared (normally {@code true},
    *                   but {@code false} during REDO operation!)
    */
@@ -417,7 +417,7 @@
   /**
    * Finishes the editing of the current segment (SimpleFeature).
    * If no editing operation is currently in progress, this method does nothing.
-   * @param refresh indicates whether the visualisation will be refreshed
+   * @param refresh indicates whether the visualization will be refreshed
    * @param aClearRedo indicates whether the REDO-Stack is cleared (normally {@code true},
    *                   but {@code false} during REDO operation!)
    * @exception UnsupportedOperationException if a line or polygon feature can not

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-08-27 09:10:10 UTC (rev 336)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/styling/StylingUtil.java	2009-08-27 09:22:45 UTC (rev 337)
@@ -1652,13 +1652,13 @@
 	 * 
 	 * @param featureType
 	 *            If this a legend for Point, Polygon or Line?
-	 * @param featureTypeStyles
+	 * @param list
 	 *            The Styles to presen in this legend
 	 * 
 	 * @author <a href="mailto:skpublic at wikisquare.de">Stefan Alfons
 	 *         Kr&uuml;ger</a>
 	 */
-	public static Box createLegendPanel(FeatureTypeStyle[] featureTypeStyles,
+	public static Box createLegendPanel(List<FeatureTypeStyle> list,
 			SimpleFeatureType featureType) {
 
 		Box box = new Box(BoxLayout.Y_AXIS) {
@@ -1684,7 +1684,7 @@
 			}
 		};
 
-		for (FeatureTypeStyle ftStyle : featureTypeStyles) {
+		for (FeatureTypeStyle ftStyle : list) {
 
 			// One child-node for every rule
 			Rule[] rules = ftStyle.getRules();