From 3877dffcd4a365c5570ea1211690187311463d67 Mon Sep 17 00:00:00 2001 From: Gary Spencer Date: Thu, 17 Aug 2006 10:39:56 +0000 Subject: [PATCH] Added desktop action attribute to allow file/folder parameters to be optional. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3535 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- config/alfresco/desktop/Alfresco.exe | Bin 49152 -> 49152 bytes source/cpp/CAlfrescoApp/CAlfrescoApp.cpp | 9 ++++++++- .../includes/alfresco/Alfresco.hpp | 5 +++++ .../smb/server/repo/DesktopAction.java | 8 +++++--- .../repo/desk/CmdLineDesktopAction.java | 2 +- .../server/repo/desk/EchoDesktopAction.java | 2 +- .../server/repo/desk/URLDesktopAction.java | 2 +- 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/config/alfresco/desktop/Alfresco.exe b/config/alfresco/desktop/Alfresco.exe index 1dc932a15dc568064b6e303271fdd693353be26d..94aee691abfd22854a04168507825728bd5727f7 100644 GIT binary patch delta 9740 zcmeHMeO#1PzCX{ys6#4@%F7@F3@|7H0tzZ7>S$=FpaUYHDT1MlI1(b7ZYU6-;5hm6 zv(;_shDJ&6v{)CbZ9xfbV~vWtp}Cv2d3&B-Z8Igao%=n{JQLX6fA4?yd_G@(=ltHz z@BGf|GgMW1R8@H#9Psd*|Jk9Rg2d5zG+u}kKWDT=h!8H*7U5oD2b~sX2+z@X!bD+u zTYwni74+~T#%j7W_U^nh8rCydik;S(g|tFfX>j_sY%#MNDJHE@?wKupm^#FOI&?-K zXT%XG++o^4K4bPL+UF(N&v(irZgdLUMzqW=_ekhC+b%H1&bpNE?6Ic@eSS};#vJwe zc?o0IyF|tu`%Nhz%QK`eXzkb!MR5rwjf>Pk@iduy%*GwJola|erI|U>Os0%;DW=G@ zt!5_CV#c^PnU0LxPgOpC;+%za%xChr+A2j=!&SA3T=gXN``vocNC#N%8dW~N8%@MAXr(dk_ z7A5(Wh@tDL#c!GL0}c4ai6ic%N&e|##(LV}pCN`v(L4UJ!Zf<&zfSa;*OsRrC5Z3; zNVb4HVI92_uv|!^knxgmf15TiPY`#kC#xYr%!r`J4f*2S8{{->A9M1i)9G=pVL^|5 zK~FKWNF!)Z&=J8xfx#)GN6u1WEoQ|`I!m_TF5zD^C1kBoPlrOn#GM=Hl@Nz`={ltt z7otDAG4vi5&RA_n`8LM_g9S6uf|-+ILK!O-k?yPv{3-9QHT8ilNX^i7D}mVyrYOZt zpl^+#!dEmVv|RX*_Jl4JjYhf<8a6%|>NRPmNWp4-(9G=TRg+=TR=O)}rDk#xW3)LU zj2gmHgpcV$m}$hNubs{usf>OMD;)F0H%@15hj(qE2ZAw5`WaLb9xXgckA=?_YUomU z$ix~WW7*cK?U?TUrsoli8t6#rbTE1zaBiCk!}Vk|MGN0inkiLhg@5joxqN;?VfgWF5lCqGePHGEgpcZ1oBSJAn+$*vFgdbJ`pj%g zPD7)jAboVhHBu2HwJ#jpqRH5zN%j6)YK070`{mQ#iX}n^EHuSe^<(-uOcT4-86pEYC%U2PKpxrbYjwc)UQqo zPxG;s?=Z7Wr|)G9k9(}?8nwJwXOS~-I&`O)`~^81HB8-pj7S>gtMqHD>G)U8fCh7L z3S7;D;Z9RsX$)mWMQeQ!3cA+O-l!Dx)Dsn>_i_44++&EQ57d;7K+#PK~ z+Sf+=j?`yJy|JpSGCFi*^<-sO`w#{_7j1~tVlt|`_~Jh^ia8dsZ=-M;0zU&Iqs>eM z@Yx|LdY5pLHpILv3?u#IrNWC;GCUFHinzIFO4mW!c5dQCHz~IxXDACw_3zEo3{= zk7c0Uz2LSW1%c;yl&fSqC@}Ue{euBuIGX?EbVBYSxu6K_9{iwMY&+6>A)0{nY9F#i=M=3?y58 z7%iFN8J5r?XJAD*efhm$uS-H8{2myNd!T%iBmJ^;A5D#m67p$H+>BW-V8B>-6>sv3 zq0RI7dDzT~_jd4vbKQP_Eyhv5=CE6-1R%qMxe}#&Xj6Ql zP)oh>0YWN$5kEd+<;PBEyVn#mJL}rxd~yON-C?vRK+Q#1QW~bseszs{C)CL9Hq^x=`yIJ!;R}{ zrAHHH3QOtT1dFhljEOk{4!%TxI*_sQ|Ox}Xk}}lHayd^TxvsV2erI1q^h>xPtypYzYD*^*&|AlhB&*AI;MXwW?Jc$ z8EHZwiAjaRt5lSfAb8R5lTvZ(eU@}YNTHoGgM{gHbY`r0^Cq2}Sr+)gFeQB}@0c;= z%x$NvyC+nh&_JGIGS+qA4WUQ2Sh?1M8~@T>;8&PTbwY8}yzY^V<$!(z3R&b( z*|VzbeU~g|sO%9{_Nq%3KSVZKDpQ4zfzo@qK6m*j#}AS(k!eNd^n1Yz`g+|9TPvMlz$NGmC2&fUV@R5@pr_;E0OG$&WgET(C5cMGTK z)Z7OInM~#bob`%%w-^A)yganp9-a4yC>$nJ$`J#@$yL*pct$(qeaSZwhH{wtQb@=k z>w-9KVRjCLRcX8QB-q?pm!@}H#HMhT<#4n9o9XKHk7HU{FLH9MkCDMtw?Mw%Og>8 z(glmZ=zou*hDOQsnM+4?I!tPV z9wd6ZB(?6lO+VE>aCwYnUT_c^NkM8tlVo<{G@~>iEWmK2jvU6!9~iNAl)JN+jEsDJ>nm+P{DU zcSLZ1o3`YH2o-cFCvoiOmlU%kwKFFDl|IZ#7G5Wx+-NcAbDEc{7q@;*@8*VT`C*5p zsfdIZs5Li8__*yt?kj>=l23K3mIz60@2xs2ic{86@tS1e2Ay0}j0fb{yfs1 z{0D`ru(ySaRz3i?r~@vPVvjI!9%r3|U<-|64Q^>eGCe+%zmu8#v)KK2~lC=8y~$oX%( z_>S~O+4>yjBfU?~S7?=-%c)~E&SiNrR-+@mU0(1UEn06dO@!pE!;!^BKfQ!8)>%-s zNPqm^>0Ei1`xy2dHLMR4KY5m3SieQoJxs<8{wktzD|p|3;nnnG@>>dvf56Ch@$*)B-piHT4TgJC(Yh>G zwsR5xJdls5EZZQfT4k+NSoz$2$undunv7TA(xM5GddM-fe%V`5?3YJ?x+bT`zW6*Q zClepe?P=6l6e*r>q3)vSsH$3I_$%ymo_U`8ujGNZ-ByxoNPKbH-z+9_>gobVY{Y>X3id+3FYGmw+3 z8zaTar^&lG48I#rEe_MSoP%#y$6whOOX&DvEQj`HvK7Y(z0_D7IO)HhLTHZjxHfA# z4f44mtt9z0S`J4KWb%to(UszmI0rabWzTa~wIWrj+Xt(g2CMl`QS7FPhU2`$A-OU_jk_&ObE=1FUmuPL-$mYV75O`*%*;97pr;!fHj zQ@8mG?y6Zn;jZS(M_twGPJWBa4ZNjndUY22zC#)$8gCo#yQ7RQ7KnrV?O zRLG@Gwt%2Wg>U7HFGx|Xl7D!Tn^ehPKS{@JhQKG_9m}v??pFAH@|&vs)hDUnHc>cr zc(c#=V{dVrCi$R3+hwb&oBt%mZVnJ%d5RWoj*K@qV30Pv>)fleR*vKb4rTENDYlLB z4=1>=)LqF#F_Ig|^Ers#23mkDZ_!nhV}+pGfm+}&&ay zG>}Ed?KdkgJD5`5KgL)EFafxL&*q1LDB!|x@u>&+0UeJrRto5WZaj;A155xe5o3=4 zDZq7j=H>7s=nZ%gm=1IS7l1DSc7U-kAoc*OWJ##Z2hxBnAd-iV_spk2FYqeR3_J!L z25N!d02_c*U^);9=m9No9X|dJ^a5SLYrr3XW}p!`3{(MSz=i{B@yimA2;~+s;icAj zTfEQAiZCHpO3X|LY6jdTdd*>yi@+)1HJ}6N271~u%3s$68CfYSU}eB&ww{#(Wo#=mvJLD3 zRz~kVIIc~zGe#Um!~YhJjW7dey(%Lv&pN9KYbuoE70Q) z-4kFyCf$YSKL+h2Ad7x{C`2?=(D;h+>7_%Ic$TZU!VsR@L2?tuGK9|^K96?$5dCBl zD*UGm)#BExVJQu<#50!-psmH!Dc1CMMaY7o8r-S^R!Pus7yJ~%Qqj%_Du6eD0U#b} z;DzgJD73gzkoR z`xOOM_|HpIgWz5AB(6r=9T?}iOUH36lwaxAqkWJvc865DC07gZLu(;p4ZvwY213^} zmI3Slc5YzoC*Z{*#yqW90YE*_4oHA;Bfk59(|`;F6hj9%3|s^}H!;=&6zWUnO6|mauz9h9a?w^$o}S&R zx(4-fm%61&8*&Z1l9%gv{o=lJwyJ8}^t{`vW)hzQO%;v>AQ|9=uO42w8K;pzK6O?G z3fJgwm4W{Cc`lb%hPceFQUbM9>Aa4>jR=z_&}7^{RZ;U+`kTRUO%xaLAl`u3-2<2D z)(^J%@Oflcpu=^0=wemK{Aj%y^*g;7st2vO%=~Y>n4!bH#8lIzs^Ey65HmA#U9~(O z?8-M^?h;gafE~1}Ivn@w@#=9SE7UGZ*PH2(7)n>FwH}ENyXU2{2|e=C0?K=7Rom^L z9%!Eh<#Y3nO1}Udj`r*gF1kpiD^&V}s^@|BNa&3O)qobLbhAnWTvX2{qN0OB94JrR z2-Kxt;-lmm?ftJq#A7?F(sxz*5vT_If2i$mL3z;}$F9fZWK40%c^qB<_hGDYb>oe? z6?M*wuQAhsTEEI7Ga8H~fpYdepgfyPKzS;7;oW7UJq)x!r5izc)LYbc1*j+5wQBnS zsM~%N_(#zm4SE8Um)=Yl^}2?5c!#$^^|kcpn(>~c2`-t2-m4iGab=debXChARVr9r zgW|m;(#y3WzVYDjvPhM1x20S%x=Q8n5jHEF)*+l;g>z*H=eFWcx6urJJP$zmEOCF4 zbf_+nV(PSXu+BK!tZJ+T<-Q9*xzD?EjazA}V!S>fo42X(ZR zu_t^C9I{0!mwQhHH^g@*IJ}e&kyyE8bjJ`6jS7ct8uWP{oIp<=1)ncHb?yyW6Aw8r zvq1Sc7J>4fazJ^0*QvBtr3X~{m`a}l<>R{o%8LZ*&KQoNy@69WSI1u-C|CBnv~@OD zTMx>ujiB6$_t?y>=wP+RTVLzq4g+^oy?YPeXHkuFL3zmcgYu9|K)HjRs+{kOUO4x% zxcFSg7c{p?tRHk;fjZ}<)SD@;*3TVVyXwA!3hMp+-K$pL;4;+0p#PVc(!)2K!9W4! zzO9^PjdGj@%c`2qNK!P&jqjHmwOeg4B<#!YmI7VQfWXRM{-eZlxKsbODWWp06) z*?{x=d3>(&PY0g%TX0r@x=ZjQcvlH>-x}bpE@jL(L~qqWtRdLe4$;E>HpxnN%!mTrnaXYQDYA`X@YF{{|Ya$bLVBR zD=1uBV6#1NzjA}VVBLKp-R9H-3X zy;7NB_3LME5-WOMMDo!kMI+;ub@gVqGo_{FHS${X`|fkj1a z4-gHbgT=cUtMAs>jumxjSkGW7bz0uImlk=|jx2IU9$aVQGJ4l5a_qF!AswJKf{bH# z>VDg~rw4)!bZP8f-HQttvy2oOv+pz}gJfk$kJ3ZqJ{AwnCyRG9Rr(}opge=Fd++3x z)wIXk6eRu2>9jP}nwUM!Xv{dCY>ZCZU}91|oTXZwpZM-PYSB&f&bG=L8m^&D;u=xZ zuQLjH^s{b~?%$E2zo0LOf7H1HKD|KT@h+y!denZShMN&y>&!zYOu{1Pbz>B)HLh z|K;N6ruLWoJp}R4O?o?^NH|16fmwo{)&@#KVtZatksuC~P=`KIyk?{;`eM=WBP|Tx zH1?~1I-SFgH_z*_&Fd*;W+|7>1@93;sVpSf^V6BKucfS%NknglbPK1b&af17zGw&+ ze_BCqp>{Fw2ig;wB8c>9XxQA=aK;)st2Wx_>CIS$gN!k$CzP>L5z)=gz)#h&24f%C zf|MM=m`e%FUNA-JbR^9V3lnzIval*)Go1@d5jzbO5*{9S9;WNljM0L{vf0FJC)6%( zk~b|5&)57s4eRwzWH|jbJXv^|LL!XA1HW}TbEP?ScSOn9Kcn8zIi{gx7@P@}q}%A- zh*)6*eH}4dh@cpwAu0lH=2)zou*^G+FTfeq(NR)<2u2=oZk&ORQ>oGzD;%MH##FDS zD~e5~*nEYSMS9cl$RJ@RMMO^W3NrAaR5!h(WQb$M-YN88$EN^kaST6*jVeLmWY?8(5a~Vgi^XI zdVYjq3UWTp=2SFm`hCwy_%|@zbUPqjz(G zQ4fRyMtio=KQq^y)4WeskUqVkO!Ey9qa+*s&AEITGmx_DsBywX;cwJFp+L})S4<4@ zZC1=2)N5iQ()=w|_nBCx)8{;#vLzcs>$^R&O1;dE3<1GSHhK$=9Mll)o$y2Yrw%?P z8_VlEf2kkPAZ&-h)ohM%8XNm!=}Jtj_UAx(nmP)NO~yzoV&nWVWrW{#SPg7lP%4t&yXCGR9*kLu+&E<%Bj8sZrPOOFKPCK11x`O z(GqZ4P)+QS!Vu}YZl2a%9xNxu#0r5DU_DRQIIwsyDOrqhFrq=ex zAs3i*6y!h;PB@#^HWo)=rak?zbbTC#{);n9$-VT$$LHPR150o7fLv|7vDI77jFv6P zjA|HgEJ42Ilrno`wbSV|a}#HLVd9vOV^43%K>OIdTY}^Xp8bzpCDTrCO&aOHDgX@o z)4w>KkPnkAp?s^3X*flnO&Tw3Ax(V5L^p5P*?NgV!F{8rr5Z!p(|e`QVQR)k$u_TV z!!Y~2KDZNRmR_Xn_|UQae|I{6H7ZIcgD7Zncx-dwEvL^O%rmjmF$Za*G;EF2;f?LY z5r_MYBSKY~J^j42fX>Fp2xj^@e%h@4nDxQgRn_kzD_Hx811Df$R>BzjBWQBn6MhJY zryRbqHq9Zk-QIx7G!@>GKBu(_NrCwT@Fo2`oOhEx_}b}2M82`{j>XiIpq~;kM7$Sb zyPd%uXltari%uuPj<^m+NW{qzIJrbfquR*SVrmu-)UbC$r8h^Q)mD#Iwo#iYU7@pyccjRA&;CYl@o)9) zF*vbp?q;bAk*e?3)~9%Ai|V`e>SS=GHm{;ZNi&2ZdML>(Y^4iHxk4m<{b=FTrC~cF zG4;{5ep`yhoRKBf!diW|m$gRAsz%v-Go>^-J+&fZ_u_~<@ zXW`e#0xYAk(OIRlWFyevog2kiF6b|ykVOxby{XFnuE^qs%J!?WV~Q+ch|E*krV5_} zrHp*tNS*waf`b;iG%M2Q3#<(s)Wa#4htg~cxjo#+8OgWgVB(=mtA*y>UK&=c_`3;n z;Qofdw534dEeFq%N4>X41go=}qG~NxW}K#YM_zXXA)ayaZ|WUog3x~Wjzqz8BQ9Rt z8rf#s2hwV~{)d^kv*Kqj7RMOKHakx|yPCe7T_en(64P2?HT9Vu;;a>S)`*Wla%T}* z?epe5C<^1KFL{qX0cTi!cT$&j$TawbFqLuCFpq>f@=qxf@~I)^JF&TxHs1AsP)@h* z8XvxiACcY3>f_ONB=KZ(s-`(r+nnlwrAGgR_T<#X0+Qj0yK981_K^7#gy0OEhjrZr zIKh7R=!E_TDp^n~9xS6T7i1{Z*aE{m8Y` z$5KL>B>jk37nv*`lzz`9JZ`%0DW_JS(BX@0m*MaNnznHEoRwd2m-xM#-sZY#GQoR` zAG#I>V|F{gH2AUl=v7Qd`|CZ^g0oV@QPi<8X4)rst-?Z6;c00tdZQ}c1&W({{V3j8 zj7D=x9xj4!Ch#ld<~L4f$IgWmU>@)F0lzcSTQEAtaZ2yfLUVwp*Jz|I&P6!-NjYsa zuc~D@qb*fUa0ssgv-A|MW5sd2B&9EKVyiCmX9+HJJXhK<1?eOt$~@AHNq9zZrYL!T zCrVLD z)E_S;o%B4$YU~`-*oCfHSoHEth(e|7JR;Chjk-zo(Bll7B;ALqt-n;THyE4H%Pe;| zs&ug6QKfq9E*Y-l^$KZHbH()LqTBr?1Ezp65;E=g=vA%Z(#;D4Sl^nF-u+dZ1blN&XOo!@9} zDcaa0M+QV?;@|LSoJw>`;=kxtR=}d;XqO75Lj8N1MHnSo8qa&5sy{ABJ&6CTf%Wg( z%8fc6mJGxqG}EGM9l>z46!FvtSNiAY=x`PB_t#ujUYF>TpuW$tFk9oSZoE^BYu| z6THm%rqj7dijpr|4OeUagY^7)^tnrKbDxo?AJf>#H!=j$9yo3 zm(F9_aatzNWjU&DaQBba}iuH_o=t{R({ zH173JuWk%%VMcvEr3~(2+cUaqbmbm>;H9&v{vdw?#sJu<&yGJ^8N+ z;`^w`#fUVtv#yr_pr^sg#I(R`~=sJL5)Yn zHqXOsOP4aF#Q&r}lIus;LH{ORz+4{(vZLu7ZCVjBwVd-$DtvqTK1bd;tVepE!z@#) zBb8Ho0nTYhA+ph)-r<;fj!v%78~q?TYPV-|QEVIL*l0%8EWPuC)0uyi+xX{4G-74A zc;+LTxN@C%p^jQt`pxn=#H}25c)sW|?2P1Jt;!&39i4+e`Zqa!zj6}(G!nMTyZl5S zmsaz!-{IBt7RReHi$A#?pYY>Ue%(7xKgXrLj=i$hdB@8gT*SW{91SXK-ymz9%4(Kb z{Dto*>Z8_G6Y(v1YSs8?E##P5zr*<RcW3DBqhYVo>l{#96fipvgiBSfthoxlID z3Ti%W;0k>Wbj#vzkj^T8T>w@5>bK4BgOyoaNlS^V!(vaoCQqWn@r110=h!RLeU67z zx?QEUXQ_5|m=H$?R>ufU)U!HXI83)z$BP#lX=3R##AHQjw7B*RJyaTw!~Rfdxc_~} zVOtsavTeSEfw%pDfvf0pX}r)%`m&%2@Abkp`-z{C*+=w_*N3#GJDx?$ZtsE2vA>s! z%M9^b!9kY2z**~Lsa#z-SY0w$HTTj>Wl{R>2N0~L?|Hq%5-5S zyuKWHvI5Uj=`;`8KF0-_b~yS^)A;hRtesrT7h2rNLCDl?{zm86#CgI3R|NO`tE6U1z(f-eU6t@`7@^|Z%vfYK-M+7K#SbD)ln?d4o9A$k~5|R}q>oKTzmrA5d6@9)I%rLxpenL7Ca- zXq9P)qeWHPrP8JkXj4U$P(b@D0{rKJ`J0Heeus!$Xr|K@Ap)asDIZy@c0CodyKo@WxxD1HU_Xnl`DZpZ26JVq>wjXO>urs+l*}_;Fa0B1g z`+-d0=ATdpl7WBxk+EHX36StE`V%l8xIv6P2NVH1pc|HXS^gkK18M+wU=Oe#coXOa zz6XAJkkvBnLyV0B^neiI0Uo;4**p_DX<*K2Id2|0seqHFo1p%&<}J2F9EH< z9$*Ks4X6Ujf#rZ1m;>DQ&{D?6!xLWKM;gIgS9!i*uKoEvHanLl5$bO zbkyh5x($Zf%h1k&met3^TF06gg9T0tz*`PjfC``r_%FZ;R6_Rw(4D|;pas|uJPkYt zv;nUH#S=~JZO|^@1aJ!I13m#R0RPB0&0&{O`5qVmegQNH&`7`w@CEchI1mj?0+N84 zfC)$e(%Lhs-qN%uZ!wDQaWy8kw~#9CpC4>RH5{|d%u3GMZk{VW@>RxNk4L<^x$%j8 zn??HQ{<#5{5I+_ zeWltUl+c-K@8Gr}I(VeAPPBV})f2WFgf>OG!qH9@Kr{CS0Wp&bn*0}VhYFtC*t zZ{;V!maRb(i@|Ued~dKyw12Ct$Pc%gm`HV7y(hE|>A_uTLwnG)qTLH^folhzAEM1C zcNuNfiI|!Y@~ZI|$)jOJoZ(kdjjxXhRafC6GunC7Tw|ymD&ZO{mNE9my^M`0!5>Y5 z)xZJZ3@`xvw1TnwS28wf6=Ti7SwL%HY&u{8S^;4-`U0zgM}V`yxKjKv8fXR*${5=K z94upgYZFp(Ho0Z4*AZRym0pO(oapeU!mXp(H{zJjmAUvLDScCku zMJ8F6P%`MvEtfYQqg)O~TV)5WRh%8&k4yrB3pD39B4)H{Cl zuPkAu2@E6^DEDu!N*Ahh38)7Ad)4+@P+l|#a7<#_PbMgG?#pO^+qk+-8EOpb)9V$x ztlmU_Zt$fm+lJS6sJ4!R@^JnIl*fV>4R8)^9`1`Ob%1iWuc_@@pd+~MDn)M$sH?vR z_nj7aD*vSk!eV1@Qw_fr7UK#+H;Fa>p)#er=g1t z2A?)na#EG>d6>AwlUWp99*HWMlQ4wSDszg5aC&5WyTIY4MU`-S1CRt!L8BJmxJMcd zGdfkBzk+h>7eTq6L#5YL`V%Nm$%NIaC$y|F!n4@bLXQ`?Ja5d@k&qzVq8mi#T_Ww0Ue!WBD0ln|P(J9lpxnw&s+?~Qe3&?E7Akx$(*V4W zrfJZ08tR;jU7R?{lzAB8EDxFBWmfg z0=zC}HIJtA&%aquAkUO^?!xgmXHb}{xe`eqN&JGdLSKlIXu@LmItRWfhZ zI;8W>7Ia+qaG3A^f7JXReAIaT{-dV-oIPe7z9AEKw`ziu`0E*E((F5PmM<$=x~#l> z?Y*WARV5}o*(t0wNJyePS`GLulz+F%zmK>2{if&K+|?D?mh~%^@op$dbVlxZrPU8T Y-44X#cj|#${MrvB3Q6rp4$KbuUu>cOGynhq diff --git a/source/cpp/CAlfrescoApp/CAlfrescoApp.cpp b/source/cpp/CAlfrescoApp/CAlfrescoApp.cpp index 4362c84821..2120081d24 100644 --- a/source/cpp/CAlfrescoApp/CAlfrescoApp.cpp +++ b/source/cpp/CAlfrescoApp/CAlfrescoApp.cpp @@ -148,7 +148,7 @@ BOOL CCAlfrescoAppApp::InitInstance() // Action does not use targets, just run the action - else { + else if ( actionInfo.allowsNoParameters()) { // Run the action @@ -465,6 +465,13 @@ bool CCAlfrescoAppApp::runAction( AlfrescoInterface& alfresco, StringList& pathL if ( buildDesktopParameters( alfresco, pathList, actionInfo, desktopParams)) { + // Check if the action requires parameters + + if ( actionInfo.allowsNoParameters() == false && desktopParams.numberOfTargets() == 0) { + AfxMessageBox( L"No parameters for action", MB_OK | MB_ICONEXCLAMATION); + return false; + } + // Run the desktop action DesktopResponse response = alfresco.runAction( actionInfo, desktopParams); diff --git a/source/cpp/CAlfrescoApp/includes/alfresco/Alfresco.hpp b/source/cpp/CAlfrescoApp/includes/alfresco/Alfresco.hpp index 0bce50c321..397bd18831 100644 --- a/source/cpp/CAlfrescoApp/includes/alfresco/Alfresco.hpp +++ b/source/cpp/CAlfrescoApp/includes/alfresco/Alfresco.hpp @@ -106,6 +106,7 @@ namespace Alfresco { #define AttrAlfrescoFiles 0x0010 #define AttrAlfrescoFolders 0x0020 #define AttrMultiplePaths 0x0040 + #define AttrAllowNoParams 0x0080 #define AttrAnyFiles (AttrTargetFiles + AttrClientFiles + AttrAlfrescoFiles) #define AttrAnyFolders (AttrTargetFolders + AttrClientFolders + AttrAlfrescoFolders) @@ -367,6 +368,10 @@ public: inline bool supportsFiles(void) const { return hasAttribute(AttrTargetFiles+AttrClientFiles+AttrAlfrescoFiles); } inline bool supportsFolders(void) const { return hasAttribute(AttrTargetFolders+AttrClientFolders+AttrAlfrescoFolders); } + // Check if the action allows no parameters + + inline bool allowsNoParameters(void) const { return hasAttribute(AttrAllowNoParams) || hasAttribute(AttrAnyFilesFolders) == false; } + // Set the action name, pseudo name, set the confirmation message inline void setName(const String& name) { m_name = name; } diff --git a/source/java/org/alfresco/filesys/smb/server/repo/DesktopAction.java b/source/java/org/alfresco/filesys/smb/server/repo/DesktopAction.java index 77b6456074..d17fca8b31 100644 --- a/source/java/org/alfresco/filesys/smb/server/repo/DesktopAction.java +++ b/source/java/org/alfresco/filesys/smb/server/repo/DesktopAction.java @@ -65,6 +65,8 @@ public abstract class DesktopAction { public static final int AttrMultiplePaths = 0x0040; // run action using multiple paths // default is to run the action against a single path with the client app calling the action // multiple times + public static final int AttrAllowNoParams = 0x0080; // allow action to run without parameters + // used when files/folder parameters are optional public static final int AttrAnyFiles = AttrTargetFiles + AttrClientFiles + AttrAlfrescoFiles; public static final int AttrAnyFolders = AttrTargetFolders + AttrClientFolders + AttrAlfrescoFolders; @@ -117,7 +119,7 @@ public abstract class DesktopAction { /** * Default constructor */ - public DesktopAction() + protected DesktopAction() { } @@ -127,7 +129,7 @@ public abstract class DesktopAction { * @param attr int * @param preActions int */ - public DesktopAction(int attr, int preActions) + protected DesktopAction(int attr, int preActions) { setAttributes(attr); setPreProcessActions(preActions); @@ -138,7 +140,7 @@ public abstract class DesktopAction { * * @param name String */ - public DesktopAction(String name) + protected DesktopAction(String name) { m_name = name; } diff --git a/source/java/org/alfresco/filesys/smb/server/repo/desk/CmdLineDesktopAction.java b/source/java/org/alfresco/filesys/smb/server/repo/desk/CmdLineDesktopAction.java index a67b4768cf..6744204fdf 100644 --- a/source/java/org/alfresco/filesys/smb/server/repo/desk/CmdLineDesktopAction.java +++ b/source/java/org/alfresco/filesys/smb/server/repo/desk/CmdLineDesktopAction.java @@ -34,7 +34,7 @@ public class CmdLineDesktopAction extends DesktopAction { */ public CmdLineDesktopAction() { - super( 0, DesktopAction.PreConfirmAction); + super( 0, PreConfirmAction); } @Override diff --git a/source/java/org/alfresco/filesys/smb/server/repo/desk/EchoDesktopAction.java b/source/java/org/alfresco/filesys/smb/server/repo/desk/EchoDesktopAction.java index 78a8bb9783..2293d3efff 100644 --- a/source/java/org/alfresco/filesys/smb/server/repo/desk/EchoDesktopAction.java +++ b/source/java/org/alfresco/filesys/smb/server/repo/desk/EchoDesktopAction.java @@ -36,7 +36,7 @@ public class EchoDesktopAction extends DesktopAction { */ public EchoDesktopAction() { - super( 0, DesktopAction.PreConfirmAction); + super( 0, PreConfirmAction); } @Override diff --git a/source/java/org/alfresco/filesys/smb/server/repo/desk/URLDesktopAction.java b/source/java/org/alfresco/filesys/smb/server/repo/desk/URLDesktopAction.java index 23129a5ac5..ca63252963 100644 --- a/source/java/org/alfresco/filesys/smb/server/repo/desk/URLDesktopAction.java +++ b/source/java/org/alfresco/filesys/smb/server/repo/desk/URLDesktopAction.java @@ -34,7 +34,7 @@ public class URLDesktopAction extends DesktopAction { */ public URLDesktopAction() { - super( 0, DesktopAction.PreConfirmAction); + super( 0, PreConfirmAction); } @Override