GIS does not expose perspectives and views
authorMathieu Baudier <mbaudier@argeo.org>
Fri, 11 Mar 2011 09:55:09 +0000 (09:55 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Fri, 11 Mar 2011 09:55:09 +0000 (09:55 +0000)
git-svn-id: https://svn.argeo.org/commons/trunk@4282 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

25 files changed:
gis/plugins/org.argeo.gis.ui.rap.openlayers/META-INF/spring/openlayers.xml
gis/plugins/org.argeo.gis.ui.rap.openlayers/src/main/java/org/argeo/gis/ui/rap/openlayers/OpenLayersMapControlCreator.java
gis/plugins/org.argeo.gis.ui/META-INF/spring/commands.xml [deleted file]
gis/plugins/org.argeo.gis.ui/META-INF/spring/editors.xml [deleted file]
gis/plugins/org.argeo.gis.ui/META-INF/spring/osgi.xml [deleted file]
gis/plugins/org.argeo.gis.ui/META-INF/spring/views.xml [deleted file]
gis/plugins/org.argeo.gis.ui/icons/earth.gif [deleted file]
gis/plugins/org.argeo.gis.ui/icons/earth_edit.gif [deleted file]
gis/plugins/org.argeo.gis.ui/icons/gis.gif [deleted file]
gis/plugins/org.argeo.gis.ui/icons/gis_add_data.gif [deleted file]
gis/plugins/org.argeo.gis.ui/icons/gis_add_note.gif [deleted file]
gis/plugins/org.argeo.gis.ui/icons/gis_bookmark.gif [deleted file]
gis/plugins/org.argeo.gis.ui/icons/gis_globe.gif [deleted file]
gis/plugins/org.argeo.gis.ui/icons/gis_map.gif [deleted file]
gis/plugins/org.argeo.gis.ui/icons/gis_process.gif [deleted file]
gis/plugins/org.argeo.gis.ui/icons/layer_folder.gif [deleted file]
gis/plugins/org.argeo.gis.ui/plugin.xml [deleted file]
gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/GisPerspective.java [deleted file]
gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/commands/AddLayer.java
gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/commands/NewMap.java
gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/editors/DefaultMapEditor.java
gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/views/DataStoresView.java
gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/views/FeatureSourcesView.java
gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/views/LayersView.java
gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/views/MapsView.java

index b2ec854fbbbe6b8a2f61527dd3299d9232fe14ee..a9d684265fc63ddb036d03168c7f5874a4f26034 100644 (file)
@@ -6,6 +6,8 @@
         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>
index 92a19fbe01aaa874309fb4fbd18e03d7ee995fa7..1610110e60e205ccb31bfe1a82991cb168e61638 100644 (file)
@@ -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 (file)
index 759f66c..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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>
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 (file)
index ced2f06..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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>
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 (file)
index 1714774..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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
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 (file)
index 0259d22..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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>
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 (file)
index 229c391..0000000
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 (file)
index c7b3278..0000000
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 (file)
index 05a2053..0000000
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 (file)
index 8956b3d..0000000
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 (file)
index 43e86db..0000000
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 (file)
index cdbc528..0000000
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 (file)
index e6517f3..0000000
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 (file)
index de1f948..0000000
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 (file)
index 80531e3..0000000
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 (file)
index 274d361..0000000
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 (file)
index a7d5ed8..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-<?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>
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 (file)
index 142856d..0000000
+++ /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);
-       }
-
-}
index 3db9127f07dce012f242e9e8748dbf94e0dc78e3..3a68f44cc6991e92f08a6483378a6a464073489d 100644 (file)
@@ -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 {
index f3c5d0c1571a57c18ce86cbb1a21320061b09b1f..f1ac62535e5681fffff65d82c4b525e64ddc32fe 100644 (file)
@@ -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 {
index 3648b23296dc3cb8aafdb70b66941796021691d1..bf949b01cd141ba6217df4bd531fb230f3c29747 100644 (file)
@@ -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;
index 17ae43165e602a44814801ecf22abd5e62025e25..635ab617b640b9fff9b442c220621bf3df3bd921 100644 (file)
@@ -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<DataStore> 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<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);
+//                                     }
                                }
                        }
                }
index a534d4745f8dcb797737c1098ef1579b687bc427..7d78bffc844e8c3e9591405e5bce1a5771d54459 100644 (file)
@@ -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;
index e2d2fb063bff7292c225dd57b969c1592e4e8899..6459696ec5a59435b6ba785adc29c20d060ecf45 100644 (file)
@@ -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();
index b04534074d99a037b8949a6eb43aa9ba13dd44dc..51413e0d22454bf91d13433adefc2de7715c4b7c 100644 (file)
@@ -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;
                        }
 
                }