[Schmitzm-commits] r756 - in trunk: . dist src/schmitzm/geotools/gui src/schmitzm/geotools/styling src/schmitzm/jfree src/schmitzm/jfree/feature src/schmitzm/jfree/feature/style src_junit/skrueger/i8n

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Fri Mar 5 18:00:24 CET 2010


Author: alfonx
Date: 2010-03-05 18:00:22 +0100 (Fri, 05 Mar 2010)
New Revision: 756

Modified:
   trunk/dist/schmitzm-2.0.x.jar
   trunk/pom.xml
   trunk/src/schmitzm/geotools/gui/XMapPaneAction_Select.java
   trunk/src/schmitzm/geotools/styling/StylingUtil.java
   trunk/src/schmitzm/jfree/JFreeChartUtil.java
   trunk/src/schmitzm/jfree/feature/AggregationFunction.java
   trunk/src/schmitzm/jfree/feature/style/FeatureBasicChartStyle.java
   trunk/src/schmitzm/jfree/feature/style/FeatureChartAxisStyle.java
   trunk/src/schmitzm/jfree/feature/style/FeatureChartUtil.java
   trunk/src_junit/skrueger/i8n/SwitchLanguageDialogTest.java
Log:
improved the pom.xml and organized some imports


Modified: trunk/dist/schmitzm-2.0.x.jar
===================================================================
(Binary files differ)

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2010-03-05 16:14:29 UTC (rev 755)
+++ trunk/pom.xml	2010-03-05 17:00:22 UTC (rev 756)
@@ -1,16 +1,19 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>schmitzm</groupId>
-	<artifactId>library</artifactId>
+	<groupId>de.schmitzm</groupId>
+	<artifactId>schmitzm-library</artifactId>
 	<name>SCHMITZM</name>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.0.x-SNAPSHOT</version>
 	<description>A jar full of utility methods for Java, Swing, Geotools
 		and JFreeChart</description>
 	<issueManagement>
 		<system>gforge</system>
 		<url>http://wald.intevation.org/tracker/?group_id=47</url>
 	</issueManagement>
+	<properties>
+		<geotools.version>2.6.2</geotools.version>
+	</properties>
 	<developers>
 		<developer>
 			<id>alfonx</id>
@@ -45,7 +48,7 @@
 		<dependency>
 			<groupId>org.geotools</groupId>
 			<artifactId>gt-render</artifactId>
-			<version>2.6.2</version>
+			<version>${geotools.version}</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
@@ -53,7 +56,7 @@
 		<dependency>
 			<groupId>org.geotools</groupId>
 			<artifactId>gt-shapefile-renderer</artifactId>
-			<version>2.6.2</version>
+			<version>${geotools.version}</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
@@ -61,42 +64,42 @@
 		<dependency>
 			<groupId>org.geotools</groupId>
 			<artifactId>gt-legacy</artifactId>
-			<version>2.6.2</version>
+			<version>${geotools.version}</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
-		
-		
+
+
 		<dependency>
 			<groupId>org.geotools</groupId>
 			<artifactId>gt-brewer</artifactId>
-			<version>2.6.2</version>
+			<version>${geotools.version}</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
-		
-		
+
+
 		<dependency>
 			<groupId>org.geotools</groupId>
 			<artifactId>gt-image</artifactId>
-			<version>2.6.2</version>
+			<version>${geotools.version}</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.geotools</groupId>
 			<artifactId>gt-geotiff</artifactId>
-			<version>2.6.2</version>
+			<version>${geotools.version}</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
-		
-		
+
+
 		<dependency>
 			<groupId>org.geotools</groupId>
 			<artifactId>gt-swing</artifactId>
-			<version>2.6.2</version>
+			<version>${geotools.version}</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
@@ -110,7 +113,7 @@
 		<dependency>
 			<groupId>org.geotools</groupId>
 			<artifactId>gt-main</artifactId>
-			<version>2.6.2</version>
+			<version>${geotools.version}</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
@@ -118,7 +121,7 @@
 		<dependency>
 			<groupId>org.geotools</groupId>
 			<artifactId>gt-arcgrid</artifactId>
-			<version>2.6.2</version>
+			<version>${geotools.version}</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
@@ -204,4 +207,18 @@
 			<url>http://download.osgeo.org/webdav/geotools/</url>
 		</repository>
 	</repositories>
+
+	<distributionManagement>
+		<repository>
+			<id>artifactory-releases</id>
+			<name>CPA Internal Repository</name>
+			<url>http://10.1.1.101:8088/artifactory/libs-releases-local</url>
+		</repository>
+		<snapshotRepository>
+			<id>artifactory</id>
+			<name>CPA Internal Snapshot Repository</name>
+			<url>http://10.1.1.101:8088/artifactory/libs-snapshots-local</url>
+		</snapshotRepository>
+	</distributionManagement>
+
 </project>

Modified: trunk/src/schmitzm/geotools/gui/XMapPaneAction_Select.java
===================================================================
--- trunk/src/schmitzm/geotools/gui/XMapPaneAction_Select.java	2010-03-05 16:14:29 UTC (rev 755)
+++ trunk/src/schmitzm/geotools/gui/XMapPaneAction_Select.java	2010-03-05 17:00:22 UTC (rev 756)
@@ -17,7 +17,6 @@
 import org.opengis.geometry.DirectPosition;
 
 import schmitzm.geotools.map.event.FeatureSelectedEvent;
-import skrueger.geotools.GeomFilterGenerator;
 import skrueger.geotools.GeomFilterGenerator.PointFilterGenerator;
 
 import com.vividsolutions.jts.geom.Coordinate;

