X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=gis%2Fplugins%2Forg.argeo.gis.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fgis%2Fui%2Feditors%2FDefaultMapEditor.java;h=94768c374a53acc46b86efc781753d26ad4e6739;hb=7995d576fb88d56ad5965d36be3ec67ea9526fb9;hp=e9311b9dbce7e68afced827da0993e432e246bc2;hpb=77eaf70d8b929dab68211d6a01f68eeb71a1dceb;p=lgpl%2Fargeo-commons.git

diff --git a/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/editors/DefaultMapEditor.java b/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/editors/DefaultMapEditor.java
index e9311b9db..94768c374 100644
--- a/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/editors/DefaultMapEditor.java
+++ b/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/editors/DefaultMapEditor.java
@@ -1,40 +1,37 @@
 package org.argeo.gis.ui.editors;
 
-import org.argeo.gis.ui.MapContextProvider;
+import javax.jcr.Node;
+
 import org.argeo.gis.ui.MapControlCreator;
-import org.argeo.gis.ui.views.LayersView;
+import org.argeo.gis.ui.MapViewer;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.EditorPart;
-import org.geotools.data.FeatureSource;
-import org.geotools.map.MapContext;
-import org.opengis.feature.simple.SimpleFeature;
-import org.opengis.feature.simple.SimpleFeatureType;
 
 /** A generic map editor */
-public class DefaultMapEditor extends EditorPart implements MapContextProvider {
-	public final static String ID = "org.argeo.gis.ui.defaultMapEditor";
-
-	private MapContext mapContext;
-	private Composite map;
+public class DefaultMapEditor extends EditorPart {
+	private Node context;
+	private MapViewer mapViewer;
 	private MapControlCreator mapControlCreator;
 
 	@Override
 	public void init(IEditorSite site, IEditorInput input)
 			throws PartInitException {
-		if (input instanceof MapContextProvider) {
-			mapContext = ((MapContextProvider) input).getMapContext();
+		if (input instanceof MapEditorInput) {
+			// mapContext = ((MapEditorInput) input).getMapContext();
+			context = ((MapEditorInput) input).getContext();
 			setSite(site);
 			setInput(input);
 			setPartName(input.getName());
 		} else {
-			throw new PartInitException("Support only "
-					+ MapContextProvider.class + " inputs");
+			throw new PartInitException("Support only " + MapEditorInput.class
+					+ " inputs");
 		}
 	}
 
@@ -45,13 +42,13 @@ public class DefaultMapEditor extends EditorPart implements MapContextProvider {
 		layout.marginHeight = 0;
 		layout.marginWidth = 0;
 		mapArea.setLayout(layout);
-		map = mapControlCreator.createMapControl(mapArea, this);
+		mapViewer = mapControlCreator.createMapControl(context, mapArea);
+		mapViewer.getControl().setLayoutData(
+				new GridData(SWT.FILL, SWT.FILL, true, true));
 	}
 
-	public void addLayer(
-			FeatureSource<SimpleFeatureType, SimpleFeature> featureSource) {
-		// TODO: deal with style
-		mapContext.addLayer(featureSource, null);
+	public MapViewer getMapViewer() {
+		return mapViewer;
 	}
 
 	@Override
@@ -74,14 +71,20 @@ public class DefaultMapEditor extends EditorPart implements MapContextProvider {
 
 	@Override
 	public void setFocus() {
-		LayersView layersView = (LayersView) getEditorSite()
-				.getWorkbenchWindow().getActivePage().findView(LayersView.ID);
-		layersView.setMapContext(getMapContext());
-		map.setFocus();
+		// LayersView layersView = (LayersView) getEditorSite()
+		// .getWorkbenchWindow().getActivePage().findView(LayersView.ID);
+		// layersView.setMapContext(getMapContext());
+		mapViewer.getControl().setFocus();
+	}
+
+	public void featureSelected(String layerId, String featureId) {
+		// TODO Auto-generated method stub
+
 	}
 
-	public MapContext getMapContext() {
-		return mapContext;
+	public void featureUnselected(String layerId, String featureId) {
+		// TODO Auto-generated method stub
+
 	}
 
 	public void setMapControlCreator(MapControlCreator mapControlCreator) {