X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fplugins%2Forg.argeo.jcr.ui.explorer%2Fplugin.xml;h=a3436071732e892bc0988c2b1ca84ad56ab33b34;hb=20c8fafc7b68d2d669cba6e7235cb17a3284cf64;hp=9428cbe9805fbec27ce8cec8975098ce7d285ce9;hpb=fc4c9f53197bc7c0a9a30bc6c55cfd1c162ebd9a;p=lgpl%2Fargeo-commons.git

diff --git a/server/plugins/org.argeo.jcr.ui.explorer/plugin.xml b/server/plugins/org.argeo.jcr.ui.explorer/plugin.xml
index 9428cbe98..a34360717 100644
--- a/server/plugins/org.argeo.jcr.ui.explorer/plugin.xml
+++ b/server/plugins/org.argeo.jcr.ui.explorer/plugin.xml
@@ -114,13 +114,15 @@
             defaultHandler="org.argeo.jcr.ui.explorer.commands.SortChildNodes"
             id="org.argeo.jcr.ui.explorer.sortChildNodes"
             name="Sort node tree">
+            <!-- FIXME: default value does not work -->
             <state 
-				id="org.argeo.jcr.ui.explorer.sortChildNodes.toggleState">
-				<class class="org.eclipse.jface.commands.ToggleState"> 
+				id="org.argeo.jcr.ui.explorer.sortChildNodes.toggleState" 
+				class="org.eclipse.ui.handlers.RegistryToggleState:true" >
+				<!-- <class class="org.eclipse.jface.commands.ToggleState"> 
 					<parameter
 						name="default"
                			value="true" />
-				</class>
+				</class> -->
 			</state>
      </command>
     </extension>
@@ -130,11 +132,12 @@
 		<!-- Browser view specific menu --> 
 		<menuContribution
 			locationURI="menu:org.argeo.jcr.ui.explorer.browserView">
-            <command
+            <!-- See bug 149 --> 
+            <!-- <command
             	commandId="org.argeo.jcr.ui.explorer.openGenericJcrQueryEditor"
                 icon="icons/query.png"
                 style="push">
-            </command>
+            </command> --> 
             <command
             	commandId="org.argeo.jcr.ui.explorer.addRemoteRepository"
                 icon="icons/addRepo.gif"
@@ -143,7 +146,7 @@
              <command
             	commandId="org.argeo.jcr.ui.explorer.sortChildNodes"
                 icon="icons/sort.gif"
-                style="toggle" 
+                style="toggle"
                 label="Sort child nodes"
                 tooltip="Warning: stopping to sort children nodes might enhance overall performances">
             </command>
@@ -166,10 +169,10 @@
 				      <and>
 				         <or>
 				            <instanceof
-				                  value="org.argeo.jcr.ui.explorer.model.SingleJcrNode">
+				                  value="org.argeo.jcr.ui.explorer.model.SingleJcrNodeElem">
 				            </instanceof>
 				            <instanceof
-				                  value="org.argeo.jcr.ui.explorer.model.WorkspaceNode">
+				                  value="org.argeo.jcr.ui.explorer.model.WorkspaceElem">
 				            </instanceof>
 				         </or>
              			<with variable="activeMenuSelection"><count value="1"/></with>
@@ -187,10 +190,10 @@
 				      <and>
 				         <or>
 				            <instanceof
-				                  value="org.argeo.jcr.ui.explorer.model.SingleJcrNode">
+				                  value="org.argeo.jcr.ui.explorer.model.SingleJcrNodeElem">
 				            </instanceof>
 				            <instanceof
-				                  value="org.argeo.jcr.ui.explorer.model.WorkspaceNode">
+				                  value="org.argeo.jcr.ui.explorer.model.WorkspaceElem">
 				            </instanceof>
 				         </or>
              			<with variable="activeMenuSelection"><count value="1"/></with>
@@ -203,111 +206,123 @@
 		         icon="icons/addWorkspace.png"
 		         label="Create Workspace"
 		         style="push">
