[Schmitzm-commits] r599 - in branches/1.0-gt2-2.6/src: schmitzm/geotools schmitzm/geotools/feature schmitzm/geotools/gui schmitzm/geotools/io schmitzm/swing skrueger/geotools skrueger/geotools/labelsearch skrueger/geotools/selection skrueger/swing
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Dec 1 15:35:27 CET 2009
Author: alfonx
Date: 2009-12-01 15:35:24 +0100 (Tue, 01 Dec 2009)
New Revision: 599
Modified:
branches/1.0-gt2-2.6/src/schmitzm/geotools/JTSUtil.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureOperationTreeParser.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FilterParser.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureTablePane.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GeoMapPane.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GridPanel.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GridPanelFormatter_LatLon1.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorPane.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorToolBar.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/LayeredMapFrame.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/SelectableFeatureTablePane.java
branches/1.0-gt2-2.6/src/schmitzm/geotools/io/GeoExportUtil.java
branches/1.0-gt2-2.6/src/schmitzm/swing/ExceptionDialog.java
branches/1.0-gt2-2.6/src/schmitzm/swing/StatusDialog.java
branches/1.0-gt2-2.6/src/schmitzm/swing/SwingUtil.java
branches/1.0-gt2-2.6/src/skrueger/geotools/GeomFilterGenerator.java
branches/1.0-gt2-2.6/src/skrueger/geotools/MapContextManagerInterface.java
branches/1.0-gt2-2.6/src/skrueger/geotools/MapPaneToolBar.java
branches/1.0-gt2-2.6/src/skrueger/geotools/SelectXMapPaneMouseListener.java
branches/1.0-gt2-2.6/src/skrueger/geotools/StyledFS.java
branches/1.0-gt2-2.6/src/skrueger/geotools/ZoomXMapPaneMouseListener.java
branches/1.0-gt2-2.6/src/skrueger/geotools/labelsearch/LabelSearch.java
branches/1.0-gt2-2.6/src/skrueger/geotools/selection/FeatureMapLayerSelectionSynchronizer.java
branches/1.0-gt2-2.6/src/skrueger/swing/CancellableDialogAdapter.java
branches/1.0-gt2-2.6/src/skrueger/swing/HeapBar.java
Log:
* Organized imports
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/JTSUtil.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/JTSUtil.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/JTSUtil.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -44,7 +44,6 @@
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Envelope;
import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.Point;
/**
* Diese Klasse enthaelt allgemeine Funktionen fuer die Arbeit mit den in
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureOperationTreeParser.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureOperationTreeParser.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FeatureOperationTreeParser.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -29,8 +29,6 @@
******************************************************************************/
package schmitzm.geotools.feature;
-import java.util.Vector;
-
import org.opengis.filter.Filter;
import schmitzm.lang.tree.BinaryTreeNode;
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FilterParser.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FilterParser.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/feature/FilterParser.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -30,8 +30,6 @@
package schmitzm.geotools.feature;
-import java.util.Vector;
-
import org.opengis.filter.Filter;
import schmitzm.swing.ParserOperatorsHints;
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureTablePane.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureTablePane.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/FeatureTablePane.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -45,21 +45,16 @@
import org.apache.log4j.Logger;
import org.geotools.feature.FeatureCollection;
-import org.geotools.map.DefaultMapContext;
import org.geotools.map.DefaultMapLayer;
import org.geotools.styling.Style;
-import org.geotools.swing.JMapPane;
import org.opengis.feature.simple.SimpleFeature;
import org.opengis.feature.simple.SimpleFeatureType;
-import schmitzm.geotools.GTUtil;
import schmitzm.geotools.feature.AttributeTypeFilter;
-import schmitzm.geotools.feature.FeatureUtil;
import schmitzm.geotools.styling.StylingUtil;
import schmitzm.swing.JPanel;
import schmitzm.swing.SortableJTable;
import schmitzm.swing.SwingUtil;
-import skrueger.geotools.XMapPane;
/**
* Diese Komponente stellt eine Tabelle dar, in der die Attribute einer
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GeoMapPane.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GeoMapPane.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GeoMapPane.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -37,17 +37,14 @@
import java.awt.Insets;
import java.util.HashMap;
-import javax.swing.BorderFactory;
-
import org.geotools.map.MapContext;
-import org.geotools.renderer.GTRenderer;
import org.geotools.renderer.lite.StreamingRenderer;
import org.geotools.renderer.shape.ShapefileRenderer;
import schmitzm.geotools.GTUtil;
-import schmitzm.geotools.map.event.MapPaneEvent;
import schmitzm.geotools.map.event.JMapPaneListener;
import schmitzm.geotools.map.event.MapAreaChangedEvent;
+import schmitzm.geotools.map.event.MapPaneEvent;
import schmitzm.geotools.map.event.ScaleChangedEvent;
import schmitzm.swing.JPanel;
import schmitzm.swing.SwingUtil;
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-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GridPanel.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -30,7 +30,6 @@
package schmitzm.geotools.gui;
import java.awt.Color;
-import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GridPanelFormatter_LatLon1.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GridPanelFormatter_LatLon1.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/GridPanelFormatter_LatLon1.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -32,10 +32,7 @@
import java.awt.Font;
import java.text.DecimalFormat;
-import java.text.NumberFormat;
-import javax.swing.text.NumberFormatter;
-
import org.geotools.referencing.crs.DefaultGeographicCRS;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
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-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorPane.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -48,7 +48,6 @@
import org.geotools.map.DefaultMapLayer;
import org.geotools.map.MapContext;
import org.geotools.map.MapLayer;
-import org.geotools.referencing.crs.DefaultGeographicCRS;
import org.geotools.renderer.GTRenderer;
import org.geotools.styling.Style;
import org.opengis.feature.simple.SimpleFeature;
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorToolBar.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorToolBar.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/JEditorToolBar.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -45,10 +45,10 @@
import schmitzm.geotools.gui.JEditorPane.EditorMode;
import schmitzm.geotools.map.event.JEditorPaneEvent;
-import schmitzm.geotools.map.event.MapPaneEvent;
import schmitzm.geotools.map.event.JMapPaneListener;
import schmitzm.geotools.map.event.LayerEditCanceledEvent;
import schmitzm.geotools.map.event.LayerEditFinishedEvent;
+import schmitzm.geotools.map.event.MapPaneEvent;
import schmitzm.swing.ExceptionDialog;
import schmitzm.swing.ManualInputOption;
import schmitzm.swing.MultipleOptionPane;
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/LayeredMapFrame.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/LayeredMapFrame.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/LayeredMapFrame.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -48,8 +48,8 @@
import schmitzm.geotools.map.event.FeatureSelectedEvent;
import schmitzm.geotools.map.event.GridCoverageSelectedEvent;
+import schmitzm.geotools.map.event.JMapPaneListener;
import schmitzm.geotools.map.event.MapPaneEvent;
-import schmitzm.geotools.map.event.JMapPaneListener;
import schmitzm.swing.SelectionInputOption;
import schmitzm.swing.SwingUtil;
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/SelectableFeatureTablePane.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/SelectableFeatureTablePane.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/gui/SelectableFeatureTablePane.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -47,7 +47,6 @@
import javax.swing.JTable;
import javax.swing.JToolBar;
import javax.swing.SortOrder;
-import javax.swing.SwingUtilities;
import javax.swing.RowSorter.SortKey;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
Modified: branches/1.0-gt2-2.6/src/schmitzm/geotools/io/GeoExportUtil.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/geotools/io/GeoExportUtil.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/schmitzm/geotools/io/GeoExportUtil.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -32,10 +32,8 @@
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
import java.io.File;
-import java.io.FileReader;
import java.io.IOException;
import java.io.PrintWriter;
-import java.io.StringReader;
import javax.imageio.ImageIO;
Modified: branches/1.0-gt2-2.6/src/schmitzm/swing/ExceptionDialog.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/swing/ExceptionDialog.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/schmitzm/swing/ExceptionDialog.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -32,8 +32,6 @@
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Frame;
-import java.awt.Toolkit;
-import java.awt.datatransfer.StringSelection;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
Modified: branches/1.0-gt2-2.6/src/schmitzm/swing/StatusDialog.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/swing/StatusDialog.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/schmitzm/swing/StatusDialog.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -31,7 +31,6 @@
import java.awt.BorderLayout;
import java.awt.Component;
-import java.awt.Frame;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Vector;
Modified: branches/1.0-gt2-2.6/src/schmitzm/swing/SwingUtil.java
===================================================================
--- branches/1.0-gt2-2.6/src/schmitzm/swing/SwingUtil.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/schmitzm/swing/SwingUtil.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -29,11 +29,9 @@
******************************************************************************/
package schmitzm.swing;
-import java.awt.AlphaComposite;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
-import java.awt.Composite;
import java.awt.Container;
import java.awt.Cursor;
import java.awt.Dimension;
@@ -45,7 +43,6 @@
import java.awt.Rectangle;
import java.awt.Toolkit;
import java.awt.Window;
-import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
import java.text.NumberFormat;
import java.util.Enumeration;
Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/GeomFilterGenerator.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/GeomFilterGenerator.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/GeomFilterGenerator.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -1,15 +1,11 @@
package skrueger.geotools;
import java.awt.geom.Point2D;
-import java.util.HashMap;
-import java.util.Map;
import org.apache.log4j.Logger;
import org.geotools.data.FeatureSource;
-import org.geotools.factory.FactoryFinder;
import org.geotools.filter.AbstractFilter;
import org.geotools.filter.GeometryFilterImpl;
-import org.geotools.geometry.jts.JTS;
import org.geotools.geometry.jts.ReferencedEnvelope;
import org.geotools.referencing.CRS;
import org.opengis.feature.simple.SimpleFeature;
@@ -20,7 +16,6 @@
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import schmitzm.geotools.FilterUtil;
-import schmitzm.geotools.GTUtil;
import schmitzm.geotools.JTSUtil;
import schmitzm.geotools.io.GeoImportUtil;
Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/MapContextManagerInterface.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/MapContextManagerInterface.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/MapContextManagerInterface.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -33,7 +33,6 @@
import org.geotools.map.MapContext;
import org.geotools.map.MapLayer;
import org.geotools.map.event.MapLayerListListener;
-import org.geotools.map.event.MapLayerListener;
import skrueger.AttributeMetadata;
import skrueger.RasterLegendData;
Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/MapPaneToolBar.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/MapPaneToolBar.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/MapPaneToolBar.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -53,13 +53,12 @@
import org.apache.log4j.Logger;
import schmitzm.geotools.gui.SelectableXMapPane;
-import schmitzm.geotools.map.event.MapPaneEvent;
import schmitzm.geotools.map.event.JMapPaneListener;
import schmitzm.geotools.map.event.MapAreaChangedEvent;
+import schmitzm.geotools.map.event.MapPaneEvent;
import schmitzm.lang.LangUtil;
import schmitzm.lang.ResourceProvider;
import schmitzm.swing.ButtonGroup;
-import schmitzm.swing.SwingUtil;
import skrueger.swing.SmallButton;
import skrueger.swing.SmallToggleButton;
Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/SelectXMapPaneMouseListener.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/SelectXMapPaneMouseListener.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/SelectXMapPaneMouseListener.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -13,7 +13,6 @@
import org.apache.log4j.Logger;
import org.geotools.data.memory.MemoryFeatureCollection;
import org.geotools.feature.FeatureCollection;
-import org.geotools.geometry.jts.ReferencedEnvelope;
import org.geotools.map.MapLayer;
import org.opengis.feature.simple.SimpleFeature;
import org.opengis.feature.simple.SimpleFeatureType;
Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/StyledFS.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/StyledFS.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/StyledFS.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -41,7 +41,6 @@
import org.apache.log4j.Logger;
import org.geotools.data.FeatureSource;
-import org.geotools.data.store.EmptyFeatureCollection;
import org.geotools.feature.FeatureCollection;
import org.geotools.styling.Style;
import org.opengis.feature.simple.SimpleFeature;
Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/ZoomXMapPaneMouseListener.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/ZoomXMapPaneMouseListener.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/ZoomXMapPaneMouseListener.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -1,7 +1,6 @@
package skrueger.geotools;
import java.awt.Color;
-import java.awt.Cursor;
import java.awt.Graphics;
import java.awt.Point;
import java.awt.Rectangle;
Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/labelsearch/LabelSearch.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/labelsearch/LabelSearch.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/labelsearch/LabelSearch.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -47,13 +47,9 @@
import org.geotools.styling.TextSymbolizer;
import org.opengis.feature.simple.SimpleFeature;
import org.opengis.feature.simple.SimpleFeatureType;
-import org.opengis.feature.type.AttributeDescriptor;
import org.opengis.filter.Filter;
-import org.opengis.filter.expression.Expression;
import org.opengis.filter.expression.PropertyName;
-import com.sun.jndi.toolkit.dir.SearchFilter;
-
import schmitzm.geotools.feature.FeatureUtil;
import schmitzm.geotools.styling.StylingUtil;
import schmitzm.lang.LangUtil;
@@ -84,28 +80,6 @@
this.mapPane = mapPane;
}
- //
- // /**
- // * The Attribute that provides the labels for this text symbolizer.
- // */
- // private AttributeDescriptor getLabelAttribute(final TextSymbolizer ts,
- // final SimpleFeatureType schema) {
- // if (ts == null) {
- // // This layer has no labels
- // return null;
- // }
- //
- // final Expression labelExp = ts.getLabel();
- // if (labelExp instanceof PropertyName) {
- // final PropertyName pn = (PropertyName) labelExp;
- // final String propertyName = pn.getPropertyName();
- // return schema.getDescriptor(propertyName);
- // } else {
- // return null;
- // }
- //
- // }
-
public List<SearchResult> search(final String string) {
final String searchMe = string.toUpperCase();
@@ -153,12 +127,12 @@
// Only one property used...
searchFilter = CQL.toFilter("strToUpperCase "
- + prop1.getPropertyName() + " LIKE '%" + searchMe
+ + prop1.getPropertyName() + " LIKE '%" + searchMe
+ "%'");
if (prop2 != null) {
Filter searchFilter2 = CQL.toFilter("strToUpperCase "
- + prop2.getPropertyName() + " LIKE '%" + searchMe
+ + prop2.getPropertyName() + " LIKE '%" + searchMe
+ "%'");
searchFilter = FeatureUtil.FILTER_FACTORY2.or(searchFilter,
@@ -173,10 +147,9 @@
if (layerFilter != null && layerFilter != Filter.INCLUDE) {
searchFilter = FeatureUtil.FILTER_FACTORY2.and(layerFilter,
searchFilter);
-
}
- LOGGER.info("Searching for "+searchFilter.toString());
+// LOGGER.info("Searching for "+searchFilter.toString());
FeatureCollection<SimpleFeatureType, SimpleFeature> features = (FeatureCollection<SimpleFeatureType, SimpleFeature>) ml
.getFeatureSource().getFeatures(
Modified: branches/1.0-gt2-2.6/src/skrueger/geotools/selection/FeatureMapLayerSelectionSynchronizer.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/geotools/selection/FeatureMapLayerSelectionSynchronizer.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/skrueger/geotools/selection/FeatureMapLayerSelectionSynchronizer.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -42,11 +42,9 @@
**/
package skrueger.geotools.selection;
-import java.awt.RenderingHints;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@@ -60,9 +58,6 @@
import org.geotools.feature.FeatureIterator;
import org.geotools.filter.FidFilterImpl;
import org.geotools.map.MapLayer;
-import org.geotools.renderer.GTRenderer;
-import org.geotools.renderer.label.LabelCacheImpl;
-import org.geotools.renderer.lite.StreamingRenderer;
import org.geotools.styling.FeatureTypeStyle;
import org.geotools.styling.Style;
import org.geotools.styling.visitor.DuplicatingStyleVisitor;
@@ -73,7 +68,6 @@
import org.opengis.filter.identity.FeatureId;
import schmitzm.geotools.FilterUtil;
-import schmitzm.geotools.GTUtil;
import schmitzm.geotools.gui.SelectableXMapPane;
import schmitzm.geotools.map.event.FeatureSelectedEvent;
import schmitzm.geotools.map.event.JMapPaneListener;
Modified: branches/1.0-gt2-2.6/src/skrueger/swing/CancellableDialogAdapter.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/swing/CancellableDialogAdapter.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/skrueger/swing/CancellableDialogAdapter.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -7,7 +7,6 @@
import javax.swing.JDialog;
import javax.swing.JOptionPane;
-import schmitzm.geotools.gui.GeotoolsGUIUtil;
import schmitzm.lang.LangUtil;
import schmitzm.lang.ResourceProvider;
import schmitzm.swing.SwingUtil;
Modified: branches/1.0-gt2-2.6/src/skrueger/swing/HeapBar.java
===================================================================
--- branches/1.0-gt2-2.6/src/skrueger/swing/HeapBar.java 2009-12-01 14:12:11 UTC (rev 598)
+++ branches/1.0-gt2-2.6/src/skrueger/swing/HeapBar.java 2009-12-01 14:35:24 UTC (rev 599)
@@ -9,11 +9,9 @@
import java.util.TimerTask;
import javax.swing.JProgressBar;
-import javax.swing.SwingUtilities;
import org.apache.log4j.Logger;
-import schmitzm.geotools.gui.GeotoolsGUIUtil;
import schmitzm.lang.LangUtil;
import schmitzm.lang.ResourceProvider;
import schmitzm.swing.SwingUtil;
More information about the Schmitzm-commits
mailing list