[Schmitzm-commits] r1787 - in trunk: schmitzm-gt/src/main/java/de/schmitzm/geotools/feature schmitzm-parent
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Nov 21 18:52:45 CET 2011
Author: alfonx
Date: 2011-11-21 18:52:44 +0100 (Mon, 21 Nov 2011)
New Revision: 1787
Modified:
trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/feature/FeatureUtil.java
trunk/schmitzm-parent/pom.xml
Log:
gt 2.7.3
Modified: trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/feature/FeatureUtil.java
===================================================================
--- trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/feature/FeatureUtil.java 2011-11-19 12:42:59 UTC (rev 1786)
+++ trunk/schmitzm-gt/src/main/java/de/schmitzm/geotools/feature/FeatureUtil.java 2011-11-21 17:52:44 UTC (rev 1787)
@@ -83,6 +83,7 @@
import org.geotools.feature.simple.SimpleFeatureBuilder;
import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
import org.geotools.filter.FilterAbstract;
+import org.geotools.map.Layer;
import org.geotools.map.MapLayer;
import org.geotools.resources.CRSUtilities;
import org.geotools.resources.coverage.FeatureUtilities;
@@ -117,6 +118,7 @@
import com.vividsolutions.jts.geom.Point;
import com.vividsolutions.jts.geom.Polygon;
+import de.appl.util.RasterMetaData;
import de.schmitzm.geotools.FilterUtil;
import de.schmitzm.geotools.GTUtil;
import de.schmitzm.geotools.styling.StyledFeaturesInterface;
@@ -2192,6 +2194,7 @@
return null;
}
}
+
/**
* Liefert das Objekt ({@link GridCoverage2D} oder {@link FeatureCollection}
Modified: trunk/schmitzm-parent/pom.xml
===================================================================
--- trunk/schmitzm-parent/pom.xml 2011-11-19 12:42:59 UTC (rev 1786)
+++ trunk/schmitzm-parent/pom.xml 2011-11-21 17:52:44 UTC (rev 1787)
@@ -14,8 +14,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<schmitzm.version>${project.version}</schmitzm.version>
- <geotools.version>8-SNAPSHOT</geotools.version>
-<!-- <geotools.version>2.7-RC1</geotools.version> -->
+<!-- <geotools.version>8-SNAPSHOT</geotools.version> -->
+ <geotools.version>2.7.3</geotools.version>
</properties>
<issueManagement>
@@ -146,58 +146,93 @@
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
+<!-- <plugin> -->
+<!-- <artifactId>maven-antrun-plugin</artifactId> -->
+<!-- <version>1.3</version> -->
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
+<!-- <executions> -->
+<!-- <execution> -->
+<!-- <phase>compile</phase> -->
+<!-- <goals> -->
+<!-- <goal>run</goal> -->
+<!-- </goals> -->
+<!-- <configuration> -->
- <tasks>
- <taskdef resource="net/sf/antcontrib/antlib.xml">
- <classpath refid="maven.dependency.classpath" />
- </taskdef>
+<!-- <tasks> -->
+<!-- <taskdef resource="net/sf/antcontrib/antlib.xml"> -->
+<!-- <classpath refid="maven.dependency.classpath" /> -->
+<!-- </taskdef> -->
- <typedef name="native2ascii"
- classname="org.apache.tools.ant.taskdefs.optional.Native2Ascii">
- <classpath refid="maven.dependency.classpath" />
- </typedef>
+<!-- <typedef name="native2ascii" -->
+<!-- classname="org.apache.tools.ant.taskdefs.optional.Native2Ascii"> -->
+<!-- <classpath refid="maven.dependency.classpath" /> -->
+<!-- </typedef> -->
- <for param="file"
- description="Alle .properties nach .propertieNative umbenennen">
- <path>
- <fileset dir="src" includes="**/*.properties" />
- </path>
- <sequential>
- <move file="@{file}" overwrite="true" tofile="@{file}Native"
- verbose="false" preservelastmodified="true" />
- </sequential>
- </for>
+<!-- <for param="file" -->
+<!-- description="Alle .properties nach .propertieNative umbenennen"> -->
+<!-- <path> -->
+<!-- <fileset dir="src" includes="**/*.properties" /> -->
+<!-- </path> -->
+<!-- <sequential> -->
+<!-- <move file="@{file}" overwrite="true" tofile="@{file}Native" -->
+<!-- verbose="false" preservelastmodified="true" /> -->
+<!-- </sequential> -->
+<!-- </for> -->
- <native2ascii encoding="UTF8" src="src"
- includes="**/*.propertiesNative" dest="src" ext=".properties" />
+<!-- <native2ascii encoding="UTF8" src="src" -->
+<!-- includes="**/*.propertiesNative" dest="src" ext=".properties" /> -->
- <for param="file">
- <path>
- <fileset dir="src" includes="**/*.propertiesNative" />
- </path>
- <sequential>
- <delete file="@{file}" quiet="true" />
- </sequential>
- </for>
+<!-- <for param="file"> -->
+<!-- <path> -->
+<!-- <fileset dir="src" includes="**/*.propertiesNative" /> -->
+<!-- </path> -->
+<!-- <sequential> -->
+<!-- <delete file="@{file}" quiet="true" /> -->
+<!-- </sequential> -->
+<!-- </for> -->
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
+<!-- </tasks> -->
+<!-- </configuration> -->
+<!-- </execution> -->
+<!-- </executions> -->
+<!-- </plugin> -->
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.apache.maven.plugins
+ </groupId>
+ <artifactId>
+ maven-antrun-plugin
+ </artifactId>
+ <versionRange>
+ [1.3,)
+ </versionRange>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
More information about the Schmitzm-commits
mailing list