http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="mapControlCreator"
- class="org.argeo.gis.ui.rap.openlayers.OpenLayersMapControlCreator"></bean>
+ class="org.argeo.gis.ui.rap.openlayers.OpenLayersMapControlCreator">
+ <property name="geoJcrMapper" ref="geoJcrMapper" />
+ </bean>
</beans>
return new OpenLayersMapViewer(context,geoJcrMapper,parent);
}
- protected void setGeoJcrMapper(GeoJcrMapper geoJcrMapper) {
+ public void setGeoJcrMapper(GeoJcrMapper geoJcrMapper) {
this.geoJcrMapper = geoJcrMapper;
}
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="newMap" class="org.argeo.gis.ui.commands.NewMap" scope="prototype">
- <property name="session" ref="jcrSession"/>
- </bean>
-
- <bean id="addFeatureSources" class="org.argeo.gis.ui.commands.AddFeatureSources"
- scope="prototype">
- <property name="geoJcrMapper" ref="geoJcrMapper" />
- <property name="session" ref="jcrSession"/>
- </bean>
-</beans>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="defaultMapEditor" class="org.argeo.gis.ui.editors.DefaultMapEditor"
- scope="prototype">
- <property name="mapControlCreator" ref="mapControlCreator" />
- </bean>
-
-</beans>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
- xsi:schemaLocation="http://www.springframework.org/schema/osgi \r
- http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
- http://www.springframework.org/schema/beans \r
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
- <reference id="mapControlCreator" interface="org.argeo.gis.ui.MapControlCreator" />\r
-\r
- <reference id="jcrSession" interface="javax.jcr.Session"\r
- filter="(argeo.jcr.repository.alias=connect_mideast)" />\r
-\r
- <reference id="geoJcrMapper" interface="org.argeo.geotools.jcr.GeoJcrMapper" />\r
-\r
-</beans:beans>
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="layersView" class="org.argeo.gis.ui.views.LayersView"
- scope="prototype">
- </bean>
-
- <bean id="featureSourcesView" class="org.argeo.gis.ui.views.FeatureSourcesView"
- scope="prototype">
- <property name="session" ref="jcrSession"/>
- </bean>
-
-</beans>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
- <extension
- point="org.eclipse.ui.views">
- <view
- name="Layers"
- icon="icons/layer_folder.gif"
- class="org.argeo.eclipse.spring.SpringExtensionFactory"
- id="org.argeo.gis.ui.layersView">
- </view>
- <view
- name="GIS Data"
- icon="icons/gis_add_data.gif"
- class="org.argeo.eclipse.spring.SpringExtensionFactory"
- id="org.argeo.gis.ui.featureSourcesView">
- </view>
- </extension>
- <extension
- point="org.eclipse.ui.editors">
- <editor
- id="org.argeo.gis.ui.defaultMapEditor"
- class="org.argeo.eclipse.spring.SpringExtensionFactory"
- default="true"
- icon="icons/earth_edit.gif"
- name="Map Editor">
- </editor>
- </extension>
- <extension
- point="org.eclipse.ui.commands">
- <command
- defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
- id="org.argeo.gis.ui.newMap"
- name="New Map">
- </command>
- <command
- defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
- id="org.argeo.gis.ui.addFeatureSources"
- name="Add Feature Sources">
- </command>
- </extension>
- <extension
- point="org.eclipse.ui.menus">
- <menuContribution
- locationURI="toolbar:org.argeo.gis.ui.layersView">
- <command
- commandId="org.argeo.gis.ui.newMap"
- disabledIcon="icons/sample.gif"
- icon="icons/earth_edit.gif"
- label="New Map"
- style="push"
- tooltip="New Map">
- </command>
- <command
- commandId="org.argeo.gis.ui.addFeatureSources"
- disabledIcon="icons/sample.gif"
- icon="icons/earth_edit.gif"
- label="Add Feature Sources"
- style="push"
- tooltip="Add Feature Sources">
- </command>
- </menuContribution>
- </extension>
- <extension
- point="org.eclipse.ui.perspectives">
- <perspective
- class="org.argeo.gis.ui.GisPerspective"
- icon="icons/gis.gif"
- id="org.argeo.gis.ui.perspective"
- name="GIS">
- </perspective>
- </extension>
- <extension
- point="org.eclipse.ui.editors">
- <editor
- id="org.argeo.gis.ui.defaultMapEditor"
- class="org.argeo.eclipse.spring.SpringExtensionFactory"
- default="true"
- icon="icons/earth_edit.gif"
- name="Map Editor">
- </editor>
- </extension>
-
-</plugin>
+++ /dev/null
-package org.argeo.gis.ui;
-
-import org.argeo.gis.ui.views.DataStoresView;
-import org.argeo.gis.ui.views.LayersView;
-import org.eclipse.ui.IFolderLayout;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-
-public class GisPerspective implements IPerspectiveFactory {
-
- public void createInitialLayout(IPageLayout layout) {
- String editorArea = layout.getEditorArea();
- layout.setEditorAreaVisible(true);
- layout.setFixed(false);
-
- IFolderLayout topLeft = layout.createFolder("topLeft",
- IPageLayout.LEFT, 0.3f, editorArea);
- topLeft.addView(LayersView.ID);
- topLeft.addView(DataStoresView.ID);
- }
-
-}
import javax.jcr.Session;
import org.argeo.eclipse.ui.dialogs.Error;
-import org.argeo.gis.ui.editors.DefaultMapEditor;
import org.argeo.gis.ui.editors.MapEditorInput;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
/** Opens a new map editor */
public class AddLayer extends AbstractHandler {
- private String editorId = DefaultMapEditor.ID;
+ private String editorId;
private Session session;
public Object execute(ExecutionEvent event) throws ExecutionException {
import javax.jcr.Session;
import org.argeo.eclipse.ui.dialogs.Error;
-import org.argeo.gis.ui.editors.DefaultMapEditor;
import org.argeo.gis.ui.editors.MapEditorInput;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
/** Opens a new map editor */
public class NewMap extends AbstractHandler {
private Session session;
- private String editorId = DefaultMapEditor.ID;
+ private String editorId;
public Object execute(ExecutionEvent event) throws ExecutionException {
try {
/** A generic map editor */
public class DefaultMapEditor extends EditorPart {
- public final static String ID = "org.argeo.gis.ui.defaultMapEditor";
-
private Node context;
private MapViewer mapViewer;
private MapControlCreator mapControlCreator;
import org.argeo.eclipse.ui.AbstractTreeContentProvider;
import org.argeo.gis.ui.data.DataStoreNode;
import org.argeo.gis.ui.data.FeatureNode;
-import org.argeo.gis.ui.editors.DefaultMapEditor;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.part.ViewPart;
import org.geotools.data.DataStore;
-import org.geotools.data.FeatureSource;
-import org.opengis.feature.simple.SimpleFeature;
-import org.opengis.feature.simple.SimpleFeatureType;
public class DataStoresView extends ViewPart implements IDoubleClickListener {
- public final static String ID = "org.argeo.gis.ui.dataStoresView";
-
private TreeViewer viewer;
private List<DataStore> dataStores;
while (it.hasNext()) {
Object obj = it.next();
if (obj instanceof FeatureNode) {
- FeatureNode featureNode = (FeatureNode) obj;
- FeatureSource<SimpleFeatureType, SimpleFeature> featureSource = featureNode
- .getFeatureSource();
- IEditorPart ed = getSite().getWorkbenchWindow().getActivePage().getActiveEditor();
- if(ed instanceof DefaultMapEditor){
-// ((DefaultMapEditor)ed).addLayer(featureSource);
- }
+// FeatureNode featureNode = (FeatureNode) obj;
+// FeatureSource<SimpleFeatureType, SimpleFeature> featureSource = featureNode
+// .getFeatureSource();
+// IEditorPart ed = getSite().getWorkbenchWindow().getActivePage().getActiveEditor();
+// if(ed instanceof DefaultMapEditor){
+//// ((DefaultMapEditor)ed).addLayer(featureSource);
+// }
}
}
}
public class FeatureSourcesView extends ViewPart implements
IDoubleClickListener {
- public final static String ID = "org.argeo.gis.ui.featureSourcesView";
-
private String dataStoresBasePath = "/gis/dataStores";
private Session session;
import org.geotools.map.event.MapLayerListListener;
public class LayersView extends ViewPart implements MapLayerListListener {
- public final static String ID = "org.argeo.gis.ui.layersView";
-
private TreeViewer viewer;
private MapContext mapContext;
MapContextNode mapContextNode = (MapContextNode) element;
return mapContextNode.getMapContext().getLayers();
} else if (element instanceof MapLayer) {
- MapLayer mapLayer = (MapLayer) element;
+ //MapLayer mapLayer = (MapLayer) element;
} else if (element instanceof TreeParent) {
return ((TreeParent) element).getChildren();
import org.eclipse.ui.part.ViewPart;
public class MapsView extends ViewPart implements IDoubleClickListener {
- public final static String ID = "org.argeo.gis.ui.mapsView";
-
private String mapsBasePath = "/gis/maps";
private Session session;
Object obj = ((IStructuredSelection) event.getSelection())
.getFirstElement();
if (obj instanceof Node) {
- Node node = (Node) obj;
+ //Node node = (Node) obj;
}
}