From: Mathieu Baudier Date: Fri, 11 Mar 2011 09:55:09 +0000 (+0000) Subject: GIS does not expose perspectives and views X-Git-Tag: argeo-commons-2.1.30~1373 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=af5f77f80fbf95da1f48d57e440c9e2cdca3c3a2;p=lgpl%2Fargeo-commons.git GIS does not expose perspectives and views git-svn-id: https://svn.argeo.org/commons/trunk@4282 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/spring/openlayers.xml b/gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/spring/openlayers.xml index b2ec854fb..a9d684265 100644 --- a/gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/spring/openlayers.xml +++ b/gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/spring/openlayers.xml @@ -6,6 +6,8 @@ http://www.springframework.org/schema/beans/spring-beans.xsd"> + class="org.argeo.gis.ui.rap.openlayers.OpenLayersMapControlCreator"> + + diff --git a/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/OpenLayersMapControlCreator.java b/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/OpenLayersMapControlCreator.java index 92a19fbe0..1610110e6 100644 --- a/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/OpenLayersMapControlCreator.java +++ b/gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/OpenLayersMapControlCreator.java @@ -14,7 +14,7 @@ public class OpenLayersMapControlCreator implements MapControlCreator { return new OpenLayersMapViewer(context,geoJcrMapper,parent); } - protected void setGeoJcrMapper(GeoJcrMapper geoJcrMapper) { + public void setGeoJcrMapper(GeoJcrMapper geoJcrMapper) { this.geoJcrMapper = geoJcrMapper; } diff --git a/gis/plugins/org.argeo.gis.ui/META-INF/spring/commands.xml b/gis/plugins/org.argeo.gis.ui/META-INF/spring/commands.xml deleted file mode 100644 index 759f66cc3..000000000 --- a/gis/plugins/org.argeo.gis.ui/META-INF/spring/commands.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - diff --git a/gis/plugins/org.argeo.gis.ui/META-INF/spring/editors.xml b/gis/plugins/org.argeo.gis.ui/META-INF/spring/editors.xml deleted file mode 100644 index ced2f0619..000000000 --- a/gis/plugins/org.argeo.gis.ui/META-INF/spring/editors.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - diff --git a/gis/plugins/org.argeo.gis.ui/META-INF/spring/osgi.xml b/gis/plugins/org.argeo.gis.ui/META-INF/spring/osgi.xml deleted file mode 100644 index 17147744c..000000000 --- a/gis/plugins/org.argeo.gis.ui/META-INF/spring/osgi.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/gis/plugins/org.argeo.gis.ui/META-INF/spring/views.xml b/gis/plugins/org.argeo.gis.ui/META-INF/spring/views.xml deleted file mode 100644 index 0259d22c3..000000000 --- a/gis/plugins/org.argeo.gis.ui/META-INF/spring/views.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - diff --git a/gis/plugins/org.argeo.gis.ui/icons/earth.gif b/gis/plugins/org.argeo.gis.ui/icons/earth.gif deleted file mode 100644 index 229c391c4..000000000 Binary files a/gis/plugins/org.argeo.gis.ui/icons/earth.gif and /dev/null differ diff --git a/gis/plugins/org.argeo.gis.ui/icons/earth_edit.gif b/gis/plugins/org.argeo.gis.ui/icons/earth_edit.gif deleted file mode 100644 index c7b32787f..000000000 Binary files a/gis/plugins/org.argeo.gis.ui/icons/earth_edit.gif and /dev/null differ diff --git a/gis/plugins/org.argeo.gis.ui/icons/gis.gif b/gis/plugins/org.argeo.gis.ui/icons/gis.gif deleted file mode 100644 index 05a2053e5..000000000 Binary files a/gis/plugins/org.argeo.gis.ui/icons/gis.gif and /dev/null differ diff --git a/gis/plugins/org.argeo.gis.ui/icons/gis_add_data.gif b/gis/plugins/org.argeo.gis.ui/icons/gis_add_data.gif deleted file mode 100644 index 8956b3d1c..000000000 Binary files a/gis/plugins/org.argeo.gis.ui/icons/gis_add_data.gif and /dev/null differ diff --git a/gis/plugins/org.argeo.gis.ui/icons/gis_add_note.gif b/gis/plugins/org.argeo.gis.ui/icons/gis_add_note.gif deleted file mode 100644 index 43e86dbfd..000000000 Binary files a/gis/plugins/org.argeo.gis.ui/icons/gis_add_note.gif and /dev/null differ diff --git a/gis/plugins/org.argeo.gis.ui/icons/gis_bookmark.gif b/gis/plugins/org.argeo.gis.ui/icons/gis_bookmark.gif deleted file mode 100644 index cdbc5287d..000000000 Binary files a/gis/plugins/org.argeo.gis.ui/icons/gis_bookmark.gif and /dev/null differ diff --git a/gis/plugins/org.argeo.gis.ui/icons/gis_globe.gif b/gis/plugins/org.argeo.gis.ui/icons/gis_globe.gif deleted file mode 100644 index e6517f3d5..000000000 Binary files a/gis/plugins/org.argeo.gis.ui/icons/gis_globe.gif and /dev/null differ diff --git a/gis/plugins/org.argeo.gis.ui/icons/gis_map.gif b/gis/plugins/org.argeo.gis.ui/icons/gis_map.gif deleted file mode 100644 index de1f948ae..000000000 Binary files a/gis/plugins/org.argeo.gis.ui/icons/gis_map.gif and /dev/null differ diff --git a/gis/plugins/org.argeo.gis.ui/icons/gis_process.gif b/gis/plugins/org.argeo.gis.ui/icons/gis_process.gif deleted file mode 100644 index 80531e39b..000000000 Binary files a/gis/plugins/org.argeo.gis.ui/icons/gis_process.gif and /dev/null differ diff --git a/gis/plugins/org.argeo.gis.ui/icons/layer_folder.gif b/gis/plugins/org.argeo.gis.ui/icons/layer_folder.gif deleted file mode 100644 index 274d361ca..000000000 Binary files a/gis/plugins/org.argeo.gis.ui/icons/layer_folder.gif and /dev/null differ diff --git a/gis/plugins/org.argeo.gis.ui/plugin.xml b/gis/plugins/org.argeo.gis.ui/plugin.xml deleted file mode 100644 index a7d5ed8f7..000000000 --- a/gis/plugins/org.argeo.gis.ui/plugin.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/GisPerspective.java b/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/GisPerspective.java deleted file mode 100644 index 142856dde..000000000 --- a/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/GisPerspective.java +++ /dev/null @@ -1,22 +0,0 @@ -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); - } - -} diff --git a/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/commands/AddLayer.java b/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/commands/AddLayer.java index 3db9127f0..3a68f44cc 100644 --- a/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/commands/AddLayer.java +++ b/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/commands/AddLayer.java @@ -3,7 +3,6 @@ package org.argeo.gis.ui.commands; 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; @@ -12,7 +11,7 @@ import org.eclipse.ui.handlers.HandlerUtil; /** 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 { diff --git a/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/commands/NewMap.java b/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/commands/NewMap.java index f3c5d0c15..f1ac62535 100644 --- a/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/commands/NewMap.java +++ b/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/commands/NewMap.java @@ -3,7 +3,6 @@ package org.argeo.gis.ui.commands; 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; @@ -13,7 +12,7 @@ import org.eclipse.ui.handlers.HandlerUtil; /** 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 { 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 3648b2329..bf949b01c 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 @@ -15,8 +15,6 @@ import org.eclipse.ui.part.EditorPart; /** 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; diff --git a/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/views/DataStoresView.java b/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/views/DataStoresView.java index 17ae43165..635ab617b 100644 --- a/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/views/DataStoresView.java +++ b/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/views/DataStoresView.java @@ -7,7 +7,6 @@ import java.util.List; 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; @@ -15,16 +14,10 @@ import org.eclipse.jface.viewers.LabelProvider; 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 dataStores; @@ -45,13 +38,13 @@ public class DataStoresView extends ViewPart implements IDoubleClickListener { while (it.hasNext()) { Object obj = it.next(); if (obj instanceof FeatureNode) { - FeatureNode featureNode = (FeatureNode) obj; - FeatureSource featureSource = featureNode - .getFeatureSource(); - IEditorPart ed = getSite().getWorkbenchWindow().getActivePage().getActiveEditor(); - if(ed instanceof DefaultMapEditor){ -// ((DefaultMapEditor)ed).addLayer(featureSource); - } +// FeatureNode featureNode = (FeatureNode) obj; +// FeatureSource featureSource = featureNode +// .getFeatureSource(); +// IEditorPart ed = getSite().getWorkbenchWindow().getActivePage().getActiveEditor(); +// if(ed instanceof DefaultMapEditor){ +//// ((DefaultMapEditor)ed).addLayer(featureSource); +// } } } } diff --git a/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/views/FeatureSourcesView.java b/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/views/FeatureSourcesView.java index a534d4745..7d78bffc8 100644 --- a/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/views/FeatureSourcesView.java +++ b/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/views/FeatureSourcesView.java @@ -23,8 +23,6 @@ import org.eclipse.ui.part.ViewPart; 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; diff --git a/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/views/LayersView.java b/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/views/LayersView.java index e2d2fb063..6459696ec 100644 --- a/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/views/LayersView.java +++ b/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/views/LayersView.java @@ -15,8 +15,6 @@ import org.geotools.map.event.MapLayerListEvent; 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; @@ -92,7 +90,7 @@ public class LayersView extends ViewPart implements MapLayerListListener { 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(); diff --git a/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/views/MapsView.java b/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/views/MapsView.java index b04534074..51413e0d2 100644 --- a/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/views/MapsView.java +++ b/gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/views/MapsView.java @@ -14,8 +14,6 @@ import org.eclipse.swt.widgets.Composite; 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; @@ -38,7 +36,7 @@ public class MapsView extends ViewPart implements IDoubleClickListener { Object obj = ((IStructuredSelection) event.getSelection()) .getFirstElement(); if (obj instanceof Node) { - Node node = (Node) obj; + //Node node = (Node) obj; } }