-			<visibleWhen>
-				<iterate>
-			      <and>
-			         <or>
-			            <instanceof
-			                  value="org.argeo.jcr.ui.explorer.model.RepositoryNode">
-			            </instanceof>
-			         </or>
-             		<with variable="activeMenuSelection"><count value="1"/></with>
-			      </and>
-				</iterate>
-			</visibleWhen>
+				<visibleWhen>
+					<iterate>
+			      		<and>
+			         		<or>
+			            		<instanceof
+			                  		value="org.argeo.jcr.ui.explorer.model.RepositoryElem">
+			            		</instanceof>
+			         		</or>
+             				<with variable="activeMenuSelection"><count value="1"/></with>
+						</and>
+					</iterate>
+				</visibleWhen>
 			</command>
-     <command
-           commandId="org.argeo.jcr.ui.explorer.deleteNodes"
-           icon="icons/remove.gif"
-		   label="Delete Nodes"
-           style="push">
-        <visibleWhen>
-           <iterate>
-              <or>
-                 <instanceof
-                       value="org.argeo.jcr.ui.explorer.model.SingleJcrNode">
-                 </instanceof>
-                 <instanceof
-                       value="org.argeo.jcr.ui.explorer.model.WorkspaceNode">
-                 </instanceof>
-              </or>
-           </iterate>
-        </visibleWhen>
-     </command>
-     <command
-           commandId="org.argeo.jcr.ui.explorer.importFileSystem"
-           icon="icons/import_fs.png"
-           style="push"
-           tooltip="Import files from the files sytem">
-        <visibleWhen>
-           <iterate>
-              <and>
-                 <or>
-                    <instanceof
-                          value="org.argeo.jcr.ui.explorer.model.SingleJcrNode">
-                    </instanceof>
-                    <instanceof
-                          value="org.argeo.jcr.ui.explorer.model.WorkspaceNode">
-                    </instanceof>
-                 </or>
-                 <with variable="activeMenuSelection"><count value="1"/></with>
-              </and>
-           </iterate>
-        </visibleWhen>
-     </command>
-     <command
-           commandId="org.argeo.jcr.ui.explorer.addRemoteRepository"
-           icon="icons/addRepo.gif"
-           style="push">
-        <visibleWhen>
-           <iterate> 
-				<or>
-              		<instanceof
-                    	value="org.argeo.jcr.ui.explorer.model.RepositoriesNode">
-					</instanceof>
-					<instanceof
-						value="org.argeo.jcr.ui.explorer.model.RepositoryNode">
-					</instanceof>
-				</or> 
-           </iterate>
-        </visibleWhen>
-     </command>
-     <command
-           commandId="org.argeo.jcr.ui.explorer.removeRemoteRepository"
-           icon="icons/remove.gif"
-           style="push">
-        <visibleWhen>
-           <iterate> 
-				<or>
-					<instanceof
-						value="org.argeo.jcr.ui.explorer.model.RemoteRepositoryNode">
-					</instanceof>
-				</or> 
-           </iterate>
-        </visibleWhen>
-     </command>
-     <command
-           commandId="org.argeo.jcr.ui.explorer.getNodeSize"
-           icon="icons/getSize.gif"
-           style="push">
-        <visibleWhen>
-           <iterate>
-              <or>
-                 <instanceof
-                       value="org.argeo.jcr.ui.explorer.model.SingleJcrNode">
-                 </instanceof>
-                 <instanceof
-                       value="org.argeo.jcr.ui.explorer.model.WorkspaceNode">
-                 </instanceof>
-              </or>
-           </iterate>
-        </visibleWhen>
-     </command>
-  </menuContribution>
+			<command
+				commandId="org.argeo.jcr.ui.explorer.deleteNodes"
+				icon="icons/remove.gif"
+				label="Delete Nodes"
+				style="push">
+				<visibleWhen>
+					<iterate>
+						<or>
+							<instanceof
+								value="org.argeo.jcr.ui.explorer.model.SingleJcrNodeElem" />
+							<instanceof
+								value="org.argeo.jcr.ui.explorer.model.WorkspaceElem" />
+						</or>
+					</iterate>
+				</visibleWhen>
+			</command>
+			<command
+				commandId="org.argeo.jcr.ui.explorer.importFileSystem"
+				icon="icons/import_fs.png"
+				style="push"
+				tooltip="Import files from the files sytem">
+				<visibleWhen>
+					<iterate>
+						<and>
+							<or>
+								<instanceof
+									value="org.argeo.jcr.ui.explorer.model.SingleJcrNodeElem" />
+								<instanceof
+                          			value="org.argeo.jcr.ui.explorer.model.WorkspaceElem" />
+                 			</or>
+                 			<with variable="activeMenuSelection"><count value="1"/></with>
+						</and>
+					</iterate>
+				</visibleWhen>
+			</command>
+			<command
+				commandId="org.argeo.jcr.ui.explorer.addRemoteRepository"
+				icon="icons/addRepo.gif"
+				style="push">
+					<visibleWhen>
+						<iterate> 
+							<or>
+								<instanceof
+                    				value="org.argeo.jcr.ui.explorer.model.RepositoriesElem" />
+								<instanceof
+									value="org.argeo.jcr.ui.explorer.model.RepositoryElem" />
+							</or> 
+						</iterate>
+					</visibleWhen>
+			</command>
+			<command
+				commandId="org.argeo.jcr.ui.explorer.removeRemoteRepository"
+				icon="icons/remove.gif"
+				style="push">
+				<visibleWhen>
+					<iterate> 
+						<or>
+							<instanceof
+								value="org.argeo.jcr.ui.explorer.model.RemoteRepositoryElem" />
+						</or> 
+           			</iterate>
+				</visibleWhen>
+			</command>
+			<command
+				commandId="org.argeo.jcr.ui.explorer.getNodeSize"
+				icon="icons/getSize.gif"
+				style="push">
+					<visibleWhen>
+						<iterate>
+							<or>
+								<instanceof
+									value="org.argeo.jcr.ui.explorer.model.SingleJcrNodeElem" />
+								<instanceof
+									value="org.argeo.jcr.ui.explorer.model.WorkspaceElem" />
+              				</or>
+           				</iterate>
+					</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+
+	<!-- Reduce visibility of JCR Explorer perspective to users that are in ROLE_ADMIN --> 	
+	<extension
+    	point="org.eclipse.ui.activities">
+		<activity
+			description="Only for admins"
+			id="org.argeo.jcr.ui.explorer.adminActivity"
+            name="Jcr Technical Admin">
+			<enabledWhen>
+				<with variable="roles">
+					<iterate ifEmpty="false" operator="or">
+						<equals value="ROLE_ADMIN" />
+					</iterate>
+				</with>
+			</enabledWhen>
+		</activity>
+        <activityPatternBinding
+			activityId="org.argeo.jcr.ui.explorer.adminActivity"
+			isEqualityPattern="true"
+			pattern="org.argeo.jcr.ui.explorer/org.argeo.jcr.ui.explorer.perspective">
+		</activityPatternBinding>
 	</extension>
-	
+
 	<!-- Core expression definition 
-	
 	<extension
          point="org.eclipse.core.expressions.definitions">
       <definition
@@ -320,13 +335,5 @@
          </with>
       </definition>
    </extension>
-	
-  <extension
-           point="org.eclipse.ui.activities">
-        <activityPatternBinding
-              activityId="org.argeo.security.ui.adminActivity"
-              isEqualityPattern="true"
-              pattern="org.argeo.jcr.ui.explorer/org.argeo.jcr.ui.explorer.perspective">
-        </activityPatternBinding>
-     </extension> -->
-</plugin>
+	--> 
+</plugin>
\ No newline at end of file