Modified: trunk/src/schmitzm/geotools/styling/StylingUtil.java
===================================================================
--- trunk/src/schmitzm/geotools/styling/StylingUtil.java	2010-03-05 16:14:29 UTC (rev 755)
+++ trunk/src/schmitzm/geotools/styling/StylingUtil.java	2010-03-05 17:00:22 UTC (rev 756)
@@ -76,7 +76,6 @@
 import org.geotools.filter.OrImpl;
 import org.geotools.filter.expression.DivideImpl;
 import org.geotools.filter.function.FilterFunction_strConcat;
-import org.geotools.filter.function.math.FilterFunction_abs;
 import org.geotools.geometry.jts.ReferencedEnvelope;
 import org.geotools.renderer.lite.RendererUtilities;
 import org.geotools.resources.i18n.Vocabulary;

Modified: trunk/src/schmitzm/jfree/JFreeChartUtil.java
===================================================================
--- trunk/src/schmitzm/jfree/JFreeChartUtil.java	2010-03-05 16:14:29 UTC (rev 755)
+++ trunk/src/schmitzm/jfree/JFreeChartUtil.java	2010-03-05 17:00:22 UTC (rev 756)
@@ -76,7 +76,6 @@
 import org.jfree.data.function.LineFunction2D;
 import org.jfree.data.general.Dataset;
 import org.jfree.data.general.DatasetUtilities;
-import org.jfree.data.statistics.Regression;
 import org.jfree.data.xy.XYDataset;
 import org.jfree.data.xy.XYSeriesCollection;
 

Modified: trunk/src/schmitzm/jfree/feature/AggregationFunction.java
===================================================================
--- trunk/src/schmitzm/jfree/feature/AggregationFunction.java	2010-03-05 16:14:29 UTC (rev 755)
+++ trunk/src/schmitzm/jfree/feature/AggregationFunction.java	2010-03-05 17:00:22 UTC (rev 756)
@@ -1,14 +1,5 @@
 package schmitzm.jfree.feature;
 
-import hep.aida.bin.QuantileBin1D;
-
-import java.awt.Component;
-
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.ListCellRenderer;
-
 import schmitzm.jfree.JFreeChartUtil;
 import schmitzm.jfree.feature.style.FeatureChartStyle;
 import schmitzm.lang.ResourceProvider;

Modified: trunk/src/schmitzm/jfree/feature/style/FeatureBasicChartStyle.java
===================================================================
--- trunk/src/schmitzm/jfree/feature/style/FeatureBasicChartStyle.java	2010-03-05 16:14:29 UTC (rev 755)
+++ trunk/src/schmitzm/jfree/feature/style/FeatureBasicChartStyle.java	2010-03-05 17:00:22 UTC (rev 756)
@@ -29,7 +29,6 @@
  ******************************************************************************/
 package schmitzm.jfree.feature.style;
 
-import java.util.HashSet;
 import java.util.Set;
 
 import org.geotools.feature.FeatureCollection;

Modified: trunk/src/schmitzm/jfree/feature/style/FeatureChartAxisStyle.java
===================================================================
--- trunk/src/schmitzm/jfree/feature/style/FeatureChartAxisStyle.java	2010-03-05 16:14:29 UTC (rev 755)
+++ trunk/src/schmitzm/jfree/feature/style/FeatureChartAxisStyle.java	2010-03-05 17:00:22 UTC (rev 756)
@@ -33,9 +33,6 @@
 import java.awt.Color;
 
 import org.jfree.chart.axis.Axis;
-import org.jfree.chart.axis.CategoryAxis;
-import org.jfree.chart.axis.DateAxis;
-import org.jfree.chart.axis.NumberAxis;
 
 import schmitzm.jfree.JFreeChartUtil;
 import schmitzm.jfree.chart.style.ChartAxisStyle;

Modified: trunk/src/schmitzm/jfree/feature/style/FeatureChartUtil.java
===================================================================
--- trunk/src/schmitzm/jfree/feature/style/FeatureChartUtil.java	2010-03-05 16:14:29 UTC (rev 755)
+++ trunk/src/schmitzm/jfree/feature/style/FeatureChartUtil.java	2010-03-05 17:00:22 UTC (rev 756)
@@ -59,8 +59,6 @@
 import org.opengis.feature.type.AttributeDescriptor;
 import org.opengis.feature.type.Name;
 
-import com.sun.org.apache.xml.internal.security.encryption.AgreementMethod;
-
 import schmitzm.geotools.feature.FeatureUtil;
 import schmitzm.geotools.feature.PipedFeatureIterator;
 import schmitzm.jfree.JFreeChartUtil;
@@ -68,7 +66,6 @@
 import schmitzm.jfree.chart.selection.DatasetSelectionModelProvider;
 import schmitzm.jfree.chart.style.ChartStyle;
 import schmitzm.jfree.chart.style.ChartStyleXMLFactory;
-import schmitzm.jfree.chart.style.ChartType;
 import schmitzm.jfree.feature.AggregationFunction;
 import schmitzm.jfree.feature.Feature2CategoryDatasetMapping;
 import schmitzm.jfree.feature.Feature2SeriesDatasetMapping;

Modified: trunk/src_junit/skrueger/i8n/SwitchLanguageDialogTest.java
===================================================================
--- trunk/src_junit/skrueger/i8n/SwitchLanguageDialogTest.java	2010-03-05 16:14:29 UTC (rev 755)
+++ trunk/src_junit/skrueger/i8n/SwitchLanguageDialogTest.java	2010-03-05 17:00:22 UTC (rev 756)
@@ -31,8 +31,6 @@
 
 import java.util.ArrayList;
 
-import org.junit.Test;
-
 import junit.framework.TestCase;
 
 public class SwitchLanguageDialogTest extends TestCase {



More information about the Schmitzm-commits mailing list