From ab4dcfd6237c3f2064e63b3e6bb1a740f0a56e2c Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 21 Jan 2011 12:46:36 +0000 Subject: [PATCH] First clean version of the security UI, also tested with RAP git-svn-id: https://svn.argeo.org/commons/trunk@4064 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../application/SecureActionBarAdvisor.java | 43 +++++++++++------- .../org.argeo.security.ui/icons/save.gif | Bin 0 -> 640 bytes .../icons/save_security.png | Bin 0 -> 706 bytes .../icons/save_security_disabled.png | Bin 0 -> 387 bytes .../plugins/org.argeo.security.ui/plugin.xml | 21 +-------- .../security/ui/commands/SaveArgeoUser.java | 1 + .../org/argeo/security/SimpleArgeoUser.java | 4 ++ 7 files changed, 33 insertions(+), 36 deletions(-) create mode 100644 security/eclipse/plugins/org.argeo.security.ui/icons/save.gif create mode 100644 security/eclipse/plugins/org.argeo.security.ui/icons/save_security.png create mode 100644 security/eclipse/plugins/org.argeo.security.ui/icons/save_security_disabled.png diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureActionBarAdvisor.java b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureActionBarAdvisor.java index 5d7c58e0c..e8bcf018f 100644 --- a/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureActionBarAdvisor.java +++ b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureActionBarAdvisor.java @@ -1,9 +1,13 @@ package org.argeo.security.ui.application; import org.eclipse.jface.action.GroupMarker; +import org.eclipse.jface.action.ICoolBarManager; import org.eclipse.jface.action.IMenuManager; +import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; +import org.eclipse.jface.action.ToolBarManager; +import org.eclipse.swt.SWT; import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.actions.ActionFactory; @@ -15,17 +19,16 @@ public class SecureActionBarAdvisor extends ActionBarAdvisor { private IWorkbenchAction exitAction; private IWorkbenchAction openPerspectiveDialogAction; private IWorkbenchAction showViewMenuAction; - private IWorkbenchAction newWindowAction; private IWorkbenchAction preferences; private IWorkbenchAction helpContentAction; - private IWorkbenchAction changePassword; - // private IWorkbenchAction aboutAction; + private IWorkbenchAction saveAction; + private IWorkbenchAction saveAllAction; - private final Boolean isRcp; + // private final Boolean isRcp; public SecureActionBarAdvisor(IActionBarConfigurer configurer, Boolean isRcp) { super(configurer); - this.isRcp = isRcp; + // this.isRcp = isRcp; } protected void makeActions(IWorkbenchWindow window) { @@ -41,13 +44,13 @@ public class SecureActionBarAdvisor extends ActionBarAdvisor { exitAction = ActionFactory.QUIT.create(window); register(exitAction); - if (isRcp) { - // aboutAction = ActionFactory.ABOUT.create(window); - // register(aboutAction); - newWindowAction = ActionFactory.OPEN_NEW_WINDOW.create(window); - register(newWindowAction); - } - + + // Save semantiocs + saveAction = ActionFactory.SAVE.create(window); + register(saveAction); + saveAllAction = ActionFactory.SAVE_ALL.create(window); + register(saveAllAction); + } protected void fillMenuBar(IMenuManager menuBar) { @@ -68,10 +71,10 @@ public class SecureActionBarAdvisor extends ActionBarAdvisor { menuBar.add(helpMenu); // File - if (isRcp) { - fileMenu.add(newWindowAction); - fileMenu.add(new Separator()); - } + fileMenu.add(saveAction); + fileMenu.add(saveAllAction); + fileMenu.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS)); + fileMenu.add(new Separator()); fileMenu.add(exitAction); // Edit @@ -86,4 +89,12 @@ public class SecureActionBarAdvisor extends ActionBarAdvisor { // helpMenu.add(aboutAction); } + @Override + protected void fillCoolBar(ICoolBarManager coolBar) { + IToolBarManager saveToolbar = new ToolBarManager(SWT.FLAT | SWT.RIGHT); + saveToolbar.add(saveAction); + saveToolbar.add(saveAllAction); + coolBar.add(saveToolbar); + } + } diff --git a/security/eclipse/plugins/org.argeo.security.ui/icons/save.gif b/security/eclipse/plugins/org.argeo.security.ui/icons/save.gif new file mode 100644 index 0000000000000000000000000000000000000000..654ad7b42407b334d90cc794efa27de55104d422 GIT binary patch literal 640 zcmZ?wbhEHb6krfwc*el+6w~t;=?ud9vy7?cE^q z*1q%4_Md-x_|o&km!6%t_VVPl7w2!kK6mTY)%$O+-hXrZ@w-PaKBPA<&u(2-(6RIc zNcPq9H=oX5zOnP@<=ao*J$&)u*_+SB-Al@Q7r*)NC8Bg!<-|)ZjH0s zngDZi_XtN5{Q%otw$=^~0s8um5jL8}0j~D0PWDc&0mjBw5oSh40pT}qg$J-}SVowt zsmpdhlU7$VjnL5(6Vnq{eg9rmMO7z4Qd#5=&;S2!TLcV~Sf{ZGJ2fOQEKqFF=5g={ zX-sWo;gpxKxS`?7)yyxaVsIcy!HI>JM{dQMpw>oDKCTTS4GxnV&13{JoirL$k1;TD bvT!H}I5;%1u=EHWIJ9Nu<>e7fj11NQ?2-~h literal 0 HcmV?d00001 diff --git a/security/eclipse/plugins/org.argeo.security.ui/icons/save_security.png b/security/eclipse/plugins/org.argeo.security.ui/icons/save_security.png new file mode 100644 index 0000000000000000000000000000000000000000..ca41dc92b0a1afe816a14fd7dbe3a275dcb38245 GIT binary patch literal 706 zcmV;z0zLhSP)#O4^Kg(>T{!Ta!*|a;=YAjj=TQKY zKEJ&A=t&i4W@o9YDBnbW?-`@O;Yj62$|`Ko+}b9=P*{SYu=J03#OT;RqkqJc;x@Oo zOBR4O3atfg1fSne)RK%?-++C7e~N1awg4DWSVlmg#Pag4%?m);nHE40K-t>@*j&KU z%5Gq3Ma&W=dK#&&uL2;rJdL~SD$bL)QGj4l4dRxKwMn#Xyx$>*v&N`tIAAmECkd`D zF!bzKx`1r_d%l=*8+Eswl@k|sGd1eR=bpw{S~(V0w_R)=MQJ>6=IPH=8A=nq6gaCdl&K8ljaau6xx0MAs9a7>$G>{s(8-R*+Sk71`uF zev%JR2!Zijb~UiBOy!-jSGaWRsgx`{=Hj)l_K1m<1KuLu4s1iA zn8F-x#ahKz<%S2uUB*Cy2_=U6B0uYVAn8%cXW8w3R+=%f#{QCQlRsPud<-7iO} zJ$^KGX<6+8An-dz+!8=giu459D729b)%L5N6u#nKk07*qoM6N<$f)08+u>b%7 literal 0 HcmV?d00001 diff --git a/security/eclipse/plugins/org.argeo.security.ui/icons/save_security_disabled.png b/security/eclipse/plugins/org.argeo.security.ui/icons/save_security_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..fb7d08d9adfe6fc7c82be26a196a90c1a9e4841a GIT binary patch literal 387 zcmV-}0et?6P)*h6Ni!dau}WH#AXao zN|FoRzFbI>Qcg%{*v5jWc9EzaN`a&yj{n=)z8 z9I|>S?8tf6^~;Gc=GlW=H}3rN8832Pyc!oK3>!9v5p64e`l})1OFa2hZ~k$NhAvvz zmy;~nvWiPTtl_sk^EE|IQdqVHW_)*DTL`4eLqf}ek3GCA1u~_c>V&4IrXwGaB!wj7 hBo0Ka_g!?=gg4txhOcH~fzki~002ovPDHLkV1kPOoGSnT literal 0 HcmV?d00001 diff --git a/security/eclipse/plugins/org.argeo.security.ui/plugin.xml b/security/eclipse/plugins/org.argeo.security.ui/plugin.xml index ec5044839..e365536b7 100644 --- a/security/eclipse/plugins/org.argeo.security.ui/plugin.xml +++ b/security/eclipse/plugins/org.argeo.security.ui/plugin.xml @@ -102,7 +102,6 @@ @@ -115,24 +114,7 @@ - - - - - - - + locationURI="menu:file?after=additions"> - diff --git a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/SaveArgeoUser.java b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/SaveArgeoUser.java index 975687207..d28761989 100644 --- a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/SaveArgeoUser.java +++ b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/commands/SaveArgeoUser.java @@ -25,4 +25,5 @@ public class SaveArgeoUser extends AbstractHandler { } return null; } + } diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SimpleArgeoUser.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SimpleArgeoUser.java index e736da8f4..ca7229c2b 100644 --- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SimpleArgeoUser.java +++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SimpleArgeoUser.java @@ -24,6 +24,10 @@ import java.util.Map; import org.argeo.ArgeoException; +/** + * Read-write implementation of an Argeo user. Typically initialized with a + * generic instance (read-only9 in order to modify a user. + */ public class SimpleArgeoUser implements ArgeoUser, Serializable { private static final long serialVersionUID = 1L; -- 2.39.2