[Schmitzm-commits] r943 - in trunk: src/schmitzm/geotools src/schmitzm/geotools/feature src/schmitzm/geotools/gui src/schmitzm/lang src/schmitzm/swing src_junit/schmitzm/geotools src_junit/schmitzm/geotools/feature src_junit/schmitzm/geotools/gui src_junit/schmitzm/lang
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Jul 23 16:15:09 CEST 2010
Author: alfonx
Date: 2010-07-23 16:15:06 +0200 (Fri, 23 Jul 2010)
New Revision: 943
Modified:
trunk/src/schmitzm/geotools/epsg.properties
trunk/src/schmitzm/geotools/feature/FeatureUtil.java
trunk/src/schmitzm/geotools/gui/XMapPane.java
trunk/src/schmitzm/lang/LimitedHashMap.java
trunk/src/schmitzm/lang/ResourceProvider.java
trunk/src/schmitzm/swing/ExceptionDialog.java
trunk/src/schmitzm/swing/ResourceProviderManagerFrame.java
trunk/src_junit/schmitzm/geotools/GTUtilTest.java
trunk/src_junit/schmitzm/geotools/feature/FeatureComparatorTest.java
trunk/src_junit/schmitzm/geotools/feature/FeatureUtilTest.java
trunk/src_junit/schmitzm/geotools/gui/XMapPaneTest.java
trunk/src_junit/schmitzm/lang/LangUtilTest.java
trunk/src_junit/schmitzm/lang/LimitedHashMapTest.java
Log:
"Organized imports" and removed a buggy CRS from the epsg.properties
Modified: trunk/src/schmitzm/geotools/epsg.properties
===================================================================
--- trunk/src/schmitzm/geotools/epsg.properties 2010-07-23 09:56:05 UTC (rev 942)
+++ trunk/src/schmitzm/geotools/epsg.properties 2010-07-23 14:15:06 UTC (rev 943)
@@ -4,7 +4,7 @@
42101=PROJCS["WGS 84 / LCC Canada",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Decimal_Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["central_meridian",-95.0],PARAMETER["latitude_of_origin",0],PARAMETER["standard_parallel_1",49.0],PARAMETER["standard_parallel_2",77.0],PARAMETER["false_northing",-8000000.0],UNIT["Meter",1]]
42102=PROJCS["BC_Albers",GEOGCS["GCS_North_American_1983",DATUM["North_American_Datum_1983",SPHEROID["GRS_1980",6378137,298.257222101],TOWGS84[0,0,0]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Albers_Conic_Equal_Area"],PARAMETER["False_Easting",1000000],PARAMETER["Central_Meridian",-126],PARAMETER["Standard_Parallel_1",50],PARAMETER["Standard_Parallel_2",58.5],PARAMETER["Latitude_Of_Origin",45],UNIT["Meter",1]]
42103=PROJCS["WGS 84 / LCC USA",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS_1978",6378135,298.26]],PRIMEM["Greenwich",0],UNIT["Decimal_Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["central_meridian",-100.0],PARAMETER["latitude_of_origin",0],PARAMETER["standard_parallel_1",33.0],PARAMETER["standard_parallel_2",45.0],UNIT["Meter",1]]
-42104=PROJCS["NAD83 / MTM zone 8 Qu\u00e9bec",GEOGCS["GRS80",DATUM["GRS_1980",SPHEROID["GRS_1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Decimal_Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-73.5],PARAMETER["scale_factor",0.9999],PARAMETER["false_easting",304800],UNIT["Meter",1]]
+42104=PROJCS["NAD83 / MTM zone 8 Qu\u00E9bec",GEOGCS["GRS80",DATUM["GRS_1980",SPHEROID["GRS_1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Decimal_Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["latitude_of_origin",0],PARAMETER["central_meridian",-73.5],PARAMETER["scale_factor",0.9999],PARAMETER["false_easting",304800],UNIT["Meter",1]]
42105=PROJCS["WGS84 / Merc NorthAm",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Decimal_Degree",0.0174532925199433]],PROJECTION["Mercator_1SP"],PARAMETER["central_meridian",-96],UNIT["Meter",1]]
42106=PROJCS["WGS84 / Lambert Azim Mozambique",GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Decimal_Degree",0.0174532925199433]],PROJECTION["Lambert_Azimuthal_Equal_Area"],PARAMETER["latitude_of_origin",5],PARAMETER["central_meridian",20],UNIT["Meter",1]]
42301=PROJCS["NAD27 / Polar Stereographic / CM=-98",GEOGCS["NAD27",DATUM["North_American_Datum_1927",SPHEROID["Clarke 1866",6378206.4,294.978698213901],TOWGS84[-9,151,185]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Stereographic"],PARAMETER["latitude_of_origin",90],PARAMETER["central_meridian",-98.0],PARAMETER["scale_factor",0.9996],UNIT["Meter",1]]
@@ -20,7 +20,6 @@
42311=PROJCS["NAD83 / LCC Statcan",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS_1980",6378137,298.257222101],TOWGS84[0,0,0]],PRIMEM["Greenwich",0],UNIT["Decimal_Degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["central_meridian",-91.866667],PARAMETER["latitude_of_origin",63.390675],PARAMETER["standard_parallel_1",49],PARAMETER["standard_parallel_2",77],PARAMETER["false_easting",6200000],PARAMETER["false_northing",3000000],UNIT["Meter",1]]
45555=PROJCS["WRF_Lambert_Conformal_Conic 2",GEOGCS["GCS_North_American_1983",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.25722356300003]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943299]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["False_Easting",0],PARAMETER["False_Northing",0],PARAMETER["Central_Meridian",-97],PARAMETER["Standard_Parallel_1",33],PARAMETER["Standard_Parallel_2",60],PARAMETER["Latitude_Of_Origin",40.003338],UNIT["Meter",1],AUTHORITY["EPSG","45555"]]
45556=PROJCS["Albers Equal area",GEOGCS["WGS 84", DATUM["World Geodetic System 1984", SPHEROID["WGS 84", 6378137.0, 298.257223563, AUTHORITY["EPSG","7030"]], AUTHORITY["EPSG","6326"]], PRIMEM["Greenwich", 0.0, AUTHORITY["EPSG","8901"]], UNIT["degree", 0.017453292519943295], AUTHORITY["EPSG","4326"]], PROJECTION["Albers Equal Area", AUTHORITY["EPSG","9822"]], PARAMETER["central_meridian", -96.0], PARAMETER["latitude_of_origin", 37.5], PARAMETER["standard_parallel_1", 29.833333333333336], PARAMETER["false_easting", 0.0], PARAMETER["false_northing", 0.0], PARAMETER["standard_parallel_2", 45.833333333333336], UNIT["m", 1.0], AUTHORITY["EPSG","45556"]]
-54004=PROJCS["WGS84 / Simple Mercator", GEOGCS["WGS 84", DATUM["WGS_1984", SPHEROID["WGS_1984", 6378137.0, 298.257223563]], PRIMEM["Greenwich", 0.0], UNIT["degree", 0.017453292519943295]], PROJECTION["Mercator_1SP_Google"], PARAMETER["latitude_of_origin", 0.0], PARAMETER["central_meridian", 0.0], PARAMETER["scale_factor", 1.0], PARAMETER["false_easting", 0.0], PARAMETER["false_northing", 0.0], UNIT["m", 1.0], AXIS["x", EAST], AXIS["y", NORTH], AUTHORITY["EPSG","54004"]]
100001=GEOGCS["NAD83 / NFIS Seconds",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101],TOWGS84[0,0,0]],PRIMEM["Greenwich",0],UNIT["Decimal_Second",4.84813681109536e-06]]
100002=PROJCS["NAD83 / Austin",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101],TOWGS84[0,0,0]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",31.8833333333333],PARAMETER["standard_parallel_2",30.1166666666667],PARAMETER["latitude_of_origin",29.6666666666667],PARAMETER["central_meridian",-100.333333333333],PARAMETER["false_easting",2296583.333333],PARAMETER["false_northing",9842500.0000000],UNIT["Meter",1]]
100003=PROJCS["WGS84 / Google Mercator", GEOGCS["WGS 84", DATUM["World Geodetic System 1984", SPHEROID["WGS 84", 6378137.0, 298.257223563, AUTHORITY["EPSG","7030"]], AUTHORITY["EPSG","6326"]], PRIMEM["Greenwich", 0.0, AUTHORITY["EPSG","8901"]], UNIT["degree", 0.017453292519943295], AUTHORITY["EPSG","4326"]], PROJECTION["Mercator (1SP)", AUTHORITY["EPSG","9804"]], PARAMETER["semi_major", 6378137.0], PARAMETER["semi_minor", 6378137.0], PARAMETER["latitude_of_origin", 0.0], PARAMETER["central_meridian", 0.0], PARAMETER["scale_factor", 1.0], PARAMETER["false_easting", 0.0], PARAMETER["false_northing", 0.0], UNIT["m", 1.0], AUTHORITY["EPSG","900913"]]
Modified: trunk/src/schmitzm/geotools/feature/FeatureUtil.java
===================================================================
--- trunk/src/schmitzm/geotools/feature/FeatureUtil.java 2010-07-23 09:56:05 UTC (rev 942)
+++ trunk/src/schmitzm/geotools/feature/FeatureUtil.java 2010-07-23 14:15:06 UTC (rev 943)
@@ -77,7 +77,6 @@
import org.geotools.feature.simple.SimpleFeatureBuilder;
import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
import org.geotools.filter.FilterAbstract;
-import org.geotools.filter.text.cql2.CQL;
import org.geotools.map.MapLayer;
import org.geotools.resources.CRSUtilities;
import org.geotools.resources.coverage.FeatureUtilities;
Modified: trunk/src/schmitzm/geotools/gui/XMapPane.java
===================================================================
--- trunk/src/schmitzm/geotools/gui/XMapPane.java 2010-07-23 09:56:05 UTC (rev 942)
+++ trunk/src/schmitzm/geotools/gui/XMapPane.java 2010-07-23 14:15:06 UTC (rev 943)
@@ -25,7 +25,6 @@
import java.util.Map;
import java.util.Vector;
-import javax.management.RuntimeErrorException;
import javax.swing.JList;
import javax.swing.Timer;
import javax.swing.border.Border;
@@ -76,7 +75,6 @@
import schmitzm.swing.SwingUtil;
import schmitzm.swing.event.MouseInputType;
import skrueger.geotools.RenderingExecutor;
-import sun.util.logging.resources.logging;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Envelope;
Modified: trunk/src/schmitzm/lang/LimitedHashMap.java
===================================================================
--- trunk/src/schmitzm/lang/LimitedHashMap.java 2010-07-23 09:56:05 UTC (rev 942)
+++ trunk/src/schmitzm/lang/LimitedHashMap.java 2010-07-23 14:15:06 UTC (rev 943)
@@ -29,7 +29,6 @@
******************************************************************************/
package schmitzm.lang;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Vector;
Modified: trunk/src/schmitzm/lang/ResourceProvider.java
===================================================================
--- trunk/src/schmitzm/lang/ResourceProvider.java 2010-07-23 09:56:05 UTC (rev 942)
+++ trunk/src/schmitzm/lang/ResourceProvider.java 2010-07-23 14:15:06 UTC (rev 943)
@@ -34,12 +34,8 @@
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
import java.io.PrintWriter;
import java.io.StringReader;
-import java.io.StringWriter;
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.net.URL;
@@ -48,8 +44,6 @@
import java.util.HashMap;
import java.util.Locale;
import java.util.MissingResourceException;
-import java.util.Properties;
-import java.util.PropertyResourceBundle;
import java.util.ResourceBundle;
import java.util.Set;
import java.util.SortedSet;
@@ -57,8 +51,6 @@
import org.apache.log4j.Logger;
-import schmitzm.io.FileInputStream;
-import schmitzm.io.IOUtil;
import schmitzm.jfree.JFreeChartUtil;
/**
Modified: trunk/src/schmitzm/swing/ExceptionDialog.java
===================================================================
--- trunk/src/schmitzm/swing/ExceptionDialog.java 2010-07-23 09:56:05 UTC (rev 942)
+++ trunk/src/schmitzm/swing/ExceptionDialog.java 2010-07-23 14:15:06 UTC (rev 943)
@@ -35,8 +35,6 @@
import java.awt.GraphicsEnvironment;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.EventListener;
import java.util.HashSet;
import java.util.Set;
@@ -49,8 +47,6 @@
import javax.swing.JToggleButton;
import javax.swing.SwingUtilities;
-import org.geotools.util.WeakHashSet;
-
import schmitzm.lang.LangUtil;
/**
Modified: trunk/src/schmitzm/swing/ResourceProviderManagerFrame.java
===================================================================
--- trunk/src/schmitzm/swing/ResourceProviderManagerFrame.java 2010-07-23 09:56:05 UTC (rev 942)
+++ trunk/src/schmitzm/swing/ResourceProviderManagerFrame.java 2010-07-23 14:15:06 UTC (rev 943)
@@ -35,12 +35,10 @@
import java.awt.Component;
import java.awt.Cursor;
import java.awt.FlowLayout;
-import java.awt.Graphics;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.WindowEvent;
import java.io.File;
-import java.lang.reflect.InvocationTargetException;
import java.util.Locale;
import java.util.ResourceBundle;
import java.util.Set;
@@ -54,11 +52,8 @@
import javax.swing.JOptionPane;
import javax.swing.JScrollPane;
import javax.swing.JTable;
-import javax.swing.SwingUtilities;
-import javax.swing.SwingWorker;
import javax.swing.table.AbstractTableModel;
-import schmitzm.io.IOUtil;
import schmitzm.lang.LocaleComparator;
import schmitzm.lang.ResourceProvider;
import schmitzm.swing.event.InputOptionAdapter;
Modified: trunk/src_junit/schmitzm/geotools/GTUtilTest.java
===================================================================
--- trunk/src_junit/schmitzm/geotools/GTUtilTest.java 2010-07-23 09:56:05 UTC (rev 942)
+++ trunk/src_junit/schmitzm/geotools/GTUtilTest.java 2010-07-23 14:15:06 UTC (rev 943)
@@ -1,6 +1,6 @@
package schmitzm.geotools;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
import java.io.IOException;
Modified: trunk/src_junit/schmitzm/geotools/feature/FeatureComparatorTest.java
===================================================================
--- trunk/src_junit/schmitzm/geotools/feature/FeatureComparatorTest.java 2010-07-23 09:56:05 UTC (rev 942)
+++ trunk/src_junit/schmitzm/geotools/feature/FeatureComparatorTest.java 2010-07-23 14:15:06 UTC (rev 943)
@@ -1,6 +1,5 @@
package schmitzm.geotools.feature;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -10,20 +9,14 @@
import java.util.Vector;
import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.FeatureIterator;
import org.junit.Test;
import org.opengis.feature.simple.SimpleFeature;
import org.opengis.feature.simple.SimpleFeatureType;
-import org.opengis.feature.type.GeometryDescriptor;
-import schmitzm.geotools.feature.FeatureUtil.GeometryForm;
import schmitzm.geotools.io.GeoImportUtil;
import schmitzm.jfree.feature.style.FeatureChartStyleTest;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
-
public class FeatureComparatorTest {
/** If tests are run on a system with head, we may theoretically open dialgs, frames etc. **/
Modified: trunk/src_junit/schmitzm/geotools/feature/FeatureUtilTest.java
===================================================================
--- trunk/src_junit/schmitzm/geotools/feature/FeatureUtilTest.java 2010-07-23 09:56:05 UTC (rev 942)
+++ trunk/src_junit/schmitzm/geotools/feature/FeatureUtilTest.java 2010-07-23 14:15:06 UTC (rev 943)
@@ -1,6 +1,6 @@
package schmitzm.geotools.feature;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
Modified: trunk/src_junit/schmitzm/geotools/gui/XMapPaneTest.java
===================================================================
--- trunk/src_junit/schmitzm/geotools/gui/XMapPaneTest.java 2010-07-23 09:56:05 UTC (rev 942)
+++ trunk/src_junit/schmitzm/geotools/gui/XMapPaneTest.java 2010-07-23 14:15:06 UTC (rev 943)
@@ -1,6 +1,7 @@
package schmitzm.geotools.gui;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import org.geotools.geometry.jts.ReferencedEnvelope;
import org.junit.Test;
Modified: trunk/src_junit/schmitzm/lang/LangUtilTest.java
===================================================================
--- trunk/src_junit/schmitzm/lang/LangUtilTest.java 2010-07-23 09:56:05 UTC (rev 942)
+++ trunk/src_junit/schmitzm/lang/LangUtilTest.java 2010-07-23 14:15:06 UTC (rev 943)
@@ -1,6 +1,8 @@
package schmitzm.lang;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
Modified: trunk/src_junit/schmitzm/lang/LimitedHashMapTest.java
===================================================================
--- trunk/src_junit/schmitzm/lang/LimitedHashMapTest.java 2010-07-23 09:56:05 UTC (rev 942)
+++ trunk/src_junit/schmitzm/lang/LimitedHashMapTest.java 2010-07-23 14:15:06 UTC (rev 943)
@@ -1,47 +1,13 @@
package schmitzm.lang;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import java.awt.Color;
-import java.awt.Graphics2D;
import java.awt.GraphicsEnvironment;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.File;
import java.io.IOException;
-import java.net.URL;
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.log4j.Logger;
-import org.geotools.feature.FeatureCollection;
-import org.geotools.filter.text.cql2.CQLException;
-import org.jfree.chart.ChartFrame;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.AxisState;
-import org.jfree.chart.axis.NumberAxis;
-import org.jfree.chart.axis.NumberTick;
-import org.jfree.chart.axis.NumberTickUnit;
-import org.jfree.chart.axis.TickUnits;
-import org.jfree.chart.axis.ValueTick;
-import org.jfree.ui.RectangleEdge;
-import org.jfree.ui.TextAnchor;
import org.junit.Test;
-import org.opengis.feature.simple.SimpleFeature;
-import org.opengis.feature.simple.SimpleFeatureType;
-import schmitzm.geotools.io.GeoImportUtil;
-import schmitzm.io.IOUtil;
-import schmitzm.jfree.chart.style.ChartAxisStyle;
-import schmitzm.jfree.chart.style.ChartLabelStyle;
-import schmitzm.jfree.chart.style.ChartRendererStyle;
-import schmitzm.jfree.chart.style.ChartType;
-import schmitzm.jfree.table.AggregationFunction;
-
public class LimitedHashMapTest {
private static Logger log = Logger.getLogger(LimitedHashMapTest.class);
/** If tests are run on a system with head, we may theoretically open dialgs, frames etc. **/
More information about the Schmitzm-commits
mailing list