# HG changeset patch # User Sascha L. Teichmann # Date 1367149522 -7200 # Node ID a3cd7833318511916cabb9ebac7fe6c8322c22e3 # Parent 545b94ec232980147ca86fe9461b4dbbb718c723 Removed obsolete imports. diff -r 545b94ec2329 -r a3cd78333185 artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWQKmsArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWQKmsArtifact.java Sun Apr 28 12:03:19 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWQKmsArtifact.java Sun Apr 28 13:45:22 2013 +0200 @@ -26,7 +26,6 @@ import org.dive4elements.river.artifacts.model.WKms; import org.dive4elements.river.artifacts.model.WQKms; import org.dive4elements.river.artifacts.model.WKmsFactory; -import org.dive4elements.river.artifacts.model.WQKmsFacet; import org.dive4elements.river.artifacts.model.WQKmsFactory; import org.dive4elements.river.artifacts.states.DefaultState; diff -r 545b94ec2329 -r a3cd78333185 gwt-client/src/main/java/org/dive4elements/river/client/client/services/GFIService.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/services/GFIService.java Sun Apr 28 12:03:19 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/services/GFIService.java Sun Apr 28 13:45:22 2013 +0200 @@ -1,16 +1,13 @@ package org.dive4elements.river.client.client.services; -import java.util.List; - import com.google.gwt.user.client.rpc.RemoteService; import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; +import org.dive4elements.river.client.shared.exceptions.ServerException; -import org.dive4elements.river.client.shared.exceptions.ServerException; import org.dive4elements.river.client.shared.model.FeatureInfoResponse; import org.dive4elements.river.client.shared.model.Theme; - @RemoteServiceRelativePath("getfeatureinfo") public interface GFIService extends RemoteService { diff -r 545b94ec2329 -r a3cd78333185 gwt-client/src/main/java/org/dive4elements/river/client/client/services/GFIServiceAsync.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/services/GFIServiceAsync.java Sun Apr 28 12:03:19 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/services/GFIServiceAsync.java Sun Apr 28 13:45:22 2013 +0200 @@ -1,13 +1,10 @@ package org.dive4elements.river.client.client.services; -import java.util.List; - import com.google.gwt.user.client.rpc.AsyncCallback; import org.dive4elements.river.client.shared.model.FeatureInfoResponse; import org.dive4elements.river.client.shared.model.Theme; - /** * @author Ingo Weinzierl */ diff -r 545b94ec2329 -r a3cd78333185 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/map/GetFeatureInfoWindow.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/map/GetFeatureInfoWindow.java Sun Apr 28 12:03:19 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/map/GetFeatureInfoWindow.java Sun Apr 28 13:45:22 2013 +0200 @@ -3,28 +3,29 @@ import com.google.gwt.core.client.GWT; import com.smartgwt.client.widgets.HTMLPane; -import com.smartgwt.client.widgets.Label; import com.smartgwt.client.widgets.Window; + import com.smartgwt.client.widgets.layout.VLayout; + import com.smartgwt.client.widgets.viewer.DetailViewer; import com.smartgwt.client.widgets.viewer.DetailViewerField; import com.smartgwt.client.widgets.viewer.DetailViewerRecord; -import org.dive4elements.river.client.client.FLYSConstants; -import org.dive4elements.river.client.shared.model.FeatureInfo; -import org.dive4elements.river.client.shared.model.FeatureInfoResponse; - import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.MissingResourceException; import java.util.Set; -import java.util.MissingResourceException; + +import org.dive4elements.river.client.client.FLYSConstants; + +import org.dive4elements.river.client.shared.model.FeatureInfo; import org.gwtopenmaps.openlayers.client.feature.VectorFeature; + import org.gwtopenmaps.openlayers.client.util.Attributes; import org.gwtopenmaps.openlayers.client.util.JSObject; - public class GetFeatureInfoWindow extends Window { protected FLYSConstants MSG = GWT.create(FLYSConstants.class); diff -r 545b94ec2329 -r a3cd78333185 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapToolbar.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapToolbar.java Sun Apr 28 12:03:19 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/map/MapToolbar.java Sun Apr 28 13:45:22 2013 +0200 @@ -4,38 +4,42 @@ import com.smartgwt.client.types.Alignment; import com.smartgwt.client.types.SelectionType; + import com.smartgwt.client.util.SC; + import com.smartgwt.client.widgets.Button; import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.ImgButton; import com.smartgwt.client.widgets.Label; + import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; + import com.smartgwt.client.widgets.layout.HLayout; import org.dive4elements.river.client.client.FLYSConstants; -import org.dive4elements.river.client.client.ui.ImgLink; + import org.dive4elements.river.client.client.ui.Toolbar; + import org.dive4elements.river.client.client.utils.EnableDisableCmd; -import org.dive4elements.river.client.shared.model.Collection; -import org.dive4elements.river.client.shared.model.Property; -import org.dive4elements.river.client.shared.model.PropertySetting; -import org.dive4elements.river.client.shared.model.Settings; + import org.dive4elements.river.client.shared.model.ThemeList; -import java.util.List; +import org.gwtopenmaps.openlayers.client.Map; -import org.gwtopenmaps.openlayers.client.Map; import org.gwtopenmaps.openlayers.client.control.DragPan; import org.gwtopenmaps.openlayers.client.control.SelectFeature; import org.gwtopenmaps.openlayers.client.control.SelectFeatureOptions; import org.gwtopenmaps.openlayers.client.control.ZoomBox; + import org.gwtopenmaps.openlayers.client.event.MapZoomListener; + import org.gwtopenmaps.openlayers.client.feature.VectorFeature; + import org.gwtopenmaps.openlayers.client.layer.Vector; + import org.gwtopenmaps.openlayers.client.util.Attributes; - /** * Toolbar for the Map views. * @author Ingo Weinzierl diff -r 545b94ec2329 -r a3cd78333185 gwt-client/src/main/java/org/dive4elements/river/client/server/GFIServiceImpl.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/server/GFIServiceImpl.java Sun Apr 28 12:03:19 2013 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/GFIServiceImpl.java Sun Apr 28 13:45:22 2013 +0200 @@ -1,33 +1,34 @@ package org.dive4elements.river.client.server; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; +import com.google.gwt.user.server.rpc.RemoteServiceServlet; + import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; + import java.net.URL; import java.net.URLConnection; + import java.util.ArrayList; import java.util.List; -import java.util.Scanner; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; import org.apache.log4j.Logger; -import com.google.gwt.user.server.rpc.RemoteServiceServlet; - import org.dive4elements.artifacts.common.utils.XMLUtils; +import org.dive4elements.river.client.client.services.GFIService; + import org.dive4elements.river.client.shared.exceptions.ServerException; + import org.dive4elements.river.client.shared.model.AttributedTheme; import org.dive4elements.river.client.shared.model.FeatureInfo; import org.dive4elements.river.client.shared.model.FeatureInfoResponse; import org.dive4elements.river.client.shared.model.Theme; -import org.dive4elements.river.client.client.services.GFIService; - +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * @author Ingo Weinzierl