From af5f77f80fbf95da1f48d57e440c9e2cdca3c3a2 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 11 Mar 2011 09:55:09 +0000 Subject: [PATCH] GIS does not expose perspectives and views git-svn-id: https://svn.argeo.org/commons/trunk@4282 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../META-INF/spring/openlayers.xml | 4 +- .../OpenLayersMapControlCreator.java | 2 +- .../META-INF/spring/commands.xml | 16 ---- .../META-INF/spring/editors.xml | 13 --- .../org.argeo.gis.ui/META-INF/spring/osgi.xml | 16 ---- .../META-INF/spring/views.xml | 17 ---- gis/plugins/org.argeo.gis.ui/icons/earth.gif | Bin 587 -> 0 bytes .../org.argeo.gis.ui/icons/earth_edit.gif | Bin 1000 -> 0 bytes gis/plugins/org.argeo.gis.ui/icons/gis.gif | Bin 596 -> 0 bytes .../org.argeo.gis.ui/icons/gis_add_data.gif | Bin 607 -> 0 bytes .../org.argeo.gis.ui/icons/gis_add_note.gif | Bin 609 -> 0 bytes .../org.argeo.gis.ui/icons/gis_bookmark.gif | Bin 578 -> 0 bytes .../org.argeo.gis.ui/icons/gis_globe.gif | Bin 573 -> 0 bytes .../org.argeo.gis.ui/icons/gis_map.gif | Bin 1012 -> 0 bytes .../org.argeo.gis.ui/icons/gis_process.gif | Bin 364 -> 0 bytes .../org.argeo.gis.ui/icons/layer_folder.gif | Bin 573 -> 0 bytes gis/plugins/org.argeo.gis.ui/plugin.xml | 85 ------------------ .../java/org/argeo/gis/ui/GisPerspective.java | 22 ----- .../org/argeo/gis/ui/commands/AddLayer.java | 3 +- .../org/argeo/gis/ui/commands/NewMap.java | 3 +- .../gis/ui/editors/DefaultMapEditor.java | 2 - .../argeo/gis/ui/views/DataStoresView.java | 21 ++--- .../gis/ui/views/FeatureSourcesView.java | 2 - .../org/argeo/gis/ui/views/LayersView.java | 4 +- .../java/org/argeo/gis/ui/views/MapsView.java | 4 +- 25 files changed, 15 insertions(+), 199 deletions(-) delete mode 100644 gis/plugins/org.argeo.gis.ui/META-INF/spring/commands.xml delete mode 100644 gis/plugins/org.argeo.gis.ui/META-INF/spring/editors.xml delete mode 100644 gis/plugins/org.argeo.gis.ui/META-INF/spring/osgi.xml delete mode 100644 gis/plugins/org.argeo.gis.ui/META-INF/spring/views.xml delete mode 100644 gis/plugins/org.argeo.gis.ui/icons/earth.gif delete mode 100644 gis/plugins/org.argeo.gis.ui/icons/earth_edit.gif delete mode 100644 gis/plugins/org.argeo.gis.ui/icons/gis.gif delete mode 100644 gis/plugins/org.argeo.gis.ui/icons/gis_add_data.gif delete mode 100644 gis/plugins/org.argeo.gis.ui/icons/gis_add_note.gif delete mode 100644 gis/plugins/org.argeo.gis.ui/icons/gis_bookmark.gif delete mode 100644 gis/plugins/org.argeo.gis.ui/icons/gis_globe.gif delete mode 100644 gis/plugins/org.argeo.gis.ui/icons/gis_map.gif delete mode 100644 gis/plugins/org.argeo.gis.ui/icons/gis_process.gif delete mode 100644 gis/plugins/org.argeo.gis.ui/icons/layer_folder.gif delete mode 100644 gis/plugins/org.argeo.gis.ui/plugin.xml delete mode 100644 gis/plugins/org.argeo.gis.ui/src/main/java/org/argeo/gis/ui/GisPerspective.java 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 229c391c49357ce457ec3581d289ac4adde48e27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 587 zcmV-R0<`@{Nk%w1VGsZi0OkMyS5$INOmI(4a8OQgP;AmybGBG;uT^laS#`2mbg@@> zxL9|#S9i5ncC=V_wODtxSa!5oc(hq}vsiVpS$48nc(YcG(^`st_v4+LRl+4Xj&dij| z%ah8c>@VN7d`c zrpS)j?8%O;QmV>uu+Mj}&U2cpbpQYT|Ns7!l2&$gRF#x*rKEy@e`V?D%{Ow5wy3j8U$pYjtr^(8{QHZ%*>-(f07#$GVevb#Hif za(H!ccXV%gb#Zuga_z^c>cppcb#m{>u%8VF|NsC0|Nj6000000A^8LW004aeEC2ui z01yBW000N5fPI34goTEOh=L|4G&L!SGbM0XOhrB(AcinRY-fB|J5fC%AB7}XcU@n2 zd`3YXAzXtoO?+NxP-1R5Ef)r6gDg)+e0oV!Z&pqi33Y=nKTAkzRa8=CN*WXZgDxvT zJUVG$S!)Fd4R(VcDnmjRZDU$_4iI!73+3>-F8i11*}09geI Z9GD=10UZGl50RMzK+cv#AO!^i06RfJ8tVW6 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 c7b32787fef1b21ce48bb45ff19bfcf655a41dce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1000 zcmXw2Z%7+w82?>OY#di(Z)SB+TpS(fCPPO+%Q_le{4*P@8!y>DB#>=4C?o4KcSPn6 z7kjQ|Ymn=4h#&lrmEZ>##K~c|R#qv_mFx&i&az29bX3njb5cfzu1Ifh()Hox;d!3- z_xzsU!^_+CMrZ5kcdJl^ePFWErj8M9I+@NUNly3AX#QT|@R7~PX0$n?Wp!;PNfeFr zXOdHb@7j`Z(XX3J#*VHpCq*S<+||fMLx@Gl;6i?HcVRwB#`NHz=AYJ8C6dpj)vQit zbTKB7eoY-B`L%`MxS=Wn2?!(E$Zl5Crg{IAF2qQ|)OVNDg|*Dc5P$fvpv|jf%m~gI zB&MBe=T(I)$s{w6w$-B6oB}45d%*j_`h5dS8A|e{eNU21QgX!Td*T+hJgYwzEmKY#!Jy&KBcFKe7MDQ3~Uu9)(er%xX~IMKiM$&))sqva&YjBoIvc z@$>hgjiujy{J#7A`_awC?>_yqudo04``?T;HBa9BtesuPfYpR<68@3)|~wR|3AaP0mYvzj0_B63_2hu zfZ~LKePcsdQ*%peQ%FZ=M_YSPU%z2UkG&+D^;9+?eVsN_GhPul4_kGi0Gn1t?Lgf? z*}x5f(yi_?d_0^BoEX%!S}iy@95@UZm_kpmwkVlw=VW0HW#-oq_G$Jq7Z5lW$}ca) zY$<#y%-Cf+OQ;b)yOo}^Sa6dH_cw-61u1b)S8>(PYji3ndB>XYD+eWT2yO6e<+AH> kU6FK{P*wk<0UY-tb0@(OrR+2-y|{t?{qO(kF8}K|{_IBn>_`6Y zSpM!>{_ku4@N4hmb^h^w{_=kP@qYdCkNxwH^y-VexQ_q()c*V2|K%|K=}-Rhng9CM z=Ht!(+7ABTA%%TO|NQB}wS2+0f1jCq>gnYD^v~V08JdGC!LoV%^UuqqC$*6ywUQ&c zmnOrWEy1sK{O6;dc^0OD8m598rGgr+iXXa|H2d9y!K`ub>Difd6S9#ytBgOvs&1=` zK&FR8!K7uurDwsXYN3Qj=h3bF_wV!N(fH-nbWctH|Nj6000000A^8LW004aeEC2ui z01yBW000NRfPI34goT707Ze#AgkgmhCvABu9}$9KIgWxFBzQJ^DSzTROX?++hGBGbVFbM-_Xk=$*P<;~}9w=K=2nQ)tWou!8`GG-7PB?x^eT-Zbkn?Z4S vNSxT?hZZq#?hLZCqoc4VZ`k4l$6s#*WKYR&WdP4Akvek@u3sBGnv$~Dhx z*1u}p_OX8R+m@YQnznsx-~GLP&-d1yU%C(c?%MaWYyVFsw;pECeiqMuR-cJ6lTNbu zPGk?7#u+}FGkg|z^gN!JdA#upc@q}#B`vY5of|!2P0X5;_Vf40oIGh?Umvq}?WB_@ z=kMRY_T4QFlO~n#-#`EU z{r&&{e0p+n?PN8z^78Wk|Nk=#S)llng^_{5kwFLK15lhWu+MLBY_e8swQO=!?&@mN zR@1iCRaI|N7M`x`*kWsDr>&vdK5d4hn!c@-xs9O|L#K#{=u9;oJ5wWLQ@wSHf`S4{ zOZ&7;3@kL)$@2*bDa=w)ld`vPU}%?R=i!%YQoF$Lz@bTojh9WP!`jNhs=Y~)g_~Qt y+1uDvpIbevf98zd>2oH{UNU>hipte17p`h7 z>pZmgSang$>EjoUA3oDqHgUs>{dHyi7tUVGj+vSkJL%rtX9XoklQXA>Mpq@2?h4CY z83*?ix*$aTXMF1?Tw<9r(-9qJ8|#T z>HDuVCZFoxb;e=$^P0UEoHm?UwCljM{m18Q-kxyyV(OuD$vY24U%r0!(W98T)93Eq znA6>G;Nit9U!ER*aB1K5Evv6)S2bm?Iaq)F?x{2Prv3TIzy`_E4=&Y3ak$J47DS1m8`_x=C>Kf?e4#h)yU3=H86 zIw1Q&al*hpt0BCJm8q$%yy$T*tuLKhV}(yn~THT+uSX zBgD=^m$RL@NzX0F-POTLS*V?%N!{MX+0oNUUZlNO&D6}s&qq#{x1D3TprO82n1q6) zcl)d+6BQ*XX_?^Ar4z$_1w^^M!kO4RC-jB$F^PTWTHYk5!C{~%&&#u+JT7KWZbw%Oqt#vb2sx)tR>fEsT{N1-d|9|@Z-)+%x&t+$Pm!I}uan^6y z$$*t-f>xXkTy`>W`N`0=7lK!u3R!XT>gWI0KL3C9^S}496MoB11g<^rzv5KD@)JQT zPKK>M6S?lp%b)+>{`w!a>B8IJ|Gk#4@msU8?db6-XU+znJ2U0X>B*-~PCa!hD95zua0lox9;le(KxIfB*mg*HEAO^2M1~FVCMk)-!E#?v1OPW=zR{_xkLX)yeCY zWp7>Iy<^ja3#V3GIJ5cifsI>McV0cS^3&^!Q>xADbIi-qtP&#~kMEj%@8YW8Ki*HP z)Spyt)LCfUS!mLbZC0LUb@$xzBZm&WJ-*`Ak>&4CY&df0;D0b+7zMNs0mYvz%nS@2 z3_2jIKzV|J<069~r;NvjgoDmn5pNz`d^Ewa(JJTxXYo@`Aps?xdj*fw&MF$X?vPOw zY^@nz(dwkY|~pm_MYfZi;Fi45vYEKE_NDh40E zUg(muYnpPydGUrsscM#ECmjzSVzo1^^O)z8t{~08#P((3$HQ&uC+mD>34UpB6Hr+0 aJ7dLX0fAoO4av7FE0%A|z0JtTU=09o^=aM! 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 80531e39b0248e788d40a889e89aeb26903d8250..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 364 zcmZ?wbhEHb6krfwxXQp_Z$IDOKK{trhxYOF?d$hjRn0wo{h|H*{YM_Yw%@Y|9%g%LnyNg zgywyX&3hXsA8oJSA3uM8ecQa$`uPyUfMk3;Q04ym`}gP1pAR&9{(YdX*ALe&i{84i z@BaSz4Gawb|NjRn0+I}bfZ|UUMg|5G1|5(>ke?XXIvr*eSd>_Fcr1DRxI<+!U;pyQ z4L02(r&EF~xgxdOc0ApYpvQM|f@bl z2xvc7T-)v0c+{=uV(f%<8k0{ISJtGjJDs)iu*2@>O$*l)AH43g;Y|F-W956!xd(Z<@P%V@`L& zfrl5be0h5K!KF!ar|dqzW8d{HtFLBPHD#|kSbzQQsWbPc{rUfTzP^2THo$Z`~UIK|JR$}zr6Y8V)y^2Oa9;L{0|hoSo-*2?f;M0 zW=`$9xvB8^#kGIFzdzh*_W9|>9XZcAIfSDAE+}arCIHil1eauCkzh zY^eL?%c|yq7G{R(eB7~No)0~}CG|{AjI4|~nVQ1hheZg>DQG*`a - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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; } } -- 2.30.2