From c208feddd6ceb7c4a6861e9a49228edc25a13181 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 6 Aug 2010 14:07:38 +0000 Subject: [PATCH] Improve RCP git-svn-id: https://svn.argeo.org/slc/trunk@3758 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- dep/org.argeo.slc.dep.eclipse/pom.xml | 26 +++ dep/org.argeo.slc.dep.sdk/pom.xml | 5 + dep/pom.xml | 1 + .../org.argeo.slc.client.rcp/.classpath | 4 +- .../.settings/org.eclipse.jdt.core.prefs | 8 +- .../META-INF/MANIFEST.MF | 4 +- .../icons/argeo-trayIcon-256.png | Bin 0 -> 10127 bytes .../org.argeo.slc.client.rcp/plugin.xml | 22 ++- .../plugins/org.argeo.slc.client.rcp/pom.xml | 39 +++++ .../slc-client-rcp.product | 155 ++++++++++++++++++ .../ApplicationWorkbenchWindowAdvisor.java | 91 +++++++++- .../{Activator.java => ClientRcpPlugin.java} | 38 +++-- .../org.argeo.slc.client.ui/.classpath | 4 +- .../.settings/org.eclipse.jdt.core.prefs | 12 +- .../META-INF/MANIFEST.MF | 2 +- .../plugins/org.argeo.slc.client.ui/pom.xml | 45 +++++ .../ExecutionModulesContentProvider.java | 6 - .../client/ui/views/ExecutionModulesView.java | 1 - eclipse/plugins/pom.xml | 61 +++++++ eclipse/pom.xml | 17 ++ pom.xml | 1 + 21 files changed, 505 insertions(+), 37 deletions(-) create mode 100644 dep/org.argeo.slc.dep.eclipse/pom.xml create mode 100644 eclipse/plugins/org.argeo.slc.client.rcp/icons/argeo-trayIcon-256.png create mode 100644 eclipse/plugins/org.argeo.slc.client.rcp/pom.xml create mode 100644 eclipse/plugins/org.argeo.slc.client.rcp/slc-client-rcp.product rename eclipse/plugins/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/{Activator.java => ClientRcpPlugin.java} (55%) create mode 100644 eclipse/plugins/org.argeo.slc.client.ui/pom.xml create mode 100644 eclipse/plugins/pom.xml create mode 100644 eclipse/pom.xml diff --git a/dep/org.argeo.slc.dep.eclipse/pom.xml b/dep/org.argeo.slc.dep.eclipse/pom.xml new file mode 100644 index 000000000..685292b67 --- /dev/null +++ b/dep/org.argeo.slc.dep.eclipse/pom.xml @@ -0,0 +1,26 @@ + + 4.0.0 + + org.argeo.slc + dep + 0.13.0-SNAPSHOT + .. + + org.argeo.slc.dep + org.argeo.slc.dep.eclipse + jar + SLC Eclipse Dependencies + + + org.argeo.slc.eclipse + org.argeo.slc.client.rcp + ${project.version} + + + org.argeo.slc.eclipse + org.argeo.slc.client.ui + ${project.version} + + + \ No newline at end of file diff --git a/dep/org.argeo.slc.dep.sdk/pom.xml b/dep/org.argeo.slc.dep.sdk/pom.xml index d00032396..7cfe3040e 100644 --- a/dep/org.argeo.slc.dep.sdk/pom.xml +++ b/dep/org.argeo.slc.dep.sdk/pom.xml @@ -46,6 +46,11 @@ org.argeo.slc.dep.gis ${project.version} + + org.argeo.slc.dep + org.argeo.slc.dep.eclipse + ${project.version} + org.argeo.slc.runtime diff --git a/dep/pom.xml b/dep/pom.xml index aabde35ea..6e8c62934 100644 --- a/dep/pom.xml +++ b/dep/pom.xml @@ -16,6 +16,7 @@ org.argeo.slc.dep.server org.argeo.slc.dep.detached org.argeo.slc.dep.gis + org.argeo.slc.dep.eclipse org.argeo.slc.dep.sdk org.argeo.slc.dep.sdk.sources diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/.classpath b/eclipse/plugins/org.argeo.slc.client.rcp/.classpath index ad32c83a7..304e86186 100644 --- a/eclipse/plugins/org.argeo.slc.client.rcp/.classpath +++ b/eclipse/plugins/org.argeo.slc.client.rcp/.classpath @@ -1,7 +1,7 @@ - - + + diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/.settings/org.eclipse.jdt.core.prefs b/eclipse/plugins/org.argeo.slc.client.rcp/.settings/org.eclipse.jdt.core.prefs index 4186daad0..5eb7b030a 100644 --- a/eclipse/plugins/org.argeo.slc.client.rcp/.settings/org.eclipse.jdt.core.prefs +++ b/eclipse/plugins/org.argeo.slc.client.rcp/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ -#Tue Jul 27 13:22:37 CEST 2010 +#Wed Aug 04 16:32:22 CEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF index b89b70c1e..b8e715c91 100644 --- a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF +++ b/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF @@ -3,9 +3,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: Rcp Bundle-SymbolicName: org.argeo.slc.client.rcp; singleton:=true Bundle-Version: 1.0.0.qualifier -Bundle-Activator: org.argeo.slc.client.rcp.Activator +Bundle-Activator: org.argeo.slc.client.rcp.ClientRcpPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.argeo.slc.client.ui.views diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/icons/argeo-trayIcon-256.png b/eclipse/plugins/org.argeo.slc.client.rcp/icons/argeo-trayIcon-256.png new file mode 100644 index 0000000000000000000000000000000000000000..da20cf48587b75e466cfd6a989ea3c128a57ba81 GIT binary patch literal 10127 zcmc(lhgTC%w8uAuDqW-tC{^iIx_|-}q)C?+YG?w2Kp+S~6htX1(mP0t^xhLhiqZt> zB?OV)LJOgVm*4v%-aFZx&DmroJ9BsLz2DEB7$buR^jEm9002P$=%Myg005Cbf&gkt z(#giJ#FccSbkuvG4P5^B%55)BBweBLeQ4!RYBBlW8+7kh28?u(>g6MS9jX~>N_zfl z3p0pQ0Js4>($+GC&1`1{XWF_;E5)Km*niwfLms*00c&W(>}*eHn{ zT8oWW-`Lz=Oycb3>@ByY)S;lV!Rcs5eABWbBPYA5`Z4bD=p&W+_4<%+73~|Ch9#pB`Vt(&@C;9Rl;fyk~{O1SA-Q z)>!gn!jW;_U=RdorJRStdfN+7c-S(6N>Jgg+6D_tWhB6QlC>v9K)IZM-x@A!? z>19Eb$L2)zKQE}fwFiF+=pt4T))5-{vNXwRto*<-gkWd-ey1LN7SRaGljZ$PkDiPu z-cpLVZ5TtXd7G<)inSR<2BX4Jnra#vy?r2tXhl#R8VI{Q)CL~^BzPhcK)W@Q$IP5b z>wQ_744 zE*y&tG4UP+jt6T$D9Pob^aHG9CWqon8a>lMPe1&)>nuk(M-ytbD=10o&R5o!sEhrB zuE!sLFTDxPQ!jCNb!AFK0bE0_#3@ci?9D#uCKyVD(QiIaE}Zx7?8f8WwbT$SvIlU4 z9%3^>@#j0GEB&vJ&`|X(wg2sqf8uPHvV$)3HgBSwPOh8#ta^Gt66U8JCj&EL$>n?; z&5kgAKG+f#drgg& z;SLuOosn8v;jelYs-n= z?NW|wjM$Pm6axXdefnXqHAweQ7v{SVg~{1sfxVaKN9JI6HCb{<;0RqPubJmg67!2@ zYPYqpc{K@Wh#$LTM&o*r=aMofD>H&!j`-O0>!r!VjEc{l->kJz-q|ks&y`mP{x}`` zaD37FB!s4oU7!l3CWvp`V90w@vJcIe>59pbLSDBQEFjIYpdlawf|k;RmjR#xFpVYtTX){jmdhyBCEvwVSN_L^&+|bD&wsnkaTNmg2&&z zm8ZwA#pT8IOzgK)l$YT2^yNPiJ9+2#StVYT#*g!O!RPU-4ZF#@1$QvA^289+vkH`? z0;mq*HFBSS7mCC>iL-x|V!fGkY+NP3Uu1we{HPdkB{@E-`}{rm^Tpd9=T`g}GG?Fb zkBtZmu`HejuHU?m#)jie!~C_De|SU6Q^V4(0JtFhH^Ep9pA9rSSL=TG>IP58*JeYwzrU3Kxz%|KTyd6FB2J-8g4=ucRgcEp`D}C! zGw2rM5+m8=8;=d+C0+LLNoNJaggV@uB~MJ-C4~>z5iJQ3siJ{VPQ5Ct@RsK)Cm#YN zwX=e7GpCT2_5EaC%;=n+)2-#1Xs95!C}v^y#fK624Et^iv^$kr)14bd*~UvqQ?G4~ zT72@(Eb@6-f?_qiCVh)`{*1he0R{wAV9akgaP++R;P;?lWc^RPBpHSocTLLLoW&>1 zu-72jJfYM?tf36zJ{HpZI zXgB*CkI!fyBasbns#E$drMwXpYw8VzP`Ycor=8%7?eXn-Gj_$J#Xs{<4X0*6Q5_XJ z-vjGf4q9k+yhoniUPza;d9P#jSZT+KrTCp1-;vQ?{1da{kk4kcvjQgL zN1z~=iS*aE1D}jF92SZauYc&))d3#+Y+t@GH8JdMh#N}dHD|2f-&EI|X7b^OH?^X` zgyiSvV)R|UW4D{DEyb&ye}1Ol^TIV(+u+JpjF8PkI{erXaehpwvu)e$YRCwu;SWa{ z6Y^Z`CZd#8{Kop^;#i>p61%+f>O+&$u4B~b;<^2oMhWAsw4%DZbLTKW-_W zY~KcZbZm;bd^mKdoqoSm$c&gdEaBOI#U7*hiPm&G3u%X1I++5IY?XR(AKi;M#-bfX z{*12ao9%ztk+T|^m8pe^M5y35gFWq?q z*Qojt!`|Rt7m<-|-!rkNa%G}(aaT9#R`^1BkH&rSqKSC&Ur zsO?~4pz@*VIF)RFd&|0;p~)n=*m|aCq^EW@J8a^z$Fce=4A_wm8?-x9^{7pt*fKCZ zILLy^eo`&bGeK{oH8`TGtH<_#E6!K@{cEm1^@(34V{CF9v{W|GyTu8rNESlC-Ki>G z&gjs86_~3Il4)g8n94gZ+b#?pk&gWwrxt$xz#5M)?y`T(+IHUnHGwGZJ2{Hv#UkD0 zx!6Fyt6SkhzAcFrVrIDgZ##uv?-id|;8_u82p>Rb0g11-=f-&Cy^{3Va4)vsq==)c zLlnb=anG26;}P;U`qZT_w4$jhL0h&1ERp4M;4ra>Va})#e>KHzrL@wvT})f)g4?ra z6F(=FdvlhLjw1ad^a@5w49U^9wU>U_P!Ze7hL~r(+-?~s1*-@tQd1Ly&4Fa8VquYe z;^pAA_Dyl$vbFW}?#)dqu-%{LlwU>mEXWYL3 z>|W`%@Eo;L;N(Zjx@eX$3c1Sr;#P&Z8+m}BMZaA9~WN5`9ZQxBwgjX|1A>n>qF{n z9*PUQbX~W;d|Hf-a6wx~B(%8bmLD#su|IO#e85#%^ScA&tPNxujy+R)t)$_%94@?t|_(`$tJLY@7bLV8#M%N88ES9Q*V!UsZ`Ja9k z9L_f2)qBB&bg{V2-5xa)^nwA2+$%4+kuD~%E|DjwKrEB8!r3CO%)JMcQpF-Xifsl~ zMku4?s5T!`A}*!r1g!I;c0pXvyDsaV6F`mO70sV+bG>#yeadQq{p|g;_x;X3)o&^r zIwgKfClL4FxKz;*GflIz?#E+<*$76k2KkQWIE4K1Vy)S!UtQE^n7n7OJeS0}Nx}RM zsIK6dg{q^;AGbShDQ6x)d&6dqxJ;K1fQgxT(R|$uX7;pQNCDz7PA*0@knT9*e+T!K z8X>35KEBt>{GY@16_&r~g+`PY8f`;!zWoM5fhJ0&xT{LG>xGuj)Zg1n>B{O1Q}6>r zuWk+Nj02f|enmqEEcH)H#_YK)eR_d8F9Nfv=&m0&^2>{Gymy(a zxCX$Bp2bFvhR3{47|6>eGB!D1U!9@6v?xKgBmET4+e&Mp$oKVKgJnGKMT%xJ^Qg{* zU-D*TETrks?A4-rm7YB0c1NjwSbE3dvQEy4gzo&hJWWL#ny!o8#sJo{9QX-t^FH607MB|Q`$5u+EUHr7q9e6Ve zKgpkCZC(KpE>YO{m@sy~0{@v)27mKed6 zT1ijBfut@e)q)&5WSnc{e+FK<|D5DcKHm;;MY%LSCp3Z?lTH~78n2+&HQy$Z-^ft*{%4LIu}F1PJJ>$(b7>u^AW1>gWsfE+W92=5O*hAahwh zMb=hH>5F>tGg4wENk(L@muTck+4-f)>->S2cO$2FDYE>qNHq1=8FV32YfL%zm~585 zD^Pv(4*mV?o1mNeyacUiOmdLAtbv1sP*n5D=aalj`S(jZb;INWN__~i5b z2$#;o#7}-Nk0fqb99BV*=^96a&;vJcOq-9Z=rH+H^fRnAT6cC_>fLm!CE(TAh_NDr zERGMjOW<-4!!{8}-Bzxo-W-dHP57Ttj(&mu~^_vXnd@xGp<47SP|MPbp3JhD3~%&maG)gNZ;xIELQ9 z{7T*?fw$?P_vBP1B30~ODI)n6D-obB>3zr1LMdQ~TYElVC{s-sRMogN)M$Hwy03tx z{<3N5`reL|dhHFksVC6Y$$bpdTCIM8CD!pj+4~uyDZOSDDoB1y!O{z=lNq z^}s$T(N_^zepW9+hBaaYaz`_YB|o}~v#0KuSZ2Bql1e6??o!=-6KNoOm$mi+CaD>e zpRRG3-Q(|cR0};*^F?Q``;bjMCfbpst9b#<9~n6e9X$J?8OEq))2HDRvpXAhQCy(KXS)+i{SA{d-_T*T?r=WbQ zT+r$SL-p5?FE0Ln7et|o8YYLMStX8t+yuT+&XVR@+*H&@u8OQ_P&(E@Mu!)~=>2?np@wkR`hV;$fP;dE=COtY!cV)u3heF8_M8i$lE z(G7bl#4*Jj9u|L6l&CE@wZa->MM~y_FB}Q{KxLGz-==}YpVocHM1O++Lg<~iJJ;Py z0|6Kp!KX|5&aaXf;JOt4XSr%X?S-%KKoJb=shd81$4>P?^UHdp*8`q-KR(=-tzRr4 zCCp)8x#~%*^F1}0v0qUz0aX?SIqp0IZsOrerUuzCSJbC3#-yJyZ+)^3^6Se`Aqkdm zl&kyLh`=5{EkB*%ms~yfD4fqC_-5q7P!1gKoXX4ymUi-6Pm4~D619rfT!Ql7AMFW~ z=9PK)jq9r2g9!bS74AkoQA2X9v#g5-g5Hldp>YvDC1c!w3KQ7WP3L&{faI9T#=SQs zO&?cUaCyB4GQGqh#nkA%<>u-TQi!{8$4U-v!Q0U5l8eMo6d>_Ga5{hijSlvaX?eSE znW%^R4}Xv&i$B4{o@!QP<)fmyob5$hdq?VW=6VXCN-U1!5N?uZ zna(N^HiLBr&T-(Zu{URNLeWyZ2m#J|K67S7N*-k6hrbptpO=%%rHyXQ&6@76z~yDc z1$wYykMSXC_~`Z6T+t!St;W5+uUG6ysgK&7sh*8ab6x+=X&=tU$)lhGF0c4Lk}aFw zzG*iYH0e=4NYE}?b0CFJ?xi?V#>jg+NioW!@kj(qit&_>Whe5|D<~t>Lqx7Ni3@># ztKLqx-KtI@)Atk0gRFaTS1uDfPPQ^L{lA*p@v4OrmjM^)$$GUN}1F$x63oGJ+F_^XR}svbKfIg zI=hPc%#1HM4da9IJP!M1lc0fnA=c-}_(M+!tuNR&2lL3B9DSh}O0hw`{rNlDQwlz+ zr_AQ`_0=_~tkO0gymgP!`fqC^=8I~-u-rjOq>=kzzuii?Ny+{S-&)r4tYd}g>DYpW z2iZr7kSVnZG--Fesr$yQdl>VUR*jV+D1ol*}{iaJmd#%p#$xPh$QVY_j& zb)NxFiHz7p7=nowr;`y{SWmRnp~0`BB&$*wVAAlSZBRewXN`P_33G$~*d75QHrulq z|57lJF6r0VTL%uq52dJEyP&&abUlosZ|BI)fi>yYCYmX02EEsxmC@g~{_>l?oxP`M zvuh+gka%CBjMKXajtmLZULX$y8fSNiwKdACLc15!Xg3^NnA4>nXB_bDndG;^Xo;bT4a;7|~3fkrmWX!?y5XaN`! z?|vbEo3xl>3f^nlXw_@!C8+1+qkGoRw)yWRt%k@e4=B|<)OI9h}ayIoY4U? z`*$O5Hri~>;l3OXq>mVCx1H2>57>_pG7y#E%Yo8zLK!8Im5@B$Ez1l*uY!4B4C?lPxY?QxREWTC1uy4`7p z%^u_#C)yB@&G1X&_a34i@0sH_yOkb$XzQ6G*vEIR7TI0fc{&@IwU>+v|NGv9bdxcf z*9i*J>&c!IRjDj}k~T)lFKqR0DWIOv+sm~o(I&w!gM7WK%H7=66z1~P=N5>^)A_64 zNIWc?q>}yvdRd-0k0NvShp6iBDXqc(xH})FafWl4F$HkrZbp|K+ke40Q;-7oL$**> zveyP&DF<{a&;cS|jShFs+B=>ch!;qtAp z)^>xyZzG_@Kb#@GZBh7@YpkqI+_>g>9!sfYS@xib)a#ukxHxD!#v0ZB~kjCbqr zZoUG(Cg!AhUws?2U57jwd+wbHZO~+rdPZ`OoYT>{d_yd_l)8jSFBXx&8CBhz#3H!d zWkM=!Eb2-@C?(MB#t%Ym9RiiZX`rhI8nMVc6b-DAJC4tkCFLxH?RU=IwKqJP*eN&}Q$pV}^mP!xY%u_1TCfy2a$8WkfC#GpVi1|oFhk9vOmz* zYh?`x8Tfnk#F7iixuF3L|KRZfUpL)-AFa}!SiR(o<1&gCoe7qxx;`FzAP>h&mC|&R z1qvaX+u<}+3<^Fx;1&c_Z@Kff>U&$leosckPp(jb=| z2oEjqL0GVBy9dGreNwX2plamAR%LtsnO^X?NR&Wq@Sjd9$-etli2j^|fOOy>X>#wt z?H0G1-(lYzY@d4b&Bt>e78rCrnsxlx7;X{a5n}v&7_VRWZ7-svjH{TII@q^9y)cSL0ks|JLUSS+~k(CTQv zV|+q@?PXfB@H~tH5Z({l!L)u9iFyX*x->zjJRT(U+X1h06#UN;lQhyq2|Mx<<+l>T zgXJ=5_9CBGI_TK<9vVLv7X7yGPD)>s|3WAFFN&njfBlH4w!ucP=PL>e8+9BCiZ#2e zT9Nqu;Q3x4_Vnq);~1cg{6HW^geCYgoK)*zz=}8O-1wbUvNB-{t=aKiN&w|_=?uE) z0Pz7#Dl#m=3qH|udG^neU4Om%60>K`)hgoIw0E-X#rr%LvXP5_uNJ4`ajw-R{rEKa z_dl7`MM{j(^!2^vaFgx+jz^Q?oEcYzO%AI_G(N)#`X{`kuU9)Dp=C%qR^LVDDD$(F~{V8FP^$PO8L+ovJjgpSZ}yEszoELK|#i?bQ$hI2`-RDOvX4)|6q+ zld!jn3%3NGhV)#L0Bd#N*BIwcMgJAlWcEp8(jVA6;Ch68s7EP7=t|{mE6Q%YpTb3Z z&JZ&eqd&Cx-|7g;4_T2cbufLq5TsZ7eb;TTuVC+97%K2b%i-Kaz|Z{3=DQ!Q*bc9? z%Zly@k#Yo5R%5?&H!}O5gHDe7+(-y%cL39WdjV7QH!~Uo zin&yhefHhNb6ENYXyLT7w-^M?a5b)9-_9P3FRp)DNy`YXL3iOpF4?0T{yEo?LM(Ir zfjtXfKSfaC2h8&Jr_$uy2Y3eMn7k+NE*qgVJw%GbLI&Ey!idWn`%UMS6d|+>OPubJ zsQpgn!A4Ze-8SD@Arjma2E#U_CE|Xz<&cQbTnChfr5WhH?~r~C`SsWn?U8mwdg6+i zG6RD>hb2au;gTc(3zK&j@f}V3bvC6m)7N#e?Zs0m;KQ5zb((hW%A6yIZe?t;I4EAM z+S02nptI)4saaF+trV(C^5fnbf1$|R{6gl8%q~*p=AgHO0k3bSf4m81T@0rti27zY za5%|2@&h7onu~K-Nn^{w+%cY9`!i6;!3uwQTJOwYZ0FgszYFNSUefIx;~a{by6%Imc=dtf zC$D*07FCGR1OEjh(X5beup_LnbORDMO#StPv4>Fv4+<2g%Ym4k*FfjX#+9^_V%pE~!j zgM2fn-85-&@gIwEJ`#)n@`DCv2Pxt%VEuK+ZX=^s8l!yzVE=UkQ@PLdgJl?Sy;+a| zPNQM*IOQx}om9VKiloFYrMtdrlE~a@sw?b;+ign^<_Q*dR6bS5*KS-i=jSk^1i>HKK$ zI`vr*a!S^&ccNN_Qg$)T4F0F~!WH{sc0T;c1c^8--yo|;>!9K4=|>eUnku0o%jE2L z@cu)Y4#+QcczFxdFO%y5VBQ|*rvx1nu+;|C00zOnjfCmZdY;UD2^{@O`FG>9>`7v)a zMPTiA=4b8{$q>$AiqyUn&L`2+>Sp>u`BC#RqEDqVmqDM=VGuDK2XdDv8ME>MpqAQU zeF^xGVSqMf%M$lw)Xk5s-p=n^G^0*6)02Ha7eU_lK+?Iw*)Eje)WIfDadwCryR#a5 zt_CX!hX2%586X`G@5sZ|HT)YE=+)d?Pcn=${C{+_gP80hm`p+b5jtpV#5V*5U^mGB zcaR0Y5(A?hBghTJJu%)Me!4zrvfOXH-cQ=hz!MrQ{~^C{4&Sy;((eEC?1Cq9pZPqmf)ZsOEye)Ul?HV3W6a)R zSOxsmMaNv$cL1xV_N4gm05{ShqKH^F{q4m8bt8Pnr>ZP6oVI@y#vINMZ9PgvQ;XW8 zda}2VbMsG&nn>pV9&^mJGK=ZFcebf!I%1r-t*(s#D$mb**AeqdOjNqY%S}#b5G19& zXo26mof?6?u2oVWhw5ZQFflctDk+fL7Sv|2#9EXq^p(c@84p#5aE-ecpZ{KG20CB$ zQ!!$*_C~j@FquaIr)RHU{$VE9V)}nO^5hAZo0idVhf5GUY3m&DNXJ0C;vVGn{{Z(^ BfZPB8 literal 0 HcmV?d00001 diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/plugin.xml b/eclipse/plugins/org.argeo.slc.client.rcp/plugin.xml index e112468cd..9caec033e 100644 --- a/eclipse/plugins/org.argeo.slc.client.rcp/plugin.xml +++ b/eclipse/plugins/org.argeo.slc.client.rcp/plugin.xml @@ -3,7 +3,7 @@ + + + + + + + + @@ -29,6 +45,10 @@ name="windowImages" value="icons/argeo-icon-256.png"> + + diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml b/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml new file mode 100644 index 000000000..d283f6c82 --- /dev/null +++ b/eclipse/plugins/org.argeo.slc.client.rcp/pom.xml @@ -0,0 +1,39 @@ + + 4.0.0 + + org.argeo.slc.eclipse + plugins + 0.13.0-SNAPSHOT + .. + + org.argeo.slc.client.rcp + SLC Client RCP + jar + + + + org.argeo.slc.eclipse + org.argeo.slc.client.ui + ${project.version} + + + + org.eclipse.ui + org.eclipse.ui + + + org.eclipse.core + org.eclipse.core.runtime + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.x86_64 + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.x86 + + + + diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/slc-client-rcp.product b/eclipse/plugins/org.argeo.slc.client.rcp/slc-client-rcp.product new file mode 100644 index 000000000..b091f99a0 --- /dev/null +++ b/eclipse/plugins/org.argeo.slc.client.rcp/slc-client-rcp.product @@ -0,0 +1,155 @@ + + + + + + + + + + -console + -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/ApplicationWorkbenchWindowAdvisor.java b/eclipse/plugins/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/ApplicationWorkbenchWindowAdvisor.java index e660ccf64..17250fa5b 100644 --- a/eclipse/plugins/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/ApplicationWorkbenchWindowAdvisor.java +++ b/eclipse/plugins/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/ApplicationWorkbenchWindowAdvisor.java @@ -1,6 +1,16 @@ package org.argeo.slc.client.rcp; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Listener; +import org.eclipse.swt.widgets.Menu; +import org.eclipse.swt.widgets.MenuItem; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Tray; +import org.eclipse.swt.widgets.TrayItem; +import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.application.ActionBarAdvisor; import org.eclipse.ui.application.IActionBarConfigurer; import org.eclipse.ui.application.IWorkbenchWindowConfigurer; @@ -8,7 +18,10 @@ import org.eclipse.ui.application.WorkbenchWindowAdvisor; public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { - public ApplicationWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) { + private TrayItem trayItem; + + public ApplicationWorkbenchWindowAdvisor( + IWorkbenchWindowConfigurer configurer) { super(configurer); } @@ -19,8 +32,82 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { public void preWindowOpen() { IWorkbenchWindowConfigurer configurer = getWindowConfigurer(); - configurer.setInitialSize(new Point(600, 400)); + configurer.setInitialSize(new Point(800, 600)); configurer.setShowCoolBar(true); configurer.setShowStatusLine(false); } + + public void postWindowOpen() { + initTray(); + } + + @Override + public boolean preWindowShellClose() { + // hide but do not dispose if tray is supported + if (trayItem != null) { + getWindowConfigurer().getWindow().getShell().setVisible(false); + return false; + } else + return true; + } + + /** Init tray support */ + protected void initTray() { + IWorkbenchWindow window = getWindowConfigurer().getWindow(); + final Tray tray = window.getShell().getDisplay().getSystemTray(); + trayItem = new TrayItem(tray, SWT.NONE); + if (trayItem == null) + return; + + // image + Image trayImage = ClientRcpPlugin.getDefault().getImageRegistry().get( + "argeoTrayIcon"); + trayItem.setImage(trayImage); + trayItem.setToolTipText("Argeo SLC"); + + // add pop-menu + // TODO: contribute more commands + trayItem.addListener(SWT.MenuDetect, new Listener() { + public void handleEvent(Event event) { + IWorkbenchWindow window = getWindowConfigurer().getWindow(); + Menu menu = new Menu(window.getShell(), SWT.POP_UP); + MenuItem exit = new MenuItem(menu, SWT.NONE); + exit.setText("Exit"); + exit.addListener(SWT.Selection, new Listener() { + public void handleEvent(Event event) { + getWindowConfigurer().getWorkbenchConfigurer() + .getWorkbench().close(); + } + }); + menu.setVisible(true); + } + }); + + // add behavior when clicked upon + trayItem.addListener(SWT.Selection, new Listener() { + public void handleEvent(Event event) { + Shell shell = getWindowConfigurer().getWindow().getShell(); + if (shell.isVisible()) { + if (shell.getMinimized()) + shell.setMinimized(false); + else { + shell.setVisible(false); + shell.setMinimized(true); + } + } else { + shell.setVisible(true); + shell.setActive(); + shell.setFocus(); + shell.setMinimized(false); + } + } + }); + } + + @Override + public void dispose() { + if (trayItem != null) + trayItem.dispose(); + } + } diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/Activator.java b/eclipse/plugins/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/ClientRcpPlugin.java similarity index 55% rename from eclipse/plugins/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/Activator.java rename to eclipse/plugins/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/ClientRcpPlugin.java index 84bc8c0fe..b919ac1d7 100644 --- a/eclipse/plugins/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/Activator.java +++ b/eclipse/plugins/org.argeo.slc.client.rcp/src/org/argeo/slc/client/rcp/ClientRcpPlugin.java @@ -1,29 +1,33 @@ package org.argeo.slc.client.rcp; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; /** * The activator class controls the plug-in life cycle */ -public class Activator extends AbstractUIPlugin { +public class ClientRcpPlugin extends AbstractUIPlugin { // The plug-in ID public static final String PLUGIN_ID = "org.argeo.slc.client.rcp"; // The shared instance - private static Activator plugin; - + private static ClientRcpPlugin plugin; + /** * The constructor */ - public Activator() { + public ClientRcpPlugin() { } /* * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + * + * @see + * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext + * ) */ public void start(BundleContext context) throws Exception { super.start(context); @@ -32,7 +36,10 @@ public class Activator extends AbstractUIPlugin { /* * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + * + * @see + * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext + * ) */ public void stop(BundleContext context) throws Exception { plugin = null; @@ -41,18 +48,25 @@ public class Activator extends AbstractUIPlugin { /** * Returns the shared instance - * + * * @return the shared instance */ - public static Activator getDefault() { + public static ClientRcpPlugin getDefault() { return plugin; } + @Override + protected void initializeImageRegistry(ImageRegistry reg) { + reg.put("argeoTrayIcon", + getImageDescriptor("icons/argeo-trayIcon-256.png")); + } + /** - * Returns an image descriptor for the image file at the given - * plug-in relative path - * - * @param path the path + * Returns an image descriptor for the image file at the given plug-in + * relative path + * + * @param path + * the path * @return the image descriptor */ public static ImageDescriptor getImageDescriptor(String path) { diff --git a/eclipse/plugins/org.argeo.slc.client.ui/.classpath b/eclipse/plugins/org.argeo.slc.client.ui/.classpath index ad32c83a7..304e86186 100644 --- a/eclipse/plugins/org.argeo.slc.client.ui/.classpath +++ b/eclipse/plugins/org.argeo.slc.client.ui/.classpath @@ -1,7 +1,7 @@ - - + + diff --git a/eclipse/plugins/org.argeo.slc.client.ui/.settings/org.eclipse.jdt.core.prefs b/eclipse/plugins/org.argeo.slc.client.ui/.settings/org.eclipse.jdt.core.prefs index 6abb6ecd1..95d6b05d7 100644 --- a/eclipse/plugins/org.argeo.slc.client.ui/.settings/org.eclipse.jdt.core.prefs +++ b/eclipse/plugins/org.argeo.slc.client.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,12 @@ -#Tue Jul 27 13:26:24 CEST 2010 +#Wed Aug 04 16:31:36 CEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF index fb8568d40..ddb16642d 100644 --- a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF +++ b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.ui;resolution:=optional, org.eclipse.rap.ui;resolution:=optional, org.eclipse.core.runtime Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.argeo.slc.client.ui, org.argeo.slc.client.ui.actions, org.argeo.slc.client.ui.views diff --git a/eclipse/plugins/org.argeo.slc.client.ui/pom.xml b/eclipse/plugins/org.argeo.slc.client.ui/pom.xml new file mode 100644 index 000000000..1757c5d4a --- /dev/null +++ b/eclipse/plugins/org.argeo.slc.client.ui/pom.xml @@ -0,0 +1,45 @@ + + 4.0.0 + + org.argeo.slc.eclipse + plugins + 0.13.0-SNAPSHOT + .. + + org.argeo.slc.client.ui + SLC Client UI + jar + + + + org.argeo.slc.runtime + org.argeo.slc.core + ${project.version} + + + + org.argeo.commons.eclipse + org.argeo.eclipse.ui + ${version.argeo-commons} + + + + org.springframework + org.springframework.context + + + + org.eclipse.ui + org.eclipse.ui + + + org.eclipse.core + org.eclipse.core.runtime + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.x86_64 + + + diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/ExecutionModulesContentProvider.java b/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/ExecutionModulesContentProvider.java index 6bfb921db..8fe82baae 100644 --- a/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/ExecutionModulesContentProvider.java +++ b/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/ExecutionModulesContentProvider.java @@ -21,7 +21,6 @@ public class ExecutionModulesContentProvider implements ITreeContentProvider { private SlcAgent slcAgent; - @Override public Object[] getChildren(Object parent) { if (parent instanceof ExecutionModuleNode) { ExecutionModuleNode executionModuleNode = (ExecutionModuleNode) parent; @@ -60,7 +59,6 @@ public class ExecutionModulesContentProvider implements ITreeContentProvider { } } - @Override public Object getParent(Object node) { // if (node instanceof TreeObject) { // return ((TreeObject) node).getParent(); @@ -68,7 +66,6 @@ public class ExecutionModulesContentProvider implements ITreeContentProvider { return null; } - @Override public boolean hasChildren(Object parent) { if (parent instanceof TreeParent && ((TreeParent) parent).isLoaded()) { return ((TreeParent) parent).hasChildren(); @@ -80,15 +77,12 @@ public class ExecutionModulesContentProvider implements ITreeContentProvider { return false; } - @Override public void inputChanged(Viewer v, Object oldInput, Object newInput) { } - @Override public void dispose() { } - @Override public Object[] getElements(Object parent) { return getChildren(parent); } diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/ExecutionModulesView.java b/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/ExecutionModulesView.java index 0f358c36a..bc0cb889a 100644 --- a/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/ExecutionModulesView.java +++ b/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/ExecutionModulesView.java @@ -60,7 +60,6 @@ public class ExecutionModulesView extends ViewPart { viewer.setInput(getViewSite()); viewer.addDoubleClickListener(new IDoubleClickListener() { - @Override public void doubleClick(DoubleClickEvent evt) { Object obj = ((IStructuredSelection) evt.getSelection()) .getFirstElement(); diff --git a/eclipse/plugins/pom.xml b/eclipse/plugins/pom.xml new file mode 100644 index 000000000..c033575b6 --- /dev/null +++ b/eclipse/plugins/pom.xml @@ -0,0 +1,61 @@ + + 4.0.0 + + org.argeo.slc + eclipse + 0.13.0-SNAPSHOT + .. + + org.argeo.slc.eclipse + plugins + Argeo Eclipse plugins + pom + + org.argeo.slc.client.ui + org.argeo.slc.client.rcp + + + + + . + + plugin.xml + META-INF/** + icons/** + + + + + + maven-jar-plugin + + + META-INF/MANIFEST.MF + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + package + + jar + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + diff --git a/eclipse/pom.xml b/eclipse/pom.xml new file mode 100644 index 000000000..7ee567fed --- /dev/null +++ b/eclipse/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + org.argeo.slc + argeo-slc + 0.13.0-SNAPSHOT + .. + + eclipse + SLC Eclipse + pom + + plugins + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 35805260d..fddc1a675 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,7 @@ runtime modules + eclipse dep server demo -- 2.39.2